Merge branch 'feature/sale' into release/1.0

 'use strict';
 'use strict';
 
 
 const mRoot = '../models';
 const mRoot = '../models';
-const library = '../../../library';
 
 
 const couponModel = require(`${mRoot}/coupon`); // 领取优惠券 model
 const couponModel = require(`${mRoot}/coupon`); // 领取优惠券 model
-const log = require(`${library}/logger`);
 
 
 exports.index = (req, res, next) => {
 exports.index = (req, res, next) => {
     var renderData = {
     var renderData = {

-var API = require('../../../library/api').API;
-var api = new API();
+var api = global.yoho.API;
 
 
 /**
 /**
  * 分享页面基础参数
  * 分享页面基础参数

@@ -8,8 +8,8 @@
 const request = require('request-promise');
 const request = require('request-promise');
 const Promise = require('bluebird');
 const Promise = require('bluebird');
 const crypto = require('crypto');
 const crypto = require('crypto');
-const logger = require('../../../library/logger');
-const cache = require('../../../library/cache');
+const logger = global.yoho.logger;
+const cache = global.yoho.cache;
 
 
 // 此处请勿使用有货公众号的 appId, 此处使用的是 女生志 的appId
 // 此处请勿使用有货公众号的 appId, 此处使用的是 女生志 的appId
 const appId = 'wxb52ec6a352f0b090';
 const appId = 'wxb52ec6a352f0b090';

@@ -27,24 +27,22 @@ const saleModel = require(`${mRoot}/sale`);
  * @param  {[string]} page js文件page名称
  * @param  {[string]} page js文件page名称
  * @return {[type]}
  * @return {[type]}
  */
  */
-const _processPublicData = (req, title, page) => {
-    let data = {};
-    let headerData = headerModel.setNav({
-        navTitle: title
-    });
-
-    data = {
+const _processPublicData = (req, title, page, backUrl) => {
+    return {
         channel: req.yoho.channel,
         channel: req.yoho.channel,
         renderData: {
         renderData: {
             module: 'product',
             module: 'product',
             page: page,
             page: page,
             title: title,
             title: title,
-            pageHeader: headerData,
+            saleNav: true,
+            pageHeader: headerModel.setNav({
+                navTitle: title,
+                navBtn: false,
+                backUrl: backUrl || ''
+            }),
             pageFooter: true
             pageFooter: true
         }
         }
     };
     };
-
-    return data;
 };
 };
 
 
 /**
 /**
@@ -54,9 +52,31 @@ const _processPublicData = (req, title, page) => {
  * @return {[type]}
  * @return {[type]}
  */
  */
 let index = (req, res, next) => {
 let index = (req, res, next) => {
-    let params = _processPublicData(req, 'SALE', 'sale');
+    let refer = req.get('Referer') || '';
+    let reqPath = req.baseUrl + req.path;
+    let backUrl = refer.indexOf(reqPath) === -1 ? refer : '';
+
+    if (['boys', 'girls', 'kids', 'lifestyle'].indexOf(req.yoho.channel) === -1) {
+        return next();
+    }
+
+    backUrl && res.cookie('saleRefer', backUrl);
+    backUrl = backUrl || req.cookies.saleRefer;
+
+    let params = _processPublicData(req, 'SALE', 'sale', backUrl);
 
 
     saleModel.getSaleData(params.channel).then((result) => {
     saleModel.getSaleData(params.channel).then((result) => {
+
+        // 扩展头部频道选择数据
+        Object.assign(params.renderData.pageHeader, {
+            saleNav: saleModel.saleNav(req.yoho.channel)
+        });
+
+        // 此处 channel 需要读取 cookies 的 channel
+        if (req.cookies._Channel) {
+            res.locals.pageChannel = {};
+            res.locals.pageChannel[req.cookies._Channel] = true;
+        }
         res.render('sale/index', Object.assign(params.renderData, {
         res.render('sale/index', Object.assign(params.renderData, {
             content: result,
             content: result,
             floorHeader: {
             floorHeader: {
@@ -94,7 +114,9 @@ let discount = (req, res, next) => {
     let params = _processPublicData(req, '折扣专场', 'discount');
     let params = _processPublicData(req, '折扣专场', 'discount');
 
 
     saleModel.getDiscountData(params.channel).then((result) => {
     saleModel.getDiscountData(params.channel).then((result) => {
-        res.render('sale/discount', Object.assign(params.renderData, result));
+        res.render('sale/discount', Object.assign(params.renderData, {
+            data: result
+        }));
     }).catch(next);
     }).catch(next);
 };
 };
 
 
@@ -109,7 +131,7 @@ let discountDetail = (req, res, next) => {
     let id = req.query.id;
     let id = req.query.id;
     let params = _processPublicData(req, '', 'discount-detail');
     let params = _processPublicData(req, '', 'discount-detail');
 
 
-    saleModel.getDiscountDetailData(id, params.channel).then((result) => {
+    saleModel.getDiscountDetailData(id, req.yoho.channel).then((result) => {
         params.renderData.pageHeader.navTitle = result.title;
         params.renderData.pageHeader.navTitle = result.title;
         res.render('sale/discount-detail', Object.assign(params.renderData, result));
         res.render('sale/discount-detail', Object.assign(params.renderData, result));
     }).catch(next);
     }).catch(next);
@@ -158,8 +180,6 @@ let filter = (req, res, next) => {
  */
  */
 let search = (req, res, next) => {
 let search = (req, res, next) => {
     let params = Object.assign({}, req.query);
     let params = Object.assign({}, req.query);
-
-    // uid = 9239279
     let uid = req.user.uid || 0;
     let uid = req.user.uid || 0;
 
 
     saleModel.getSearchData(params, uid).then((result) => {
     saleModel.getSearchData(params, uid).then((result) => {

@@ -15,8 +15,7 @@ const processTime = require(`${utils}/time-process`);
 const _ = require('lodash');
 const _ = require('lodash');
 const api = global.yoho.API;
 const api = global.yoho.API;
 const serviceAPI = global.yoho.ServiceAPI;
 const serviceAPI = global.yoho.ServiceAPI;
-
-
+const helpers = global.yoho.helpers;
 
 
 /**
 /**
  * 排序转换
  * 排序转换
@@ -37,11 +36,43 @@ const channelType = {
     boys: '1',
     boys: '1',
     girls: '2',
     girls: '2',
     kids: '3',
     kids: '3',
-    lifeStyle: '4',
+    lifestyle: '4',
     all: '1,2,3,4'
     all: '1,2,3,4'
 };
 };
 
 
 /**
 /**
+ * 频道转换
+ * 产品要求，SALE的导航显示 Boy，Girl 单数形式
+ */
+const channelHash = {
+    boys: 'Boy',
+    girls: 'Girl',
+    kids: 'Kid',
+    lifestyle: 'Lifestyle'
+};
+
+const saleNav = (channel) => {
+    return {
+        channel: channelHash[channel],
+        list: [
+            {
+                title: 'Boy',
+                url: helpers.urlFormat('/product/sale', {channel: 'boys'})
+            }, {
+                title: 'Girl',
+                url: helpers.urlFormat('/product/sale', {channel: 'girls'})
+            }, {
+                title: 'Kid',
+                url: helpers.urlFormat('/product/sale', {channel: 'kids'})
+            }, {
+                title: 'Lifestyle',
+                url: helpers.urlFormat('/product/sale', {channel: 'lifestyle'})
+            }
+        ]
+    };
+};
+
+/**
  * 资源位code码
  * 资源位code码
  */
  */
 const contentCode = contentCodeConfig.sale;
 const contentCode = contentCodeConfig.sale;
@@ -51,7 +82,7 @@ const contentCode = contentCodeConfig.sale;
  * @param  {[array]} list
  * @param  {[array]} list
  * @return {[array]}
  * @return {[array]}
  */
  */
-const _processDiscount = (list, channel) => {
+const _processDiscount = (list) => {
     const formatData = [];
     const formatData = [];
     let flag = true;
     let flag = true;
 
 
@@ -65,7 +96,6 @@ const _processDiscount = (list, channel) => {
 
 
     _.forEach(list, (data) => {
     _.forEach(list, (data) => {
         if (flag === true) {
         if (flag === true) {
-            data.specialUrl = `/product/sale/discount/detail?id=${data.id}&channel=${channel}`;
             Object.assign(data, processTime(data.leftTime));
             Object.assign(data, processTime(data.leftTime));
         }
         }
 
 
@@ -87,7 +117,9 @@ const _discount = (params) => {
         method: 'app.activity.get',
         method: 'app.activity.get',
         sort: 2,
         sort: 2,
         plateform: 3
         plateform: 3
-    }, params));
+    }, params), {
+        cache: true
+    });
 };
 };
 
 
 /**
 /**
@@ -158,7 +190,9 @@ const _searchSales = (params) => {
 
 
     return api.get('', Object.assign({
     return api.get('', Object.assign({
         method: method
         method: method
-    }, params), true);
+    }, params), {
+        cache: true
+    });
 };
 };
 
 
 /**
 /**
@@ -176,7 +210,9 @@ const _getUserProfile = (uid) => {
     return api.get('', {
     return api.get('', {
         method: 'app.passport.profile',
         method: 'app.passport.profile',
         uid: uid
         uid: uid
-    }, true);
+    }, {
+        cache: true
+    });
 };
 };
 
 
 /**
 /**
@@ -187,6 +223,8 @@ const _getUserProfile = (uid) => {
 const _getResources = (page, channel) => {
 const _getResources = (page, channel) => {
     return serviceAPI.get('operations/api/v5/resource/get', {
     return serviceAPI.get('operations/api/v5/resource/get', {
         content_code: contentCode[channel][page]
         content_code: contentCode[channel][page]
+    }, {
+        cache: true
     }).then((result) => {
     }).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
             return resourcesProcess(result.data);
             return resourcesProcess(result.data);
@@ -206,6 +244,8 @@ const _getBreakingSort = (yhChannel) => {
     return api.get('', {
     return api.get('', {
         method: 'app.sale.getBreakingSort',
         method: 'app.sale.getBreakingSort',
         yh_channel: channelType[yhChannel] || '1'
         yh_channel: channelType[yhChannel] || '1'
+    }, {
+        cache: true
     }).then((result) => {
     }).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
             return _processBreakingSort(result.data);
             return _processBreakingSort(result.data);
@@ -302,14 +342,13 @@ const getBreakCodeData = (params) => {
  * @return {[object]}
  * @return {[object]}
  */
  */
 const getDiscountData = (yhChannel) => {
 const getDiscountData = (yhChannel) => {
-    const discountData = {};
-
     return _discount({
     return _discount({
         yh_channel: channelType[yhChannel] || '1'
         yh_channel: channelType[yhChannel] || '1'
     }).then((result) => {
     }).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
-            discountData.data = _processDiscount(result.data, yhChannel);
-            return discountData;
+            return {
+                list: _processDiscount(result.data)
+            };
         } else {
         } else {
             logger.error('折扣专场专题列表返回 code 不是 200');
             logger.error('折扣专场专题列表返回 code 不是 200');
             return {};
             return {};
@@ -332,7 +371,9 @@ const getDiscountDetailData = (id, yhChannel) => {
     return _discount(param).then((result) => {
     return _discount(param).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
             res = _processDiscount(result.data);
             res = _processDiscount(result.data);
-
+            if (res[0] && res[0].coverUrl) {
+                res[0].coverUrl = res[0].coverUrl.replace('/extent/{width}x{height}', '');
+            }
             return {
             return {
                 title: res[0] && res[0].title,
                 title: res[0] && res[0].title,
                 productPool: res[0] && res[0].productPool,
                 productPool: res[0] && res[0].productPool,
@@ -355,5 +396,6 @@ module.exports = {
     getDiscountDetailData,
     getDiscountDetailData,
     getVipData,
     getVipData,
     getFilterData,
     getFilterData,
-    getSearchData
+    getSearchData,
+    saleNav
 };
 };

@@ -9,7 +9,7 @@
         <ul id="list-nav" class="list-nav clearfix">
         <ul id="list-nav" class="list-nav clearfix">
 
 
             {{# sortData}}
             {{# sortData}}
-                <li {{#if @first}} class="active" {{/if}} data-id="{{sortId}}" data-allSub="{{allSub}}">
+                <li data-id="{{sortId}}" data-allSub="{{allSub}}">
                     <a href="javascript:void(0);">
                     <a href="javascript:void(0);">
                         <span class="span-test">{{sortName}}</span>
                         <span class="span-test">{{sortName}}</span>
                     </a>
                     </a>
@@ -35,7 +35,7 @@
                 </div>
                 </div>
             </div>
             </div>
             {{/ sub}}
             {{/ sub}}
-        </div>        
+        </div>
     {{/ nav}}
     {{/ nav}}
 
 
     <div id="goods-container" class="goods-container">
     <div id="goods-container" class="goods-container">

 <div class="discount-page yoho-page">
 <div class="discount-page yoho-page">
-    <ul class="special-list">
-        {{#each data}}
-        <li>
-            <a href="{{specialUrl}}">
-                <img class="lazy" data-original="{{image coverUrl 640 250}}" />
-                <p class="special-cont">
-                    <span class="special-title">{{title}}</span>
-                    <span class="special-time {{#if warnColor}}red-color{{/if}}">{{time}}</span>
-                </p>
-            </a>
-        </li>
-        {{/each}}
-    </ul>
-</div>
+    {{> resources/discount-activity}}
+</div>

@@ -10,14 +10,40 @@
         {{#if smallPic}}
         {{#if smallPic}}
             {{> resources/thumb-row}}
             {{> resources/thumb-row}}
         {{/if}}
         {{/if}}
+
+        {{! 中间banner}}
+        {{#if singleImage}}
+            {{> resources/banner}}
+        {{/if}}
+
+        {{!-- 折扣专场 --}}
+        {{#if discountActivity}}
+            {{> resources/discount-activity}}
+        {{/if}}
+
+        {{!-- 会员专享 --}}
+        {{#if vipFloor}}
+            {{> resources/vip-floor}}
+        {{/if}}
+
+        {{!-- 断码区 --}}
+        {{#if offCodeArea}}
+            {{> resources/off-code-area}}
+        {{/if}}
+
+        {{!-- OUTLETS --}}
+        {{#if titleImage}}
+            {{> resources/goods-category}}
+        {{/if}}
     {{/content}}
     {{/content}}
 
 
     {{#floorHeader}}
     {{#floorHeader}}
         {{> common/floor-header}}
         {{> common/floor-header}}
     {{/floorHeader}}
     {{/floorHeader}}
 
 
-    {{> common/filter-nav}}
-
+    <div class="sale-nav-wrap">
+        {{> common/filter-nav}}
+    </div>
     {{> product/sale/common}}
     {{> product/sale/common}}
 
 
 </div>
 </div>

@@ -7,7 +7,7 @@
 
 
     {{# activity}}
     {{# activity}}
         <img src="{{image coverUrl 640 200}}"/>
         <img src="{{image coverUrl 640 200}}"/>
-        <p class="activity-time" data-time-ms="{{leftTime}}"><i class="iconfont time-ico">&#xe603;</i><span></span></p>
+        <p class="activity-time" data-time-s="{{leftTime}}"><i class="iconfont time-ico">&#xe603;</i><span></span></p>
     {{/ activity}}
     {{/ activity}}
 
 
 </div>
 </div>

@@ -14,5 +14,3 @@
 </div>
 </div>
 
 
 {{> common/query-param}}
 {{> common/query-param}}
-
-{{> common/suspend-cart}}

@@ -22,7 +22,7 @@ const saleContentCode = {
         breakCode: '3f0898f1089b7bef5f3e071725c7a608',
         breakCode: '3f0898f1089b7bef5f3e071725c7a608',
         vip: '664935745012db6e2a96a7d57f75512f'
         vip: '664935745012db6e2a96a7d57f75512f'
     },
     },
-    lifeStyle: {
+    lifestyle: {
         sale: '01269e498ff5b07756e0733ec0e88c75',
         sale: '01269e498ff5b07756e0733ec0e88c75',
         breakCode: '0020a5762771aa16902a666c9491394e',
         breakCode: '0020a5762771aa16902a666c9491394e',
         vip: '647f1154d30b323ff46c787fc78aef65'
         vip: '647f1154d30b323ff46c787fc78aef65'

@@ -3,7 +3,7 @@
  * @return {[type]}
  * @return {[type]}
  */
  */
 const headerModel = require('../models/header');
 const headerModel = require('../models/header');
-const logger = require('../../library/logger');
+const logger = global.yoho.logger;
 
 
 exports.notFound = () => {
 exports.notFound = () => {
     return (req, res) => {
     return (req, res) => {

@@ -21,7 +21,6 @@ exports.setNav = (opt) => {
         navBtn: true          // 顶部下拉菜单选项
         navBtn: true          // 顶部下拉菜单选项
     };
     };
 
 
-
     Object.assign(defaultOpt, opt || {});
     Object.assign(defaultOpt, opt || {});
 
 
     if (defaultOpt.navBtn || _.isNull(defaultOpt.navBtn)) {
     if (defaultOpt.navBtn || _.isNull(defaultOpt.navBtn)) {

@@ -47,6 +47,8 @@
             <script src="//cdn.yoho.cn/m-yohobuy-node/{{version}}/libs.js"></script>
             <script src="//cdn.yoho.cn/m-yohobuy-node/{{version}}/libs.js"></script>
             <script src="//cdn.yoho.cn/m-yohobuy-node/{{version}}/{{module}}.{{page}}.js"></script>
             <script src="//cdn.yoho.cn/m-yohobuy-node/{{version}}/{{module}}.{{page}}.js"></script>
         {{/if}}
         {{/if}}
+        {{#unless devEnv}}
         {{> analysis}}
         {{> analysis}}
+        {{/unless}}
     </body>
     </body>
 </html>
 </html>

 {{# title}}
 {{# title}}
 <div class="floor-header-more">
 <div class="floor-header-more">
-    <h2>{{title}}</h2>
+    <h2>{{#if title}}{{title}}{{else}}{{name}}{{/if}}</h2>
     {{#if moreUrl}}
     {{#if moreUrl}}
         <a class="more-btn iconfont" href="{{moreUrl}}">&#xe618;</a>
         <a class="more-btn iconfont" href="{{moreUrl}}">&#xe618;</a>
     {{/if}}
     {{/if}}
 </div>
 </div>
-{{/ title}}
+{{/ title}}

 {{#pageHeader}}
 {{#pageHeader}}
-{{# ../pageChannel}}
+{{# @root.pageChannel}}
 <header id="yoho-header" class="yoho-header{{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}{{#if lifestyle}} life-style{{/if}}">
 <header id="yoho-header" class="yoho-header{{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}{{#if lifestyle}} life-style{{/if}}">
-{{/ ../pageChannel}}
+{{^}}
+<header id="yoho-header" class="yoho-header">
+{{/ @root.pageChannel}}
     {{#navBack}}
     {{#navBack}}
     <a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back">&#xe610;</a>
     <a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back">&#xe610;</a>
     {{/navBack}}
     {{/navBack}}
@@ -20,11 +22,26 @@
     {{#navTitle}}
     {{#navTitle}}
     <p class="nav-title">{{.}}</p>
     <p class="nav-title">{{.}}</p>
     {{/navTitle}}
     {{/navTitle}}
+    {{#saleNav}}
+    <span class="sale-nav nav-home">
+        {{channel}} <span class="iconfont">&#xe616;</span>
+    </span>
+    {{/saleNav}}
 </header>
 </header>
+{{#if saleNav.list}}
+<div class="sale-nav-select">
+    <span class="arrow"></span>
+    {{#each saleNav.list}}
+    <a href="{{url}}">{{title}}</a>
+    {{/each}}
+</div>
+{{/if}}
 {{#navBtn}}
 {{#navBtn}}
-{{# ../../pageChannel}}
+{{# @root.pageChannel}}
 <div class="homebuttom hide {{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}{{#if lifestyle}} life-style{{/if}}">
 <div class="homebuttom hide {{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}{{#if lifestyle}} life-style{{/if}}">
-{{/ ../../pageChannel}}
+{{^}}
+<div class="homebuttom hide">
+{{/ @root.pageChannel}}
     <ul>
     <ul>
         <li>
         <li>
             <a href="{{ indexUrl }}">
             <a href="{{ indexUrl }}">

+{{#data}}
+{{#if ../discountActivity}}
+    {{> common/floor-header-more}}
+{{/if}}
+<ul class="discount-list">
+    {{#list}}
+    <li>
+        <a href="/product/sale/discount/detail?id={{id}}&channel={{@root.channel}}">
+            <img class="lazy" data-original="{{image coverUrl 640 250}}" />
+            <p class="discount-cont">
+                <span class="discount-title">{{title}}</span>
+                <span class="discount-time {{#if warnColor}}red-color{{/if}}">{{time}}</span>
+            </p>
+        </a>
+    </li>
+    {{/list}}
+</ul>
+{{/data}}

@@ -26,6 +26,7 @@
                 </div>
                 </div>
             {{/if}}
             {{/if}}
         {{/ bigImage}}
         {{/ bigImage}}
+        {{#if list}}
         <ul class="category-list clearfix">
         <ul class="category-list clearfix">
             {{# list}}
             {{# list}}
                 <li>
                 <li>
@@ -42,5 +43,6 @@
                 </li>
                 </li>
             {{/ list}}
             {{/ list}}
         </ul>
         </ul>
+        {{/if}}
     </div>
     </div>
 {{/data}}
 {{/data}}

+{{#data}}
+    {{> common/floor-header-more}}
+    {{> resources/banner-top}}
+{{/data}}
+{{> resources/left-right}}

-<div id="thumb-row">
+<div class="thumb-row">
    {{# data}}
    {{# data}}
     <a href="{{url}}">
     <a href="{{url}}">
         <div class="thumb-row-box" style="background-image:url({{image src 275 160}})"></div>
         <div class="thumb-row-box" style="background-image:url({{image src 275 160}})"></div>

+{{#data}}
+    {{> common/floor-header-more}}
+    {{> resources/banner-top}}
+{{/data}}
+<div class="vip-floor clearfix" data-id={{data.title.productPoolId}}>
+</div>

-/**
- * 接口公共方法
- * @author: xuqi<qi.xu@yoho.cn>
- * @date: 2016/4/25
- */
-
-'use strict';
-const rp = require('request-promise');
-const qs = require('querystring');
-const md5 = require('md5');
-const _ = require('lodash');
-const log = require('./logger');
-const cache = require('./cache');
-const Timer = require('./timer');
-const sign = require('./sign');
-const config = require('../config/common');
-const api = config.domains.api;
-const serviceApi = config.domains.service;
-const searchApi = config.domains.search;
-
-// 错误返回
-const API_BAD_RETSULT = {
-    code: 500,
-    message: 'API result is not JSON string or null.'
-};
-
-// 调用失败
-const API_CALL_FAIL = {
-    code: 500,
-    message: 'Call API failed.'
-};
-
-// all 方法错误的传参
-const API_ALL_METHOD_ERROR = 'the parameters of api all method should be Array!';
-
-// 获取缓存数据失败
-const SLAVE_CACHE_FAIL = 'get slave cache fail';
-const MASTER_CACHE_FAIL = 'get master cache fail';
-
-// 获取缓存数据成功
-const SLAVE_CACHE_SUCCESS = 'get slave cache success';
-const MASTER_CACHE_SUCCESS = 'get master cache success';
-
-class Http {
-
-    constructor(baseUrl) {
-        this.ApiUrl = baseUrl;
-    }
-
-    /**
-     * 获取请求 ID
-     */
-    _getReqId(options) {
-        return md5(`${options.url}?${qs.stringify(options.qs || options.form)}`);
-    }
-
-    /**
-     * 调用接口
-     */
-    _requestFromAPI(options, cacheOption, reqId) {
-        const timer = new Timer();
-        const method = options.method || 'get';
-
-        timer.put('getApi');// 统计时间开始
-        return rp(options).then((result) => {
-            const duration = timer.put('getApi');// 统计时间结束
-
-            // 数据校验
-            if (!result) {
-                log.error(`error: ${API_BAD_RETSULT.message}`);
-                return Promise.reject(API_BAD_RETSULT);
-            }
-
-            // 写缓存, 否则返回 Slave 缓存服务器的数据
-            if (config.useCache && cacheOption) {
-                const cacheTime = _.isNumber(cacheOption) ? cacheOption : 60;
-                const catchErr = (err) => {
-                    log.error(`cache: ${err.toString()}`);
-                };
-
-                reqId = reqId || this._getReqId(options);
-                cache.set(`apiCache:${reqId}`, result, cacheTime).catch(catchErr);
-                cache.setSlave(`apiCache:${reqId}`, result, 86400).catch(catchErr); // 二级缓存存储一天
-            }
-
-            let reqData = options.qs || options.form;
-
-            log.info(`use: ${duration}ms for ${method} api: ${options.url}?${qs.stringify(reqData)} `);
-            return result;
-        }).catch((err)=> {
-            const duration = timer.put('getApi');// 统计时间结束
-
-            log.error(`${method} api fail: use: ${duration}ms, code:${err.statusCode}, error: ${err.message}`);
-            log.error(`API: ${options.url}?${qs.stringify(options.qs)}`);
-
-            // 使用缓存的时候，读取二级缓存
-            if (config.useCache && cacheOption) {
-                return this._requestFromCache(options, true);
-            }
-            return Promise.resolve(API_CALL_FAIL);
-        });
-    }
-
-    /**
-     * 读取缓存
-     * @param  {[object]} options
-     * @param  {[boolean]} slave true： 读取二级缓存
-     * @return {[type]}
-     */
-    _requestFromCache(options, slave) {
-        const reqId = this._getReqId(options);
-        const getCache = slave ? cache.getFromSlave : cache.get;
-
-        log.info(`get ${slave ? 'slave' : 'master'} cache: ${reqId}, url: ${options.url}?${qs.stringify(options.qs)}`);
-        return getCache(`apiCache:${reqId}`).then((result) => {
-            if (!_.isNil(result)) {
-                try {
-                    result = JSON.parse(result);
-                } finally {
-                    log.info(slave ? SLAVE_CACHE_SUCCESS : MASTER_CACHE_SUCCESS);
-                    return result;
-                }
-            }
-
-            // 读取缓存失败，并且不是二级缓存的时候，调用 API
-            if (!slave) {
-                return this._requestFromAPI(options, true, reqId);
-            }
-        }).catch(() => {
-            log.error(slave ? SLAVE_CACHE_FAIL : MASTER_CACHE_FAIL);
-
-            // 读取缓存失败，并且不是二级缓存的时候，调用 API
-            if (!slave) {
-                return this._requestFromAPI(options, true, reqId);
-            }
-
-            return Promise.resolve(API_CALL_FAIL);
-        });
-    }
-
-    /**
-     * 使用 get 请求获取接口
-     * @param  {[string]} url
-     * @param  {[object]} data
-     * @param  {[bool or number]} cacheOption 使用数字时，数字表示缓存时间
-     * @return {[type]}
-     */
-    get(url, data, cacheOption) {
-        const options = {
-            url: `${this.ApiUrl}${url}`,
-            qs: data.client_secret ? data : sign.apiSign(data),
-            json: true,
-            gzip: true,
-            timeout: 3000
-        };
-
-        // 从缓存获取数据
-        if (config.useCache && cacheOption) {
-            return this._requestFromCache(options);
-        }
-
-        return this._requestFromAPI(options, cacheOption);
-    }
-
-    /**
-     * post
-     * @param url String
-     * @param data Obejct
-     */
-    post(url, data) {
-        const options = {
-            url: `${this.ApiUrl}${url}`,
-            form: data.client_secret ? data : sign.apiSign(data),
-            method: 'post',
-            json: true,
-            timeout: 3000
-        };
-
-        return this._requestFromAPI(options);
-    }
-
-    all(list) {
-        if (_.isArray(list)) {
-            return Promise.all(list);
-        } else {
-            return Promise.reject(Error(API_ALL_METHOD_ERROR));
-        }
-    }
-}
-
-class API extends Http {
-    constructor() {
-        super(api);
-    }
-}
-
-class ServiceAPI extends Http {
-    constructor() {
-        super(serviceApi);
-    }
-}
-
-class SearchAPI extends Http {
-    constructor() {
-        super(searchApi);
-    }
-}
-
-exports.API = API;
-exports.ServiceAPI = ServiceAPI;
-exports.SearchAPI = SearchAPI;

-/**
- * 缓存封装
- * 前期使用 memcache, 写方法的时候考虑一下如何转换为 redis
- * @author bikai kai.bi@yoho.cn
- * @date 2016/05/16
- */
-'use strict';
-const Promise = require('bluebird');
-const Memcached = require('memcached');
-const _ = require('lodash');
-const config = require('../config/common');
-
-let master = new Memcached(config.memcache.master, config.memcache);
-let slave = new Memcached(config.memcache.slave, config.memcache);
-
-master = Promise.promisifyAll(master);
-slave = Promise.promisifyAll(slave);
-
-/**
- * 获取缓存
- * @param  {[string]} key 键
- * @return {[type]}
- */
-exports.get = (key) => {
-    if (_.isString(key)) {
-        return master.getAsync(key);
-    }
-
-    return Promise.resolve();
-};
-
-/**
- * 批量获取缓存
- * @param  {[array]} list 字符串数组
- * @return {[type]}
- */
-exports.getMulti = (list) => {
-    if (_.isArray(list)) {
-        return master.getMultiAsync(list);
-    }
-    return Promise.resolve();
-};
-
-/**
- * 获取缓存(从 Slave 服务器)
- * @param  {[string]} key 键
- * @return {[type]}
- */
-exports.getFromSlave = (key) => {
-    if (_.isString(key)) {
-        return slave.getAsync(key);
-    }
-    return Promise.resolve();
-};
-
-/**
- * 批量获取缓存(从 Slave 服务器)
- * @param  {[array]} list 字符串数组
- * @return {[type]}
- */
-exports.getMultiFromSlave = (list) => {
-    if (_.isArray(list)) {
-        return slave.getMultiAsync(list);
-    }
-    return Promise.resolve();
-};
-
-/**
- * 写缓存
- * @param  {[type]} key 键
- * @param  {[type]} value 值
- * @param  {[type]} lifetime 生命周期
- * @return {[type]}
- */
-exports.set = (key, value, lifetime) => {
-    lifetime = lifetime || 86400;
-
-    if (_.isObject(value)) {
-        value = JSON.stringify(value);
-    }
-
-    if (_.isString(key)) {
-        return master.setAsync(key, value, lifetime);
-    }
-    return Promise.resolve();
-};
-
-/**
- * 写缓存(到 Slave 服务器)
- * @param  {[type]} key 键
- * @param  {[type]} value 值
- * @param  {[type]} lifetime 生命周期
- * @return {[type]}
- */
-exports.setSlave = (key, value, lifetime) => {
-    lifetime = lifetime || 86400;
-
-    if (_.isObject(value)) {
-        value = JSON.stringify(value);
-    }
-
-    if (_.isString(key)) {
-        return slave.setAsync(key, value, lifetime);
-    }
-    return Promise.resolve();
-};
-
-/**
- * 删除缓存
- * @param  {[string]} key 键
- * @return {[type]}
- */
-exports.del = (key) => {
-    if (_.isString(key)) {
-        return master.delAsync(key);
-    }
-    return Promise.resolve();
-};

-/**
- * 对象键名驼峰化
- * @author: Bi Kai<kai.bi@yoho.cn>
- * @date: 2016/05/09
- */
-'use strict';
-const _ = require('lodash');
-
-let camelCase,
-    camelCaseObject,
-    camelCaseArray;
-
-camelCaseObject = (obj) => {
-    _.forEach(Object.keys(obj), (k) => {
-        obj[k] = camelCase(obj[k]);
-        if (/[_-]/.test(k)) {
-            obj[_.camelCase(k)] = obj[k];
-            delete obj[k];
-        }
-    });
-    return obj;
-};
-
-camelCaseArray = (list) => {
-    _.forEach(list, (k) => {
-        k = camelCase(k);
-    });
-    return list;
-};
-
-camelCase = (data) => {
-    if (_.isArray(data)) {
-        data = camelCaseArray(data);
-    } else if (_.isObject(data)) {
-        data = camelCaseObject(data);
-    }
-
-    return data;
-};
-
-module.exports = camelCase;

-/**
- * 获取 UID
- * @param  {[object]} req
- * @return {[string]}
- */
-'use strict';
-const sign = require('./sign');
-
-exports.getUid = (req) => {
-    const cookie = req.cookies._UID;
-    let _uid = 0;
-    let cookieList;
-
-    if (req.isApp) {
-        return req.query.uid || 0;
-    }
-
-    if (cookie) {
-        cookieList = cookie.split('::');
-        if (cookieList[1] && !isNaN(cookieList[1])) {
-            _uid = cookieList[1];
-        }
-    }
-
-    // 校验 cookie 的 uid 有没有被修改
-    if (req.cookies._TOKEN !== sign.makeToken(_uid)) {
-        _uid = 0;
-    }
-
-    return _uid;
-};
-
-exports.getShoppingKey = (req) => {
-    return req.cookies['_SPK'] ? req.cookies['_SPK'] : ''; // eslint-disable-line
-};

-/**
- * Handlebars helpers
- * bikai kai.bi@yoho.cn
- * 2016-05-10
- */
-'use strict';
-const querystring = require('querystring');
-const _ = require('lodash');
-const moment = require('moment');
-const config = require('../config/common');
-
-/**
- * 七牛图片路径处理
- * @param  {[string]} url
- * @param  {[string]} width
- * @param  {[string]} height
- * @param  {[string]} mode
- * @return {[string]}
- */
-exports.image = (url, width, height, mode) => {
-    mode = _.isNumber(mode) ? mode : 2;
-    url = url || '';
-    url = url.replace(/{width}/g, width).replace(/{height}/g, height).replace(/{mode}/g, mode);
-
-    return url.replace('http:', '');
-};
-
-/**
- * 条件判断
- * @param  {[string]} v1
- * @param  {[string]} v2
- * @param  {[object]} options 上下文环境，一般不手动传
- * @return {[boolen]}
- */
-exports.isEqual = (v1, v2, _options) => {
-    if (_.isEqual(v1, v2)) {
-        return _options.fn(this); // eslint-disable-line
-    }
-
-    return _options.inverse(this); // eslint-disable-line
-};
-
-/**
- * 站内地址格式化
- * @param  {[string]} uri 路径
- * @param  {[object]} qs 查询字符串
- * @param  {[string]} module 模块
- * @return {[string]}
- */
-exports.urlFormat = (uri, qs, module) => {
-    const subDomain = '.m.yohobuy.com';
-    const subName = {
-        default: config.siteUrl,
-        guang: `//guang${subDomain}`,
-        list: `//list${subDomain}`,
-        search: `//search${subDomain}`,
-        huodong: `//huodong${subDomain}`,
-        activity: '//activity.yohobuy.com',
-        index: config.siteUrl
-    };
-    let url;
-
-    module = module || 'default';
-    if (subName[module]) {
-        url = subName[module];
-    } else {
-        url = `//${module}${subDomain}`; // 规则没匹配到就把模块当作子域名
-    }
-
-    url += uri;
-    if (qs) {
-        url += `?${querystring.stringify(qs)}`;
-    }
-
-    return url;
-};
-
-/**
- * 大写转小写处理
- * @param  {[string]} str 转换字符
- */
-exports.lowerCase = (str) => {
-    str = str || '';
-    return str.toLowerCase();
-};
-
-/**
- * 小写转大写处理
- * @param  {[string]} str 转换字符
- */
-exports.upperCase = (str) => {
-    str = str || '';
-    return str.toUpperCase();
-};
-
-
-/**
- * 四舍五入
- * @param  {[type]} num 数字
- * @param  {[type]} precision 精度
- * @return {[type]}
- */
-exports.round = (num, precision) => {
-    precision = _.isNumber(precision) ? precision : 2;
-    num = _.isInteger(num) ? (+num).toFixed(precision) : _.round(num, precision);
-    return num;
-};
-
-/**
- * 链接改成自适应链接
- * @return {[type]}
- */
-exports.https = (url) => {
-    return url.replace('http:', '');
-};
-
-/**
- * 时间格式化
- * @param format 格式化token @see{http://momentjs.cn/docs/#/displaying/format/}
- * @param date 日期或者数字
- * @return string
- *
- */
-exports.dateFormat = (format, date) => {
-    if (typeof format !== 'string' || typeof date === 'undefined') {
-        return '';
-    } else {
-        if (date instanceof Date) {
-            return moment(date).format(format);
-        } else {
-            const d = moment.unix(date);
-
-            return moment(d).utc().format(format);
-        }
-    }
-};
-
-/**
- * 时间差格式化
- * @param {[string]} format 格式化字符串
- * @param {[number]} diff 相差值
- * @param {[string]} type diff时间类型 默认ms
- *
- *          Key                Shorthand
- *           years              y
- *           quarters           Q
- *           months             M
- *           weeks              w
- *           days               d
- *           hours              h
- *           minutes            m
- *           seconds            s
- *           milliseconds       ms
- *
- * @example
- *  let diff = 60 * 60 * 24 * (1.3) + 2;
- *
- *  let s = helpers.dateDiffFormat('{d}天{h}小时', diff, 's');
- *  >>> 1天7小时
- */
-exports.dateDiffFormat = (format, diff, type) => {
-    if (typeof format !== 'string' || typeof diff === 'undefined') {
-        return '';
-    } else {
-        type = type || 'ms';
-        const m = moment.duration(diff, type);
-
-        format.match(/(\{.*?\})/g).forEach((s) => {
-            format = format.replace(s, m.get(s.substring(1, s.length - 1)));
-        });
-
-        return format;
-    }
-};
-
-/**
- * 验证邮箱是否合法
- *
- * @param string email
- * @return boolean
- */
-exports.verifyEmail = (email) => {
-    if (!email) {
-        return false;
-    }
-
-    const emailRegExp = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
-
-    return emailRegExp.test(email);
-};
-
-/**
- * 各国手机号规则
- */
-function areaMobileVerify(phone, area) {
-    area = area || '86';
-    phone = phone.trim();
-
-    let verify = {
-        86: {
-            name: '中国',
-            match: /^1[3|4|5|8|7][0-9]{9}$/.test(phone)
-        },
-        852: {
-            name: '中国香港',
-            match: /^[9|6|5][0-9]{7}$/.test(phone)
-        },
-        853: {
-            name: '中国澳门',
-            match: /^[0-9]{8}$/.test(phone)
-        },
-        886: {
-            name: '中国台湾',
-            match: /^[0-9]{10}$/.test(phone)
-        },
-        65: {
-            name: '新加坡',
-            match: /^[9|8][0-9]{7}$/.test(phone)
-        },
-        60: {
-            name: '马来西亚',
-            match: /^1[1|2|3|4|6|7|9][0-9]{8}$/.test(phone)
-        },
-        1: {
-            name: '加拿大&美国',
-            match: /^[0-9]{10}$/.test(phone)
-        },
-        82: {
-            name: '韩国',
-            match: /^01[0-9]{9}$/.test(phone)
-        },
-        44: {
-            name: '英国',
-            match: /^7[7|8|9][0-9]{8}$/.test(phone)
-        },
-        81: {
-            name: '日本',
-            match: /^0[9|8|7][0-9]{9}$/.test(phone)
-        },
-        61: {
-            name: '澳大利亚',
-            match: /^[0-9]{11}$/.test(phone)
-        }
-    };
-
-    if (verify[area]) {
-        return verify[area].match;
-    } else {
-        return false;
-    }
-}
-
-/**
- * 验证国际手机号是否合法
- */
-exports.verifyAreaMobile = (areaMobile) => {
-    if (!areaMobile) {
-        return false;
-    }
-
-    let mobile = {
-        area: '86',
-        phone: ''
-    };
-
-    let splitMobile = areaMobile.split('-');
-
-    if (splitMobile.length === 2) {
-        mobile.area = splitMobile[0];
-        mobile.phone = splitMobile[1];
-    } else {
-        mobile.phone = splitMobile[0];
-    }
-
-    return areaMobileVerify(mobile.phone, mobile.area);
-};
-
-/**
- *  验证手机是否合法
- */
-exports.verifyMobile = (phone) => {
-    if (!phone) {
-        return false;
-    }
-
-    return /^1[3|4|5|8|7][0-9]{9}$/.test(phone);
-};
-
-/**
- * 验证密码规则
- */
-exports.verifyPassword = (password) => {
-    if (!password) {
-        return false;
-    }
-
-    return /^([a-zA-Z0-9\-\+_!@\#$%\^&\*\(\)\:\;\.=\[\]\\\',\?]){6,20}$/.test(password);
-};

-/**
- * 日志工具类
- * @author: hbomb<qiqi.zhou@yoho.cn>
- * @date: 2016/05/06
- */
-'use strict';
-
-const winston = require('winston');
-const config = require('../config/common');
-const FileTransport = require('winston-daily-rotate-file');
-
-require('influxdb-winston');
-
-const logger = new(winston.Logger)({
-    transports: [
-        new(FileTransport)(config.loggers.infoFile),
-        new(FileTransport)(config.loggers.errorFile),
-        new(winston.transports.UdpTransport)(config.loggers.udp),
-        new(winston.transports.Console)(config.loggers.console)
-    ],
-    exitOnError: false
-});
-
-module.exports = logger;

-/**
- * 签名
- * @author: bikai
- * @date: 2016/5/6
- */
-
-'use strict';
-const _ = require('lodash');
-const md5 = require('md5');
-
-const privateKey = {
-    android: 'fd4ad5fcfa0de589ef238c0e7331b585',
-    iphone: 'a85bb0674e08986c6b115d5e3a4884fa',
-    ipad: 'ad9fcda2e679cf9229e37feae2cdcf80',
-    web: '0ed29744ed318fd28d2c07985d3ba633',
-    yoho: 'fd4ad5fcsa0de589af23234ks1923ks',
-    h5: 'fd4ad5fcfa0de589ef238c0e7331b585'
-};
-
-/**
- * 排序参数
- * @param  {Object} argument 需要排序的参数对象
- * @return {Object}          排序之后的参数对象
- */
-const packageSort = argument => {
-    const newObj = {};
-
-    for (const k of Object.keys(argument).sort()) {
-        newObj[k] = argument[k];
-    }
-
-    return newObj;
-};
-
-/**
- * 生成签名
- * @param  {Object} argument 需要签名的数据
- * @return {string}          生成的签名字符串
- */
-const makeSign = argument => {
-    const qs = [];
-
-    _.forEach(argument, (value, key) => {
-        qs.push(`${key}=${_.trim(value)}`);
-    });
-
-    return md5(qs.join('&')).toLowerCase();
-};
-
-// 生成API签名，调用后端接口的时候有私钥校验
-exports.apiSign = (params) => {
-    const clientType = params.client_type || 'h5';
-
-    /* eslint-disable */
-    let sign = packageSort(Object.assign({
-        client_type: clientType,
-        private_key: privateKey[clientType],
-        app_version: '4.6.0',
-        os_version: 'yohobuy:h5',
-        screen_size: '720x1280',
-        v: '7'
-    }, params));
-    /* eslint-enable */
-
-    sign = Object.assign(sign, {
-        client_secret: makeSign(sign) // eslint-disable-line camelcase
-    });
-    delete sign.private_key;
-    return sign;
-};
-
-// 检查签名，APP 访问 H5 页面的时候需要检查
-exports.checkSign = (params) => {
-    const // eslint-disable-line camelcase
-        clientSecret = params.client_secret;
-
-    let sortedParams;
-
-    // 忽略部分参数
-    delete params.client_secret;
-    delete params.q;
-    delete params.debug_data;
-    delete params['/api'];
-
-    params.private_key = privateKey[params.client_type]; // eslint-disable-line camelcase
-    sortedParams = packageSort(params);
-
-    return clientSecret === makeSign(sortedParams);
-};
-
-// 检查签名，APP 访问 H5 页面的时候需要检查, 有可能不同于上边的签名方式
-exports.webSign = (params) => {
-    const webPrivateKey = 'yohobuyapp';
-
-    return params.key === md5(md5(webPrivateKey) + params.uid);
-};
-
-// 生成 token
-exports.makeToken = (string) => {
-    return md5(md5(string + '#@!@#'));
-};
-
-// 校验 token
-exports.verifyToken = (string, token) => {
-    return exports.makeToken(string) === token;
-};

-/**
- * 计时类
- * @example
- * let timer = new Timer();
- * timer.put('profile');
- * timer.put('proflie'); // console output: 12.14
- *
- * @author: hbomb<qiqi.zhou@yoho.cn>
- * @date: 2016/05/07
- */
-'use strict';
-class Timer {
-    constructor() {
-        this.timers = {};
-    }
-
-    /**
-     * 打点计时
-     */
-    put(label) {
-        const labelTime = this.timers[label];
-
-        if (labelTime) {
-            const duration = process.hrtime(labelTime);
-
-            return this._round(duration[0], duration[1]);
-        } else {
-            this.timers[label] = process.hrtime();
-        }
-    }
-
-    /**
-     * 格式化成毫秒
-     * @param {Number} value 纳秒
-     */
-    _round(seconds, nanoseconds) {
-        return Math.round((seconds * 1e9 + nanoseconds) / 10000) / 100;
-    }
-
-}
-
-module.exports = Timer;

-webpackJsonp([19],[function(e,n,o){var t,i,s=o(1),a=s("#orderCode").html(),d=s("#oldUserCouponPic").html(),r=s("#newUserCouponPic").html(),l=s("#tipMessage").html(),c=s("#activityID").html(),h="//m.yohobuy.com/life/getSignPackage",u=s("#shareTitle").val(),m=s("#shareImg").val(),p=s("#shareDesc").val(),g=s("#shareLink").val(),v=window.wx;o(3),s("#phone").bind("input propertychange",function(){11===s(this).val().length?s(".input-content div").eq("0").addClass("verification-code"):(s(".input-content div").eq("0").removeClass(),s(this).val().length>=1?s(".input-content i").eq("0").removeClass("hidden"):s(".input-content i").eq("0").addClass("hidden"))}),s("#verification").bind("input propertychange",function(){4===s(this).val().length?s(".input-content div").eq("1").addClass("get"):(s(".input-content div").eq("1").removeClass(),s(this).val().length>=1?s(".input-content i").eq("1").removeClass("hidden"):s(".input-content i").eq("1").addClass("hidden"))}),s("#activityEnded").html()&&(s(".tip-wrap").removeClass("hidden"),s(".tip-wrap .title").html(l)),s("#newUser").html()||s(".gain-coupon-centent .coupon img").attr("src",d),"undefined"!=typeof v&&(s.getJSON(h+"?pageurl="+encodeURIComponent(location.href.split("#")[0])+"&callback=?",function(e){var n,o,t,i;e&&(n=e.appId.toString(),o=e.timestamp,t=e.nonceStr.toString(),i=e.signature.toString(),v.config({debug:!1,appId:n,timestamp:o,nonceStr:t,signature:i,jsApiList:["checkJsApi","onMenuShareTimeline","onMenuShareAppMessage","onMenuShareQQ","onMenuShareWeibo","hideMenuItems","showMenuItems","hideAllNonBaseMenuItem","showAllNonBaseMenuItem","translateVoice","startRecord","stopRecord","onRecordEnd","playVoice","pauseVoice","stopVoice","uploadVoice","downloadVoice","chooseImage","previewImage","uploadImage","downloadImage","getNetworkType","openLocation","getLocation","hideOptionMenu","showOptionMenu","closeWindow","scanQRCode","chooseWXPay","openProductSpecificView","addCard","chooseCard","openCard"]}))}),v.ready(function(){var e={title:u,desc:p,imgUrl:m,link:g};v.onMenuShareAppMessage(e),v.onMenuShareTimeline(e),v.onMenuShareQQ(e),v.onMenuShareWeibo(e)})),s(".phone-input-content  div").on("click",function(){return t=s(this).siblings("input").val(),i=/[0-9]{11}/,i.test(t)?void s.ajax({url:"/activity/coupon/phone",data:{mobile:s("#phone").val(),ordercode:a},success:function(e){if(200===e.result.code)if(window._yas&&window._yas.sendCustomInfo&&window._yas.sendCustomInfo({activityID:c,returnCode:e.result.returnCode},!0),e.result.newUser?s(".gain-coupon-centent .coupon img").attr("src",r):s(".gain-coupon-centent .coupon img").attr("src",d),e.result.ended)s(".tip-wrap").removeClass("hidden"),s(".tip-wrap .title").html(e.result.message);else if(e.result.geted)s(".page .gain-coupon-centent").removeClass("hidden"),s(".page .coupon-centent").addClass("hidden"),s("#mobile").html("优惠券已放至账户"+e.result.mobile);else if(e.result.newUser)s(".coupon-centent .phone-input-content").addClass("hidden"),s(".coupon-centent .vertify-input-content").removeClass("hidden");else{if(e.result.wrongNumb)return s("#dialog").removeClass("hidden"),s(".mask").removeClass("hidden"),s("#dialog .content").html('<p class="phone-error">手机号错误，请重新输入。<p>'),void setTimeout(function(){s(".messages").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" ")},1400);if(e.result.oldUserAskCouponOnceMore)return s("#dialog").removeClass("hidden"),s(".mask").removeClass("hidden"),s("#dialog .content").html('<p class="phone-error">您今天已经领过咯，速度去有货购潮流！<p>'),void setTimeout(function(){s(".messages").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" "),s(".page .gain-coupon-centent").removeClass("hidden"),s(".page .coupon-centent").addClass("hidden"),s("#mobile").html("优惠券已放至账户"+e.result.mobile)},2500)}else s("#dialog").removeClass("hidden"),s(".mask").removeClass("hidden"),s("#dialog .content").html('<p class="phone-error">网络错误<p>'),setTimeout(function(){s(".messages").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" ")},1400)},error:function(){s("#dialog").removeClass("hidden"),s(".mask").removeClass("hidden"),s("#dialog .content").html('<p class="phone-error">网络错误，稍后再试！<p>'),setTimeout(function(){s(".messages").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" ")},1400)}}):(s("#dialog").removeClass("hidden"),s(".mask").removeClass("hidden"),s("#dialog .content").html('<p class="phone-error">手机号错误，请重新输入。<p>'),void setTimeout(function(){s(".messages").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" ")},1400))}),s(".vertify-input-content").on("click",".get",function(){s(".input-content div").eq("1").removeClass("get"),4===s(this).siblings("input").val().length?s.ajax({url:"/activity/coupon/verify",data:{identifycode:s("#verification").val(),mobile:s("#phone").val(),ordercode:a},dataType:"json",success:function(e){if(200===e.result.code)if(window._yas&&window._yas.sendCustomInfo&&window._yas.sendCustomInfo({activityID:c,returnCode:e.result.returnCode},!0),e.result.newUser?s(".gain-coupon-centent .coupon img").attr("src",r):s(".gain-coupon-centent .coupon img").attr("src",d),e.result.ended)s(".tip-wrap").removeClass("hidden"),s(".tip-wrap .title").html(e.result.message);else if(e.result.geted)s(".page .gain-coupon-centent").removeClass("hidden"),s(".page .coupon-centent").addClass("hidden"),s("#mobile").html("优惠券已放至账户"+e.result.mobile);else if(e.result.newUser)s(".coupon-centent .phone-input-content").addClass("hidden"),s(".coupon-centent .vertify-input-content").removeClass("hidden");else{if(e.result.wrongNumb)return s("#dialog").removeClass("hidden"),s(".mask").removeClass("hidden"),s("#dialog .content").html('<p class="phone-error">手机号错误，请重新输入。<p>'),void setTimeout(function(){s(".messages").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" ")},1400);if(e.result.vertifyWrong)return s("#dialog").removeClass("hidden"),s(".mask").removeClass("hidden"),s("#dialog .content").html('<p class="phone-error">验证码错误，请重新输入。<p>'),void setTimeout(function(){s(".messages").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" ")},1400);if(e.result.oldUserAskCouponOnceMore)return s("#dialog").removeClass("hidden"),s(".mask").removeClass("hidden"),s("#dialog .content").html('<p class="phone-error">您今天已经领过咯，速度去有货购潮流！<p>'),void setTimeout(function(){s(".messages").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" "),s(".page .gain-coupon-centent").removeClass("hidden"),s(".page .coupon-centent").addClass("hidden"),s("#mobile").html("优惠券已放至账户"+e.result.mobile)},2500)}else s("#dialog").removeClass("hidden"),s(".mask").removeClass("hidden"),s("#dialog .content").html('<p class="phone-error">'+e.result.message+"<p>"),setTimeout(function(){s(".messages").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" ")},1400)},error:function(){s("#dialog").removeClass("hidden"),s(".mask").removeClass("hidden"),s("#dialog .content").html('<p class="phone-error">网络错误，稍后再试！<p>'),setTimeout(function(){s(".messages").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" ")},1400)}}):(s("#dialog").removeClass("hidden"),s(".mask").removeClass("hidden"),s("#dialog .content").html('<p class="phone-error">验证码错误，请重新输入。<p>'),setTimeout(function(){s(".messages").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" ")},1400))}),s(".close").on("click",function(){s(".dialog").addClass("hidden"),s(".mask").addClass("hidden"),s("#dialog .content").html(" ")}),s(".coupon-description span").on("click",function(){s("#message").removeClass("hidden"),s(".mask").removeClass("hidden")}),s(".description").on("click",function(){s("#message").removeClass("hidden"),s(".mask").removeClass("hidden")}),s(".use-coupon-btn").on("click",function(){window._yas&&window._yas.sendCustomInfo&&window._yas.sendCustomInfo({activityID:c},!1)}),s(".input-content .clear-mobile").on("click",function(){s(".input-content input").eq("0").val(""),s(this).addClass("hidden"),s(".input-content div").eq("0").removeClass()}),s(".input-content .clear-verify").on("click",function(){s(".input-content input").eq("1").val(""),s(this).addClass("hidden"),s(".input-content div").eq("1").removeClass()})},,,function(e,n,o){function t(e){var n,o,t=document.cookie;return document.cookie&&""!==document.cookie&&(o=t.indexOf(e+"="),o>-1&&(o+=e.length+1,n=decodeURIComponent(m.trim(t.substring(o,t.indexOf(";",o)))))),n}function i(e,n,o){var t,i,s,a,d="";"undefined"!=typeof n&&(o=o||{},null===n&&(n="",o.expires=-1),o.expires&&("number"==typeof o.expires||o.expires.toUTCString)&&("number"==typeof o.expires?(a=new Date,a.setTime(a.getTime()+24*o.expires*60*60*1e3)):a=o.expires,d="; expires="+a.toUTCString()),t=o.path?"; path="+o.path:"",i=o.domain?"; domain="+o.domain:"",s=o.secure?"; secure":"",document.cookie=[e,"=",encodeURIComponent(n),d,t,i,s].join(""))}function s(){var e=!!navigator.cookieEnabled;return"undefined"!=typeof navigator.cookieEnabled||e||(document.cookie="testcookie",e=-1!==document.cookie.indexOf("testcookie")),e}function a(){var e,n=t("_UID");return"undefined"==typeof n?0:(e=n.split("::"),"undefined"==typeof e||e.length<4?0:e)}function d(){var e=a();return 0===e?0:e[1]}function r(){var e=t("_g");return"undefined"==typeof e?"":JSON.parse(e).k}function l(){var e;0!==g.length&&(e=Math.min(m(window).height(),window.screen.availHeight),m("body").height()<=e-parseInt(g.css("height"),0)?g.addClass("bottom"):g.removeClass("bottom"))}function c(e){var n=m(e).outerHeight();e&&g.css("margin-bottom",n+"px")}function h(){var e,n,o=[],t=window.location.search.slice(1).split("&");for(n=0;n<t.length;n++)e=t[n].split("="),o.push(e[0]),o[e[0]]=e[1];return o}function u(e){return e.replace(/(\d{3})\d{4}(\d{4})/,"$1****$2")}var m=o(1),p=o(4),g=m("#yoho-footer"),v=m(".yoho-page"),f=m(".yoho-header");!function(){var e,n=g.children(".op-row"),o=m(".back-to-top"),t=a();l(),0===t?n.prepend('<a href="http://m.yohobuy.com/signin.html?refer='+location.href+'">登录</a><span class="sep-line">|</span><a href="http://m.yohobuy.com/reg.html">注册</a>'):n.prepend('<span>Hi,</span><a class="user-name" href="http://m.yohobuy.com/home?tmp='+Math.random()+'">'+t[0]+'</a><a href="http://m.yohobuy.com/passport/signout/index">退出</a>'),o.length>0&&(e=new p(o[0]),e.on("tap",function(e){return m(window).scrollTop(0),e.srcEvent.preventDefault(),!1})),g.removeClass("hide")}(),function(e,n,o,t,i){var s=n.createElement(o),a=n.getElementsByTagName(o)[0];e.YohoAcquisitionObject=i,e[i]=function(){e[i].p=arguments},s.async=1,s.src=t,a.parentNode.insertBefore(s,a)}(window,document,"script",("https:"===document.location.protocol?"https":"http")+"://cdn.yoho.cn/yas-jssdk/1.0.17/yas.js","_yas"),function(){var e=d();e=0===e?"":e,window._ozuid=e,window._yas&&window._yas(1*new Date,"1.0.17","yohobuy_m",e,"","")}(),f.on("touchstart","a",function(){f.find("a").removeClass("highlight"),m(this).addClass("highlight")}).on("touchend touchcancel","a",function(){m(this).removeClass("highlight")}),v.on("touchstart",".tap-hightlight",function(){m(this).siblings(".tap-hightlight").removeClass("highlight"),m(this).addClass("highlight")}).on("touchend touchcancel",".tap-hightlight",function(){m(this).removeClass("highlight")}),m(".nav-home").on("touchstart",function(){m(".homebuttom").toggleClass("hide")}),function(){var e,n,o=0,t="webkit moz ms o".split(" "),i=window.requestAnimationFrame,s=window.cancelAnimationFrame;for(n=0;n<t.length&&(!i||!s);n++)e=t[n],i=i||window[e+"RequestAnimationFrame"],s=s||window[e+"CancelAnimationFrame"]||window[e+"CancelRequestAnimationFrame"];i&&s||(i=function(e){var n=(new Date).getTime(),t=Math.max(0,16-(n-o)),i=window.setTimeout(function(){e(n+t)},t);return o=n+t,i},s=function(e){window.clearTimeout(e)}),window.requestAnimationFrame=i,window.cancelAnimationFrame=s}(),m.extend({queryString:h}),11===g.find(".user-name").text().length&&g.find(".user-name").html(u(g.find(".user-name").text())),window.cookie=t,window.setCookie=i,window.isCookiesEnabled=s,window.getUser=a,window.getUid=d,window.getShoppingKey=r,window.rePosFooter=l,window.reMarginFooter=c,window.queryString=h()}]);

@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <!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">
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
 <metadata>
-Created by FontForge 20120731 at Fri Apr 15 10:26:51 2016
+Created by FontForge 20120731 at Wed Jun 29 15:45:02 2016
  By admin
  By admin
 </metadata>
 </metadata>
 <defs>
 <defs>
@@ -16,10 +16,10 @@ Created by FontForge 20120731 at Fri Apr 15 10:26:51 2016
     ascent="896"
     ascent="896"
     descent="-128"
     descent="-128"
     x-height="792"
     x-height="792"
-    bbox="-0.75 -224 3943 896"
+    bbox="-0.75 -128 3943 896.75"
     underline-thickness="50"
     underline-thickness="50"
     underline-position="-100"
     underline-position="-100"
-    unicode-range="U+0078-E648"
+    unicode-range="U+0078-E64C"
   />
   />
 <missing-glyph horiz-adv-x="374" 
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -34,207 +34,211 @@ d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h91
 t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
 t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
 t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
 t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
     <glyph glyph-name="uniE600" unicode="&#xe600;" horiz-adv-x="1463" 
     <glyph glyph-name="uniE600" unicode="&#xe600;" horiz-adv-x="1463" 
-d="M798 -160q0 -46 25 -58t61 16l537 420q36 28 36 68t-36 68l-537 424q-36 29 -61 16.5t-25 -57.5v-238q-138 0 -252.5 -24.5t-192 -63t-137.5 -94t-94.5 -109.5t-57.5 -117t-31.5 -109.5t-11 -94t-1.5 -63.5t2 -25q47 62 87 104t90 78t103.5 57.5t127 36.5t161.5 21t207 6
-v-262z" />
+d="M798 -64q0 -46 25 -58t61 16l537 420q36 28 36 68t-36 68l-537 424q-36 29 -61 16.5t-25 -57.5v-238q-486 0 -676 -290q-102 -157 -102 -361q0 -49 2 -49q47 62 87 104t90 78t103.5 57.5t127 36.5t161.5 21t207 6v-262z" />
     <glyph glyph-name="uniE601" unicode="&#xe601;" 
     <glyph glyph-name="uniE601" unicode="&#xe601;" 
-d="M281 372q-14 -9 -23 -23t-9 -28v-7v-483h1q5 -24 24 -39.5t44 -15.5h582q28 0 48.5 20t20.5 49t-20.5 49t-48.5 20h41q35 0 59 24.5t24 58.5t-24 58.5t-59 24.5q35 0 59 24t24 58.5t-24 58.5t-59 24h-48q31 0 53.5 22.5t22.5 53.5v-13q0 31 -22.5 54t-53.5 24
-q-125 6 -259 9q40 148 16 278q-8 44 -30.5 70.5t-49.5 31t-53 -4t-43 -35t-17 -62.5q-5 -34 -6.5 -64t-2.5 -42t-5 -30.5t-14 -42.5q-24 -60 -133 -115q-7 -2 -13 -6zM60 356q-25 0 -42.5 -17.5t-17.5 -42.5v-405q0 -25 17.5 -42.5t42.5 -17.5h134v525h-134z" />
+d="M281 468q-14 -9 -23 -23t-9 -28v-7v-19v-464h1q5 -24 24 -39.5t44 -15.5h582q28 0 48.5 20t20.5 49t-20.5 49t-48.5 20h-215h256q35 0 59 24.5t24 58.5t-24 58.5t-59 24.5h-235h235q35 0 59 24t24 58.5t-24 58.5t-59 24h-259h211q31 0 53.5 22.5t22.5 53.5v-13
+q0 31 -22.5 54t-53.5 24q-125 6 -259 9q40 148 16 278q-8 44 -30.5 70.5t-49.5 31t-53 -4t-43 -35t-17 -62.5q-5 -34 -6.5 -64t-2.5 -42t-5 -30.5t-14 -42.5q-24 -60 -133 -115q-7 -2 -13 -6zM60 452q-25 0 -42.5 -17.5t-17.5 -42.5v-405q0 -25 17.5 -42.5t42.5 -17.5h134
+v525h-134z" />
     <glyph glyph-name="uniE602" unicode="&#xe602;" horiz-adv-x="1323" 
     <glyph glyph-name="uniE602" unicode="&#xe602;" horiz-adv-x="1323" 
-d="M643 472q0 -68 -47.5 -116t-113.5 -48q0 -68 47 -116t113.5 -48t113.5 48t47 116t-47 116t-113 48zM643 800q-79 0 -162 -28.5t-152 -74.5t-131 -102t-105 -110.5t-68 -101.5t-25 -75t25 -75t68 -102t105 -111t131 -101.5t152 -74.5t161.5 -29t161.5 29t152 74.5
-t131 101.5t105 111t68 102t25 75t-25 75t-68 101.5t-105 110.5t-131 102t-152 74.5t-161 28.5zM643 -21q-88 0 -162 44t-117 120t-43 165t43 164.5t117 119.5t161.5 44t161.5 -44t117 -119.5t43 -164.5t-43 -165t-117 -120t-161 -44z" />
+d="M643 568q0 -68 -47.5 -116t-113.5 -48q0 -68 47 -116t113.5 -48t113.5 48t47 116t-47 116t-113 48zM643 896q-79 0 -162 -28.5t-152 -74.5t-131 -102t-105 -110.5t-68 -101.5t-25 -75t25 -75t68 -102t105 -111t131 -101.5t152 -74.5t161.5 -29t161.5 29t152 74.5
+t131 101.5t105 111t68 102t25 75t-25 75t-68 101.5t-105 110.5t-131 102t-152 74.5t-161 28.5zM643 75q-88 0 -162 44t-117 120t-43 165t43 164.5t117 119.5t161.5 44t161.5 -44t117 -119.5t43 -164.5t-43 -165t-117 -120t-161 -44z" />
     <glyph glyph-name="uniE603" unicode="&#xe603;" 
     <glyph glyph-name="uniE603" unicode="&#xe603;" 
-d="M512 286v343h85v-426h-81v-2h-256v85h252zM512 -224q139 0 257 68.5t186.5 186.5t68.5 257t-68.5 257t-186.5 186.5t-257 68.5t-257 -68.5t-186.5 -186.5t-68.5 -257t68.5 -257t186.5 -186.5t257 -68.5z" />
+d="M512 382v343h85v-426h-81v-2h-256v85h252zM512 -128q139 0 257 68.5t186.5 186.5t68.5 257t-68.5 257t-186.5 186.5t-257 68.5t-257 -68.5t-186.5 -186.5t-68.5 -257t68.5 -257t186.5 -186.5t257 -68.5z" />
     <glyph glyph-name="uniE604" unicode="&#xe604;" 
     <glyph glyph-name="uniE604" unicode="&#xe604;" 
-d="M774 324q13 -17 11.5 -39.5t-17.5 -38.5q0 -1 -1 -1l-427 -428q-18 -17 -42.5 -17t-42 17.5t-17.5 42t17 41.5l387 387l-387 387q-17 17 -17 41.5t17.5 42t42 17.5t42.5 -17l427 -428q1 0 1 -1z" />
+d="M774 420q13 -17 11.5 -39.5t-17.5 -38.5q0 -1 -1 -1l-427 -428q-18 -17 -42.5 -17t-42 17.5t-17.5 42t17 41.5l387 387l-387 387q-17 17 -17 41.5t17.5 42t42 17.5t42.5 -17l427 -428q1 0 1 -1z" />
     <glyph glyph-name="uniE605" unicode="&#xe605;" 
     <glyph glyph-name="uniE605" unicode="&#xe605;" 
-d="M707 748q-112 0 -195 -77q-83 77 -195 77q-121 0 -207 -88t-86 -212q0 -110 69 -194l2 -2l344 -391q30 -33 73 -33t73 33l344 391l2 2q69 84 69 194q0 124 -86 212t-207 88z" />
+d="M707 844q-112 0 -195 -77q-83 77 -195 77q-121 0 -207 -88t-86 -212q0 -110 69 -194l2 -2l344 -391q30 -33 73 -33t73 33l344 391l2 2q69 84 69 194q0 124 -86 212t-207 88z" />
     <glyph glyph-name="uniE606" unicode="&#xe606;" horiz-adv-x="1000" 
     <glyph glyph-name="uniE606" unicode="&#xe606;" horiz-adv-x="1000" 
-d="M109.5 415q37.5 0 64 -26.5t26.5 -63.5t-26.5 -63.5t-64 -26.5t-64 26.5t-26.5 63.5t26.5 63.5t64 26.5zM515.5 415q37.5 0 63.5 -26.5t26 -63.5t-26 -63.5t-63.5 -26.5t-64 26.5t-26.5 63.5t26.5 63.5t64 26.5zM921 415q37 0 63.5 -26.5t26.5 -63.5t-26.5 -63.5
+d="M109.5 511q37.5 0 64 -26.5t26.5 -63.5t-26.5 -63.5t-64 -26.5t-64 26.5t-26.5 63.5t26.5 63.5t64 26.5zM515.5 511q37.5 0 63.5 -26.5t26 -63.5t-26 -63.5t-63.5 -26.5t-64 26.5t-26.5 63.5t26.5 63.5t64 26.5zM921 511q37 0 63.5 -26.5t26.5 -63.5t-26.5 -63.5
 t-63.5 -26.5t-63.5 26.5t-26.5 63.5t26.5 63.5t63.5 26.5z" />
 t-63.5 -26.5t-63.5 26.5t-26.5 63.5t26.5 63.5t63.5 26.5z" />
     <glyph glyph-name="uniE607" unicode="&#xe607;" horiz-adv-x="1643" 
     <glyph glyph-name="uniE607" unicode="&#xe607;" horiz-adv-x="1643" 
-d="M547 190h-1l45 -46l248 239l-45 46l-201 -194l-195 201l-46 -44z" />
+d="M547 286h-1l45 -46l248 239l-45 46l-201 -194l-195 201l-46 -44z" />
     <glyph glyph-name="uniE608" unicode="&#xe608;" horiz-adv-x="1821" 
     <glyph glyph-name="uniE608" unicode="&#xe608;" horiz-adv-x="1821" 
-d="M930 135q-14 -13 -33.5 -13t-33.5 13l-252 242q-14 13 -14 32t14 32t34 13t34 -13l251 -242q14 -13 14 -32t-14 -32zM360 135q-14 13 -14 32t14 32l251 242q14 13 34 13t33.5 -13t13.5 -32t-13 -32l-252 -242q-14 -13 -33.5 -13t-33.5 13z" />
+d="M930 231q-14 -13 -33.5 -13t-33.5 13l-252 242q-14 13 -14 32t14 32t34 13t34 -13l251 -242q14 -13 14 -32t-14 -32zM360 231q-14 13 -14 32t14 32l251 242q14 13 34 13t33.5 -13t13.5 -32t-13 -32l-252 -242q-14 -13 -33.5 -13t-33.5 13z" />
     <glyph glyph-name="uniE609" unicode="&#xe609;" horiz-adv-x="1821" 
     <glyph glyph-name="uniE609" unicode="&#xe609;" horiz-adv-x="1821" 
-d="M930 377l-251 -242q-14 -13 -34 -13t-34 13t-14 32t14 32l252 242q14 13 33.5 13t33.5 -13t14 -32t-14 -32zM427 441l252 -242q13 -13 13 -32t-13.5 -32t-33.5 -13t-34 13l-251 242q-14 13 -14 32t14 32t33.5 13t33.5 -13z" />
+d="M930 473l-251 -242q-14 -13 -34 -13t-34 13t-14 32t14 32l252 242q14 13 33.5 13t33.5 -13t14 -32t-14 -32zM427 537l252 -242q13 -13 13 -32t-13.5 -32t-33.5 -13t-34 13l-251 242q-14 13 -14 32t14 32t33.5 13t33.5 -13z" />
     <glyph glyph-name="uniE60A" unicode="&#xe60a;" 
     <glyph glyph-name="uniE60A" unicode="&#xe60a;" 
-d="M1024 288q0 -139 -68.5 -257t-186.5 -186.5t-257 -68.5t-257 68.5t-186.5 186.5t-68.5 257t68.5 257t186.5 186.5t257 68.5t257 -68.5t186.5 -186.5t68.5 -257zM801 498l-365 -366l-156 156l-37 -37l193 -193l403 403z" />
+d="M1024 384q0 -139 -68.5 -257t-186.5 -186.5t-257 -68.5t-257 68.5t-186.5 186.5t-68.5 257t68.5 257t186.5 186.5t257 68.5t257 -68.5t186.5 -186.5t68.5 -257zM801 594l-365 -366l-156 156l-37 -37l193 -193l403 403z" />
     <glyph glyph-name="uniE60B" unicode="&#xe60b;" horiz-adv-x="1344" 
     <glyph glyph-name="uniE60B" unicode="&#xe60b;" horiz-adv-x="1344" 
-d="M1280 236h-1216q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5h1216q27 0 45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5zM1280 -212h-1216q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5h1216q27 0 45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5zM1280 684
+d="M1280 320h-1216q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5h1216q27 0 45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5zM1280 -128h-1216q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5h1216q27 0 45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5zM1280 768
 h-1216q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5h1216q27 0 45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5z" />
 h-1216q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5h1216q27 0 45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5z" />
     <glyph glyph-name="uniE60C" unicode="&#xe60c;" 
     <glyph glyph-name="uniE60C" unicode="&#xe60c;" 
-d="M1024 300q0 -139 -68.5 -257t-186.5 -186.5t-257 -68.5t-257 68.5t-186.5 186.5t-68.5 257t68.5 257t186.5 186.5t257 68.5t257 -68.5t186.5 -186.5t68.5 -257z" />
+d="M1024 384q0 -139 -68.5 -257t-186.5 -186.5t-257 -68.5t-257 68.5t-186.5 186.5t-68.5 257t68.5 257t186.5 186.5t257 68.5t257 -68.5t186.5 -186.5t68.5 -257z" />
     <glyph glyph-name="uniE60D" unicode="&#xe60d;" horiz-adv-x="1685" 
     <glyph glyph-name="uniE60D" unicode="&#xe60d;" horiz-adv-x="1685" 
-d="M1229 -77l289 -135l58 124l-281 131q-21 -54 -66 -120zM944 475v-134h137v258q42 47 62 81l-118 69q-2 -4 -8 -12t-24.5 -30.5t-41 -45.5t-60.5 -54.5t-81 -59.5l75 -114q30 20 59 42zM1524 19v304h-605v-304h137v167h332v-167h136zM1283 169h-137v-66q0 -31 -20 -57.5
-t-49.5 -45t-70.5 -34.5t-76.5 -25t-73.5 -17l74 -124q55 14 103 30.5t95.5 43t80.5 58t53.5 75.5t20.5 96v66zM1088 570l31 -133q42 9 85 21q19 -49 59 -78q49 -36 120 -36q45 0 92 14q69 21 133 78l-67 125q-17 -19 -46 -40.5t-60 -31.5q-63 -19 -91 1q-4 3 -8 9
-q147 51 240 103l-81 111q-74 -38 -173 -74v85h-137v-129q-50 -14 -97 -25zM755 477v137h-348q11 42 19 84l-134 26q-11 -56 -28 -110h-200v-137h142q-79 -149 -206 -260l90 -103q43 38 85 83v-389h137v165h260v-24h-124l48 -137h83q54 0 92 38t38 92v490h-373q11 22 21 45
-h398zM312 134h260v-24h-260v24zM312 295h260v-24h-260v24zM1683 732q0 -33 -22.5 -56t-55.5 -23t-56 23t-23 56t23 55.5t56 22.5t55.5 -22.5t22.5 -55.5zM1545 732q0 -26 17.5 -44.5t42.5 -18.5t41.5 18t16.5 44q0 27 -16.5 45.5t-42.5 18.5q-25 0 -42 -18.5t-17 -44.5z
-M1592 691h-17v79q17 2 29 2q18 0 26 -6t8 -17q0 -13 -16 -19v-1q10 -3 14 -19q2 -13 6 -19h-19q-2 3 -6 19q-2 12 -16 12h-9v-31zM1593 735h8q18 0 18 12t-16 12q-6 0 -10 -1v-23z" />
+d="M1229 7l289 -135l58 124l-281 131q-21 -54 -66 -120zM944 559v-134h137v258q42 47 62 81l-118 69q-2 -4 -8 -12t-24.5 -30.5t-41 -45.5t-60.5 -54.5t-81 -59.5l75 -114q30 20 59 42zM1524 103v304h-605v-304h137v167h332v-167h136zM1283 253h-137v-66q0 -31 -20 -57.5
+t-49.5 -45t-70.5 -34.5t-76.5 -25t-73.5 -17l74 -124q55 14 103 30.5t95.5 43t80.5 58t53.5 75.5t20.5 96v66zM1088 654l31 -133q42 9 85 21q19 -49 59 -78q49 -36 120 -36q45 0 92 14q69 21 133 78l-67 125q-17 -19 -46 -40.5t-60 -31.5q-63 -19 -91 1q-4 3 -8 9
+q147 51 240 103l-81 111q-74 -38 -173 -74v85h-137v-129q-50 -14 -97 -25zM755 561v137h-348q11 42 19 84l-134 26q-11 -56 -28 -110h-200v-137h142q-79 -149 -206 -260l90 -103q43 38 85 83v-389h137v165h260v-24h-124l48 -137h83q54 0 92 38t38 92v490h-373q11 22 21 45
+h398zM312 218h260v-24h-260v24zM312 379h260v-24h-260v24zM1683 816q0 -33 -22.5 -56t-55.5 -23t-56 23t-23 56t23 55.5t56 22.5t55.5 -22.5t22.5 -55.5zM1545 816q0 -26 17.5 -44.5t42.5 -18.5t41.5 18t16.5 44q0 27 -16.5 45.5t-42.5 18.5q-25 0 -42 -18.5t-17 -44.5z
+M1592 775h-17v79q17 2 29 2q18 0 26 -6t8 -17q0 -13 -16 -19v-1q10 -3 14 -19q2 -13 6 -19h-19q-2 3 -6 19q-2 12 -16 12h-9v-31zM1593 819h8q18 0 18 12t-16 12q-6 0 -10 -1v-23z" />
     <glyph glyph-name="uniE60E" unicode="&#xe60e;" horiz-adv-x="3958" 
     <glyph glyph-name="uniE60E" unicode="&#xe60e;" horiz-adv-x="3958" 
-d="M611 639h-177l-150 -222l-95 222h-178l168 -395v-2l-31 -243h156l30 231zM699 481q-100 0 -179.5 -72.5t-92.5 -175.5q-13 -105 51 -178q61 -68 157 -68q99 0 178.5 72.5t92.5 175.5q13 104 -51 177q-60 69 -156 69zM759 233q-5 -41 -35.5 -70.5t-68.5 -29.5
-q-37 0 -60 27q-27 30 -21 75q5 41 36 70.5t69 29.5q36 0 59 -27q27 -30 21 -75zM1656 481q-100 0 -179.5 -72.5t-92.5 -175.5q-13 -105 51 -178q61 -68 157 -68q99 0 178.5 72.5t92.5 175.5q13 104 -51 177q-60 69 -156 69zM1717 233q-6 -41 -36.5 -70.5t-68.5 -29.5
-q-37 0 -60 27q-27 30 -21 75q5 41 36 70.5t69 29.5q36 0 60 -27q26 -30 21 -75zM1332 418q-44 50 -114 50q-51 0 -97 -27l-10 -6l26 204h-156l-80 -640h155l37 288q3 24 22 41t43 17q25 0 40.5 -17.5t11.5 -41.5l-36 -287h156l37 298q10 71 -35 121zM2949 460l-37 -288
-q-3 -24 -22 -41t-44 -17q-24 0 -39.5 17.5t-12.5 41.5l37 287h-156l-38 -298q-9 -71 36 -121q43 -50 114 -50q51 0 97 27l9 6l-3 -25h156l58 461h-155zM1951 639l-55 -432h156l55 432h-156zM1970 168q-37 0 -67 -26.5t-34.5 -63.5t18.5 -63q22 -26 59 -26t67 26.5t34 63.5
-q5 37 -18 63t-59 26zM2608 178q6 51 -14.5 93.5t-62.5 65.5l-8 5l8 5q39 21 64 57t30 78q8 63 -30 108q-37 44 -97 48l-6 1h-314l-81 -640h317q72 3 128.5 55t65.5 124zM2451 200q-3 -27 -25 -46.5t-50 -19.5h-106l17 134h107q27 -1 43.5 -20.5t13.5 -47.5zM2483 447
-q-3 -25 -23 -43t-45 -18h-113l15 124h112q25 0 41.5 -18.5t12.5 -44.5zM3132 -211q65 0 124 37.5t89 99.5l264 534h-156l-127 -258l-63 258h-156l113 -471l-7 -14q-8 -18 -25 -29t-36 -11q-10 0 -20 4l-29 11l-67 -139l29 -10q31 -12 67 -12zM3943 646q0 -65 -45 -110.5
-t-110.5 -45.5t-111 45.5t-45.5 111t45.5 110.5t111.5 45q65 0 110 -45t45 -111zM3670 646q0 -52 34 -88t84 -36q49 -1 82.5 35.5t33.5 87.5q0 53 -33.5 89.5t-84.5 36.5q-49 0 -82.5 -36.5t-33.5 -88.5zM3763 566h-35v155q35 5 58 5q36 0 52 -12t16 -34q0 -26 -32 -37v-2
-q20 -6 27 -37q5 -26 11 -38h-37q-4 5 -12 38q-4 23 -31 23h-17v-61zM3764 653h17q35 0 35 23t-32 23q-13 0 -20 -1v-45z" />
+d="M611 723h-177l-150 -222l-95 222h-178l168 -395v-2l-31 -243h156l30 231zM699 565q-100 0 -179.5 -72.5t-92.5 -175.5q-13 -105 51 -178q61 -68 157 -68q99 0 178.5 72.5t92.5 175.5q13 104 -51 177q-60 69 -156 69zM759 317q-5 -41 -35.5 -70.5t-68.5 -29.5
+q-37 0 -60 27q-27 30 -21 75q5 41 36 70.5t69 29.5q36 0 59 -27q27 -30 21 -75zM1656 565q-100 0 -179.5 -72.5t-92.5 -175.5q-13 -105 51 -178q61 -68 157 -68q99 0 178.5 72.5t92.5 175.5q13 104 -51 177q-60 69 -156 69zM1717 317q-6 -41 -36.5 -70.5t-68.5 -29.5
+q-37 0 -60 27q-27 30 -21 75q5 41 36 70.5t69 29.5q36 0 60 -27q26 -30 21 -75zM1332 502q-44 50 -114 50q-51 0 -97 -27l-10 -6l26 204h-156l-80 -640h155l37 288q3 24 22 41t43 17q25 0 40.5 -17.5t11.5 -41.5l-36 -287h156l37 298q10 71 -35 121zM2949 544l-37 -288
+q-3 -24 -22 -41t-44 -17q-24 0 -39.5 17.5t-12.5 41.5l37 287h-156l-38 -298q-9 -71 36 -121q43 -50 114 -50q51 0 97 27l9 6l-3 -25h156l58 461h-155zM1951 723l-55 -432h156l55 432h-156zM1970 252q-37 0 -67 -26.5t-34.5 -63.5t18.5 -63q22 -26 59 -26t67 26.5t34 63.5
+q5 37 -18 63t-59 26zM2608 262q6 51 -14.5 93.5t-62.5 65.5l-8 5l8 5q39 21 64 57t30 78q8 63 -30 108q-37 44 -97 48l-6 1h-314l-81 -640h317q72 3 128.5 55t65.5 124zM2451 284q-3 -27 -25 -46.5t-50 -19.5h-106l17 134h107q27 -1 43.5 -20.5t13.5 -47.5zM2483 531
+q-3 -25 -23 -43t-45 -18h-113l15 124h112q25 0 41.5 -18.5t12.5 -44.5zM3132 -127q65 0 124 37.5t89 99.5l264 534h-156l-127 -258l-63 258h-156l113 -471l-7 -14q-8 -18 -25 -29t-36 -11q-10 0 -20 4l-29 11l-67 -139l29 -10q31 -12 67 -12zM3943 730q0 -65 -45 -110.5
+t-110.5 -45.5t-111 45.5t-45.5 111t45.5 110.5t111.5 45q65 0 110 -45t45 -111zM3670 730q0 -52 34 -88t84 -36q49 -1 82.5 35.5t33.5 87.5q0 53 -33.5 89.5t-84.5 36.5q-49 0 -82.5 -36.5t-33.5 -88.5zM3763 650h-35v155q35 5 58 5q36 0 52 -12t16 -34q0 -26 -32 -37v-2
+q20 -6 27 -37q5 -26 11 -38h-37q-4 5 -12 38q-4 23 -31 23h-17v-61zM3764 737h17q35 0 35 23t-32 23q-13 0 -20 -1v-45z" />
     <glyph glyph-name="uniE60F" unicode="&#xe60f;" 
     <glyph glyph-name="uniE60F" unicode="&#xe60f;" 
-d="M682 74q-108 -89 -249 -89q-107 0 -197.5 53t-143.5 143.5t-53 197.5t53 197.5t143.5 143.5t197.5 53t197.5 -53t143.5 -143.5t53 -197.5q0 -141 -89 -249l286 -286l-56 -56zM433.5 64q130.5 0 222.5 92t92 222.5t-92 223t-222.5 92.5t-223 -92.5t-92.5 -223t92.5 -222.5
-t223 -92z" />
+d="M682 158q-108 -89 -249 -89q-107 0 -197.5 53t-143.5 143.5t-53 197.5t53 197.5t143.5 143.5t197.5 53t197.5 -53t143.5 -143.5t53 -197.5q0 -141 -89 -249l286 -286l-56 -56zM433.5 148q130.5 0 222.5 92t92 222.5t-92 223t-222.5 92.5t-223 -92.5t-92.5 -223
+t92.5 -222.5t223 -92z" />
     <glyph glyph-name="uniE610" unicode="&#xe610;" 
     <glyph glyph-name="uniE610" unicode="&#xe610;" 
-d="M245 300l-9 9l472 472l80 -80l-400 -401l400 -401l-80 -80l-472 472z" />
+d="M245 384l-9 9l472 472l80 -80l-400 -401l400 -401l-80 -80l-472 472z" />
     <glyph glyph-name="uniE611" unicode="&#xe611;" 
     <glyph glyph-name="uniE611" unicode="&#xe611;" 
-d="M509 780q-4 -2 -245 -245q-176 -179 -208.5 -213.5t-32.5 -46.5q0 -35 42 -33q7 0 233 227l225 228l226 -228q225 -227 232 -227q21 -1 31.5 7.5t10.5 25.5q0 12 -31.5 46.5t-206.5 211.5q-241 243 -246 246q-15 8 -30 1zM171 245q-12 -8 -14 -38.5t-2 -188t2 -188
-t14 -38.5q7 -6 352.5 -6t352.5 6q11 8 13 38.5t2 188t-2 188t-13 38.5q-8 7 -21.5 5.5t-21.5 -10.5l-10 -9v-381h-600v381l-10 9q-8 9 -21 10.5t-21 -5.5zM398 202l-11 -12v-215l11 -12q10 -13 25.5 -13t25.5 13l10 12v175h128v-175l11 -12q11 -13 25.5 -13t25.5 13l10 12
-v215l-20 24h-231z" />
+d="M509 876q-4 -2 -245 -245q-176 -179 -208.5 -213.5t-32.5 -46.5q0 -35 42 -33q7 0 233 227l225 228l226 -228q225 -227 232 -227q21 -1 31.5 7.5t10.5 25.5q0 12 -31.5 46t-206.5 212q-241 243 -246 246q-15 8 -30 1zM171 341q-12 -8 -14 -38.5t-2 -188t2 -188t14 -38.5
+q7 -6 352.5 -6t352.5 6q11 8 13 38.5t2 188t-2 188t-13 38.5q-8 7 -21.5 5.5t-21.5 -10.5l-10 -9v-381h-600v381l-10 9q-8 9 -21 10.5t-21 -5.5zM398 298l-11 -12v-215l11 -12q10 -13 25.5 -13t25.5 13l10 12v175h128v-175l11 -12q11 -13 25.5 -13t25.5 13l10 12v215l-20 24
+h-231z" />
     <glyph glyph-name="uniE612" unicode="&#xe612;" 
     <glyph glyph-name="uniE612" unicode="&#xe612;" 
-d="M951 -7h-878l439 614z" />
+d="M951 77h-878l439 614z" />
     <glyph glyph-name="uniE613" unicode="&#xe613;" 
     <glyph glyph-name="uniE613" unicode="&#xe613;" 
-d="M512 -7l-439 614h878z" />
+d="M512 77l-439 614h878z" />
     <glyph glyph-name="uniE614" unicode="&#xe614;" 
     <glyph glyph-name="uniE614" unicode="&#xe614;" 
-d="M313 -49l349 349l-349 349q-7 7 -7 16.5t6.5 16t16 6.5t16.5 -6l345 -345q16 -15 21 -20q7 -7 7 -17t-7 -17q-44 -44 -48 -47l-318 -318q-7 -6 -16.5 -6t-16 6.5t-6.5 16t7 16.5z" />
+d="M313 35l349 349l-349 349q-7 7 -7 16.5t6.5 16t16 6.5t16.5 -6l345 -345q16 -15 21 -20q7 -7 7 -17t-7 -17q-44 -44 -48 -47l-318 -318q-7 -6 -16.5 -6t-16 6.5t-6.5 16t7 16.5z" />
     <glyph glyph-name="uniE615" unicode="&#xe615;" 
     <glyph glyph-name="uniE615" unicode="&#xe615;" 
-d="M527 475q8 0 14 -6l293 -288q6 -6 6.5 -14.5t-5.5 -14.5t-14.5 -6t-14.5 6l-279 273l-278 -273q-7 -6 -15 -6t-14 6t-6 14.5t6 14.5l293 288q6 6 14 6z" />
+d="M527 559q8 0 14 -6l293 -288q6 -6 6.5 -14.5t-5.5 -14.5t-14.5 -6t-14.5 6l-279 273l-278 -273q-7 -6 -15 -6t-14 6t-6 14.5t6 14.5l293 288q6 6 14 6z" />
     <glyph glyph-name="uniE616" unicode="&#xe616;" 
     <glyph glyph-name="uniE616" unicode="&#xe616;" 
-d="M527.5 146q-8.5 0 -14.5 6l-293 288q-6 6 -6 14t6 14.5t14 6.5t15 -6l278 -274l279 274q6 6 14.5 6t14.5 -6.5t5.5 -14.5t-6.5 -14l-293 -288q-5 -6 -13.5 -6z" />
+d="M527.5 230q-8.5 0 -14.5 6l-293 288q-6 6 -6 14t6 14.5t14 6.5t15 -6l278 -274l279 274q6 6 14.5 6t14.5 -6.5t5.5 -14.5t-6.5 -14l-293 -288q-5 -6 -13.5 -6z" />
     <glyph glyph-name="uniE617" unicode="&#xe617;" horiz-adv-x="1030" 
     <glyph glyph-name="uniE617" unicode="&#xe617;" horiz-adv-x="1030" 
-d="M-195 162zM520 770q-98 0 -187.5 -38t-154 -102.5t-102.5 -154t-38 -187.5t38 -187.5t102.5 -154t154 -102.5t187.5 -38t187.5 38t154 102.5t102.5 154t38 187.5t-38 187.5t-102.5 154t-154 102.5t-187.5 38zM857 485l-339 -451l-328 238q-12 9 -14 23.5t6.5 26.5t23 14
+d="M-195 258zM520 866q-98 0 -187.5 -38t-154 -102.5t-102.5 -154t-38 -187.5t38 -187.5t102.5 -154t154 -102.5t187.5 -38t187.5 38t154 102.5t102.5 154t38 187.5t-38 187.5t-102.5 154t-154 102.5t-187.5 38zM857 581l-339 -451l-328 238q-12 9 -14 23.5t6.5 26.5t23 14
 t26.5 -6l271 -198l297 396q9 12 23.5 14t26.5 -7t14 -23.5t-7 -26.5z" />
 t26.5 -6l271 -198l297 396q9 12 23.5 14t26.5 -7t14 -23.5t-7 -26.5z" />
     <glyph glyph-name="uniE618" unicode="&#xe618;" 
     <glyph glyph-name="uniE618" unicode="&#xe618;" 
-d="M224 192q-40 0 -68 28t-28 68t28 68t68 28t68 -28t28 -68t-28 -68t-68 -28zM512 192q-40 0 -68 28t-28 68t28 68t68 28t68 -28t28 -68t-28 -68t-68 -28zM800 192q-40 0 -68 28t-28 68t28 68t68 28t68 -28t28 -68t-28 -68t-68 -28z" />
+d="M224 288q-40 0 -68 28t-28 68t28 68t68 28t68 -28t28 -68t-28 -68t-68 -28zM512 288q-40 0 -68 28t-28 68t28 68t68 28t68 -28t28 -68t-28 -68t-68 -28zM800 288q-40 0 -68 28t-28 68t28 68t68 28t68 -28t28 -68t-28 -68t-68 -28z" />
     <glyph glyph-name="uniE619" unicode="&#xe619;" 
     <glyph glyph-name="uniE619" unicode="&#xe619;" 
-d="M125.5 225q30.5 0 51 21.5t20.5 52.5q0 33 -20.5 54.5t-51 21.5t-51.5 -21.5t-21 -54.5q0 -31 21 -52.5t51.5 -21.5zM512.5 225q30.5 0 51 21.5t20.5 52.5q0 33 -20.5 54.5t-51 21.5t-51.5 -21.5t-21 -54.5q0 -31 21 -52.5t51.5 -21.5zM899.5 225q30.5 0 51 21.5
+d="M125.5 309q30.5 0 51 21.5t20.5 52.5q0 33 -20.5 54.5t-51 21.5t-51.5 -21.5t-21 -54.5q0 -31 21 -52.5t51.5 -21.5zM512.5 309q30.5 0 51 21.5t20.5 52.5q0 33 -20.5 54.5t-51 21.5t-51.5 -21.5t-21 -54.5q0 -31 21 -52.5t51.5 -21.5zM899.5 309q30.5 0 51 21.5
 t20.5 52.5q0 33 -20.5 54.5t-51 21.5t-51.5 -21.5t-21 -54.5q0 -31 21 -52.5t51.5 -21.5z" />
 t20.5 52.5q0 33 -20.5 54.5t-51 21.5t-51.5 -21.5t-21 -54.5q0 -31 21 -52.5t51.5 -21.5z" />
     <glyph glyph-name="uniE61A" unicode="&#xe61a;" 
     <glyph glyph-name="uniE61A" unicode="&#xe61a;" 
-d="M512 -146q-91 0 -173.5 35.5t-142 95t-95 142t-35.5 173.5t35.5 173.5t95 142t142 95t173.5 35.5t173.5 -35.5t142 -95t95 -142t35.5 -173.5t-35.5 -173.5t-95 -142t-142 -95t-173.5 -35.5zM512 682q-104 0 -192 -51t-139 -139t-51 -192t51 -192t139 -139t192 -51t192 51
-t139 139t51 192t-51 192t-139 139t-192 51zM512 508zM464 508q0 20 14 34t34 14t34 -14t14 -34t-14 -34t-34 -14t-34 14t-14 34zM512 44q-13 0 -22.5 9.5t-9.5 22.5v288q0 13 9.5 22.5t22.5 9.5t22.5 -9.5t9.5 -22.5v-288q0 -13 -9.5 -22.5t-22.5 -9.5z" />
+d="M512 -62q-91 0 -173.5 35.5t-142 95t-95 142t-35.5 173.5t35.5 173.5t95 142t142 95t173.5 35.5t173.5 -35.5t142 -95t95 -142t35.5 -173.5t-35.5 -173.5t-95 -142t-142 -95t-173.5 -35.5zM512 766q-104 0 -192 -51t-139 -139t-51 -192t51 -192t139 -139t192 -51t192 51
+t139 139t51 192t-51 192t-139 139t-192 51zM512 592zM464 592q0 20 14 34t34 14t34 -14t14 -34t-14 -34t-34 -14t-34 14t-14 34zM512 128q-13 0 -22.5 9.5t-9.5 22.5v288q0 13 9.5 22.5t22.5 9.5t22.5 -9.5t9.5 -22.5v-288q0 -13 -9.5 -22.5t-22.5 -9.5z" />
     <glyph glyph-name="uniE61B" unicode="&#xe61b;" 
     <glyph glyph-name="uniE61B" unicode="&#xe61b;" 
-d="M437 41h-193q-27 2 -41.5 22.5t-17.5 45.5q3 25 17.5 41t41.5 18h193v63l-193 1q-27 2 -41.5 19t-17.5 43q3 25 17.5 41t41.5 18h144l-134 236q-10 12 -19 30.5t-8 40.5q5 28 20 45.5t56 22.5q24 -2 43 -16.5t31 -31.5l152 -278l167 280q12 17 31 30t43 16q15 -1 27.5 -4
-t22 -10t16 -20t9.5 -34q0 -29 -20 -55l-155 -252h147q26 -2 41 -18t17 -41q-2 -26 -17.5 -44t-41.5 -20l-191 -1v-61h192q26 -2 41 -20t17 -43q-2 -26 -17 -43.5t-41 -19.5l-192 1v-106q-4 -85 -93 -85q-44 0 -68.5 21t-26.5 64v104z" />
+d="M437 137h-193q-27 2 -41.5 22.5t-17.5 45.5q3 25 17.5 41t41.5 18h193v63l-193 1q-27 2 -41.5 19t-17.5 43q3 25 17.5 41t41.5 18h144l-134 236q-10 12 -19 30.5t-8 40.5q5 28 20 45.5t56 22.5q24 -2 43 -16.5t31 -31.5l152 -278l167 280q12 17 31 30t43 16
+q15 -1 27.5 -4t22 -10t16 -20t9.5 -34q0 -29 -20 -55l-155 -252h147q26 -2 41 -18t17 -41q-2 -26 -17.5 -44t-41.5 -20l-191 -1v-61h192q26 -2 41 -20t17 -43q-2 -26 -17 -43.5t-41 -19.5l-192 1v-106q-4 -85 -93 -85q-44 0 -68.5 21t-26.5 64v104z" />
     <glyph glyph-name="uniE61C" unicode="&#xe61c;" 
     <glyph glyph-name="uniE61C" unicode="&#xe61c;" 
-d="M946 -196h-868q-26 0 -44 18t-18 44v868q0 26 18 44t44 18h868q26 0 44 -18t18 -44v-868q0 -26 -18 -44t-44 -18zM946 703q0 13 -9 22t-22 9h-806q-13 0 -22 -9t-9 -22v-806q0 -13 9 -22t22 -9h806q13 0 22 9t9 22v806z" />
+d="M946 -112h-868q-26 0 -44 18t-18 44v868q0 26 18 44t44 18h868q26 0 44 -18t18 -44v-868q0 -26 -18 -44t-44 -18zM946 787q0 13 -9 22t-22 9h-806q-13 0 -22 -9t-9 -22v-806q0 -13 9 -22t22 -9h806q13 0 22 9t9 22v806z" />
     <glyph glyph-name="uniE61D" unicode="&#xe61d;" 
     <glyph glyph-name="uniE61D" unicode="&#xe61d;" 
-d="M939 -202h-876q-26 0 -44.5 18.5t-18.5 44.5v876q0 26 18.5 44.5t44.5 18.5h876q26 0 44.5 -18.5t18.5 -44.5v-876q0 -26 -18.5 -44.5t-44.5 -18.5zM814 612l-376 -438l-250 188l-63 -126l313 -250l439 501z" />
+d="M939 -106h-876q-26 0 -44.5 18.5t-18.5 44.5v876q0 26 18.5 44.5t44.5 18.5h876q26 0 44.5 -18.5t18.5 -44.5v-876q0 -26 -18.5 -44.5t-44.5 -18.5zM814 708l-376 -438l-250 188l-63 -126l313 -250l439 501z" />
     <glyph glyph-name="uniE61E" unicode="&#xe61e;" 
     <glyph glyph-name="uniE61E" unicode="&#xe61e;" 
-d="M224 211l416 410l179 -179l-416 -410zM659 525l-19 19l-333 -333l19 -19zM698 486l-20 20l-332 -333l19 -19zM736 448l-19 19l-333 -333l19 -19zM717 704q14 14 38 14t39 -14l102 -102q14 -15 14 -39t-14 -38l-64 -58l-173 173zM211 186l167 -167l-148 -51l-70 70z
-M205 -45l-83 -32l32 83z" />
+d="M224 307l416 410l179 -179l-416 -410zM659 621l-19 19l-333 -333l19 -19zM698 582l-20 20l-332 -333l19 -19zM736 544l-19 19l-333 -333l19 -19zM717 800q14 14 38 14t39 -14l102 -102q14 -15 14 -39t-14 -38l-64 -58l-173 173zM211 282l167 -167l-148 -51l-70 70z
+M205 51l-83 -32l32 83z" />
     <glyph glyph-name="uniE61F" unicode="&#xe61f;" 
     <glyph glyph-name="uniE61F" unicode="&#xe61f;" 
-d="M512 812q-138 0 -256 -69t-187 -187t-69 -256t69 -256t187 -187t256 -69t256 69t187 187t69 256t-69 256t-187 187t-256 69zM563 44h-102v307h102v-307zM563 454h-102v102h102v-102z" />
+d="M512 896q-138 0 -256 -69t-187 -187t-69 -256t69 -256t187 -187t256 -69t256 69t187 187t69 256t-69 256t-187 187t-256 69zM563 128h-102v307h102v-307zM563 538h-102v102h102v-102z" />
     <glyph glyph-name="uniE620" unicode="&#xe620;" 
     <glyph glyph-name="uniE620" unicode="&#xe620;" 
-d="M938 276h-400v274h-50v-274h-399q-31 0 -53 21.5t-22 52.5v175q0 31 22 53t53 22h90q-40 47 -40 100q0 27 10 47.5t25 30t29.5 15t24.5 6.5l11 1q53 0 100 -15.5t81 -42t56 -50t39 -50.5q17 27 39.5 51t56 50t79.5 41.5t98 15.5q4 0 11 -1t24 -7t30 -15.5t24 -30.5
-t11 -49q0 -51 -35 -97h85q31 0 53 -22t22 -53v-175q0 -31 -22 -52.5t-53 -21.5zM264 725q-15 0 -26 -2.5t-15.5 -6t-6.5 -7.5t-2 -6v-3q0 -49 66 -100h173q-14 30 -30 52.5t-34 35.5t-33 21t-34.5 11.5t-30 4t-27.5 0.5zM763 723q-17 0 -27.5 -1t-29.5 -4t-33.5 -11
-t-32 -20.5t-33.5 -34.5t-30 -52h177q59 50 59 97v3q0 2 -2 6.5t-7 7.5t-15.5 6t-25.5 3zM488 -224h-349q-31 0 -53 22t-22 53v375h424v-450zM538 226h400v-375q0 -31 -22 -53t-53 -22h-325v450z" />
+d="M938 372h-30h-370v274h-50v-274h-395h-4q-31 0 -53 21.5t-22 52.5v175q0 31 22 53t53 22h90q-40 47 -40 100q0 27 10 47.5t25 30t29.5 15t24.5 6.5l11 1q53 0 100 -15.5t81 -42t56 -50t39 -50.5q17 27 39.5 51t56 50t79.5 41.5t98 15.5q4 0 11 -1t24 -7t30 -15.5
+t24 -30.5t11 -49q0 -51 -35 -97h85q31 0 53 -22t22 -53v-175q0 -31 -22 -52.5t-53 -21.5zM264 821q-15 0 -26 -2.5t-15.5 -6t-6.5 -7.5t-2 -6v-3q0 -49 66 -100h173q-14 30 -30 52.5t-34 35.5t-33 21t-34.5 11.5t-30 4t-27.5 0.5zM763 819q-17 0 -27.5 -1t-29.5 -4
+t-33.5 -11t-32 -20.5t-33.5 -34.5t-30 -52h177q59 50 59 97q2 0 0 6.5t-14 13t-36 6.5zM488 -128h-349q-31 0 -53 22t-22 53v375h424v-450zM538 322h400v-375q0 -31 -22 -53t-53 -22h-325v450z" />
     <glyph glyph-name="uniE621" unicode="&#xe621;" 
     <glyph glyph-name="uniE621" unicode="&#xe621;" 
-d="M160 492v-640q0 -26 19 -45t45 -19h576q26 0 45 19t19 45v640h-704zM352 -84h-64v448h64v-448zM480 -84h-64v448h64v-448zM608 -84h-64v448h64v-448zM736 -84h-64v448h64v-448zM880 684h-208v80q0 20 -14 34t-34 14h-224q-20 0 -34 -14t-14 -34v-80h-208q-20 0 -34 -14
-t-14 -34v-80h832v80q0 20 -14 34t-34 14zM608 684h-192v63h192v-63z" />
+d="M160 576v-640q0 -26 19 -45t45 -19h576q26 0 45 19t19 45v640h-704zM352 0h-64v448h64v-448zM480 0h-64v448h64v-448zM608 0h-64v448h64v-448zM736 0h-64v448h64v-448zM880 768h-208v80q0 20 -14 34t-34 14h-224q-20 0 -34 -14t-14 -34v-80h-208q-20 0 -34 -14t-14 -34
+v-80h832v80q0 20 -14 34t-34 14zM608 768h-192v63h192v-63z" />
     <glyph glyph-name="uniE622" unicode="&#xe622;" horiz-adv-x="1173" 
     <glyph glyph-name="uniE622" unicode="&#xe622;" horiz-adv-x="1173" 
-d="M586 588q-28 65 -69 113t-86.5 73.5t-96 34t-97.5 -2t-90 -39.5t-75.5 -73t-51.5 -107.5t-20 -138.5q0 -41 9 -78.5t24 -66.5t39 -57.5t47 -48.5t55.5 -43t56.5 -38t58.5 -35.5t53.5 -33.5q93 -61 162 -138.5t82 -120.5q10 39 81.5 118.5t160.5 142.5q24 17 71.5 47
+d="M586 672q-28 65 -69 113t-86.5 73.5t-96 34t-97.5 -2t-90 -39.5t-75.5 -73t-51.5 -107.5t-20 -138.5q0 -41 9 -78.5t24 -66.5t39 -57.5t47 -48.5t55.5 -43t56.5 -38t58.5 -35.5t53.5 -33.5q93 -61 162 -138.5t82 -120.5q10 39 81.5 118.5t160.5 142.5q24 17 71.5 47
 t79 50.5t71.5 54.5t64 67t41 81t16 102q0 75 -19.5 138t-52.5 105.5t-76.5 70.5t-91 37.5t-98 1t-96 -34.5t-85.5 -72.5t-67 -108.5z" />
 t79 50.5t71.5 54.5t64 67t41 81t16 102q0 75 -19.5 138t-52.5 105.5t-76.5 70.5t-91 37.5t-98 1t-96 -34.5t-85.5 -72.5t-67 -108.5z" />
     <glyph glyph-name="uniE623" unicode="&#xe623;" 
     <glyph glyph-name="uniE623" unicode="&#xe623;" 
-d="M835 576l-60 63l-263 -275v0l-263 275l-60 -63l262 -276l-262 -276l60 -63l263 275v0l263 -275l60 63l-262 276z" />
+d="M835 660l-60 63l-263 -275v0l-263 275l-60 -63l262 -276l-262 -276l60 -63l263 275v0l263 -275l60 63l-262 276z" />
     <glyph glyph-name="uniE624" unicode="&#xe624;" horiz-adv-x="1000" 
     <glyph glyph-name="uniE624" unicode="&#xe624;" horiz-adv-x="1000" 
-d="M459 754h55h54v-382h191h191v-109h-191h-191v-191v-190h-109v190v191h-191h-190q-1 37 -1 109h191h191v382z" />
+d="M459 850h55h54v-120v-142v-120h191h191v-109h-191h-191v-191v-190h-109v190v191h-191h-190q-1 37 -1 109h191h191v382z" />
     <glyph glyph-name="uniE625" unicode="&#xe625;" horiz-adv-x="1000" 
     <glyph glyph-name="uniE625" unicode="&#xe625;" horiz-adv-x="1000" 
-d="M77 372h873v-109h-873v109z" />
+d="M77 468h873v-109h-873v109z" />
     <glyph glyph-name="uniE626" unicode="&#xe626;" 
     <glyph glyph-name="uniE626" unicode="&#xe626;" 
-d="M866.5 663.5q-97.5 97.5 -228 132t-261.5 0t-228.5 -132t-132 -228.5t0 -261.5t132 -228t228.5 -132t261.5 0t228 132t132 228t0 261.5t-132 228.5zM798 115l-101 -101l-187 186l-186 -186l-101 101l186 186l-186 187l101 101l186 -186l187 186l101 -101l-186 -187z" />
+d="M866.5 747.5q-97.5 97.5 -228 132t-261.5 0t-228.5 -132t-132 -228.5t0 -261.5t132 -228t228.5 -132t261.5 0t228 132t132 228t0 261.5t-132 228.5zM798 199l-101 -101l-187 186l-186 -186l-101 101l186 186l-186 187l101 101l186 -186l187 186l101 -101l-186 -187z" />
     <glyph glyph-name="uniE627" unicode="&#xe627;" 
     <glyph glyph-name="uniE627" unicode="&#xe627;" 
-d="M741 258q-23 9 -22 34q6 114 -8 186q-13 68 -37.5 125.5t-48 89.5t-50.5 57t-38 32t-18 10l-7 3l-7 -3q-7 -3 -18 -10t-38 -32t-50.5 -57t-48 -89.5t-37.5 -125.5q-14 -72 -8 -186q1 -25 -22 -34q-25 -11 -47.5 -26t-47 -40.5t-39 -65t-14.5 -87.5v-16h198
-q2 -22 17.5 -36.5t37.5 -14.5h248q22 0 37.5 14.5t17.5 36.5h198v16q0 48 -14.5 87.5t-39 65t-47 40.5t-47.5 26zM512 442q-31 0 -53 22t-22 53t22 53t53 22t53 -22t22 -53t-22 -53t-53 -22zM453 -61q-14 0 -23.5 -10t-9.5 -24v-83q0 -14 9.5 -24t23.5 -10t24 10t10 24v83
-q0 14 -10 24t-24 10zM571 -61q-14 0 -24 -10t-10 -24v-83q0 -14 10 -24t24 -10t23.5 10t9.5 24v83q0 14 -9.5 24t-23.5 10z" />
+d="M741 342q-23 9 -22 34q6 114 -8 186q-13 68 -37.5 125.5t-48 89.5t-50.5 57t-38 32t-18 10l-7 3l-7 -3q-7 -3 -18 -10t-38 -32t-50.5 -57t-48 -89.5t-37.5 -125.5q-14 -72 -8 -186q1 -25 -22 -34q-25 -11 -47.5 -26t-47 -40.5t-39 -65t-14.5 -87.5v-16h198
+q2 -22 17.5 -36.5t37.5 -14.5h248q22 0 37.5 14.5t17.5 36.5h198v16q0 48 -14.5 87.5t-39 65t-47 40.5t-47.5 26zM512 526q-31 0 -53 22t-22 53t22 53t53 22t53 -22t22 -53t-22 -53t-53 -22zM453 23q-14 0 -23.5 -10t-9.5 -24v-83q0 -14 9.5 -24t23.5 -10t24 10t10 24v83
+q0 14 -10 24t-24 10zM571 23q-14 0 -24 -10t-10 -24v-83q0 -14 10 -24t24 -10t23.5 10t9.5 24v83q0 14 -9.5 24t-23.5 10z" />
     <glyph glyph-name="uniE628" unicode="&#xe628;" 
     <glyph glyph-name="uniE628" unicode="&#xe628;" 
-d="M505 776q95 0 182 -37t150 -100t100.5 -150t37.5 -182t-37.5 -182t-100.5 -150t-150 -100.5t-182 -37.5t-182 37.5t-150 100.5t-100 150t-37 182t37 182t100 150t150 100t182 37zM505 -104q112 0 206.5 55t149.5 149.5t55 206t-55 206t-149.5 149.5t-206 55t-206 -55
-t-149.5 -149.5t-55 -206t55 -206t149.5 -149.5t205.5 -55zM528 138v-59h-58v59h58zM470 564h58v-349h-58v349z" />
+d="M505 860q95 0 182 -37t150 -100t100.5 -150t37.5 -182t-37.5 -182t-100.5 -150t-150 -100.5t-182 -37.5t-182 37.5t-150 100.5t-100 150t-37 182t37 182t100 150t150 100t182 37zM505 -20q112 0 206.5 55t149.5 149.5t55 206t-55 206t-149.5 149.5t-206 55t-206 -55
+t-149.5 -149.5t-55 -206t55 -206t149.5 -149.5t205.5 -55zM528 222v-59h-58v59h58zM470 648h58v-349h-58v349z" />
     <glyph glyph-name="uniE629" unicode="&#xe629;" 
     <glyph glyph-name="uniE629" unicode="&#xe629;" 
-d="M512 809v0q-58 0 -112.5 -12t-105.5 -38t-80.5 -44t-77.5 -51v-450q0 -57 19.5 -110.5t49 -93.5t69 -76t75.5 -59.5t73.5 -43t57 -28t32.5 -12.5q13 4 32.5 12.5t57 28t73.5 43t75.5 59.5t69 76t49 93.5t19.5 110.5v450q-48 33 -77.5 51t-80.5 44t-105.5 38t-112.5 12z
-M808 214q0 -76 -36.5 -138t-112.5 -117q-73 -53 -147 -82q-74 29 -147 82q-76 55 -112.5 117t-36.5 138v421q87 53 146.5 75t149.5 23q90 -1 149.5 -23t146.5 -75v-421zM512 671q-67 0 -112.5 -12.5t-119.5 -49.5v-399q0 -35 12.5 -68.5t30 -57.5t44 -46t47 -35.5t46 -26
-t34 -16t18.5 -6.5q10 3 18.5 6.5t34 16t46 26t47 35.5t44 46t30 57.5t12.5 68.5v399q-74 37 -119.5 49.5t-112.5 12.5v0zM667 515v-47h-105v-67h92v-61h-92v-77h116v-57h-332v57h42v168h64v-168h46v205h-138v61h307v-14z" />
+d="M512 893v0q-58 0 -112.5 -12t-105.5 -38t-80.5 -44t-77.5 -51v-450q0 -57 19.5 -110.5t49 -93.5t69 -76t75.5 -59.5t73.5 -43t57 -28t32.5 -12.5q13 4 32.5 12.5t57 28t73.5 43t75.5 59.5t69 76t49 93.5t19.5 110.5v450q-48 33 -77.5 51t-80.5 44t-105.5 38t-112.5 12z
+M808 298q0 -76 -36.5 -138t-112.5 -117q-73 -53 -147 -82q-74 29 -147 82q-76 55 -112.5 117t-36.5 138v421q87 53 146.5 75t149.5 23q90 -1 149.5 -23t146.5 -75v-421zM512 755q-67 0 -112.5 -12.5t-119.5 -49.5v-399q0 -35 12.5 -68.5t30 -57.5t44 -46t47 -35.5t46 -26
+t34 -16t18.5 -6.5q10 3 18.5 6.5t34 16t46 26t47 35.5t44 46t30 57.5t12.5 68.5v399q-74 37 -119.5 49.5t-112.5 12.5v0zM667 599v-47h-105v-67h92v-61h-92v-77h116v-57h-332v57h42v168h64v-168h46v205h-138v61h307v-14z" />
     <glyph glyph-name="uniE62A" unicode="&#xe62a;" 
     <glyph glyph-name="uniE62A" unicode="&#xe62a;" 
-d="M497 806l-451 -386q-20 -18 -20 -45v-500q0 -32 22.5 -54.5t53.5 -22.5h256v333h308v-333h256q31 0 53.5 22.5t22.5 54.5v500q0 27 -20 45l-451 386q-15 13 -30 0z" />
+d="M497 890l-451 -386q-20 -18 -20 -45v-500q0 -32 22.5 -54.5t53.5 -22.5h256v333h308v-333h256q31 0 53.5 22.5t22.5 54.5v500q0 27 -20 45l-451 386q-15 13 -30 0z" />
     <glyph glyph-name="uniE62B" unicode="&#xe62b;" 
     <glyph glyph-name="uniE62B" unicode="&#xe62b;" 
-d="M761 539q0 -104 -73 -177t-176.5 -73t-177 73t-73.5 177t73.5 177t177 73t176.5 -73t73 -177zM888 -164q11 22 9 48q-7 99 -60 181.5t-139 130t-186.5 47.5t-187 -47.5t-139.5 -130t-60 -181.5q-1 -26 10 -48q12 -25 40 -25h673q27 0 40 25z" />
+d="M761 623q0 -104 -73 -177t-176.5 -73t-177 73t-73.5 177t73.5 177t177 73t176.5 -73t73 -177zM888 -80q11 22 9 48q-7 99 -60 181.5t-139 130t-186.5 47.5t-187 -47.5t-139.5 -130t-60 -181.5q-1 -26 10 -48q12 -25 40 -25h673q27 0 40 25z" />
     <glyph glyph-name="uniE62C" unicode="&#xe62c;" horiz-adv-x="1048" 
     <glyph glyph-name="uniE62C" unicode="&#xe62c;" horiz-adv-x="1048" 
-d="M832 -126.5q0 -35.5 -25 -60.5t-60.5 -25t-60.5 25t-25 60.5t25 60.5t60.5 25t60.5 -25t25 -60.5zM533 -126.5q0 -35.5 -25 -60.5t-60 -25t-60 25t-25 60.5t25 60.5t60 25t60 -25t25 -60.5zM277 620l-35 159q-3 14 -15 23.5t-27 9.5h-147q-22 0 -37.5 -15.5t-15.5 -37.5
+d="M832 -42.5q0 -35.5 -25 -60.5t-60.5 -25t-60.5 25t-25 60.5t25 60.5t60.5 25t60.5 -25t25 -60.5zM533 -42.5q0 -35.5 -25 -60.5t-60 -25t-60 25t-25 60.5t25 60.5t60 25t60 -25t25 -60.5zM277 704l-35 159q-3 14 -15 23.5t-27 9.5h-147q-22 0 -37.5 -15.5t-15.5 -37.5
 t15.5 -38t37.5 -16h54l157 -627q6 -25 25.5 -40t44.5 -15h527q25 0 44.5 15t25.5 40l113 452q9 34 -13 62t-57 28h-697z" />
 t15.5 -38t37.5 -16h54l157 -627q6 -25 25.5 -40t44.5 -15h527q25 0 44.5 15t25.5 40l113 452q9 34 -13 62t-57 28h-697z" />
     <glyph glyph-name="uniE62D" unicode="&#xe62d;" 
     <glyph glyph-name="uniE62D" unicode="&#xe62d;" 
-d="M442 274h-84v-76h-230v76h-81q-20 0 -33.5 -12.5t-13.5 -31.5v-395q0 -20 13.5 -33.5t33.5 -13.5h395q19 0 31.5 13.5t12.5 33.5v395q0 19 -12.5 31.5t-31.5 12.5zM977 812h-81v-77h-230v77h-84q-19 0 -31.5 -13.5t-12.5 -33.5v-395q0 -19 12.5 -31.5t31.5 -12.5h395
-q20 0 33.5 12.5t13.5 31.5v395q0 20 -13.5 33.5t-33.5 13.5zM977 274h-81v-76h-230v76h-84q-19 0 -31.5 -12.5t-12.5 -31.5v-395q0 -20 12.5 -33.5t31.5 -13.5h395q20 0 33.5 13.5t13.5 33.5v395q0 19 -13.5 31.5t-33.5 12.5z" />
+d="M442 358h-84v-76h-230v76h-81q-20 0 -33.5 -12.5t-13.5 -31.5v-395q0 -20 13.5 -33.5t33.5 -13.5h395q19 0 31.5 13.5t12.5 33.5v395q0 19 -12.5 31.5t-31.5 12.5zM977 896h-81v-77h-230v77h-84q-19 0 -31.5 -13.5t-12.5 -33.5v-395q0 -19 12.5 -31.5t31.5 -12.5h395
+q20 0 33.5 12.5t13.5 31.5v395q0 20 -13.5 33.5t-33.5 13.5zM977 358h-81v-76h-230v76h-84q-19 0 -31.5 -12.5t-12.5 -31.5v-395q0 -20 12.5 -33.5t31.5 -13.5h395q20 0 33.5 13.5t13.5 33.5v395q0 19 -13.5 31.5t-33.5 12.5z" />
     <glyph glyph-name="uniE62E" unicode="&#xe62e;" horiz-adv-x="1639" 
     <glyph glyph-name="uniE62E" unicode="&#xe62e;" horiz-adv-x="1639" 
-d="M1 783h1045v-625h-1045v625zM1424 783h-337v-625l61 -33q33 14 70 14q66 0 116 -42t61 -105l7 -4h205v398zM1178 411v290h164l121 -290h-285zM235 125h-235v-163h111q2 57 36.5 101.5t87.5 61.5zM452 -46q0 66 -47 112.5t-113.5 46.5t-114 -46.5t-47.5 -112.5
-t47.5 -112.5t114 -46.5t113.5 46.5t47 112.5zM1067 125h-721q54 -17 88.5 -61.5t36.5 -101.5h570q0 50 26 92v71zM1380 -44q0 66 -47 112.5t-113.5 46.5t-113.5 -46.5t-47 -112.5t47 -112.5t113.5 -46.5t113.5 46.5t47 112.5z" />
+d="M1 867h1045v-625h-1045v625zM1424 867h-337v-625l61 -33q33 14 70 14q66 0 116 -42t61 -105l7 -4h205v398zM1178 495v290h164l121 -290h-285zM235 209h-235v-163h111q2 57 36.5 101.5t87.5 61.5zM452 38q0 66 -47 112.5t-113.5 46.5t-114 -46.5t-47.5 -112.5t47.5 -112.5
+t114 -46.5t113.5 46.5t47 112.5zM1067 209h-721q54 -17 88.5 -61.5t36.5 -101.5h570q0 50 26 92v71zM1380 40q0 66 -47 112.5t-113.5 46.5t-113.5 -46.5t-47 -112.5t47 -112.5t113.5 -46.5t113.5 46.5t47 112.5z" />
     <glyph glyph-name="uniE62F" unicode="&#xe62f;" 
     <glyph glyph-name="uniE62F" unicode="&#xe62f;" 
-d="M474 28v161h-167v50h167v74h-167v49h134l-168 265h87l152 -257v386q-35 0 -70.5 2t-64 6t-55 8.5t-46.5 8.5t-34.5 8t-22.5 6t-7 2q-2 -43 -16.5 -74t-34 -44t-38.5 -20t-33 -7h-13q0 -40 1.5 -78t3.5 -69t5.5 -59.5t7 -51t6.5 -41.5t6.5 -32.5t5.5 -23t3 -13.5l2 -5
-q15 -61 45 -120.5t65.5 -105.5t75 -87t76.5 -70.5t67 -50.5t47.5 -32t17.5 -10v225h-38zM550 28v161h167v50h-167v74h167v49h-134l168 265h-87l-152 -257v386q76 0 151 10.5t112 20.5l37 10q2 -43 16.5 -74t34 -44t38.5 -20t33 -7h13q0 -234 -40 -368l-1 -5
+d="M474 112v161h-167v50h167v74h-167v49h134l-168 265h87l152 -257v386q-35 0 -70.5 2t-64 6t-55 8.5t-46.5 8.5t-34.5 8t-22.5 6t-7 2q-2 -43 -16.5 -74t-34 -44t-38.5 -20t-33 -7h-13q0 -40 1.5 -78t3.5 -69t5.5 -59.5t7 -51t6.5 -41.5t6.5 -32.5t5.5 -23t3 -13.5l2 -5
+q15 -61 45 -120.5t65.5 -105.5t75 -87t76.5 -70.5t67 -50.5t47.5 -32t17.5 -10v225h-38zM550 112v161h167v50h-167v74h167v49h-134l168 265h-87l-152 -257v386q76 0 151 10.5t112 20.5l37 10q2 -43 16.5 -74t34 -44t38.5 -20t33 -7h13q0 -234 -40 -368l-1 -5
 q-15 -61 -44.5 -120.5t-65.5 -105.5t-75.5 -87t-76.5 -70.5t-66.5 -50.5t-47.5 -32t-18 -10v225h38z" />
 q-15 -61 -44.5 -120.5t-65.5 -105.5t-75.5 -87t-76.5 -70.5t-66.5 -50.5t-47.5 -32t-18 -10v225h38z" />
     <glyph glyph-name="uniE630" unicode="&#xe630;" 
     <glyph glyph-name="uniE630" unicode="&#xe630;" 
-d="M629 -71h-268v20q0 31 -21.5 53t-52.5 22t-52.5 -22t-21.5 -53v-20h-174v609h590v-609zM400 -30h188v527h-508v-527h94q7 41 39 68t74 27t74 -27t39 -68zM989 -71h-136v20q0 31 -21.5 53t-52.5 22t-52.5 -22t-21.5 -53v-20h-117v476h210q22 0 57 -34q27 -26 58 -67
-q31 -40 52 -75q24 -41 24 -62v-238zM892 -30h56v197q0 9 -18 40t-46 68t-53 63q-23 23 -34 26h-168v-394h37q7 41 39 68t74 27t74 -27t39 -68zM989 137h-287v193h191l6 -8q35 -43 61 -84q29 -48 29 -71v-30zM743 178h202q-6 15 -21 39q-21 34 -50 72h-131v-111zM779.5 -166
-q-47.5 0 -81.5 34t-34 81.5t34 81.5t81.5 34t81 -34t33.5 -81.5t-33.5 -81.5t-81 -34zM779 24q-31 0 -52.5 -22t-21.5 -52.5t21.5 -52.5t52.5 -22t52.5 22t21.5 52.5t-21.5 52.5t-52.5 22zM287 -166q-48 0 -81.5 34t-33.5 81.5t33.5 81.5t81.5 34t81.5 -34t33.5 -81.5
-t-33.5 -81.5t-81.5 -34zM287 24q-31 0 -52.5 -22t-21.5 -52.5t21.5 -52.5t52.5 -22t52.5 22t21.5 52.5t-21.5 52.5t-52.5 22z" />
+d="M629 25h-268v20q0 31 -21.5 53t-52.5 22t-52.5 -22t-21.5 -53v-20h-174v609h590v-609zM400 66h188v527h-508v-527h94q7 41 39 68t74 27t74 -27t39 -68zM989 25h-136v20q0 31 -21.5 53t-52.5 22t-52.5 -22t-21.5 -53v-20h-117v476h210q22 0 57 -34q27 -26 58 -67
+q31 -40 52 -75q24 -41 24 -62v-238zM892 66h56v197q0 9 -18 40t-46 68t-53 63q-23 23 -34 26h-168v-394h37q7 41 39 68t74 27t74 -27t39 -68zM989 233h-287v193h191l6 -8q35 -43 61 -84q29 -48 29 -71v-30zM743 274h202q-6 15 -21 39q-21 34 -50 72h-131v-111zM779.5 -70
+q-47.5 0 -81.5 34t-34 81.5t34 81.5t81.5 34t81 -34t33.5 -81.5t-33.5 -81.5t-81 -34zM779 120q-31 0 -52.5 -22t-21.5 -52.5t21.5 -52.5t52.5 -22t52.5 22t21.5 52.5t-21.5 52.5t-52.5 22zM287 -70q-48 0 -81.5 34t-33.5 81.5t33.5 81.5t81.5 34t81.5 -34t33.5 -81.5
+t-33.5 -81.5t-81.5 -34zM287 120q-31 0 -52.5 -22t-21.5 -52.5t21.5 -52.5t52.5 -22t52.5 22t21.5 52.5t-21.5 52.5t-52.5 22z" />
     <glyph glyph-name="uniE631" unicode="&#xe631;" 
     <glyph glyph-name="uniE631" unicode="&#xe631;" 
-d="M24 799zM47 799zM70 799zM94 799zM117 799zM140 799zM163 799zM187 799zM210 799zM233 799zM256 799zM280 799zM303 799zM326 799zM349 799zM373 799zM396 799zM419 799zM442 799zM466 799zM489 799zM512 799zM535 799zM558 799zM582 799zM605 799zM628 799zM651 799z
-M675 799zM698 799zM721 799zM744 799zM768 799zM791 799zM814 799zM837 799zM861 799zM884 799zM907 799zM930 799zM954 799zM977 799zM1000 799zM1 776zM1 753zM1 730zM1 706zM1 683zM1 660zM1 637zM1 613zM1 590zM1 567zM1 544zM1 520zM1 497zM1 474zM1 451zM1 427zM1 404
-zM1 381zM1 358zM1 334zM1 311zM1 288zM1 265zM1 242zM1 218zM1 195zM1 172zM1 149zM1 125zM1 102zM1 79zM1 56zM1 32zM1 9zM1 -14zM1 -37zM1 -61zM1 -84zM1 -107zM1 -130zM1 -154zM1 -177zM1 -200zM512 -223q-7 8 -18.5 22t-45.5 59t-64.5 91t-68 113.5t-64.5 131.5
-t-45.5 139t-18.5 141q0 52 11 96.5t30 75.5t43 56.5t51 41t54 27t51.5 17t43.5 8.5t30 3h11q7 0 18.5 -0.5t45.5 -7t64.5 -17.5t68 -35.5t64.5 -57.5t45.5 -87t18.5 -120q0 -237 -215 -552q-60 -88 -110 -145zM740 517q-16 85 -86 140q-1 1 -4 3.5t-5 3.5q-5 4 -22 13
-t-19 10q-1 0 -20 7q-21 7 -24 7q-24 5 -48 5v0q-24 0 -47 -5q-44 -8 -82 -34h-1q-12 -9 -27 -23q-2 -1 -5 -4l-3 -3q-4 -4 -16 -19.5t-13 -16.5q-2 -3 -4.5 -7.5t-3.5 -5.5q-10 -19 -13 -27q-1 -2 -2 -6t-2 -5q-7 -21 -9 -32q-4 -22 -4 -44q0 -183 175 -470l57 -88
-q9 13 25 36.5t56 92t70.5 133.5t55.5 148t25 148q0 22 -4 43zM373 474q0 58 40.5 98.5t98.5 40.5t98.5 -40.5t40.5 -98.5t-40.5 -99t-98.5 -41t-98.5 41t-40.5 99z" />
+d="M24 895v-1022v1022zM47 895v-1022v1022zM70 895v-1022v1022zM94 895v-1022v1022zM117 895v-1022v1022zM140 895v-1022v1022zM163 895v-1022v1022zM187 895v-1022v1022zM210 895v-1022v1022zM233 895v-1022v1022zM256 895v-1022v1022zM280 895v-1022v1022zM303 895v-1022
+v1022zM326 895v-1022v1022zM349 895v-1022v1022zM373 895v-1022v1022zM396 895v-1022v1022zM419 895v-1022v1022zM442 895v-1022v1022zM466 895v-1022v1022zM489 895v-1022v1022zM512 895v-1022v1022zM535 895v-1022v1022zM558 895v-1022v1022zM582 895v-1022v1022zM605 895
+v-1022v1022zM628 895v-1022v1022zM651 895v-1022v1022zM675 895v-1022v1022zM698 895v-1022v1022zM721 895v-1022v1022zM744 895v-1022v1022zM768 895v-1022v1022zM791 895v-1022v1022zM814 895v-1022v1022zM837 895v-1022v1022zM861 895v-1022v1022zM884 895v-1022v1022z
+M907 895v-1022v1022zM930 895v-1022v1022zM954 895v-1022v1022zM977 895v-1022v1022zM1000 895v-1022v1022zM1 872h1022h-1022zM1 849h1022h-1022zM1 826h1022h-1022zM1 802h1022h-1022zM1 779h1022h-1022zM1 756h1022h-1022zM1 733h1022h-1022zM1 709h1022h-1022zM1 686
+h1022h-1022zM1 663h1022h-1022zM1 640h1022h-1022zM1 616h1022h-1022zM1 593h1022h-1022zM1 570h1022h-1022zM1 547h1022h-1022zM1 523h1022h-1022zM1 500h1022h-1022zM1 477h1022h-1022zM1 454h1022h-1022zM1 430h1022h-1022zM1 407h1022h-1022zM1 384h1022h-1022zM1 361
+h1022h-1022zM1 338h1022h-1022zM1 314h1022h-1022zM1 291h1022h-1022zM1 268h1022h-1022zM1 245h1022h-1022zM1 221h1022h-1022zM1 198h1022h-1022zM1 175h1022h-1022zM1 152h1022h-1022zM1 128h1022h-1022zM1 105h1022h-1022zM1 82h1022h-1022zM1 59h1022h-1022zM1 35h1022
+h-1022zM1 12h1022h-1022zM1 -11h1022h-1022zM1 -34h1022h-1022zM1 -58h1022h-1022zM1 -81h1022h-1022zM1 -104h1022h-1022zM512 -127q-7 8 -18.5 22t-45.5 59t-64.5 91t-68 113.5t-64.5 131.5t-45.5 139t-18.5 141q0 52 11 96.5t30 75.5t43 56.5t51 41t54 27t51.5 17
+t43.5 8.5t30 3h11q7 0 18.5 -0.5t45.5 -7t64.5 -17.5t68 -35.5t64.5 -57.5t45.5 -87t18.5 -120q0 -237 -215 -552q-60 -88 -110 -145zM740 613q-16 85 -86 140q-1 1 -4 3.5t-5 3.5q-5 4 -22 13t-19 10q-1 0 -20 7q-21 7 -24 7q-24 5 -48 5v0q-24 0 -47 -5q-44 -8 -82 -34h-1
+q-12 -9 -27 -23q-2 -1 -5 -4l-3 -3q-4 -4 -16 -19.5t-13 -16.5q-2 -3 -4.5 -7.5t-3.5 -5.5q-10 -19 -13 -27q-1 -2 -2 -6t-2 -5q-7 -21 -9 -32q-4 -22 -4 -44q0 -65 23.5 -146.5t58 -151.5t68.5 -129.5t58 -95.5t24 -35q9 13 25 36.5t56 92t70.5 133.5t55.5 148t25 148
+q0 22 -4 43zM373 570q0 58 40.5 98.5t98.5 40.5t98.5 -40.5t40.5 -98.5t-40.5 -99t-98.5 -41t-98.5 41t-40.5 99z" />
     <glyph glyph-name="uniE632" unicode="&#xe632;" 
     <glyph glyph-name="uniE632" unicode="&#xe632;" 
-d="M313 163h397v69h-397v-69zM313 26h397v68h-397v-68zM611 747h-430q-14 0 -23.5 -10t-9.5 -24v-825q0 -14 9.5 -24t23.5 -10h661q14 0 24 10t10 24v619zM644 626l131 -119h-131v119zM809 -77h-595v755h364v-206q0 -14 9.5 -24t23.5 -10h198v-515zM313 300h397v69h-397v-69
-z" />
+d="M313 247h397v69h-397v-69zM313 110h397v68h-397v-68zM611 831h-430q-14 0 -23.5 -10t-9.5 -24v-825q0 -14 9.5 -24t23.5 -10h661q14 0 24 10t10 24v619zM644 710l131 -119h-131v119zM809 7h-595v755h364v-206q0 -14 9.5 -24t23.5 -10h198v-515zM313 384h397v69h-397v-69z
+" />
     <glyph glyph-name="uniE633" unicode="&#xe633;" horiz-adv-x="1304" 
     <glyph glyph-name="uniE633" unicode="&#xe633;" horiz-adv-x="1304" 
-d="M1303 454l-161 242h-304v-443h233q19 0 32.5 14t13.5 33t-13.5 33t-32.5 14h-140v256h161l118 -177v-242h-442v577q0 21 -15 36t-36 15h-666q-21 0 -36 -15t-15 -36v-620q0 -21 15 -35.5t36 -14.5h142q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140
-q0 56 -31 105h363q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140q0 56 -31 105h77v363zM93 719h582v-535h-582v535zM465 -14q0 -43 -30.5 -74t-74 -31t-74 31t-30.5 74t30.5 74t74 31t74 -31t30.5 -74zM1164 -14q0 -43 -31 -74t-74 -31t-74 31t-31 74t31 74t74 31
+d="M1303 538l-161 242h-304v-443h233q19 0 32.5 14t13.5 33t-13.5 33t-32.5 14h-140v256h161l118 -177v-242h-442v577q0 21 -15 36t-36 15h-666q-21 0 -36 -15t-15 -36v-620q0 -21 15 -35.5t36 -14.5h142q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140
+q0 56 -31 105h363q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140q0 56 -31 105h77v363zM93 803h582v-535h-582v535zM465 70q0 -43 -30.5 -74t-74 -31t-74 31t-30.5 74t30.5 74t74 31t74 -31t30.5 -74zM1164 70q0 -43 -31 -74t-74 -31t-74 31t-31 74t31 74t74 31
 t74 -31t31 -74z" />
 t74 -31t31 -74z" />
     <glyph glyph-name="uniE634" unicode="&#xe634;" horiz-adv-x="1476" 
     <glyph glyph-name="uniE634" unicode="&#xe634;" horiz-adv-x="1476" 
-d="M1403 812h-1331q-30 0 -51 -21t-21 -51v-880q0 -30 21 -51t51 -21h1331q30 0 51.5 21t21.5 51v880q0 30 -21.5 51t-51.5 21zM120 692h1235v-151h-1235v151zM120 330h1235v-422h-1235v422zM211 210h572v-61h-572v61zM211 89h331v-60h-331v60z" />
+d="M1403 896h-1331q-30 0 -51 -21t-21 -51v-880q0 -30 21 -51t51 -21h1331q30 0 51.5 21t21.5 51v880q0 30 -21.5 51t-51.5 21zM120 776h1235v-151h-1235v151zM120 414h1235v-422h-1235v422zM211 294h572v-61h-572v61zM211 173h331v-60h-331v60z" />
     <glyph glyph-name="uniE635" unicode="&#xe635;" 
     <glyph glyph-name="uniE635" unicode="&#xe635;" 
-d="M512 797q-102 0 -194.5 -39.5t-160 -106.5t-107 -160t-39.5 -194.5t39.5 -194.5t107 -160t160 -107t194.5 -40t194.5 40t160 107t107 160t39.5 194.5t-39.5 194.5t-107 160t-160 106.5t-194.5 39.5zM512 -118q-112 0 -207.5 55.5t-151 151t-55.5 208t55.5 207.5
-t151 150.5t207.5 55.5t207.5 -55.5t151 -150.5t55.5 -207.5t-55.5 -208t-151 -151t-207.5 -55.5zM512 471q25 0 43 -18t18 -44h87q0 50 -29 89t-75 53v50q0 9 -6.5 15.5t-15.5 6.5h-44q-9 0 -15.5 -6.5t-6.5 -15.5v-50q-46 -14 -75 -53t-29 -89q0 -104 133 -154
-q27 -9 44 -20t23 -22t7.5 -16.5t1.5 -13.5q0 -25 -18 -43t-43 -18t-43 18t-18 43h-87q0 -49 29 -88t75 -54v-50q0 -9 6.5 -15t15.5 -6h44q9 0 15.5 6t6.5 15v50q46 15 75 54t29 88q0 105 -133 154q-27 10 -44 21t-23 22t-7.5 16.5t-1.5 12.5q0 26 18 44t43 18z" />
+d="M512 881q-102 0 -194.5 -39.5t-160 -106.5t-107 -160t-39.5 -194.5t39.5 -194.5t107 -160t160 -107t194.5 -40t194.5 40t160 107t107 160t39.5 194.5t-39.5 194.5t-107 160t-160 106.5t-194.5 39.5zM512 -34q-112 0 -207.5 55.5t-151 151t-55.5 208t55.5 207.5t151 150.5
+t207.5 55.5t207.5 -55.5t151 -150.5t55.5 -207.5t-55.5 -208t-151 -151t-207.5 -55.5zM512 555q25 0 43 -18t18 -44h87q0 50 -29 89t-75 53v50q0 9 -6.5 15.5t-15.5 6.5h-44q-9 0 -15.5 -6.5t-6.5 -15.5v-50q-46 -14 -75 -53t-29 -89q0 -104 133 -154q27 -9 44 -20t23 -22
+t7.5 -16.5t1.5 -13.5q0 -25 -18 -43t-43 -18t-43 18t-18 43h-87q0 -49 29 -88t75 -54v-50q0 -9 6.5 -15t15.5 -6h44q9 0 15.5 6t6.5 15v50q46 15 75 54t29 88q0 105 -133 154q-27 10 -44 21t-23 22t-7.5 16.5t-1.5 12.5q0 26 18 44t43 18z" />
     <glyph glyph-name="uniE636" unicode="&#xe636;" 
     <glyph glyph-name="uniE636" unicode="&#xe636;" 
-d="M947 675h-892q-23 0 -39 -16t-16 -38v-642q0 -23 16 -39t39 -16h892q22 0 38 16t16 39v642q0 22 -16 38t-38 16zM836 584l-335 -260l-336 260h671zM91 16v511l376 -293q15 -11 33.5 -11t33.5 11l376 293v-511h-819z" />
+d="M947 759h-892q-23 0 -39 -16t-16 -38v-642q0 -23 16 -39t39 -16h892q22 0 38 16t16 39v642q0 22 -16 38t-38 16zM836 668l-335 -260l-336 260h671zM91 100v511l376 -293q15 -11 33.5 -11t33.5 11l376 293v-511h-819z" />
     <glyph glyph-name="uniE637" unicode="&#xe637;" 
     <glyph glyph-name="uniE637" unicode="&#xe637;" 
-d="M512 572q-63 0 -107.5 -44.5t-44.5 -107.5t44.5 -107.5t107.5 -44.5t107.5 44.5t44.5 107.5t-44.5 107.5t-107.5 44.5zM512 796q-102 0 -188.5 -50.5t-136.5 -137t-50 -188.5q0 -56 36 -137.5t81 -151t104 -146.5t85 -107t44 -50l25 -28l25 28q18 20 44 50t85 107
-t104 146.5t81 151t36 137.5q0 102 -50 188.5t-136.5 137t-188.5 50.5zM512 -97q-46 54 -93.5 115.5t-98.5 137t-83 147t-32 117.5q0 127 90 217t217 90t217 -90t90 -217q0 -46 -32 -117.5t-83 -147t-98.5 -137t-93.5 -115.5z" />
+d="M512 656q-63 0 -107.5 -44.5t-44.5 -107.5t44.5 -107.5t107.5 -44.5t107.5 44.5t44.5 107.5t-44.5 107.5t-107.5 44.5zM512 880q-102 0 -188.5 -50.5t-136.5 -137t-50 -188.5q0 -56 36 -137.5t81 -151t104 -146.5t85 -107t44 -50l25 -28l25 28q18 20 44 50t85 107
+t104 146.5t81 151t36 137.5q0 102 -50 188.5t-136.5 137t-188.5 50.5zM512 -13q-46 54 -93.5 115.5t-98.5 137t-83 147t-32 117.5q0 127 90 217t217 90t217 -90t90 -217q0 -46 -32 -117.5t-83 -147t-98.5 -137t-93.5 -115.5z" />
     <glyph glyph-name="uniE638" unicode="&#xe638;" horiz-adv-x="1335" 
     <glyph glyph-name="uniE638" unicode="&#xe638;" horiz-adv-x="1335" 
-d="M1273 -88h-1179q-26 0 -44 -18t-18 -44t18 -44t44 -18h1179q26 0 44 18t18 44t-18 44t-44 18zM841 657h429q27 0 46 18t19 44t-19 44t-46 18h-429q-27 0 -46 -18t-19 -44t19 -44t46 -18zM841 230h429q27 0 46 18t19 44t-19 44t-46 18h-429q-27 0 -46 -18t-19 -44t19 -44
-t46 -18zM85 230h434q26 0 44 18t18 44v435q0 25 -18 43.5t-44 18.5h-434q-26 0 -44 -18.5t-18 -43.5v-435q0 -25 18 -43.5t44 -18.5zM147 665h310v-311h-310v311z" />
+d="M1273 -4h-1179q-26 0 -44 -18t-18 -44t18 -44t44 -18h1179q26 0 44 18t18 44t-18 44t-44 18zM841 741h429q27 0 46 18t19 44t-19 44t-46 18h-429q-27 0 -46 -18t-19 -44t19 -44t46 -18zM841 314h429q27 0 46 18t19 44t-19 44t-46 18h-429q-27 0 -46 -18t-19 -44t19 -44
+t46 -18zM85 314h434q26 0 44 18t18 44v435q0 25 -18 43.5t-44 18.5h-434q-26 0 -44 -18.5t-18 -43.5v-435q0 -25 18 -43.5t44 -18.5zM147 749h310v-311h-310v311z" />
     <glyph glyph-name="uniE639" unicode="&#xe639;" 
     <glyph glyph-name="uniE639" unicode="&#xe639;" 
-d="M507 811q-101 0 -194 -40t-160 -107t-107 -160t-40 -194.5t40 -194.5t107 -160t160 -107t194.5 -40t194.5 40t160 107t107 160t40 194.5t-40 194.5t-107 160t-160 107t-195 40zM507 -104q-112 0 -207.5 55.5t-150.5 150.5t-55 207.5t55 208t150.5 151t208 55.5
-t207.5 -55.5t150.5 -151t55.5 -208t-55.5 -207.5t-150.5 -150.5t-208 -55.5zM506 605h-1h-1q-67 0 -115 -47q-48 -48 -48 -116q0 -18 12.5 -31t30.5 -13t31 13t13 31q0 32 22 54q22 21 55 22q30 -1 52.5 -23t22.5 -52q1 -24 -12 -43t-34 -29q-34 -14 -54 -44.5t-20 -68.5
-v-36q0 -18 13 -30.5t31 -12.5t31 12.5t13 30.5v36q0 24 20 33q46 20 73 61.5t26 91.5q-1 66 -48 113t-113 48zM504 135q-23 0 -39 -16t-16 -38.5t16 -38.5t39 -16t38.5 16t15.5 38.5t-15.5 38.5t-38.5 16z" />
+d="M507 895q-101 0 -194 -40t-160 -107t-107 -160t-40 -194.5t40 -194.5t107 -160t160 -107t194.5 -40t194.5 40t160 107t107 160t40 194.5t-40 194.5t-107 160t-160 107t-195 40zM507 -20q-112 0 -207.5 55.5t-150.5 150.5t-55 207.5t55 208t150.5 151t208 55.5
+t207.5 -55.5t150.5 -151t55.5 -208t-55.5 -207.5t-150.5 -150.5t-208 -55.5zM506 689h-1h-1q-67 0 -115 -47q-48 -48 -48 -116q0 -18 12.5 -31t30.5 -13t31 13t13 31q0 32 22 54q22 21 55 22q30 -1 52.5 -23t22.5 -52q1 -24 -12 -43t-34 -29q-34 -14 -54 -44.5t-20 -68.5
+v-36q0 -18 13 -30.5t31 -12.5t31 12.5t13 30.5v36q0 24 20 33q46 20 73 61.5t26 91.5q-1 66 -48 113t-113 48zM504 219q-23 0 -39 -16t-16 -38.5t16 -38.5t39 -16t38.5 16t15.5 38.5t-15.5 38.5t-38.5 16z" />
     <glyph glyph-name="uniE63A" unicode="&#xe63a;" 
     <glyph glyph-name="uniE63A" unicode="&#xe63a;" 
-d="M964 376q21 1 35 16t14 36v147q0 21 -15.5 36.5t-36.5 15.5h-898q-21 0 -36.5 -15.5t-15.5 -36.5v-147q0 -21 14 -36t35 -16q29 -2 49.5 -24t20.5 -52t-20.5 -52t-49.5 -24q-21 -1 -35 -16t-14 -36v-147q0 -21 15.5 -36.5t36.5 -15.5h898q21 0 36.5 15.5t15.5 36.5v147
-q0 21 -14 36t-35 16q-29 2 -49.5 24t-20.5 52t20.5 52t49.5 24zM926 143v-83h-828v83q52 15 85.5 58.5t33.5 98.5t-33.5 98.5t-85.5 58.5v83h283v-66h66v66h479v-83q-52 -15 -85.5 -58.5t-33.5 -98.5t33.5 -98.5t85.5 -58.5zM381 278h66v-109h-66v109zM381 431h66v-109h-66
-v109zM381 126h66v-66h-66v66z" />
+d="M964 460q21 1 35 16t14 36v147q0 21 -15.5 36.5t-36.5 15.5h-898q-21 0 -36.5 -15.5t-15.5 -36.5v-147q0 -21 14 -36t35 -16q29 -2 49.5 -24t20.5 -52t-20.5 -52t-49.5 -24q-21 -1 -35 -16t-14 -36v-147q0 -21 15.5 -36.5t36.5 -15.5h898q21 0 36.5 15.5t15.5 36.5v147
+q0 21 -14 36t-35 16q-29 2 -49.5 24t-20.5 52t20.5 52t49.5 24zM926 227v-83h-828v83q52 15 85.5 58.5t33.5 98.5t-33.5 98.5t-85.5 58.5v83h283v-66h66v66h479v-83q-52 -15 -85.5 -58.5t-33.5 -98.5t33.5 -98.5t85.5 -58.5zM381 362h66v-109h-66v109zM381 515h66v-109h-66
+v109zM381 210h66v-66h-66v66z" />
     <glyph glyph-name="uniE63B" unicode="&#xe63b;" horiz-adv-x="1199" 
     <glyph glyph-name="uniE63B" unicode="&#xe63b;" horiz-adv-x="1199" 
-d="M1149 812h-1099q-21 0 -35.5 -14.5t-14.5 -35.5v-350q0 -20 14.5 -35t35.5 -15h1099q21 0 35.5 15t14.5 35v350q0 21 -14.5 35.5t-35.5 14.5zM100 712h999v-250h-999v250zM1024 312q-21 0 -35.5 -14.5t-14.5 -34.5v-375h-749v375q0 20 -14.5 34.5t-35.5 14.5t-35.5 -14.5
-t-14.5 -34.5v-425q0 -21 14.5 -35.5t35.5 -14.5h849q21 0 35.5 14.5t14.5 35.5v425q0 20 -14.5 34.5t-35.5 14.5zM325 312q-21 0 -35.5 -14.5t-14.5 -34.5v-200q0 -21 14.5 -35.5t35.5 -14.5h549q21 0 35.5 14.5t14.5 35.5v200q0 20 -14.5 34.5t-35.5 14.5t-35.5 -14.5
+d="M1149 896h-1099q-21 0 -35.5 -14.5t-14.5 -35.5v-350q0 -20 14.5 -35t35.5 -15h1099q21 0 35.5 15t14.5 35v350q0 21 -14.5 35.5t-35.5 14.5zM100 796h999v-250h-999v250zM1024 396q-21 0 -35.5 -14.5t-14.5 -34.5v-375h-749v375q0 20 -14.5 34.5t-35.5 14.5t-35.5 -14.5
+t-14.5 -34.5v-425q0 -21 14.5 -35.5t35.5 -14.5h849q21 0 35.5 14.5t14.5 35.5v425q0 20 -14.5 34.5t-35.5 14.5zM325 396q-21 0 -35.5 -14.5t-14.5 -34.5v-200q0 -21 14.5 -35.5t35.5 -14.5h549q21 0 35.5 14.5t14.5 35.5v200q0 20 -14.5 34.5t-35.5 14.5t-35.5 -14.5
 t-14.5 -34.5v-150h-449v150q0 20 -15 34.5t-35 14.5z" />
 t-14.5 -34.5v-150h-449v150q0 20 -15 34.5t-35 14.5z" />
     <glyph glyph-name="uniE63C" unicode="&#xe63c;" horiz-adv-x="1048" 
     <glyph glyph-name="uniE63C" unicode="&#xe63c;" horiz-adv-x="1048" 
-d="M297.5 437q-20.5 0 -35 -14.5t-14.5 -35.5t14.5 -35.5t35 -14.5t35.5 14.5t15 35.5t-15 35.5t-35.5 14.5zM953 -55q95 93 95 215t-94 214q2 20 2 23q0 111 -64 205t-174.5 148.5t-240 54.5t-239.5 -54.5t-174 -148.5t-64 -205q0 -78 33 -148.5t93 -125.5l-77 -123
-q-8 -12 -6.5 -26t10.5 -25q13 -15 32 -15q9 0 18 4l180 80q4 2 7 4q20 -7 39 -12q48 -80 138.5 -128t199.5 -48q75 0 145 25q1 -1 2 -1l140 -62q8 -4 17 -4q20 0 32 15q10 10 11 24t-7 26zM286 160q0 -17 2 -35v1q-88 42 -140.5 114t-52.5 157t51.5 157t139.5 114t192 42
-q142 0 249.5 -76.5t128.5 -189.5q-88 43 -189 43q-104 0 -191.5 -43.5t-138.5 -119t-51 -164.5zM381 160q0 96 84 164t202 68t202 -68t84 -163.5t-84 -163.5t-202 -68t-202 68t-84 163zM527 191q-16 0 -27.5 -11t-11.5 -27t11.5 -27.5t27.5 -11.5t27.5 11.5t11.5 27.5
-t-11.5 27t-27.5 11zM667 191q-16 0 -27.5 -11t-11.5 -27t11.5 -27.5t27.5 -11.5t27.5 11.5t11.5 27.5t-11.5 27t-27.5 11zM806 191q-16 0 -27 -11t-11 -27t11 -27.5t27 -11.5t27.5 11.5t11.5 27.5t-11.5 27t-27.5 11z" />
+d="M297.5 521q-20.5 0 -35 -14.5t-14.5 -35.5t14.5 -35.5t35 -14.5t35.5 14.5t15 35.5t-15 35.5t-35.5 14.5zM953 29q95 93 95 215t-94 214q2 20 2 23q0 111 -64 205t-174.5 148.5t-240 54.5t-239.5 -54.5t-174 -148.5t-64 -205q0 -78 33 -148.5t93 -125.5l-77 -123
+q-8 -12 -6.5 -26t10.5 -25q13 -15 32 -15q9 0 18 4l180 80q4 2 7 4q20 -7 39 -12q48 -80 138.5 -128t199.5 -48q75 0 145 25q1 -1 2 -1l140 -62q8 -4 17 -4q20 0 32 15q10 10 11 24t-7 26zM286 244q0 -17 2 -35v1q-88 42 -140.5 114t-52.5 157t51.5 157t139.5 114t192 42
+q142 0 249.5 -76.5t128.5 -189.5q-88 43 -189 43q-104 0 -191.5 -43.5t-138.5 -119t-51 -164.5zM381 244q0 96 84 164t202 68t202 -68t84 -163.5t-84 -163.5t-202 -68t-202 68t-84 163zM527 275q-16 0 -27.5 -11t-11.5 -27t11.5 -27.5t27.5 -11.5t27.5 11.5t11.5 27.5
+t-11.5 27t-27.5 11zM667 275q-16 0 -27.5 -11t-11.5 -27t11.5 -27.5t27.5 -11.5t27.5 11.5t11.5 27.5t-11.5 27t-27.5 11zM806 275q-16 0 -27 -11t-11 -27t11 -27.5t27 -11.5t27.5 11.5t11.5 27.5t-11.5 27t-27.5 11z" />
     <glyph glyph-name="uniE63D" unicode="&#xe63d;" 
     <glyph glyph-name="uniE63D" unicode="&#xe63d;" 
 d="M512 13q-131 0 -241.5 55t-175 149.5t-64.5 205.5t64.5 205.5t175 149.5t241.5 55t241.5 -55t175 -149.5t64.5 -205.5t-64.5 -205.5t-175 -149.5t-241.5 -55zM512 751q-108 0 -200 -44t-145.5 -119.5t-53.5 -164.5t53.5 -164.5t145.5 -119.5t200 -44t200 44t145.5 119.5
 d="M512 13q-131 0 -241.5 55t-175 149.5t-64.5 205.5t64.5 205.5t175 149.5t241.5 55t241.5 -55t175 -149.5t64.5 -205.5t-64.5 -205.5t-175 -149.5t-241.5 -55zM512 751q-108 0 -200 -44t-145.5 -119.5t-53.5 -164.5t53.5 -164.5t145.5 -119.5t200 -44t200 44t145.5 119.5
 t53.5 164.5t-53.5 164.5t-145.5 119.5t-200 44zM730 75l184 -82l-102 164zM914 -44q-8 0 -15 3l-184 82q-14 6 -19.5 20.5t0.5 28.5t20.5 19.5t28.5 -1.5l74 -33l-39 62q-8 13 -4.5 28t16.5 23t28 4.5t23 -16.5l102 -164q15 -23 -3 -43q-11 -13 -28 -13zM379 412.5
 t53.5 164.5t-53.5 164.5t-145.5 119.5t-200 44zM730 75l184 -82l-102 164zM914 -44q-8 0 -15 3l-184 82q-14 6 -19.5 20.5t0.5 28.5t20.5 19.5t28.5 -1.5l74 -33l-39 62q-8 13 -4.5 28t16.5 23t28 4.5t23 -16.5l102 -164q15 -23 -3 -43q-11 -13 -28 -13zM379 412.5
 q0 -21.5 -15 -36.5t-36.5 -15t-36.5 15t-15 36.5t15 36.5t36.5 15t36.5 -15t15 -36.5zM563 412.5q0 -21.5 -15 -36.5t-36 -15t-36 15t-15 36.5t15 36.5t36 15t36 -15t15 -36.5zM748 413q0 -22 -15 -37t-36.5 -15t-36.5 15t-15 36.5t15 36.5t36.5 15t36.5 -15t15 -36z" />
 q0 -21.5 -15 -36.5t-36.5 -15t-36.5 15t-15 36.5t15 36.5t36.5 15t36.5 -15t15 -36.5zM563 412.5q0 -21.5 -15 -36.5t-36 -15t-36 15t-15 36.5t15 36.5t36 15t36 -15t15 -36.5zM748 413q0 -22 -15 -37t-36.5 -15t-36.5 15t-15 36.5t15 36.5t36.5 15t36.5 -15t15 -36z" />
     <glyph glyph-name="uniE63E" unicode="&#xe63e;" 
     <glyph glyph-name="uniE63E" unicode="&#xe63e;" 
-d="M521 317zM768 -178q-94 0 -205 56q-145 72 -277 204.5t-205 277.5q-55 113 -56.5 201t52.5 140q13 13 30 13t29.5 -13t12.5 -30t-12 -30q-32 -32 -26.5 -98t47.5 -149q68 -137 187.5 -256.5t256.5 -187.5q83 -42 149 -47.5t98 26.5q13 13 30 13t30 -13t13 -30t-13 -30
-q-54 -47 -141 -47zM333 355q-26 0 -39 26q-9 16 -4 32.5t21 23.5l99 46q15 8 26 23t8 33q0 13 -17 30l-141 145q-20 20 -56 13q-12 -7 -25 -13l-68 -73q-13 -12 -30 -12t-30 12.5t-13 29.5t13 30l68 68q28 28 60 34q80 20 141 -34l140 -140q32 -32 39 -82q6 -41 -16.5 -81.5
-t-64.5 -63.5l-98 -47h-13zM875 -139q-17 0 -30 12.5t-13 29.5t13 30l68 68q13 13 13 26q7 35 -13 55l-141 141q-4 4 -30 17q-18 3 -33 -7t-22 -27l-47 -98q-6 -16 -22.5 -21.5t-32.5 4.5q-17 6 -22 22.5t4 32.5l47 99q23 42 62 64.5t83 16.5q45 -7 77 -39l141 -141
-q29 -28 38 -65t-4 -75q-17 -43 -34 -60l-72 -73q-13 -12 -30 -12zM602 87q-9 0 -26 8q-77 58 -154 128q-76 77 -128 154q-9 12 -6 29.5t19 30.5q16 9 33 6.5t27 -15.5q69 -95 119 -141q94 -85 141 -119q16 -10 18.5 -27t-9.5 -33q-6 -21 -34 -21z" />
+d="M521 401zM768 -94q-94 0 -205 56q-145 72 -277 204.5t-205 277.5q-55 113 -56.5 201t52.5 140q13 13 30 13t29.5 -13t12.5 -30t-12 -30q-32 -32 -26.5 -98t47.5 -149q68 -137 187.5 -256.5t256.5 -187.5q83 -42 149 -47.5t98 26.5q13 13 30 13t30 -13t13 -30t-13 -30
+q-54 -47 -141 -47zM333 439q-26 0 -39 26q-9 16 -4 32.5t21 23.5l99 46q15 8 26 23t8 33q0 13 -17 30l-141 145q-20 20 -56 13q-12 -7 -25 -13l-68 -73q-13 -12 -30 -12t-30 12.5t-13 29.5t13 30l68 68q28 28 60 34q80 20 141 -34l140 -140q32 -32 39 -82q6 -41 -16.5 -81.5
+t-64.5 -63.5l-98 -47h-13zM875 -55q-17 0 -30 12.5t-13 29.5t13 30l68 68q5 6 7.5 8.5t4 7t1.5 10.5q7 35 -13 55l-141 141q-4 4 -30 17q-18 3 -33 -7t-22 -27l-47 -98q-6 -16 -22.5 -21.5t-32.5 4.5q-17 6 -22 22.5t4 32.5l47 99q23 42 62 64.5t83 16.5q45 -7 77 -39
+l141 -141q29 -28 38 -65t-4 -75q-17 -43 -34 -60l-72 -73q-13 -12 -30 -12zM602 171q-9 0 -26 8q-77 58 -154 128q-76 77 -128 154q-9 12 -6 29.5t19 30.5q16 9 33 6.5t27 -15.5q69 -95 119 -141q94 -85 141 -119q16 -10 18.5 -27t-9.5 -33q-6 -21 -34 -21z" />
     <glyph glyph-name="uniE63F" unicode="&#xe63f;" horiz-adv-x="1025" 
     <glyph glyph-name="uniE63F" unicode="&#xe63f;" horiz-adv-x="1025" 
-d="M512 -66q-11 0 -31 -1t-36.5 -1t-30.5 2l-222 -146q0 227 5 243q-91 65 -144 152.5t-53 189.5q0 122 68.5 223t186 158.5t257.5 57.5t257.5 -57.5t186 -158.5t68.5 -222.5t-68.5 -223t-186 -159t-257.5 -57.5zM512 763q-122 0 -229 -52.5t-170.5 -143t-63.5 -194.5
-q0 -95 53 -179t142 -138v-170l146 97q16 -3 35.5 -4t49 0t37.5 1q122 0 229 53.5t170.5 144.5t63.5 195t-63.5 194.5t-170.5 143t-229 52.5zM768 300q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5t45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5zM512 300
-q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5t45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5zM256 300q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5t45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5z" />
+d="M512 18q-11 0 -31 -1t-36.5 -1t-30.5 2l-222 -146q0 227 5 243q-91 65 -144 152.5t-53 189.5q0 122 68.5 223t186 158.5t257.5 57.5t257.5 -57.5t186 -158.5t68.5 -222.5t-68.5 -223t-186 -159t-257.5 -57.5zM512 847q-122 0 -229 -52.5t-170.5 -143t-63.5 -194.5
+q0 -95 53 -179t142 -138v-170l146 97q16 -3 35.5 -4t49 0t37.5 1q122 0 229 53.5t170.5 144.5t63.5 195t-63.5 194.5t-170.5 143t-229 52.5zM768 384q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5t45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5zM512 384
+q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5t45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5zM256 384q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5t45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5z" />
     <glyph glyph-name="uniE640" unicode="&#xe640;" 
     <glyph glyph-name="uniE640" unicode="&#xe640;" 
-d="M957 510q-12 19 -38 19h-598l-29 62q-3 7 -8 14q-3 4 -8 8q-4 3 -7 6l-2 1l-8 4h-2q-5 2 -9 2l-4 1h-5h-118q-23 0 -40 -16.5t-17 -40t17 -40.5t40 -17h81l33 -71q3 -10 8 -21t8 -17l3 -5l81 -181q0 -2 2 -5l15 -32q9 -30 39 -38v-3h392l18 1v2q30 9 39 38l98 217
-q40 77 19 112zM909 413l-93 -207l-3 1l-4 -15q-5 -19 -25 -19l-19 1v-1h-340h-18q-19 0 -24 19l-4 15l-3 -1l-93 208q-10 17 -18 40l-42 92h-102q-10 0 -17 7t-7 17t7 17.5t17 7.5h119l3 -1q1 0 4 -1q2 0 4 -2q2 -1 4 -3q2 -1 3 -3l4 -6l38 -83h619q8 0 10 -3
-q5 -8 -1.5 -32.5t-18.5 -47.5zM470 107q-33 0 -56.5 -23t-23.5 -56t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5t-23.5 56t-56.5 23zM470 -23q-21 0 -36 15t-15 36t15 36t36 15t36 -15t15 -36.5t-15 -36t-36 -14.5zM747 107q-33 0 -56.5 -23t-23.5 -56t23.5 -56.5
-t56.5 -23.5t56.5 23.5t23.5 56.5t-23.5 56t-56.5 23zM747 -23q-21 0 -36 14.5t-15 36t15 36.5t36 15t36 -15t15 -36t-15 -36t-36 -15z" />
+d="M957 594q-12 19 -38 19h-598l-29 62q-3 7 -8 14q-3 4 -8 8q-4 3 -7 6l-2 1l-8 4h-2q-5 2 -9 2l-4 1h-5h-118q-23 0 -40 -16.5t-17 -40t17 -40.5t40 -17h81l33 -71q2 -6 5 -13t5 -12t4.5 -9.5t3.5 -6.5l1 -2l81 -181q0 -2 2 -5l15 -32q9 -30 39 -38v-3h392l18 1v2
+q30 9 39 38l98 217q40 77 19 112zM909 497l-93 -207l-3 1l-4 -15q-5 -19 -25 -19l-19 1v-1h-340h-18q-19 0 -24 19l-4 15l-3 -1l-93 208q-10 17 -18 40l-42 92h-102q-10 0 -17 7t-7 17t7 17.5t17 7.5h119l3 -1q1 0 4 -1q2 0 4 -2q2 -1 4 -3q2 -1 3 -3l4 -6l38 -83h619
+q8 0 10 -3q5 -8 -1.5 -32.5t-18.5 -47.5zM470 191q-33 0 -56.5 -23t-23.5 -56t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5t-23.5 56t-56.5 23zM470 61q-21 0 -36 15t-15 36t15 36t36 15t36 -15t15 -36.5t-15 -36t-36 -14.5zM747 191q-33 0 -56.5 -23t-23.5 -56t23.5 -56.5
+t56.5 -23.5t56.5 23.5t23.5 56.5t-23.5 56t-56.5 23zM747 61q-21 0 -36 14.5t-15 36t15 36.5t36 15t36 -15t15 -36t-15 -36t-36 -15z" />
     <glyph glyph-name="uniE641" unicode="&#xe641;" horiz-adv-x="1045" 
     <glyph glyph-name="uniE641" unicode="&#xe641;" horiz-adv-x="1045" 
 d="M522 893q-103 0 -197 -40t-162 -108t-108.5 -162t-40.5 -197.5t40.5 -197.5t108.5 -162t162 -108t197.5 -40t197.5 40t162 108t108 162t40 197.5t-40 197.5t-108 162t-162 108t-198 40zM522 -49q-88 0 -168.5 34.5t-138.5 93t-92.5 138.5t-34.5 168.5t34.5 169
 d="M522 893q-103 0 -197 -40t-162 -108t-108.5 -162t-40.5 -197.5t40.5 -197.5t108.5 -162t162 -108t197.5 -40t197.5 40t162 108t108 162t40 197.5t-40 197.5t-108 162t-162 108t-198 40zM522 -49q-88 0 -168.5 34.5t-138.5 93t-92.5 138.5t-34.5 168.5t34.5 169
 t92.5 138.5t138.5 92.5t169 34.5t168.5 -34.5t138.5 -92.5t93 -138.5t34.5 -169t-34.5 -168.5t-93 -138.5t-138.5 -93t-169 -34.5zM775 268l-105 61q-11 4 -21 6.5t-18 2.5t-15 -0.5t-13 -4t-10 -5.5t-9 -6l-6 -7q-2 -2 -6 -7l-3 -4l-6 -10q-34 -4 -59 21l-51 50
 t92.5 138.5t138.5 92.5t169 34.5t168.5 -34.5t138.5 -92.5t93 -138.5t34.5 -169t-34.5 -168.5t-93 -138.5t-138.5 -93t-169 -34.5zM775 268l-105 61q-11 4 -21 6.5t-18 2.5t-15 -0.5t-13 -4t-10 -5.5t-9 -6l-6 -7q-2 -2 -6 -7l-3 -4l-6 -10q-34 -4 -59 21l-51 50
@@ -250,18 +254,34 @@ d="M523 881q-101 0 -192.5 -39.5t-158 -105.5t-105.5 -158t-39 -192.5t39 -192.5t105
 q-7 -7 -17 -7t-18 7l-34 34q-59 -42 -131 -42q-94 0 -160.5 66.5t-66.5 160.5t67 160.5t160.5 66.5t160 -66.5t66.5 -160.5q0 -75 -45 -135zM592 337q8 7 18 6.5t17 -7.5l27 -27q25 39 25 84q0 64 -45.5 109.5t-110 45.5t-110 -45.5t-45.5 -109.5t45.5 -109.5t109.5 -45.5
 q-7 -7 -17 -7t-18 7l-34 34q-59 -42 -131 -42q-94 0 -160.5 66.5t-66.5 160.5t67 160.5t160.5 66.5t160 -66.5t66.5 -160.5q0 -75 -45 -135zM592 337q8 7 18 6.5t17 -7.5l27 -27q25 39 25 84q0 64 -45.5 109.5t-110 45.5t-110 -45.5t-45.5 -109.5t45.5 -109.5t109.5 -45.5
 q44 0 80 21l-27 28q-8 7 -7.5 18t7.5 18z" />
 q44 0 80 21l-27 28q-8 7 -7.5 18t7.5 18z" />
     <glyph glyph-name="uniE645" unicode="&#xe645;" 
     <glyph glyph-name="uniE645" unicode="&#xe645;" 
-d="M512 798q-104 0 -198 -40.5t-162.5 -109t-109 -162.5t-40.5 -198t40.5 -198t109 -162.5t162.5 -109t198 -40.5t198 40.5t162.5 109t109 162.5t40.5 198t-40.5 198t-109 162.5t-162.5 109t-198 40.5zM512 -149q-89 0 -170 34.5t-139.5 93t-93 139.5t-34.5 170t34.5 170
-t93 139.5t139.5 93t170 34.5t170 -34.5t139.5 -93t93 -139.5t34.5 -170t-34.5 -170t-93 -139.5t-139.5 -93t-170 -34.5zM659 288q15 0 25.5 10.5t10.5 25.5t-10.5 26t-25.5 11h-111v17l135 141q11 11 10.5 26t-11 25.5t-25.5 10t-26 -11.5l-115 -121l-123 122
+d="M512 894q-104 0 -198 -40.5t-162.5 -109t-109 -162.5t-40.5 -198t40.5 -198t109 -162.5t162.5 -109t198 -40.5t198 40.5t162.5 109t109 162.5t40.5 198t-40.5 198t-109 162.5t-162.5 109t-198 40.5zM512 -53q-89 0 -170 34.5t-139.5 93t-93 139.5t-34.5 170t34.5 170
+t93 139.5t139.5 93t170 34.5t170 -34.5t139.5 -93t93 -139.5t34.5 -170t-34.5 -170t-93 -139.5t-139.5 -93t-170 -34.5zM659 384q15 0 25.5 10.5t10.5 25.5t-10.5 26t-25.5 11h-111v17l135 141q11 11 10.5 26t-11 25.5t-25.5 10t-26 -11.5l-115 -121l-123 122
 q-11 11 -26 10.5t-25.5 -11t-11 -25.5t10.5 -26l135 -135v-22h-108q-15 0 -26 -11t-11 -26t11 -25.5t26 -10.5h108v-73h-108q-15 0 -26 -10.5t-11 -25.5t11 -26t26 -11h108v-108q0 -15 10.5 -25.5t25.5 -10.5t25.5 10.5t10.5 25.5v108h111q15 0 25.5 11t10.5 26t-10.5 25.5
 q-11 11 -26 10.5t-25.5 -11t-11 -25.5t10.5 -26l135 -135v-22h-108q-15 0 -26 -11t-11 -26t11 -25.5t26 -10.5h108v-73h-108q-15 0 -26 -10.5t-11 -25.5t11 -26t26 -11h108v-108q0 -15 10.5 -25.5t25.5 -10.5t25.5 10.5t10.5 25.5v108h111q15 0 25.5 11t10.5 26t-10.5 25.5
 t-25.5 10.5h-111v73h111z" />
 t-25.5 10.5h-111v73h111z" />
     <glyph glyph-name="uniE646" unicode="&#xe646;" 
     <glyph glyph-name="uniE646" unicode="&#xe646;" 
-d="M708 469l-257 -267l-135 141q-12 13 -28.5 13t-28 -12.5t-11.5 -29.5t11 -29l164 -170q4 -4 8 -7q12 -7 25.5 -5.5t23.5 12.5l284 295q12 13 12 30t-12 29q-41 16 -56 0zM512 300zM17 300q0 101 39 192.5t105.5 158t158 105.5t192.5 39t192.5 -39t158 -105.5t105.5 -158
+d="M708 553l-257 -267l-135 141q-12 13 -28.5 13t-28 -12.5t-11.5 -29.5t11 -29l164 -170q4 -4 8 -7q12 -7 25.5 -5.5t23.5 12.5l284 295q12 13 12 30t-12 29q-41 16 -56 0zM512 384zM17 384q0 101 39 192.5t105.5 158t158 105.5t192.5 39t192.5 -39t158 -105.5t105.5 -158
 t39 -192.5t-39 -192.5t-105.5 -158t-158 -105.5t-192.5 -39t-192.5 39t-158 105.5t-105.5 158t-39 192.5z" />
 t39 -192.5t-39 -192.5t-105.5 -158t-158 -105.5t-192.5 -39t-192.5 39t-158 105.5t-105.5 158t-39 192.5z" />
     <glyph glyph-name="uniE647" unicode="&#xe647;" 
     <glyph glyph-name="uniE647" unicode="&#xe647;" 
 d="M512 -92q-97 0 -185 37.5t-152 101.5t-101.5 152t-37.5 185t37.5 185t101.5 152t152 101.5t185 37.5t185 -37.5t152 -101.5t101.5 -152t37.5 -185t-37.5 -185t-101.5 -152t-152 -101.5t-185 -37.5zM512 828q-90 0 -172.5 -35t-142 -94.5t-94.5 -142t-35 -172.5t35 -172.5
 d="M512 -92q-97 0 -185 37.5t-152 101.5t-101.5 152t-37.5 185t37.5 185t101.5 152t152 101.5t185 37.5t185 -37.5t152 -101.5t101.5 -152t37.5 -185t-37.5 -185t-101.5 -152t-152 -101.5t-185 -37.5zM512 828q-90 0 -172.5 -35t-142 -94.5t-94.5 -142t-35 -172.5t35 -172.5
 t94.5 -142t142 -94.5t172.5 -35t172.5 35t142 94.5t94.5 142t35 172.5t-35 172.5t-94.5 142t-142 94.5t-172.5 35z" />
 t94.5 -142t142 -94.5t172.5 -35t172.5 35t142 94.5t94.5 142t35 172.5t-35 172.5t-94.5 142t-142 94.5t-172.5 35z" />
     <glyph glyph-name="uniE648" unicode="&#xe648;" 
     <glyph glyph-name="uniE648" unicode="&#xe648;" 
-d="M512 798q-101 0 -193.5 -39.5t-159 -106t-106 -159t-39.5 -193.5t39.5 -193.5t106 -159t159 -106t193.5 -39.5t193.5 39.5t159 106t106 159t39.5 193.5t-39.5 193.5t-106 159t-159 106t-193.5 39.5zM512 -166q-95 0 -181 37t-148.5 99.5t-99.5 148.5t-37 181t37 181
-t99.5 148.5t148.5 99.5t181 37t181 -37t148.5 -99.5t99.5 -148.5t37 -181t-37 -181t-99.5 -148.5t-148.5 -99.5t-181 -37zM420 133l-156 155l-22 -22l178 -179l361 361l-23 23z" />
+d="M512 882q-101 0 -193.5 -39.5t-159 -106t-106 -159t-39.5 -193.5t39.5 -193.5t106 -159t159 -106t193.5 -39.5t193.5 39.5t159 106t106 159t39.5 193.5t-39.5 193.5t-106 159t-159 106t-193.5 39.5zM512 -82q-95 0 -181 37t-148.5 99.5t-99.5 148.5t-37 181t37 181
+t99.5 148.5t148.5 99.5t181 37t181 -37t148.5 -99.5t99.5 -148.5t37 -181t-37 -181t-99.5 -148.5t-148.5 -99.5t-181 -37zM420 217l-156 155l-22 -22l178 -179l361 361l-23 23z" />
+    <glyph glyph-name="uniE649" unicode="&#xe649;" 
+d="M875 126l-363 -164l-363 164v610q247 75 363 75t363 -75v-610zM930 808q-34 11 -84.5 26t-159.5 38.5t-174 23.5t-174 -23.5t-159.5 -38.5t-84.5 -26q-14 -4 -22 -15.5t-8 -25.5v-669q0 -27 25 -39l405 -183q9 -3 18 -3t18 3l405 183q25 12 25 39v669q0 14 -8 25.5
+t-22 15.5zM751 552v83h-473v-83h206v-298h-72v237h-87v-237h-66v-84h506v84h-193v119h151v83h-151v96h179z" />
+    <glyph glyph-name="uniE64A" unicode="&#xe64a;" 
+d="M510.5 -61q-90.5 0 -173.5 35.5t-142.5 95t-95 142.5t-35.5 173.5t35.5 173.5t95 142.5t142.5 95t173.5 35.5t173.5 -35.5t142.5 -95t95 -142.5t35.5 -173.5t-35.5 -173.5t-95 -142.5t-142.5 -95t-173.5 -35.5zM510.5 793q-110.5 0 -204.5 -54.5t-148.5 -148.5
+t-54.5 -204.5t54.5 -204.5t148.5 -148.5t204.5 -54.5t204.5 54.5t148.5 148.5t54.5 204.5t-54.5 204.5t-148.5 148.5t-204.5 54.5zM491 347q-8 0 -13.5 5.5t-5.5 13.5v330q0 8 5.5 14t13.5 6t14 -6t6 -14v-330q0 -8 -6 -13.5t-14 -5.5zM763 347h-272q-8 0 -13.5 5.5
+t-5.5 13.5t5.5 13.5t13.5 5.5h272q8 0 13.5 -5.5t5.5 -13.5t-5.5 -13.5t-13.5 -5.5z" />
+    <glyph glyph-name="uniE64B" unicode="&#xe64b;" 
+d="M379 -128q-57 0 -122 51.5t-97 132.5q-26 71 -27 149.5t24 151.5q11 33 32.5 70.5t37 58.5t46.5 62q17 20 51 68l11 14l23 34q9 14 21 35t18.5 38.5t11.5 38t4 42.5t-7 44q-6 11 7 24q7 7 20 7q149 -50 216 -284q27 50 58 69q12 6 23 0t11 -21q-3 -59 11.5 -126.5
+t42.5 -126.5q4 -5 9 -17t8 -17q51 -89 55 -157q4 -63 -14.5 -126.5t-65.5 -120t-115 -80.5q-30 -11 -61 -11q-18 0 -30.5 5t-18 12.5t-7.5 13t-2 10.5q0 7 2 13t4 10t7.5 9.5t7.5 7t9 6.5t8 6l3 3q36 26 54 75.5t7 95.5q-4 28 -27 75q-2 6 -7.5 20t-8.5 22t-6.5 20t-4.5 23
+q0 -2 -2 -5t-2 -5q-15 -42 -20 -75q0 -45 7 -58q7 -5 7.5 -14.5t-4.5 -16.5q-5 -8 -14 -10t-17 3v0q-67 44 -85 120q7 34 7 78v21v24q0 68 -10 92q-14 -53 -28 -72q-22 -39 -37 -58q-6 -6 -15.5 -20t-12.5 -18q-13 -22 -24 -46.5t-21.5 -61.5t-5.5 -78t28 -76
+q3 -7 7.5 -12.5t8 -10t8.5 -10t7.5 -8t8 -7t7.5 -6.5t7.5 -6.5t6.5 -4.5q11 -9 16.5 -14.5t10 -14.5t0.5 -19q-5 -18 -21.5 -29.5t-39.5 -11.5z" />
+    <glyph glyph-name="uniE64C" unicode="&#xe64c;" 
+d="M911 725h-242v123q0 21 -13.5 34.5t-34.5 13.5h-246q-20 0 -33.5 -13.5t-13.5 -34.5v-123h-246q-21 0 -34.5 -13.5t-13.5 -34t13.5 -34t34.5 -13.5h293h243h293q21 0 34.5 13.5t13.5 34t-13.5 34t-34.5 13.5zM423 725v72h147v-72h-147zM765 579q-21 0 -34.5 -14
+t-13.5 -34v-560h-441v560q0 20 -13.5 34t-34 14t-34 -14t-13.5 -34v-611q0 -21 13.5 -34.5t34.5 -13.5h536q20 0 33.5 13.5t13.5 34.5v611q3 20 -11.5 34t-35.5 14zM447 67v389q0 20 -13.5 33.5t-34 13.5t-34 -13.5t-13.5 -33.5v-389q0 -21 13.5 -34.5t34 -13.5t34 13.5
+t13.5 34.5zM645 67v389q0 20 -13.5 33.5t-34.5 13.5q-20 0 -35.5 -13.5t-15.5 -33.5v-389q0 -21 13.5 -34.5t34.5 -13.5t36 13.5t15 34.5z" />
   </font>
   </font>
 </defs></svg>
 </defs></svg>

@@ -7,7 +7,7 @@
 var $ = require('yoho-jquery');
 var $ = require('yoho-jquery');
 
 
 var $activityTime = $('.activity-time'),
 var $activityTime = $('.activity-time'),
-    endTime = $activityTime ? $activityTime.data('time-ms') : '';
+    endTime = $activityTime ? $activityTime.data('time-s') : '';
 
 
 var params = {
 var params = {
     anHour: 3600, // 1小时=？秒
     anHour: 3600, // 1小时=？秒

@@ -515,13 +515,25 @@ $(window).scroll(function() {
 });
 });
 
 
 // 初始请求最新第一页数据
 // 初始请求最新第一页数据
-search([{
-    type: 'breakSort',
-    id: $('.coat').data('id')
-}, {
-    type: 'breakSize',
-    id: $('.coat').data('allsub')
-}]);
+$(function() {
+    var type = window.queryString.type;
+    var selector;
+
+    // type 1: 上装， 3:下装, 6: 鞋装
+    if (type && type !== '1') {
+        selector = type === '3' ? '.trouser' : '.shoes';
+    } else {
+        selector = '.coat';
+    }
+    $('#list-nav').find(selector).addClass('active').siblings().removeClass('active');
+    search([{
+        type: 'breakSort',
+        id: $(selector).data('id')
+    }, {
+        type: 'breakSize',
+        id: $(selector).data('allsub')
+    }]);
+});
 
 
 $listNav.on('touchstart', 'li', function() {
 $listNav.on('touchstart', 'li', function() {
     $(this).addClass('bytouch');
     $(this).addClass('bytouch');

@@ -14,5 +14,3 @@ search.start();
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
 
 
 countDown();
 countDown();
-
-

@@ -5,22 +5,83 @@
  */
  */
 
 
 var $ = require('yoho-jquery'),
 var $ = require('yoho-jquery'),
-    Swiper = require('yoho-swiper');
+    Swiper = require('yoho-swiper'),
+    ellipsis = require('yoho-mlellipsis'),
+    lazyload = require('yoho-jquery-lazyload');
 
 
 var search = require('./sale/search');
 var search = require('./sale/search');
 
 
 require('../common');
 require('../common');
 
 
 search.start();
 search.start();
+lazyload($('img.lazy'));
+ellipsis.init();
 
 
-if ($('.swiper-container .swiper-slide').length > 1) {
-    new Swiper('.swiper-container', {
-        lazyLoading: true,
-        lazyLoadingInPrevNext: true,
-        loop: true,
-        autoplay: 3000,
-        autoplayDisableOnInteraction: true,
-        paginationClickable: true,
-        pagination: '.banner-top .pagination-inner'
+$('.swiper-container').each(function() {
+    if ($(this).find('.swiper-slide').length > 1) {
+        new Swiper($(this).get(0), {
+            lazyLoading: true,
+            lazyLoadingInPrevNext: true,
+            loop: true,
+            autoplay: 3000,
+            autoplayDisableOnInteraction: true,
+            paginationClickable: true,
+            pagination: $(this).closest('.banner-top').find('.pagination-inner').get(0)
+        });
+    }
+});
+
+$(function() {
+    var $body = $('body');
+    var $saleNavSelect = $('.sale-nav-select');
+    var $vipFloor = $('.vip-floor');
+    var $saleNavWrap = $('.sale-nav-wrap');
+    var $listNav = $saleNavWrap.find('#list-nav');
+    var $filterMask = $('.filter-mask');
+
+    $('.sale-nav').on('click', function() {
+        $saleNavSelect.toggleClass('show');
+    });
+
+    // 读取会员专享商品
+    $.ajax({
+        url: '/product/sale/search',
+        data: {
+            yh_channel: window.queryString.channel || 'boys',
+            saleType: '2',
+            productPool: $vipFloor.data('id'),
+            order: '0',
+            limit: '4'
+        }
+    }).then(function(res) {
+        if (/good-info/.test(res)) {
+            $vipFloor.html(res).addClass('goods-container');
+            lazyload($vipFloor.find('img.lazy'));
+
+            $('.good-detail-text .name').each(function() {
+                var $this = $(this),
+                    $title = $this.find('a');
+
+                $title[0].mlellipsis(2);
+            });
+        }
+    });
+
+    $saleNavWrap.css({
+        height: $saleNavWrap.height()
     });
     });
-}
+
+    $(window).on('scroll', function() {
+        if (!$filterMask.length) {
+            $filterMask = $('.filter-mask');
+        }
+
+        if ($body.scrollTop() > $saleNavWrap.offset().top) {
+            $listNav.addClass('fixed');
+            $filterMask.addClass('fixed');
+        } else {
+            $listNav.removeClass('fixed');
+            $filterMask.removeClass('fixed');
+        }
+    }).trigger('scroll');
+});

@@ -71,7 +71,6 @@ var $listNav = $('#list-nav'),
     $pre = $listNav.find('.active'), // 纪录进入筛选前的active项，初始为选中项
     $pre = $listNav.find('.active'), // 纪录进入筛选前的active项，初始为选中项
     searching;
     searching;
 
 
-require('../../common/suspend-cart'); // 悬浮购物车
 require('../../common');
 require('../../common');
 
 
 ellipsis.init();
 ellipsis.init();

@@ -32,12 +32,12 @@
 
 
 .banner-swiper {
 .banner-swiper {
     position: relative;
     position: relative;
-    height: 310.303px;
+    max-height: 310.303px;
     overflow: hidden;
     overflow: hidden;
 
 
     ul {
     ul {
         position: relative;
         position: relative;
-        height: 310.303px;
+        max-height: 310.303px;
 
 
         li {
         li {
             float: left;
             float: left;

+.discount-list {
+    li {
+        margin-bottom: 30px;
+        background: #fff;
+    }
+
+    img {
+        width: 100%;
+        height: 250px;
+    }
+
+    .discount-cont {
+        box-sizing: border-box;
+        padding: 0 20px;
+        height: 77px;
+        border-bottom: 1px solid #e0e0e0;
+        line-height: 77px;
+    }
+
+    .discount-title {
+        float: left;
+        overflow: hidden;
+        width: 450px;
+        height: 77px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 24px;
+    }
+
+    .discount-time {
+        float: right;
+        font-size: 22px;
+    }
+
+    .red-color {
+        color: #d0021b;
+    }
+}

@@ -21,6 +21,8 @@
 @import "notice";
 @import "notice";
 @import "fresh-only";
 @import "fresh-only";
 @import "coupon";
 @import "coupon";
+@import "discount-list";
+@import "left-right";
 
 
 .mobile-container {
 .mobile-container {
     margin-left: auto;
     margin-left: auto;

+.left-right-thumb-row {
+    background-color: #fff;
+    text-align: center;
+    margin-bottom: 30px;
+    padding: 30px 0;
+    border-bottom: 1px solid #e0e0e0;
+
+    .thumb-row-box {
+        display: inline-block;
+        width: 275px;
+        height: 132px;
+        border-radius: 0;
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+        background-position: center;
+        margin: 0 14.4px;
+
+        &.first {
+            margin: 0 !important;
+        }
+    }
+
+    .left-thumb-row-box {
+        height: 308px;
+    }
+
+    .right-container {
+        display: inline-block;
+        width: 275px;
+        height: 280px;
+        border-radius: 4px;
+        margin: 0 14.4px;
+
+        .right-thumb-row-box {
+            margin: 32px 0 0;
+        }
+    }
+}

-#thumb-row {
+.thumb-row {
     background-color: #f0f0f0;
     background-color: #f0f0f0;
     text-align: center;
     text-align: center;
     padding: 32px 0 0;
     padding: 32px 0 0;

@@ -10,7 +10,7 @@
 @import "common/index";
 @import "common/index";
 @import "outlet/index";
 @import "outlet/index";
 @import "activity/index";
 @import "activity/index";
-
 /* @import "passport/index"; */
 /* @import "passport/index"; */
 @import "guang/index";
 @import "guang/index";
+
 @import "cart/chose-panel";
 @import "cart/chose-panel";

@@ -53,6 +53,7 @@ a {
 }
 }
 
 
 .main-wrap {
 .main-wrap {
+    position: relative;
     margin-right: auto;
     margin-right: auto;
     margin-left: auto;
     margin-left: auto;
     max-width: 640px;
     max-width: 640px;

@@ -18,6 +18,7 @@
     width: 100%;
     width: 100%;
     height: 90px;
     height: 90px;
     background-color: #000;
     background-color: #000;
+    background-image: linear-gradient(#323232, #414141);
     color: #fff;
     color: #fff;
     line-height: 90px;
     line-height: 90px;
 
 

@@ -22,6 +22,7 @@
     bottom: 0;
     bottom: 0;
     left: 0;
     left: 0;
     background: rgba(0, 0, 0, 0.5);
     background: rgba(0, 0, 0, 0.5);
+    z-index: 9;
 
 
     .loading {
     .loading {
         position: absolute;
         position: absolute;

 .outlet-page {
 .outlet-page {
-    #thumb-row {
+    .thumb-row {
         .thumb-row-box {
         .thumb-row-box {
             height: 132px;
             height: 132px;
             border-radius: 0;
             border-radius: 0;
@@ -8,39 +8,7 @@
     }
     }
 
 
     .left-right-thumb-row {
     .left-right-thumb-row {
-        background-color: #f0f0f0;
-        text-align: center;
-        padding: 32px 0;
-
-        .thumb-row-box {
-            display: inline-block;
-            width: 275px;
-            height: 132px;
-            border-radius: 0;
-            background-size: 100% 100%;
-            background-repeat: no-repeat;
-            background-position: center;
-            margin: 0 14.4px;
-
-            &.first {
-                margin: 0 !important;
-            }
-        }
-
-        .left-thumb-row-box {
-            height: 308px;
-        }
-
-        .right-container {
-            display: inline-block;
-            width: 275px;
-            height: 280px;
-            border-radius: 4px;
-            margin: 0 14.4px;
-
-            .right-thumb-row-box {
-                margin: 32px 0 0;
-            }
-        }
+        background: #f0f0f0;
+        border-bottom: none;
     }
     }
 }
 }

@@ -2,43 +2,4 @@
     overflow: hidden;
     overflow: hidden;
     height: auto;
     height: auto;
     background: #f0f0f0;
     background: #f0f0f0;
-
-    .special-list {
-        li {
-            margin-bottom: 30px;
-            background: #fff;
-        }
-
-        img {
-            width: 100%;
-            height: 250px;
-        }
-
-        .special-cont {
-            box-sizing: border-box;
-            padding: 0 20px;
-            height: 77px;
-            border-bottom: 1px solid #e0e0e0;
-            line-height: 77px;
-        }
-
-        .special-title {
-            float: left;
-            overflow: hidden;
-            width: 450px;
-            height: 77px;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            font-size: 24px;
-        }
-
-        .special-time {
-            float: right;
-            font-size: 22px;
-        }
-
-        .red-color {
-            color: #d0021b;
-        }
-    }
 }
 }

 .goods-page {
 .goods-page {
-    .banner-swiper {
-        height: 200px;
-        max-height: 200px;
-
-        ul {
-            height: 200px;
-            max-height: 200px;
-        }
-    }
-
     .list-nav {
     .list-nav {
         border-top: 1px solid #e6e6e6;
         border-top: 1px solid #e6e6e6;
         border-bottom: 1px solid #e6e6e6;
         border-bottom: 1px solid #e6e6e6;

-.sale-page {
-    overflow: hidden;
-    background-color: #f0f0f0;
+.yoho-header {
+    .sale-nav {
+        text-transform: capitalize;
+        width: auto;
+        right: 20px;
+        font-size: 36px;
+    }
 
 
-    #thumb-row {
-        overflow: hidden;
-        padding-left: 30px;
-        height: auto;
-        background: #fff;
-        text-align: left;
+    + .sale-nav-select {
+        position: absolute;
+        top: 90px;
+        right: 20px;
+        z-index: 2;
+        padding: 10px 30px;
+        min-width: 246px;
+        border-radius: 10px;
+        background-color: #000;
+        background-image: linear-gradient(to bottom, #000 0%, #333 100%);
+        box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.6);
+        text-align: center;
+        font-size: 28px;
+        line-height: 80px;
+        display: none;
+
+        .arrow {
+            position: absolute;
+            top: -10px;
+            right: 30px;
+            width: 20px;
+            height: 20px;
+            background: #000;
+            content: "";
+            transform: rotate(45deg);
+        }
+
+        &.show {
+            display: block;
+        }
 
 
         a {
         a {
-            float: left;
-            margin-right: 30px;
-            width: 275px;
-            height: 130px;
+            display: block;
+            border-bottom: 2px solid #ccc;
+            color: #fff;
+
+            &:last-child {
+                border-bottom: none;
+            }
         }
         }
+    }
+}
+
+.sale-page {
+    overflow: hidden;
+    background-color: #f0f0f0;
+
+    .thumb-row {
+        padding-top: 25px;
+        padding-bottom: 0;
 
 
         .thumb-row-box {
         .thumb-row-box {
-            margin: 0 auto;
-            width: 100%;
-            height: 100%;
-            border-radius: 20px;
+            margin-top: 10px;
         }
         }
     }
     }
 
 
@@ -28,6 +66,36 @@
     .goods-container {
     .goods-container {
         background: #fff;
         background: #fff;
     }
     }
+
+    .category-swiper {
+        height: auto;
+    }
+
+    .vip-floor {
+        padding-bottom: 30px;
+        border-bottom: 1px solid #e0e0e0;
+
+        .good-info {
+            margin-bottom: 20px;
+        }
+    }
+
+    .list-nav {
+        width: 100%;
+        z-index: 1;
+        background: #fff;
+
+        &.fixed {
+            position: fixed;
+            top: 0;
+            left: 0;
+        }
+    }
+
+    .filter-mask.fixed {
+        position: fixed;
+        top: 70px;
+    }
 }
 }
 
 
 .sale-vip-page {
 .sale-vip-page {

-/**
- * http api 测试
- *
- * @author: jiangfeng<jeff.jiang@yoho.cn>
- * @date: 2016/05/17
- */
-'use strict';
-
-const test = require('ava');
-const sign = require('../../library/sign');
-
-
-const API = require('../../library/api').API;
-const ServiceAPI = require('../../library/api').ServiceAPI;
-const SearchAPI = require('../../library/api').SearchAPI;
-
-const getUrl = 'operations/api/v6/category/getCategory';
-
-test('api constructor test', (t) => {
-    let api = new ServiceAPI();
-    let api2 = new API();
-    let api3 = new SearchAPI();
-
-    t.true(api !== null);
-    t.true(api2 !== null);
-    t.true(api3 !== null);
-});
-
-test('api get test', t => {
-    let api = new ServiceAPI();
-
-    return api.get(getUrl, sign.apiSign({})).then(result => {
-        if (result && result.code) {
-            t.pass();
-        } else {
-            t.fail();
-        }
-    });
-});
-
-test('api get test, api return an error', t => {
-    let api = new ServiceAPI();
-
-    return api.get(getUrl + '/error', sign.apiSign({})).catch(err => {
-
-        // 故意调用一个错误的接口
-        if (err && err.code === 500) {
-            t.pass();
-        } else {
-            t.fail();
-        }
-    });
-});
-
-test('api get use cache test', t => {
-    let api = new ServiceAPI();
-
-    return api.get(getUrl, sign.apiSign({}), true).then(result => {
-        if (result && result.code) {
-            t.pass();
-        } else {
-            t.fail();
-        }
-    });
-});
-
-test('api post test', t => {
-    let api = new ServiceAPI();
-
-    return api.post(getUrl, sign.apiSign({})).then(result => {
-        if (result && result.code) {
-            t.pass();
-        } else {
-            t.fail();
-        }
-    });
-});
-
-test('api multiple call test', (t) => {
-    let api = new ServiceAPI();
-    let multi = [api.get(getUrl, sign.apiSign({})), api.get(getUrl, sign.apiSign({}))];
-
-    return api.all(multi).then(result => {
-        if (result.length === 2) {
-            t.pass();
-        } else {
-            t.fail();
-        }
-    });
-});
-
-test('api multiple fail call test', (t) => {
-    let api = new ServiceAPI();
-
-    return api.all(1).catch((e) => {
-        if (e) {
-            t.pass();
-        } else {
-            t.fail();
-        }
-    });
-});

-/**
- * cache 测试
- *
- * @author: jf<jeff.jiang@yoho.cn>
- * @date: 2016/5/18
- */
-
-'use strict';
-
-import test from 'ava';
-
-import cache from '../../library/cache';
-
-let testKey = 'test_unit_key:' + (new Date()).getTime();
-let testValue = 'anotherValue';
-let anotherKey = 'test_unit_key2:' + (new Date()).getTime();
-let anotherValue = {a: 1};
-
-let slaveTestKey = 'test_unit_key3:' + (new Date()).getTime();
-let slaveTestValue = 'anotherValue3';
-
-test.before('set test key', (t) => {
-    cache.set(testKey, testValue);
-    cache.set(anotherKey, anotherValue);
-    t.pass();
-});
-
-test.after('del test key', (t) => {
-    cache.del(testKey);
-    cache.del(anotherKey);
-    t.pass();
-});
-
-test('cache get test', (t) => {
-    return cache.get(testKey).then((v) => {
-        t.is(v, testValue);
-    });
-});
-
-test('cache get multi test', (t) => {
-    cache.set(anotherKey, anotherValue);
-    return cache.getMulti([testKey, anotherKey]).then((values) => {
-        t.is(values[testKey], testValue);
-        t.is(values[anotherKey], JSON.stringify(anotherValue));
-    });
-});
-
-test('cache get from slave test', (t) => {
-    return cache.getFromSlave(testKey).then((v) => {
-        t.is(v, testValue);
-    });
-});
-
-test('cache get multi from slave test', (t) => {
-    cache.set(anotherKey, anotherValue);
-    return cache.getMultiFromSlave([testKey, anotherKey]).then((values) => {
-        t.is(values[testKey], testValue);
-        t.is(values[anotherKey], JSON.stringify(anotherValue));
-    });
-});
-
-test('cache set to slave', (t) => {
-    return cache.setSlave(slaveTestKey, {
-        value: slaveTestValue
-    }).then(() => {
-        return cache.getFromSlave(slaveTestKey);
-    }).then((v) => {
-        v = JSON.parse(v);
-        t.is(v.value, slaveTestValue);
-        cache.del(slaveTestKey);
-    });
-});
-
-test('cache get test, key is not a string', (t) => {
-    return cache.get(123).then((v) => {
-        t.notOk(v);
-    });
-});
-
-test('cache get multi test, key is not an array', (t) => {
-    return cache.getMulti(123).then((v) => {
-        t.notOk(v);
-    });
-});
-
-test('cache get from slave test, key is not a string', (t) => {
-    return cache.getFromSlave(123).then((v) => {
-        t.notOk(v);
-    });
-});
-
-test('cache get multi from slave test, key is not an array', (t) => {
-    return cache.getMultiFromSlave(123).then((v) => {
-        t.notOk(v);
-    });
-});
-
-test('cache set test, key is not a string', (t) => {
-    return cache.set(123).then((v) => {
-        t.notOk(v);
-    });
-});
-
-test('cache set multi test, key is not an array', (t) => {
-    return cache.setSlave(123).then((v) => {
-        t.notOk(v);
-    });
-});
-
-test('cache del test, key is not a string', (t) => {
-    return cache.del(123).then((v) => {
-        t.notOk(v);
-    });
-});

-/**
- * 对象键名驼峰测试
- *
- * @author: jiangfeng<jeff.jiang@yoho.cn>
- * @date: 2016/05/17
- */
-
-import {test} from 'ava';
-
-const camelCase = require('../../library/camel-case');
-
-test('camel case object', t => {
-    let o = {
-        A_B: 'ab_cd'
-    };
-
-    t.is(camelCase(o).aB, 'ab_cd');
-});
-
-test('camel case array', t => {
-    let arr = [{
-        A_B: 'ab_cd'
-    }, {
-        A_B: 'ab_cd'
-    }];
-
-    t.is(camelCase(arr)[1].aB, 'ab_cd');
-});

-/**
- * library helpers 类单元测试
- * @author jeff.jiang<jeff.jiang@yoho.cn>
- * @date 2016/05/17
- */
-
-'use strict';
-
-const test = require('ava');
-const helpers = require('../../library/helpers');
-
-test('qiniu image url handle', t => {
-    let url = 'http://img11.static.yhbimg.com/yhb-img01/2016/04/18/03/016d50b20cfdec5a91c614b68546bc9d72.jpg?imageView2/{mode}/w/{width}/h/{height}';
-    let expected = 'http://img11.static.yhbimg.com/yhb-img01/2016/04/18/03/016d50b20cfdec5a91c614b68546bc9d72.jpg?imageView2/2/w/400/h/300';
-
-    t.is(helpers.image(url, 400, 300), expected);
-});
-
-test('uri format', t => {
-    let uri = '/test';
-    let qs = { name: 'yoho' };
-    let mod = 'list';
-    let expected = '//list.m.yohobuy.com/test?name=yoho';
-
-    t.is(helpers.urlFormat(uri, qs, mod), expected);
-});
-
-test('upper char to lowercase', t => {
-    let str = 'ABc';
-    let expected = 'abc';
-
-    t.is(helpers.lowerCase(str), expected);
-});
-
-test('lower char to uppercase', t => {
-    let str = 'abc!';
-    let expected = 'ABC!';
-
-    t.is(helpers.upperCase(str), expected);
-});
-
-test('date format test', (t) => {
-    let seconds = 60 * 60 * 3 + 2;
-    let str = helpers.dateFormat('HH:mm:ss', seconds, 'ss');
-    let expected = '03:00:02';
-
-    t.is(str, expected);
-});
-
-test('date diff format test', (t) => {
-    let seconds = 60 * 60 * 24 * (1.3) + 2;
-
-    let str = helpers.dateDiffFormat('{d}天{h}小时', seconds, 's');
-
-    console.log(str);
-    t.pass();
-});

-/**
- * logger 工具类测试
- */
-
-const test = require('ava');
-const logger = require('../../library/logger');
-
-test('logger error test', t => {
-    logger.error('error test', () => {
-        t.pass();
-    });
-});
-
-test('logger info test', t => {
-    logger.info('info test', () => {
-        t.pass();
-    });
-});

-/**
- * 签名类测试
- *
- * @author: jiangfeng<jeff.jiang@yoho.cn>
- * @date: 2016/05/17
- */
-
-const test = require('ava');
-const sign = require('../../library/sign');
-
-test('app sign test', t => {
-    let params = {
-        client_type: 'h5', // eslint-disable-line
-        a: 1,
-        b: 'b'
-    };
-    let signedParams = sign.apiSign(params);
-
-    t.true(sign.checkSign(signedParams));
-});
-
-test('app sign test webSign', t => {
-    let params = {
-        uid: '123',
-        key: '3fc5a9fcea9fea49cce5432202a167ad'
-    };
-
-    t.true(sign.webSign(params));
-});

-/**
- * Timer 计时类测试
- *
- * @author: jiangfeng<jeff.jiang@yoho.cn>
- * @date: 2016/05/17
- */
-
-const test = require('ava');
-const Timer = require('../../library/timer');
-
-const sleep = (timeout) => {
-    return new Promise((resolve) => {
-        setTimeout(() => {
-            resolve();
-        }, timeout);
-    });
-};
-
-test.cb('timer class ', t => {
-    let timer = new Timer();
-
-    timer.put('test');
-    sleep(300).then(() => {
-        let diff = timer.put('test');
-
-        t.true(diff >= 300);
-        t.end();
-    });
-});

 'use strict';
 'use strict';
+require('../app');
 const _ = require('lodash');
 const _ = require('lodash');
 const camelCase = global.yoho.camelCase;
 const camelCase = global.yoho.camelCase;
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
@@ -10,7 +11,7 @@ const helpers = global.yoho.helpers;
  * 否则优先从cover1 --》 cover2 -- 》 images_url
  * 否则优先从cover1 --》 cover2 -- 》 images_url
  *
  *
  */
  */
-const procProductImg = (product, gender, yhChannel) => {
+const _procProductImg = (product, gender, yhChannel) => {
     if (gender === '2,3' || gender === '2' || gender === '3' && yhChannel === '2') {
     if (gender === '2,3' || gender === '2' || gender === '3' && yhChannel === '2') {
         return product.cover2 || product.imagesUrl || product.cover1 || '';
         return product.cover2 || product.imagesUrl || product.cover1 || '';
     }
     }
@@ -18,6 +19,23 @@ const procProductImg = (product, gender, yhChannel) => {
     return product.cover1 || product.imagesUrl || product.cover2 || '';
     return product.cover1 || product.imagesUrl || product.cover2 || '';
 };
 };
 
 
+/**
+ * 按照数组中指定字段排序二维数组
+ *
+ * @param  array list 需要排序的数组
+ * @param  string key 字段名称
+ * @param  boolean 有 desc 时候降序排列，默认为false
+ */
+const _sortListByField = (list, key, desc) => {
+    list = _.toArray(list);
+    list = list.sort((a, b) => {
+        if (a[key] && b[key]) {
+            return (desc ? a[key] > b[key] : a[key] < b[key]) ? -1 : 1;
+        }
+        return (desc ? a > b : a < b) ? -1 : 1;
+    });
+    return list;
+};
 
 
 /**
 /**
  * 商品搜索商品数据处理
  * 商品搜索商品数据处理
@@ -70,7 +88,7 @@ exports.processProductList = (list, options) => {
 
 
         // 如果还未赋值，则取第一个skc产品的默认图片
         // 如果还未赋值，则取第一个skc产品的默认图片
         if (!flag) {
         if (!flag) {
-            product.defaultImages = procProductImg(product.goodsList[0], product.gender, options.yh_channel);
+            product.defaultImages = _procProductImg(product.goodsList[0], product.gender, options.yh_channel);
         }
         }
 
 
         product.isSoonSoldOut = product.isSoonSoldOut === 'Y';
         product.isSoonSoldOut = product.isSoonSoldOut === 'Y';
@@ -219,6 +237,11 @@ exports.processFilter = (list, options) => {
             name: filtersType[key].name
             name: filtersType[key].name
         });
         });
 
 
+        // 折扣，价格区间，需要排序
+        if (key === 'discount' || key === 'priceRange') {
+            item = _sortListByField(item, 'name');
+        }
+
         _.forEach(item, (sub, index) => {
         _.forEach(item, (sub, index) => {
             let subs = {};
             let subs = {};
 
 
@@ -244,6 +267,5 @@ exports.processFilter = (list, options) => {
 
 
         filters.classify[filtersType[key].sortNum] = classify;
         filters.classify[filtersType[key].sortNum] = classify;
     });
     });
-
     return filters;
     return filters;
 };
 };

 const _ = require('lodash');
 const _ = require('lodash');
+const processTime = require('./time-process');
 const camelCase = global.yoho.camelCase;
 const camelCase = global.yoho.camelCase;
 
 
 /**
 /**
@@ -12,7 +13,6 @@ module.exports = (list) => {
     list = list || [];
     list = list || [];
     list = camelCase(list);
     list = camelCase(list);
 
 
-
     _.forEach(list, (floor) => {
     _.forEach(list, (floor) => {
         floor[_.camelCase(floor.templateName)] = true;
         floor[_.camelCase(floor.templateName)] = true;
 
 
@@ -33,6 +33,43 @@ module.exports = (list) => {
             }
             }
         }
         }
 
 
+        // OUTLETS
+        if (floor.titleImage && floor.data) {
+            if (floor.data.image) {
+                floor.data.bigImage = {
+                    bigList: [floor.data.image]
+                };
+            }
+
+            floor.data.title = {
+                moreName: floor.data.moreName,
+                moreUrl: floor.data.moreUrl,
+                title: floor.data.title
+            };
+        }
+
+        // 折扣专场
+        if (floor.discountActivity && floor.data && floor.data.list.length) {
+            _.map(floor.data.list, (item) => {
+                Object.assign(item, processTime(item.leftTime));
+            });
+        }
+
+        // 断码区 ， 此资源位数据结构比较坑
+        if (floor.offCodeArea && floor.data && floor.data.list.length) {
+            floor.data = {
+                title: floor.data.title,
+                data: [floor.data.list[0]],
+                left: [floor.data.list[1]],
+                right: floor.data.list.slice(2)
+            };
+        }
+
+        // 会员专享
+        if (floor.vipFloor && floor.data) {
+            floor.data.data = floor.data.image;
+        }
+
         formatData.push(floor);
         formatData.push(floor);
     });
     });
 
 

@@ -7,6 +7,8 @@
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 
 
 const timeFormat = {
 const timeFormat = {
+    y: '剩{y}年{M}月{d}天',
+    M: '剩{M}月{d}天',
     d: '剩{d}天',
     d: '剩{d}天',
     h: '剩{h}小时',
     h: '剩{h}小时',
     m: '剩{m}分钟',
     m: '剩{m}分钟',
@@ -19,9 +21,11 @@ const timeFormat = {
 
 
 const anHour = 3600;
 const anHour = 3600;
 const aDay = anHour * 24;
 const aDay = anHour * 24;
+const aMonth = aDay * 30;
+const aYear = aMonth * 12;
 
 
 /**
 /**
- * 折扣专场专题列表过期时间处理
+ * 折扣专场专题列表过期时间处理 单位:s
  * @param  {[string]} time
  * @param  {[string]} time
  * @return {[object]}
  * @return {[object]}
  */
  */
@@ -33,7 +37,11 @@ const processTime = (time) => {
         data.warnColor = true;
         data.warnColor = true;
         data.time = '低于1小时';
         data.time = '低于1小时';
     } else {
     } else {
-        if (time > aDay) {
+        if (time > aYear) {
+            type = 'y';
+        } else if (time > aMonth) {
+            type = 'M';
+        } else if (time > aDay) {
             type = 'dh';
             type = 'dh';
         } else {
         } else {
             type = 'h';
             type = 'h';