keyboard

63a57615 · JingChao · 21154140 · 154e58b9 · 63a57615 · 63a57615
Commit 63a57615 authored Sep 27, 2019 by JingChao
67 changed files
--- a/README.md
+++ b/README.md
@@ -461,14 +461,14 @@ showActionSheetButton() {
 ### s-tab 切换    
 ```html
      <div class="local-region">
-        <s-tab @tabClick="stabClick" :show-divider="true">
+        <s-tab @tabClick="stabClick" :show-divider="true" has-border="true">
          <tab-item>测试</tab-item>
          <tab-item>你好</tab-item>
          <tab-item>再见</tab-item>
          <tab-item>按钮</tab-item>
        </s-tab>
-        <s-tab @tabClick="stabClick" position="bottom" cusClass='class' :default-active="2">
+        <s-tab @tabClick="stabClick" cusClass='class' :default-active="2">
          <tab-item><img src="../assets/image/myInfo/about@2x.png"></tab-item>
          <tab-item><img src="../assets/image/myInfo/version@2x.png"></tab-item>
          <tab-item><img src="../assets/image/myInfo/setting@2x.png"></tab-item>
@@ -530,3 +530,27 @@ showActionSheetButton() {
    },
 ```
+### Note 
+ hls-easy-ui#0.0.5
+   [添加金额输入框 currency-input](/packages/components/CurrencyInput/README.md)
+   [添加动态配置组件 h-layout](/packages/components/HLayout/README.md)
+ hls-easy-ui#0.0.4
+   [添加懒加载组建](https://github.com/hilongjw/vue-lazyload)
+   [添加文件选择组建 h-file](/packages/components/HFile/README.md)
+   [添加单选框组建 h-radio](/packages/components/Radio/README.md)
+   [添加checkBox组建](/packages/components/CheckBox/README.md)
+   [修改原有的check-box组建名为h-switch](/packages/components/Switch/README.md)
+ hls-easy-ui#0.0.3 
+    添加ios下content的has-footer样式用于content高度在100%是滑动不到底部的问题
+    修复 s-tab分割线以及活跃状态下底部边线的样式
--- a/build/webpack.lib.conf.js
+++ b/build/webpack.lib.conf.js
@@ -9,6 +9,13 @@ const CleanWebpackPlugin = require('clean-webpack-plugin')
 const env = require('../config/prod.env')
 const webpackConfig = merge(baseWebpackConfig, {
+  module: {
+    rules: utils.styleLoaders({
+      sourceMap: true,
+      extract: true,
+      usePostCSS: false
+    })
+  },
  entry: {
    hlsuis: path.resolve(__dirname, '../packages/index.js'),
  },
@@ -28,6 +35,7 @@ const webpackConfig = merge(baseWebpackConfig, {
    // http://vuejs.github.io/vue-loader/en/workflow/production.html
    new webpack.DefinePlugin({
      'process.env': env,
+      '$config': env,
    }),
    // extract css into its own file
    new ExtractTextPlugin({

--- a/index.html
+++ b/index.html
@@ -9,11 +9,14 @@
  <!-- safari私有meta标签 允许全屏模式浏览 指定safari顶部状态栏样式(黑色) -->
  <meta name="apple-mobile-web-app-capable" content="yes">
  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <script type="text/javascript" src="./static/vuePlatform.js"></script>
  <script type="text/javascript" src="../../cordova.js"></script>
  <title>车租易</title>
 </head>
 <body>
-<div id="app-box"></div>
+<div id="app-box">
-<!-- built files will be auto injected -->
+  <img width="100%" src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNzUwIiBoZWlnaHQ9IjEzMzQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiA8Zz4KICA8cmVjdCBmaWxsPSIjZmZmIiBpZD0iY2FudmFzX2JhY2tncm91bmQiIGhlaWdodD0iMTMzNCIgd2lkdGg9Ijc1MCIgeT0iLTEiIHg9Ii0xIi8+CiAgPGcgZGlzcGxheT0ibm9uZSIgb3ZlcmZsb3c9InZpc2libGUiIHk9IjAiIHg9IjAiIGhlaWdodD0iMTAwJSIgd2lkdGg9IjEwMCUiIGlkPSJjYW52YXNHcmlkIj4KICAgPHJlY3QgZmlsbD0idXJsKCNncmlkcGF0dGVybikiIHN0cm9rZS13aWR0aD0iMCIgeT0iMCIgeD0iMCIgaGVpZ2h0PSIxMDAlIiB3aWR0aD0iMTAwJSIvPgogIDwvZz4KIDwvZz4KIDxnPgogIDxyZWN0IG9wYWNpdHk9IjAuNyIgc3Ryb2tlPSIjMDAwIiBpZD0ic3ZnXzEiIGhlaWdodD0iMjAwIiB3aWR0aD0iNjU2IiB5PSI4OSIgeD0iNDYiIHN0cm9rZS13aWR0aD0iMCIgZmlsbD0iI0RERERERCIvPgogIDxlbGxpcHNlIG9wYWNpdHk9IjAuNyIgc3Ryb2tlPSIjMDAwIiByeT0iNTAiIHJ4PSI1MCIgaWQ9InN2Z18zIiBjeT0iNDA4IiBjeD0iOTMiIHN0cm9rZS1vcGFjaXR5PSJudWxsIiBzdHJva2Utd2lkdGg9IjAiIGZpbGw9IiNEREREREQiLz4KICA8ZWxsaXBzZSBvcGFjaXR5PSIwLjciIHN0cm9rZT0iIzAwMCIgcnk9IjUwIiByeD0iNTAiIGlkPSJzdmdfNCIgY3k9IjQwOCIgY3g9IjI4NCIgc3Ryb2tlLW9wYWNpdHk9Im51bGwiIHN0cm9rZS13aWR0aD0iMCIgZmlsbD0iI0RERERERCIvPgogIDxlbGxpcHNlIG9wYWNpdHk9IjAuNyIgc3Ryb2tlPSIjMDAwIiByeT0iNTAiIHJ4PSI1MCIgaWQ9InN2Z184IiBjeT0iNDA4IiBjeD0iNDY5IiBmaWxsLW9wYWNpdHk9Im51bGwiIHN0cm9rZS1vcGFjaXR5PSJudWxsIiBzdHJva2Utd2lkdGg9IjAiIGZpbGw9IiNEREREREQiLz4KICA8ZWxsaXBzZSBvcGFjaXR5PSIwLjciIHN0cm9rZT0iIzAwMCIgcnk9IjUwIiByeD0iNTAiIGlkPSJzdmdfOSIgY3k9IjQwOCIgY3g9IjY1MSIgZmlsbC1vcGFjaXR5PSJudWxsIiBzdHJva2Utb3BhY2l0eT0ibnVsbCIgc3Ryb2tlLXdpZHRoPSIwIiBmaWxsPSIjREREREREIi8+CiAgPGVsbGlwc2Ugb3BhY2l0eT0iMC43IiBzdHJva2U9IiMwMDAiIHJ5PSI1MCIgcng9IjUwIiBpZD0ic3ZnXzEwIiBjeT0iNTc2IiBjeD0iOTMiIHN0cm9rZS1vcGFjaXR5PSJudWxsIiBzdHJva2Utd2lkdGg9IjAiIGZpbGw9IiNEREREREQiLz4KICA8ZWxsaXBzZSBvcGFjaXR5PSIwLjciIHN0cm9rZT0iIzAwMCIgcnk9IjUwIiByeD0iNTAiIGlkPSJzdmdfMTEiIGN5PSI1NzYiIGN4PSIyODQiIHN0cm9rZS1vcGFjaXR5PSJudWxsIiBzdHJva2Utd2lkdGg9IjAiIGZpbGw9IiNEREREREQiLz4KICA8ZWxsaXBzZSBvcGFjaXR5PSIwLjciIHN0cm9rZT0iIzAwMCIgcnk9IjUwIiByeD0iNTAiIGlkPSJzdmdfMTIiIGN5PSI1NzYiIGN4PSI0NjkiIGZpbGwtb3BhY2l0eT0ibnVsbCIgc3Ryb2tlLW9wYWNpdHk9Im51bGwiIHN0cm9rZS13aWR0aD0iMCIgZmlsbD0iI0RERERERCIvPgogIDxlbGxpcHNlIG9wYWNpdHk9IjAuNyIgc3Ryb2tlPSIjMDAwIiByeT0iNTAiIHJ4PSI1MCIgaWQ9InN2Z18xMyIgY3k9IjU3NiIgY3g9IjY1MSIgZmlsbC1vcGFjaXR5PSJudWxsIiBzdHJva2Utb3BhY2l0eT0ibnVsbCIgc3Ryb2tlLXdpZHRoPSIwIiBmaWxsPSIjREREREREIi8+CiAgPHJlY3Qgc3Ryb2tlPSIjMDAwIiBvcGFjaXR5PSIwLjciIGlkPSJzdmdfMTQiIGhlaWdodD0iODAiIHdpZHRoPSI2NTYiIHk9IjY4OSIgeD0iNDYiIGZpbGwtb3BhY2l0eT0ibnVsbCIgc3Ryb2tlLW9wYWNpdHk9Im51bGwiIHN0cm9rZS13aWR0aD0iMCIgZmlsbD0iI0RERERERCIvPgogIDxyZWN0IGlkPSJzdmdfMTYiIGhlaWdodD0iMjguMDAwMDE1IiB3aWR0aD0iMCIgeT0iODM5IiB4PSIzNzUiIGZpbGwtb3BhY2l0eT0ibnVsbCIgc3Ryb2tlLW9wYWNpdHk9Im51bGwiIHN0cm9rZS13aWR0aD0iMCIgc3Ryb2tlPSIjMDAwIiBmaWxsPSIjREREREREIi8+CiAgPHJlY3Qgc3Ryb2tlPSIjMDAwIiBvcGFjaXR5PSIwLjciIGlkPSJzdmdfMTciIGhlaWdodD0iMzAiIHdpZHRoPSI2NTYiIHk9IjgwNSIgeD0iNDYiIGZpbGwtb3BhY2l0eT0ibnVsbCIgc3Ryb2tlLW9wYWNpdHk9Im51bGwiIHN0cm9rZS13aWR0aD0iMCIgZmlsbD0iI0RERERERCIvPgogIDxyZWN0IHN0cm9rZT0iIzAwMCIgb3BhY2l0eT0iMC43IiBpZD0ic3ZnXzE4IiBoZWlnaHQ9IjMwIiB3aWR0aD0iNjU2IiB5PSI4NjciIHg9IjQ2IiBmaWxsLW9wYWNpdHk9Im51bGwiIHN0cm9rZS1vcGFjaXR5PSJudWxsIiBzdHJva2Utd2lkdGg9IjAiIGZpbGw9IiNEREREREQiLz4KICA8cmVjdCBzdHJva2U9IiMwMDAiIG9wYWNpdHk9IjAuNyIgaWQ9InN2Z18xOSIgaGVpZ2h0PSIzMCIgd2lkdGg9IjY1NiIgeT0iOTI3IiB4PSI0NiIgZmlsbC1vcGFjaXR5PSJudWxsIiBzdHJva2Utb3BhY2l0eT0ibnVsbCIgc3Ryb2tlLXdpZHRoPSIwIiBmaWxsPSIjREREREREIi8+CiAgPHJlY3Qgc3Ryb2tlPSIjMDAwIiBvcGFjaXR5PSIwLjciIGlkPSJzdmdfMjAiIGhlaWdodD0iMzAiIHdpZHRoPSI2NTYiIHk9Ijk4NyIgeD0iNDYiIGZpbGwtb3BhY2l0eT0ibnVsbCIgc3Ryb2tlLW9wYWNpdHk9Im51bGwiIHN0cm9rZS13aWR0aD0iMCIgZmlsbD0iI0RERERERCIvPgogIDxyZWN0IHN0cm9rZT0iIzAwMCIgb3BhY2l0eT0iMC43IiBpZD0ic3ZnXzIxIiBoZWlnaHQ9IjMwIiB3aWR0aD0iNjU2IiB5PSIxMDQ3IiB4PSI0NiIgZmlsbC1vcGFjaXR5PSJudWxsIiBzdHJva2Utb3BhY2l0eT0ibnVsbCIgc3Ryb2tlLXdpZHRoPSIwIiBmaWxsPSIjREREREREIi8+CiAgPHJlY3Qgc3Ryb2tlPSIjMDAwIiBvcGFjaXR5PSIwLjciIGlkPSJzdmdfMjIiIGhlaWdodD0iMzAiIHdpZHRoPSI2NTYiIHk9IjExMDciIHg9IjQ2IiBmaWxsLW9wYWNpdHk9Im51bGwiIHN0cm9rZS1vcGFjaXR5PSJudWxsIiBzdHJva2Utd2lkdGg9IjAiIGZpbGw9IiNEREREREQiLz4KICA8cmVjdCBzdHJva2U9IiMwMDAiIG9wYWNpdHk9IjAuNyIgaWQ9InN2Z18yMyIgaGVpZ2h0PSIzMCIgd2lkdGg9IjY1NiIgeT0iMTE2NyIgeD0iNDYiIGZpbGwtb3BhY2l0eT0ibnVsbCIgc3Ryb2tlLW9wYWNpdHk9Im51bGwiIHN0cm9rZS13aWR0aD0iMCIgZmlsbD0iI0RERERERCIvPgogIDxyZWN0IHN0cm9rZT0iIzAwMCIgb3BhY2l0eT0iMC43IiBpZD0ic3ZnXzI0IiBoZWlnaHQ9IjMwIiB3aWR0aD0iNjU2IiB5PSIxMjI3IiB4PSI0NiIgZmlsbC1vcGFjaXR5PSJudWxsIiBzdHJva2Utb3BhY2l0eT0ibnVsbCIgc3Ryb2tlLXdpZHRoPSIwIiBmaWxsPSIjREREREREIi8+CiA8L2c+Cjwvc3ZnPgo="/>
+</div>
+  <!-- built files will be auto injected -->
 </body>
 </html>
--- a/package.json
+++ b/package.json
 {
  "name": "hls-easy-ui",
-  "version": "0.0.2",
+  "version": "0.0.5",
  "description": "A Vue components project",
  "author": "JingChao <jingchao.wu@hand-china.com>",
  "private": false,
@@ -20,13 +20,11 @@
  "dependencies": {
    "autosize": "^3.0.20",
    "better-scroll": "^1.10.3",
-    "crypto-js": "^3.1.9-1",
    "fastclick": "https://hel.hand-china.com/easyUI/fastclick.git",
    "vue": "^2.5.2",
    "vue-router": "^3.0.1",
-    "vuex": "^2.1.1",
+    "vux": "^2.9.2",
-    "vuex-i18n": "^1.3.1",
+    "vue-lazyload": "1.2.3"
-    "vux": "^2.9.2"
  },
  "devDependencies": {
    "autoprefixer": "^7.1.2",
@@ -86,7 +84,7 @@
    "vue-slim-better-scroll": "^1.4.1",
    "vue-style-loader": "^3.0.1",
    "vue-template-compiler": "^2.5.2",
-    "vux-loader": "^1.0.56",
+    "vux-loader": "latest",
    "webpack": "^3.6.0",
    "webpack-bundle-analyzer": "^2.9.0",
    "webpack-dev-middleware": "^1.10.0",

--- a/packages/common/picture/errloading.jpg
+++ b/packages/common/picture/errloading.jpg
--- a/packages/common/scripts/filter.js
+++ b/packages/common/scripts/filter.js
@@ -21,6 +21,10 @@ export default (Vue) => {
      return intPartFormat + floatPart
    }
  })
+  Vue.filter('uncurrency', function (val) {
+    if (!val) return null
+    return Number((val).replace(/,/gi, ''))
+  })
  Vue.filter('datetime', timestamp => {
    function format (number) {
      return number.toString().padStart(2, '0')

--- a/packages/common/scripts/hlsPopup.js
+++ b/packages/common/scripts/hlsPopup.js
@@ -4,9 +4,9 @@ import ActionSheet from '../../components/ActionSheet/index'
 import ShowPicture from '../../components/ShowPicture/index'
 import Select from '../../components/select/index'
 import Notify from '../../components/Dialog/plugins/index'
-import HlsModal from '../../components/Modal/index'
+// import HlsModal from '../../components/Modal/index'
-import numberKeyboard from '../../components/NumberKeyboard/index'
+import NumberKeyboard from '../../components/NumberKeyboard/index'
 Vue.use(ToastPlugin)
 Vue.use(AlertPlugin)
@@ -16,10 +16,10 @@ Vue.use(DatetimePlugin)
 Vue.use(ActionSheet)
 Vue.use(ShowPicture)
 Vue.use(Select)
-Vue.use(numberKeyboard)
+Vue.use(NumberKeyboard)
 Vue.use(Notify)
 Vue.use(HlsModal)
-Vue.prototype.HlsModal = window.HlsModal = HlsModal
+// Vue.prototype.HlsModal = window.HlsModal = HlsModal
 export default {
@@ -68,19 +68,13 @@ export default {
  showLongTop: function (content) {
    let vm = this
    let text = content || '操作失败'
-    if (!process.env.isMobilePlatform) {
+    Vue.$vux.toast.show({
-      Vue.$vux.toast.show({
+      text: text,
-        text: text,
+      type: 'text',
-        type: 'text',
+      time: vm.SHOW_TIMES,
-        time: vm.SHOW_TIMES,
+      isShowMask: vm.IS_SHOW_MASK,
-        isShowMask: vm.IS_SHOW_MASK,
+      position: 'top',
-        position: 'top',
+    })
-      })
-    } else {
-      window.plugins.toast.showLongTop(content, function (success) {
-      }, function (error) { // eslint-disable-line
-      })
-    }
  },
  /**
@@ -90,19 +84,13 @@ export default {
  showLongCenter: function (content) {
    let vm = this
    let text = content || '操作失败'
-    if (!process.env.isMobilePlatform) {
+    Vue.$vux.toast.show({
-      Vue.$vux.toast.show({
+      text: text,
-        text: text,
+      type: 'text',
-        type: 'text',
+      time: vm.SHOW_TIMES,
-        time: vm.SHOW_TIMES,
+      isShowMask: vm.IS_SHOW_MASK,
-        isShowMask: vm.IS_SHOW_MASK,
+      position: 'middle',
-        position: 'middle',
+    })
-      })
-    } else {
-      window.plugins.toast.showLongCenter(content, function (success) {
-      }, function (error) { // eslint-disable-line
-      })
-    }
  },
  /**
   * 长时间中部提示toast
@@ -111,19 +99,13 @@ export default {
  showLongBottom: function (content) {
    let vm = this
    let text = content || '操作失败'
-    if (!process.env.isMobilePlatform) {
+    Vue.$vux.toast.show({
-      Vue.$vux.toast.show({
+      text: text,
-        text: text,
+      time: vm.SHOW_TIMES,
-        time: vm.SHOW_TIMES,
+      type: 'text',
-        type: 'text',
+      isShowMask: vm.IS_SHOW_MASK,
-        isShowMask: vm.IS_SHOW_MASK,
+      position: 'bottom',
-        position: 'bottom',
+    })
-      })
-    } else {
-      window.plugins.toast.showLongBottom(content, function (success) {
-      }, function (error) { // eslint-disable-line
-      })
-    }
  },
  /**
   * 成功提示框
@@ -160,35 +142,19 @@ export default {
   * @param confirmObject.onConfirm 确定函数
   */
  showConfirm: function (confirmObject) {
-    if (!process.env.isMobilePlatform) {
+    let def = {
-      let def = {
+      title: confirmObject.title || '提示',
-        title: confirmObject.title || '提示',
+      content: confirmObject.content || '',
-        content: confirmObject.content || '',
+      confirmText: '确定',
-        confirmText: '确定',
+      cancelText: '取消',
-        cancelText: '取消',
+      onConfirm: () => {
-        onConfirm: () => {
+        confirmObject.onConfirm(1)
-          confirmObject.onConfirm(1)
+      },
-        },
+      onCancel: () => {
-        onCancel: () => {
+        confirmObject.onConfirm(0)
-          confirmObject.onConfirm(0)
+      },
-        },
-      }
-      Vue.$vux.confirm.show(def)
-    } else {
-      let message = confirmObject.content || ''
-      let onConfirm = function (index) {
-        confirmObject.onConfirm(index)
-      }
-      let title = confirmObject.title || '提示'
-      navigator.notification.confirm(
-        message, // message
-        function (index) {
-          onConfirm(index - 1)
-        },
-        title, // title
-        ['取消', '确定'] // buttonLabels
-      )
    }
+    Vue.$vux.confirm.show(def)
  },
  /*
   * 弹出确认的窗口
@@ -198,30 +164,16 @@ export default {
   *
   */
  showPopup: function (confirmObject) {
-    if (!process.env.isMobilePlatform) {
+    let def = {
-      let def = {
+      title: confirmObject.title || '提示',
-        title: confirmObject.title || '提示',
+      content: confirmObject.content || '',
-        content: confirmObject.content || '',
+      confirmText: '确定',
-        confirmText: '确定',
+      showCancelButton: false,
-        showCancelButton: false,
+      onConfirm: () => {
-        onConfirm: () => {
-          confirmObject.onConfirm()
-        },
-      }
-      Vue.$vux.confirm.show(def)
-    } else {
-      var alertDismissed = function (index) {
        confirmObject.onConfirm()
-      }
+      },
-      let title = confirmObject.title || '提示'
-      var message = confirmObject.content || ''
-      navigator.notification.alert(
-        message, // message
-        alertDismissed, // callback
-        title || '提示', // title
-        '确定' // buttonName
-      )
    }
+    Vue.$vux.confirm.show(def)
  },
  /**
   * @param actionObject.titleText 弹出框的标题可空
@@ -306,6 +258,8 @@ export default {
      ShowPicture.show({
        imgUrl: imgObject.imgUrl,
        width: imgObject.width,
+        imgList: imgObject.imgList,
+        startPosition: imgObject.startPosition,
      })
    }
  },
@@ -364,7 +318,7 @@ export default {
   */
  showNumberKeyborad: function (keyboardObject) {
    if (typeof keyboardObject === 'object') {
-      numberKeyboard.show({
+      NumberKeyboard.show({
        title: keyboardObject.title,
        closeButtonText: keyboardObject.closeButtonText,
        extraKey: keyboardObject.extraKey || '.',

--- a/packages/common/scripts/hlsUtil.js
+++ b/packages/common/scripts/hlsUtil.js
@@ -92,7 +92,7 @@ export default {
  // 校验日期
  verifyBirthday: function (year, month, day, birthday) {
    // 年月日是否合理
-    return (birthday.getFullYear().toString() === year && ((birthday.getMonth() + 1) < 10 ? '0' + (birthday.getMonth() + 1) : (birthday.getMonth() + 1)) === month &&
+    return (birthday.getFullYear().toString() === year && ((birthday.getMonth() + 1) < 10 ? '0' + (birthday.getMonth() + 1) : (birthday.getMonth() + 1).toString()) === month &&
      birthday.getDate().toString() === day)
  },

--- a/packages/common/styles/ionic-public-style.less
+++ b/packages/common/styles/ionic-public-style.less
@@ -54,44 +54,6 @@
      padding-top: 0.8rem;
    }
  }
-  .header-bar {
-    background-color: #FFFFFF;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);  /*no*/
-    .buttons {
-      .button {
-        color: @headerColor;
-        font-size: 0.32rem;
-        padding-left: 0.2rem;
-        padding-right: 0.25rem;
-      }
-    }
-    .title {
-      color: #4A4A4A;
-      font-size: 0.34rem;
-      //font-weight: 600;
-      left: 0 !important;
-      right: 0 !important;
-    }
-    .iconLeft {
-      text-align: left;
-      i {
-        font-size: 0.25rem;
-        padding-left: 0.1rem;
-      }
-    }
-  }
-  .bar-custom {
-    background-color: @headerColor;
-    border-bottom: none;
-    .buttons {
-      .button {
-        color: #ffffff;
-      }
-    }
-    .title {
-      color: #ffffff;
-    }
-  }
  //  ion-list he ion-item公用样式 -
  .content {
    //padding-top: 2px;

--- a/packages/common/styles/platform-ios.less
+++ b/packages/common/styles/platform-ios.less
@@ -11,7 +11,8 @@
  }
  .has-header {
-    padding-bottom: 1.28rem;
+    top: 1.28rem;
+    //padding-bottom: 1.28rem;
  }
  .header-top {
    margin-top: 1.26rem;

--- a/packages/common/styles/platform-iosx.less
+++ b/packages/common/styles/platform-iosx.less
@@ -8,9 +8,9 @@
      bottom: 1.68rem;
    }
    .has-footer {
-     // padding-bottom: 2.84rem;
+      padding-bottom: 1.6rem;
-      .scrollContent {
+      .scrollContent{
-        padding-bottom: 1.44rem;
+        padding-bottom: 2.84rem;
      }
    }
@@ -34,7 +34,7 @@
      bottom: 1.68rem;
    }
    .has-footer {
-     // padding-bottom: 2.84rem;
+      padding-bottom: 1.6rem;
      .scrollContent{
        padding-bottom: 1.44rem;
      }

--- a/packages/common/styles/publicStyle.less
+++ b/packages/common/styles/publicStyle.less
@@ -44,7 +44,7 @@
  max-width: 14em;
  min-height: 3em !important;
  top: 38% !important;
-  border-radius: 0.14rem !important;
+  border-radius: 0.3rem !important;
 }
 .weui-toast.vux-toast-top {
@@ -73,7 +73,7 @@
 .weui-toast_text .weui-toast__content {
  border-radius: 0.2rem !important;
-  padding: 0.12rem 0.14rem;
+  padding: 0.12rem 0.14rem !important;
 }
 .weui-toast.vux-toast-bottom {

--- a/packages/common/styles/variables.less
+++ b/packages/common/styles/variables.less
@@ -19,7 +19,9 @@
 @background-color-gray: #fafafa;
 @activated-color: #5D98F6;
 @divider-color:#fafafa;
-@check-box-bg:#48D2A0;
+@switch-box-bg:#48D2A0;
+@check-box-bg:@theme-color;
+@radio-box-bg:#ff00ff;
 /**

--- a/packages/common/ydui.flexible.js
+++ b/packages/common/ydui.flexible.js
 /* eslint-disable */
 /**
 * YDUI 可伸缩布局方案
- * rem计算方式：设计图尺寸px / 100 = 实际rem  例: 100px = 1rem
+ * rem计算方式：设计图尺寸px / 50 = 实际rem  例: 100px = 2rem
 */
 !(function(window) {
  /* 设计图文档宽度 */

--- a/packages/components/ActionSheet/actionsheet.vue
+++ b/packages/components/ActionSheet/actionsheet.vue
@@ -13,7 +13,7 @@
            v-text="b.text"/>
        </div>
        <div class="action-sheet-group action-sheet-cancel">
-          <div class="ng-binding action-sheet-option" style="border:none" @click="hide(-1)">取消</div>
+          <div class="action-sheet-option" style="border:none" @click="hide(-1)">取消</div>
        </div>
      </div>
    </div>
@@ -65,7 +65,6 @@
        }
      }
    }
  }
  .action-sheet-backdrop {

--- a/packages/components/BottomTab/index.vue
+++ b/packages/components/BottomTab/index.vue
@@ -32,7 +32,7 @@ export default {
    width: 100%;
    background-color: #fff;
    position: fixed;
-    z-index: 5;
+    z-index: 10;
    bottom: 0;
    display: flex;
    align-items: center;

--- a/packages/components/CheckBox/README.md
+++ b/packages/components/CheckBox/README.md
-checkBox 配合 ListItem组件调用
+h-check checkBox
 ```html
    <list-item>
      <item :show-arrow="true">
-         <img slot="left-icon" src="../assets/myInfo/version@2x.png" class="left-icon">
+         <h-check slot="left-icon" v-model="radioValue" @checkClick="checkClick"/>
-         <div slot="name">检查更新</div>
+         <section slot="content">CheckBox</section>
-         <check-box slot="content" v-model="savePhoto" @checkClick="savePhotoFun"></check-box>
      </item>
    </list-item>
+    <h-check slot="left-icon" v-model="checkValue" :disable="true" @checkClick="checkClick"/>
    export default {
       data() {
         return {
-           savePhoto: new Boolean(window.localStorage.savePhoto) || false,
+           radioValue: false,
         }
       },
       methods: {
-         savePhotoFun(value) {
+         checkClick(value) {
-           this.savePhoto = value;
+           this.checkValue = value;
-           window.localStorage.setItem('savePhoto', value);
         }
       }
    }
 ```
+style
+@check-box-bg checkbox选中是的背景颜色
+v-model 绑定value值 true/false
+disable 是否只读 true/false
+@checkClick 点击checkBox返回当前value值
--- a/packages/components/CheckBox/index.vue
+++ b/packages/components/CheckBox/index.vue
+/**
+* @Author think
+* @Date 2019-07-10 09:39
+*/
 <template>
-  <label
+  <label class="h-checkbox" @click="checked">
-    :class="cusClass" class="toggle toggle-positive toggle-check"
+    <label class="checkbox">
-    @touchstart="checked"
+      <input :checked="value" :disabled="disable" type="checkbox">
-    @mousedown="checked">
+    </label>
-    <input :checked="value" type="checkbox">
-    <div class="track">
-      <div class="handle"/>
-    </div>
  </label>
 </template>
@@ -18,68 +19,79 @@ export default {
      type: Boolean,
      default: false,
    },
-    cusClass: {
+    disable: {
-      type: String,
+      type: Boolean,
-      default: '',
+      default: false,
    },
+    /* checkedColor: {
+          type: String,
+          default: '#5D98F6',
+        }, */
  },
  data () {
-    return {
+    return {}
-      // clickValue: false
-    }
-  },
-  computed: {
-    /* value() {
-        return value ? value : false
-      } */
  },
  watch: {
-    value (val) {
-      this.$emit('input', val)
-      this.value = val
-    },
  },
  methods: {
    checked () {
-      this.$emit('checkClick', !this.value)
+      if (!this.disable) {
+        this.$emit('input', !this.value)
+        this.$emit('checkClick', !this.value)
+      }
    },
  },
 }
 </script>
-<style lang="less" scoped>
+<style lang="less">
+  @import "../../common/styles/variables";
-  .toggle-check {
+  .h-checkbox {
-    display: -webkit-flex;
+    //width: 42px;
+    //height: 42px;
    display: flex;
-    -webkit-justify-content: space-between;
-    justify-content: space-between;
-    -webkit-align-items: center;
    align-items: center;
-    .track {
+    .checkbox {
-      width: 40px;
+      padding: 5px 5px;
-      height: 25px;
-      margin-right: 2.5px;
+      input {
-      border-radius: 15px;
+        width: 22px;
-      .handle {
+        height: 22px;
-        width: 22.5px;
+        border-radius: 11px;
-        height: 22.5px;
-        top: 3.5px;
+        &:after {
-        left: 2.5px;
+          top: 32%;
+          left: 20%;
+          opacity: 1;
+          border-width: 2px; /*no*/
+        }
+        &:checked {
+          &:before {
+            background: @check-box-bg;
+            border-color: @check-box-bg;
+          }
+        }
+        &:disabled {
+          &:checked {
+            opacity: .7;
+          }
+        }
      }
    }
  }
-  .toggle.toggle-positive input:checked + .track {
+  .hls-item {
-    border-color: @check-box-bg;
+    .contents {
-    background-color: @check-box-bg;
+        .h-checkbox {
+          .checkbox {
-    .handle {
+            padding: 0;
-      width: 22.5px;
+          }
-      height: 22.5px;
+        }
-      top: 3.5px;
-      left: 9px;
    }
  }
 </style>
--- a/packages/components/CurrencyInput/README.md
+++ b/packages/components/CurrencyInput/README.md
+curreny-input 金额输入框
+```html
+    <list-item>
+       <item>
+          <div slot="name">融资额</div>
+             <curreny-input slot="content" v-model="money"/>
+           <div slot="right-icon">¥</div>
+       </item>
+    </list-item>
+    export default {
+       data() {
+         return {
+           money: null,
+         }
+       }
+    }
+```
+v-model 绑定value值 number值
+disable 是否只读 true/false
--- a/packages/components/CurrencyInput/index.vue
+++ b/packages/components/CurrencyInput/index.vue
+/**
+* @Author think
+* @Date 2019-09-09 14:29
+*/
+<template>
+  <input
+    :value="formatValue" :readonly="disable" type="text"
+    @input="onInput($event.target.value)" @focus="onFocus" @blur="onBlur">
+</template>
+<script>
+export default {
+  name: 'CurrencyInput',
+  props: {
+    value: {
+      type: Number,
+      default: 0,
+    },
+    disable: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data () {
+    return {
+      focused: false,
+    }
+  },
+  filter: {
+    uncurrency (val) {
+      if (!val) return null
+      return (Number((val).replace(/,/gi, ''))) === 0 ? null : Number((val).replace(/,/gi, ''))
+    },
+  },
+  computed: {
+    formatValue () {
+      let currency = this.$options.filters['currency']
+      if (!this.focused) {
+        return currency(this.value)
+      } else {
+        return this.value
+      }
+    },
+  },
+  methods: {
+    onInput: function (value) {
+      let uncurrency = this.$options.filter['uncurrency']
+      this.currencyValue = uncurrency(value)
+      this.$emit('input', this.currencyValue)
+    },
+    onFocus (event) {
+      this.focused = true
+      setTimeout(function () {
+        event.target.type = 'number'
+        event.target.focus()
+      }, 0)
+    },
+    onBlur (event) {
+      event.target.type = 'text'
+      this.focused = false
+    },
+  },
+}
+</script>
+<style scoped lang="less">
+</style>
--- a/packages/components/Dialog/Notify.vue
+++ b/packages/components/Dialog/Notify.vue
@@ -111,7 +111,7 @@ export default {
    position: absolute;
    left: 0;
    text-align: center;
-    z-index: 1;
+    z-index: 5;
    &-top {
      top: 0;

--- a/packages/components/HContent/index.vue
+++ b/packages/components/HContent/index.vue
@@ -4,18 +4,147 @@
 */
 <template>
-  <section :class="cusClass" class="content">
+  <div
+    class="content" @touchstart.capture="touchStart" @touchend.capture="touchEnd">
    <slot/>
-  </section>
+  </div>
 </template>
 <script>
+import { detectOS } from '../../common/utils/index'
 export default {
  name: 'HContent',
  props: {
-    cusClass: {
+    calContent: {
-      type: String,
+      type: Boolean,
-      default: '',
+      default: true,
+    },
+  },
+  data () {
+    return {
+      fontSize: Number(window.document.documentElement.style.fontSize.replace('px', '')),
+      winHeight: window.innerHeight,
+      winWidth: window.innerWidth,
+      height: 0,
+      startY: 0,
+      endY: 0,
+    }
+  },
+  mounted () {
+    let vm = this
+    if (this.calContent) {
+      this.contentHeight()
+    }
+    window.addEventListener('native.keyboardshow', function (e) {
+      setTimeout(function () {
+        if (detectOS() === 'android') {
+          vm.$el.style.transition = 'all .2s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
+          vm.$el.style.transform = 'translate(0px, -45px) scale(1) translateZ(0px)'
+        } else {
+          let keyBoardHeight = vm.getKeyBoardHeight()
+          let scollHeight = (innerHeight - vm.endY) < keyBoardHeight ? (keyBoardHeight - (innerHeight - vm.endY)) : 0
+          if (scollHeight) {
+            vm.$el.style.paddingBottom = (scollHeight + 20) + 'px'
+            vm.$el.style.transition = 'all .2s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
+            vm.$el.style.transform = 'translate(0px, -' + scollHeight + 'px) scale(1) translateZ(0px)'
+          }
+        }
+      }, 300)
+    })
+    window.addEventListener('native.keyboardhide', function (e) {
+      setTimeout(function () {
+        vm.$el.style.transition = 'all .2s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
+        vm.$el.style.transform = 'translate(0px, 0px) scale(1) translateZ(0px)'
+        vm.$el.style.paddingBottom = '0px'
+      }, 300)
+    })
+  },
+  methods: {
+    touchStart (event) {
+      if (detectOS() === 'ios') {
+        if (event.target.readOnly) return
+        if (event.target.nodeName === 'INPUT' || event.target.nodeName === 'TEXTAREA') {
+          this.startY = event.changedTouches[0].clientY
+        }
+      }
+    },
+    touchEnd (event) {
+      if (detectOS() === 'ios') {
+        if (event.target.readOnly) return
+        if (event.target.nodeName === 'INPUT' || event.target.nodeName === 'TEXTAREA') {
+          this.endY = event.changedTouches[0].clientY
+        }
+      }
+    },
+    getHeaderHeight () {
+      let vm = this
+      let $el = vm.$el.previousElementSibling
+      let headerHeight = 0
+      do {
+        if ($el) {
+          let elHeight = window.getComputedStyle($el).height
+          if (elHeight) {
+            headerHeight += Number(elHeight.replace('px', ''))
+          }
+          if ($el._prevClass && $el._prevClass.indexOf('h-header') === 0) {
+            if (detectOS() === 'ios' && vm.winWidth === 375 && vm.winHeight === 812) {
+              headerHeight += 0.8 * vm.fontSize
+            } else if (detectOS() === 'ios' && vm.winWidth === 414 && vm.winHeight === 896) {
+              headerHeight += 0.8 * vm.fontSize
+            } else if (detectOS() === 'ios') {
+              headerHeight += 0.4 * vm.fontSize
+            }
+          }
+          $el = $el.previousElementSibling
+        }
+      } while ($el)
+      return headerHeight
+    },
+    getNextElementHeight () {
+      let vm = this
+      let nextElement = this.$el.nextElementSibling
+      let nextHeight = 0
+      do {
+        if (nextElement) {
+          let elHeight = window.getComputedStyle(nextElement).height
+          if (elHeight) {
+            nextHeight += Number(elHeight.replace('px', ''))
+          }
+          if (nextElement._prevClass && nextElement._prevClass.indexOf('h-bottom-tab') === 0) {
+            if (detectOS() === 'ios' && vm.winWidth === 375 && vm.winHeight === 812) {
+              nextHeight += vm.fontSize * 0.68
+            } else if (detectOS() === 'ios' && vm.winWidth === 414 && vm.winHeight === 896) {
+              nextHeight += vm.fontSize * 0.68
+            }
+          }
+          nextElement = nextElement.nextElementSibling
+        }
+      } while (nextElement)
+      return nextHeight
+    },
+    contentHeight () {
+      let vm = this
+      const headerHeight = vm.getHeaderHeight()
+      const nextHeight = vm.getNextElementHeight()
+      let content = vm.$el
+      vm.height = (window.innerHeight - nextHeight - headerHeight)
+      content.style.height = (window.innerHeight - nextHeight - headerHeight) + 'px'
+    },
+    getKeyBoardHeight () {
+      let innerWidth = window.innerWidth
+      if (detectOS() === 'ios') {
+        if (innerWidth >= 375 && innerHeight >= 812) {
+          return 460
+        }
+        return 400
+      } else {
+        return 275
+      }
    },
  },
 }
@@ -26,18 +155,13 @@ export default {
    flex: 1;
    overflow: hidden;
    background-color: #fafafa;
+    position: relative;
    overflow-y: scroll;
    height: 100%;
    -webkit-overflow-scrolling: touch;
    overflow-scrolling: touch;
  }
-  .platform-ios {
-    .has-header{
-      top:64px
-    }
-  }
  // iPhoneX适配
  @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
    .platform-ios {

--- a/packages/components/HFile/README.md
+++ b/packages/components/HFile/README.md
+文件上传组建 h-file 用于选择本地文件预览上传
+```html
+<template>
+  <h-view>
+    <h-content>
+      <h-file
+        :file-list="fileList" v-model="fileList" :upload="upload"
+        :upload-config="uploadConfig" :disabled="disable" :accept="accept" :beforeRead="beforeRead"
+        :afterRead="afterRead" :maxCount="maxCount" :max-size="maxSize" :previewImage="previewImage"
+        :deleteImage="deleteImage"
+        :result-type="resultType"
+        @upload="uploaded"
+        @delete="deletePic"
+        @oversize="oversize"/>
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {
+  name: 'FileTest',
+  data () {
+    return {
+      fileList: [], // 文件数组 必填
+      disable: false, // 是否禁用文件上传 默认false 可选
+      accept: 'image/png,image/jpeg', // 接受的文件类型 可选
+      upload: false, // 选取完成是否自动上传 默认 false 可选
+      maxSize: 2000000, // 文件大小限制，单位为byte 可选 超过大小的文件会自动取消
+      maxCount: 5, // 文件上传数量限制 可选超过数量自动隐藏选择按钮
+      deleteImage: true, // 是否删除文件 默认true 可选
+      previewImage: true, // 是否在选取完成后展示预览图 默认true 可选
+      resultType: 'dataUrl', // 文件读取结果类型 默认读取完成后取base64 可选值为text
+      uploadConfig: { // 文件上传配置
+        uploadUrl: $config.rootPath + '/app/fileUploadSvc?sysName=HLS_APP&apiName=attachment_upload', // 上传的URL
+        params: { // 上传的额外参数
+          user_id: 1,
+          source_type: 'HLS_DOC_FILE_TEMPLET',
+          pkvalue: 42,
+        },
+        uploadSuccess: this.fileSuccess, // 上传成功后的回调函数 用于给文件添加服务端唯一标示或其他
+      },
+    }
+  },
+  methods: {
+    /**
+     * email事件 可选
+     * 删除文件后触发 返回当前文件以及 对应的index
+     * @param file
+     * @param index
+     */
+    deletePic (file, index) {
+      debugger
+    },
+    /**
+     * 可选
+     * 文件选择完成后读取前触发 返回当前选择的文件数组
+     * 返回 ture 或者promise对象 标示继续读取，否则终止 操作
+     * @param files 选择的文件数组
+     * @returns {boolean}
+     */
+    beforeRead (files) {
+      files.forEach((file, index) => {
+        console.log(file.size)
+      })
+      return true
+    },
+    /**
+     * 可选
+     * 文件读取成功后触发添加了文件的content内容
+     * @param files 选择的文件数组
+     * @returns {boolean}
+     */
+    afterRead (files) {
+      files.forEach((item, index) => {
+        console.log(item.file.name)
+      })
+      return true
+    },
+    /**
+     * email事件 可选
+     * 全部文件上传成功后触发
+     * @param fileList 全部文件数组
+     */
+    uploaded (fileList) {
+      debugger
+    },
+    /**
+     * email事件 可选
+     * 文件大小超过配置的大小
+     * @param files
+     */
+    oversize (files) {
+      debugger
+    },
+    /**
+     * 每个文件上传成功后的回调 可选配置
+     * @param fileList 文件数组
+     * @param result 上传返回结果
+     */
+    fileSuccess (fileList, result) {
+      this.fileList = fileList
+      this.fileList.forEach((itemFile, index) => {
+        if (result.response && itemFile.file && !itemFile.attachment_id && result.response.fileName === itemFile.file.name) {
+          itemFile.attachment_id = result.response.attachment_id
+        }
+      })
+    },
+  },
+}
+</script>
+<style scoped lang="less">
+</style>
+```
+默认插槽 slot 用于自定义选择文件样式
+v-model 绑定文件数组
+fileList 文件数组 [{file:File,content:''base64 or url'}]
+disable: false, // 是否禁用文件上传 默认false 可选
+accept: 'image/png,image/jpeg', // 接受的文件类型 可选
+upload: false, // 选取完成是否自动上传 默认 false 可选
+maxSize: 2000000, // 文件大小限制，单位为byte 可选 超过大小的文件会自动取消
+maxCunt: 5, // 文件上传数量限制 可选超过数量自动隐藏选择按钮
+deleteImage: true, // 是否删除文件 默认true 可选
+previewImage: true, // 是否在选取完成后展示预览图 默认true 可选
+resultType: 'dataUrl', // 文件读取结果类型 默认base64 可选值为text
+    uploadConfig: { // 文件上传配置
+      uploadUrl: $config.rootPath + '/app/fileUploadSvc?sysName=HLS_APP&apiName=attachment_upload', // 上传的URL
+        params: { // 上传的额外参数
+           user_id: 1,
+           source_type: 'HLS_DOC_FILE_TEMPLET',
+           pkvalue: 42,
+        },
+        uploadSuccess: this.fileSuccess, // 上传成功后的回调函数 用于给文件添加服务端唯一标示或其他
+      },
--- a/packages/components/HFile/index.vue
+++ b/packages/components/HFile/index.vue
+/**
+* @Author think
+* @Date 2019-07-11 10:07
+*/
+<template>
+  <section class="h-file">
+    <div class="review-wrap">
+      <div v-for="(item,index) in fileList" v-if="previewImage" class="review-img">
+        <img v-lazy="item.content" :key="index" @click="showBigPic(index)">
+        <i v-if="deleteImage" class="icon ion-trash-a" @click="deleteFile(item,index)"/>
+      </div>
+      <section v-show="fileList.length < maxCount" class="file-upload">
+        <slot/>
+        <img v-if="!slot" class="default-img" src="./plus.png">
+        <input
+          ref="input" :accept="accept" :disabled="disabled" type="file"
+          multiple
+          @change="change">
+      </section>
+    </div>
+  </section>
+</template>
+<script>
+import ShowPicturePlugin from '../ShowPicture/index'
+import { toArray, readFile, isOversize, isImageDataUrl } from './utils'
+import axios from 'axios'
+export default {
+  name: 'HFile',
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    afterRead: {
+      type: Function,
+      default: () => { return true },
+    },
+    beforeRead: {
+      type: Function,
+      default: () => { return true },
+    },
+    uploadConfig: {
+      type: Object,
+      default: () => {},
+    },
+    upload: {
+      type: Boolean,
+      default: false,
+    },
+    fileList: {
+      type: Array,
+      default: () => [],
+    },
+    accept: {
+      type: String,
+      default: 'image/*',
+    },
+    maxSize: {
+      type: Number,
+      default: Number.MAX_VALUE,
+    },
+    maxCount: {
+      type: Number,
+      default: Number.MAX_VALUE,
+    },
+    previewImage: {
+      type: Boolean,
+      default: true,
+    },
+    resultType: {
+      type: String,
+      default: 'dataUrl',
+    },
+    deleteImage: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data () {
+    return {
+      slot: false,
+      fileReadList: [],
+      uploadFiles: [],
+    }
+  },
+  mounted () {
+    let vm = this
+    if (this.$slots.default) {
+      vm.slot = true
+    } else {
+      vm.slot = false
+    }
+  },
+  methods: {
+    resetInput () {
+      /* istanbul ignore else */
+      if (this.$refs.input) {
+        this.$refs.input.value = ''
+      }
+    },
+    change ($event) {
+      let vm = this
+      let { files } = event.target
+      if (vm.disabled || !files.length) {
+        return
+      }
+      files = files.length === 1 ? files[0] : [].slice.call(files)
+      if (vm.beforeRead) {
+        const response = vm.beforeRead(toArray(files))
+        if (!response) {
+          vm.resetInput()
+          return
+        }
+        if (response.then) {
+          response
+            .then(() => {
+              vm.fileRead(files)
+            })
+            .catch(vm.resetInput)
+        }
+      }
+      vm.fileRead(files)
+    },
+    fileRead (files) {
+      const oversize = isOversize(files, this.maxSize)
+      if (oversize) {
+        files = files.filter(file => file.size <= this.maxSize)
+      }
+      if (Array.isArray(files)) {
+        const maxCount = this.maxCount - this.fileList.length
+        if (files.length > maxCount) {
+          files = files.slice(0, maxCount)
+        }
+        Promise.all(files.map(file => readFile(file, this.resultType))).then(contents => {
+          const fileList = files.map((file, index) => ({
+            file,
+            content: contents[index],
+          }))
+          this.onAfterRead(fileList, oversize)
+        })
+      } else {
+        readFile(files, this.resultType).then(content => {
+          this.onAfterRead({ file: files, content: content }, oversize)
+        })
+      }
+    },
+    onAfterRead (files, oversize) {
+      if (oversize) {
+        this.$emit('oversize', toArray(files))
+        // return
+      }
+      this.resetInput()
+      this.$emit('input', [...this.fileList, ...toArray(files)])
+      if (this.afterRead) {
+        this.afterRead(toArray(files))
+      }
+      if (this.upload) {
+        this.fileReadList = [...this.fileList, ...toArray(files)]
+        this.uploadFiles = Object.assign(this.uploadFiles, toArray(files))
+        this.onUploadFile()
+      }
+    },
+    onUploadFile () {
+      let vm = this
+      if (this.upload) {
+        if (vm.uploadConfig) {
+          let itemFile = vm.uploadFiles.pop()
+          let url = vm.uploadConfig.uploadUrl
+          let uploadParams = vm.uploadConfig.params
+          let uploadSuccess = vm.uploadConfig.uploadSuccess
+          let param = new FormData()
+          for (let key in uploadParams) {
+            param.append(key, uploadParams[key])
+          }
+          param.append('fileName', itemFile.file.name)
+          param.append('file', itemFile.file)
+          axios.post(url, param, {
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+              'Authorization': 'Bearer ' + window.localStorage.access_token,
+            },
+          }).then(function (result) {
+            /* vm.fileReadList.forEach((itemFile, index) => {
+                if (result.response && itemFile.file && !itemFile.attachment_id && result.response.fileName === itemFile.file.name) {
+                  itemFile.attachment_id = result.response.attachment_id
+                }
+              }) */
+            if (uploadSuccess) {
+              uploadSuccess(itemFile, result)
+            }
+            if (vm.uploadFiles.length > 0) {
+              vm.onUploadFile()
+            } else {
+              vm.$emit('upload', vm.fileReadList)
+              vm.$emit('input', vm.fileReadList)
+              vm.fileReadList = []
+            }
+          })
+        }
+      }
+    },
+    deleteFile (file, index) {
+      const fileList = this.fileList.slice(0)
+      fileList.splice(index, 1)
+      this.$emit('input', fileList)
+      this.$emit('delete', file, index)
+    },
+    showBigPic (index) {
+      let vm = this
+      if (vm.previewImage) {
+        const imageFiles = vm.fileList
+          .filter(item => isImageDataUrl(item.content))
+        ShowPicturePlugin.show({
+          imgList: imageFiles,
+          startPosition: index,
+        })
+      }
+    },
+  },
+}
+</script>
+<style lang="less">
+  .h-file {
+    display: flex;
+    flex-wrap: wrap;
+    .review-wrap {
+      display: flex;
+      flex-wrap: wrap;
+      .review-img {
+        position: relative;
+        display: block;
+        img {
+          width: 65px;
+          height: 65px;
+          margin: 0 10px 10px 0;
+          object-fit: cover
+        }
+        .icon {
+          position: absolute;
+          right: 10px;
+          bottom: 12px;
+          font-size: 16px;
+          width: 16px;
+          height: 16px;
+          display: flex;
+          color: #fff;
+          background-color: rgba(0, 0, 0, 0.45);
+          justify-content: center;
+        }
+      }
+      .file-upload {
+        position: relative;
+        display: inline-block;
+        //width: 75px;
+        //height: 75px;
+        .default-img {
+          width: 65px;
+          height: 65px;
+          margin: 0 10px 10px 0;
+          object-fit: cover
+        }
+        input {
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 100%;
+          height: 100%;
+          overflow: hidden;
+          cursor: pointer;
+          opacity: 0;
+        }
+      }
+    }
+  }
+</style>
--- a/packages/components/HFile/plus.png
+++ b/packages/components/HFile/plus.png
--- a/packages/components/HFile/utils.js
+++ b/packages/components/HFile/utils.js
+export function toArray (item) {
+  if (Array.isArray(item)) {
+    return item
+  }
+  return [item]
+}
+export function readFile (file, resultType) {
+  return new Promise(resolve => {
+    const reader = new FileReader()
+    reader.onload = event => {
+      resolve(event.target.result)
+    }
+    if (resultType === 'dataUrl') {
+      reader.readAsDataURL(file)
+    } else if (resultType === 'text') {
+      reader.readAsText(file)
+    }
+  })
+}
+export function isOversize (files, maxSize) {
+  return toArray(files).some(file => file.size > maxSize)
+}
+export function isImageDataUrl (dataUrl) {
+  return dataUrl.indexOf('data:image') === 0
+}
--- a/packages/components/HHeader/index.vue
+++ b/packages/components/HHeader/index.vue
@@ -57,6 +57,9 @@ export default {
    color: #4A4A4A;
    box-sizing: content-box;
    overflow: hidden;
+    position: relative;
+    z-index: 20;
+    width: 100%;
    .h-header-center {
      flex: 1;
@@ -116,11 +119,12 @@ export default {
      vertical-align: middle;
      box-sizing: border-box;
      width: 80%;
+      color:@headerColor;
    }
    .ion-ios-arrow-back {
      font-size: 32px;
-      color: @headerColor;
+      //color: @headerColor;
    }
  }
@@ -128,13 +132,23 @@ export default {
  .h-header-border {
    border-bottom: 1px solid rgba(0, 0, 0, .1); /*no*/
  }
  .bar-custom {
-    .h-header-center, .h-header-btn {
+    background-color: @headerColor;
+    border-bottom: none;
+    .buttons {
+      .button {
+        color: #fff;
+      }
+    }
+    .title {
      color: #fff;
    }
+    .h-header-left, .h-header-right{
-    .ion-ios-arrow-back {
+      .h-header-btn{
+        color: #fff;
+      }
+    }
+    .h-header-center{
      color: #fff;
    }
  }

--- a/packages/components/HLayout/README.md
+++ b/packages/components/HLayout/README.md
+动态配置功能
+ 目前支持配置 form、s-tab、button 以及底部固定位置的按钮
+```html
+/**
+* @Author think
+* @Date 2019-07-16 20:00
+*/
+<template>
+  <h-view class="form">
+    <h-header>
+      <div slot="left" class="h-header-btn" @click="$hlsExit()">
+        <i class="ion-ios-arrow-back"/>
+      </div>
+      <div slot="center">From</div>
+      <div slot="right" class="h-header-btn">右边</div>
+    </h-header>
+    <h-layout
+      v-if="layoutShow"
+      :layout-data="layoutData" :show-form-title="showFormTitle" :show-btn-divider="true"
+      :show-tab-divider="true" :formData="data" v-model="data" :read-only="readOnly"
+      :show-btn="showBtn"
+      @tabClick="tabClick"
+      @showSelect="showSelect" @showTime="showTime" @filedClick="filedClick"
+      @btnClick="btnClick"/>
+  </h-view>
+</template>
+```
+```javascript
+<script>
+import layoutData from './layout.json'
+export default {
+  name: 'Form',
+  data () {
+    return {
+      tabIndex: 1,
+      showFormTitle: true,
+      layoutData: [],
+      layoutShow: false,
+      readOnly: false,
+      showBtn: true,
+      data: {
+        contract: {
+          postion: '01',
+          postion_n: '技术顾问',
+          enable_flag: false,
+        },
+      },
+      postionList: [
+        {code: '01', code_name: '技术顾问'},
+        {code: '02', code_name: '技术经理'},
+        {code: '03', code_name: '项目经理'},
+      ],
+    }
+  },
+  created () {
+    let vm = this
+    /* axios.get('http://leafservice.hand-china.com/r/api/get/layoutCode?layoutCode=CON_QURERY', {
+      header: {'Content-Type': 'application/json',
+        'Authorization': 'bearer SRHJVdrftyGUYguyhiHiuiojmgrrcgv' },
+    }).then(res => {
+      vm.layoutData = res.rows
+      vm.layoutShow = true
+    }) */
+    setTimeout(() => {
+      vm.layoutData = layoutData
+      vm.layoutShow = true
+    }, 100)
+  },
+  methods: {
+    /**
+     * tab的点击事件
+     * @param index
+     */
+    tabClick (index) {
+      this.tabIndex = index
+    },
+    showPostion (configCode, filedCode) {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.postionList,
+        code: filedCode,
+        object: vm.data[configCode],
+        returnItem (index) {
+          vm.data[configCode][filedCode] = vm.postionList[index].code
+          vm.data[configCode][filedCode + '_n'] = vm.postionList[index].code_name
+        },
+      })
+    },
+    /**
+     * 下拉框点击事件
+     * @param configCode
+     * @param filedCode
+     */
+    showSelect (configCode, filedCode) {
+      let vm = this
+      switch (filedCode) {
+        case 'postion':
+          vm.showPostion(configCode, filedCode)
+          break
+        default:
+      }
+    },
+    showOrderDate (configCode, filedCode) {
+      let vm = this
+      vm.hlsPopup.showTime({
+        callback (time) {
+          vm.data[configCode][filedCode] = time
+        },
+      })
+    },
+    /**
+     * 事件选择事件
+     * @param configCode
+     * @param filedCode
+     */
+    showTime (configCode, filedCode) {
+      let vm = this
+      switch (filedCode) {
+        case 'order_date':
+          vm.showOrderDate(configCode, filedCode)
+          break
+        default:
+      }
+    },
+    /**
+     * 其他字端的点击事件
+     * @param configCode
+     * @param filedCode
+     */
+    filedClick (configCode, filedCode) {
+      debugger
+    },
+    /**
+     * 按钮点击事件
+     * @param btn
+     */
+    btnClick (btn) {
+      console.log(JSON.stringify(this.data, '', 2))
+      if (btn.btnType === 'BottomTab') {
+        if (btn.btnCode === 'save') {
+          alert('底部固定按钮的保存')
+        }
+        if (btn.btnCode === 'submit') {
+          alert('底部固定按钮的提交')
+        }
+      } if (btn.btnType === 'Button') {
+        if (btn.btnCode === 'nextBtn') {
+          alert('按钮继续')
+        }
+      }
+    },
+  },
+}
+</script>
+```
+```less
+<style  lang="less">
+  .form {
+  }
+</style>
+``` 
+1. 动态布局目前仅仅支持一个 s-tab组件，一个底部按钮bottom-tab 组件
+2. 组件名为h-layout，需要在布局查询出来之后再去渲染此组件否则渲染失败
+3. 布局的查询在created生命周期函数内查询，查询成功再去渲染组件
+4. 因无法在data里面直接set数据，故需在data里面新建data数据对象用于组件解析成功以及数据双向绑定使用
+5. 支持在自定义data对象设置默认值，默认值的优先级高于组件定义的默认值
+6. 组件使用v-model与formData进行传递data数据实现双向绑定，两者缺一不可
+7. 组件中会解析出全部的按钮，每个按钮对应 组件code、按钮code、以及按钮描述。以btns数组反馈给父组件，用于按钮点击事件
+8. 所有的下拉框、时间以及按钮的触发逻辑全部交由父组件处理，子组件通知父组件，子组件内不做任何业务处理逻辑
+props
+* layoutData:组件布局默认数组
+* showFormTitle:是否展示form表单上的title，title也可以点击实现form的缩放 默认 true
+* showTabDivider:是否显示s-tab的分割线 默认true
+* showTabBorder:是否显示s-tab的下边框 默认false
+* showBtn:是否显示按钮组件(button与bottom-tab)
+* showBtnDivider:是否底部按钮的分割线 默认true
+* formData:组件数据，用于双向绑定
+* readOnly:设置组件全部只读，禁用字端及按钮的输入点击
+emit
+* tabClick s-tab组件切换点击事件 返回当前点击的index
+* showSelect 下拉框点开事件 返回布局组件code，字端的code，用于判断是哪个下拉框
+* showTime  事件点开事件 返回组件code，字端的code，用于判断是哪个时间选择
+* filedClick 其它字端点击事件，字端类型为其它的点击事件 返回组件code，字端的code，可用于超链接，提示等
+* btnClick 按钮点击事件，返回当前btn对象，包含组件code、按钮code、以及按钮描述，可根据此判断点击的是哪个按钮
--- a/packages/components/HLayout/index.vue
+++ b/packages/components/HLayout/index.vue
+/**
+* @Author think
+* @Date 2019-07-16 20:00
+*/
+<template>
+  <section class="h-form">
+    <s-tab
+      v-for="com in layoutConfig" v-if="com.configType==='Stab' && com.layoutFiledList.length"
+      :key="com.configId"
+      :default-active="tabIndex" :class="com.cssClass" :has-border="showTabBorder"
+      :show-divider="showTabDivider"
+      @tabClick="layoutTabClick"
+      @click.native="tabNativeClick(com)">
+      <tab-item v-for="tab in com.layoutFiledList" :key="tab.filedId">
+        <section v-html="tab.tabContent || tab.filedName"/>
+      </tab-item>
+    </s-tab>
+    <h-content :class="{'has-footer':hasBottom}">
+      <template v-for="(com, index) in layoutConfig">
+        <list-item
+          v-if="com.configType==='Form' && com.layoutFiledList.length" v-show="checkFromHide(com)"
+          :class="com.cssClass" :key="com.configId">
+          <item v-show="showFormTitle" class="form-title" @click.native="hideFormClick(index)">
+            <div slot="name">{{ com.configName }}</div>
+            <img
+              slot="right-icon" :class="{'hide-down-icon':!com.hideForm,'hide-up-icon':com.hideForm}"
+              class="right-icon " src="./right-arrow@2x.png">
+          </item>
+          <item
+            v-for="filed in com.layoutFiledList"
+            v-show="!com.hideForm" :key="filed.filedId" :class="filed.cssClass" :has-border="filed.hasBorder"
+            :showContent="filed.showContent" :proportion="proportionArray(filed.proportion)" :showName="filed.showName"
+            :showArrow="filed.showArrow"
+            :item-height="filed.filedHeight">
+            <img v-if="filed.leftIcon" slot="left-icon" :src="filed.leftIcon" class="left-icon">
+            <div slot="name" :class="{'required':filed.inputMode=='required'}">{{ filed.filedName }}</div>
+            <input
+              v-if="filed.filedType==='INPUT'" slot="content"
+              :readonly="filedReadOnly(filed)"
+              :placeholder="filed.placeholder" v-model="data[com.configCode][filed.filedCode]" :type="filed.inputType"
+              :name="filed.filedCode">
+            <input
+              v-else-if="filed.filedType==='SELECT'"
+              slot="content" :name="filed.filedCode"
+              v-model="data[com.configCode][filed.filedCode+'_n']" :placeholder="filed.placeholder" readonly
+              @click="showSelect(com,filed)">
+            <input
+              v-else-if="filed.filedType=='TIME'"
+              slot="content" :name="filed.filedCode"
+              v-model="data[com.configCode][filed.filedCode]" :placeholder="filed.placeholder" readonly
+              @click="showTime(com,filed)">
+            <h-switch
+              v-else-if="filed.filedType==='SWITCH'" slot="content" v-model="data[com.configCode][filed.filedCode]"
+              :name="filed.filedCode"
+              :disable="filedReadOnly(filed)"/>
+            <h-check
+              v-else-if="filed.filedType==='CHECKBOX'" slot="content" v-model="data[com.configCode][filed.filedCode]"
+              :name="filed.filedCode"
+              :disable="filedReadOnly(filed)"/>
+            <div v-else slot="content" @click="filedClick(com,filed)" v-html="data[com.configCode][filed.filedCode]"/>
+            <img v-if="filed.rightIcon" slot="right-icon" :src="filed.rightIcon" class="right-icon">
+          </item>
+        </list-item>
+        <template v-if="showBtn">
+          <section v-if="com.configType==='Button' && com.layoutFiledList.length" class="layout-button">
+            <h-button
+              v-for="btn in com.layoutFiledList"
+              :key="btn.filedId" :class="btn.cssClass"
+              size="normal" @click.native="btnClick(com,btn)">
+              <section v-html="btn.btnContent || btn.filedName"/>
+            </h-button>
+          </section>
+        </template>
+      </template>
+    </h-content>
+    <template v-if="showBtn">
+      <bottom-tab
+        v-for="(com, index) in layoutConfig" v-if="com.configType==='BottomTab' && com.layoutFiledList.length"
+        :key="index" :show-divider="showBtnDivider"
+        :class="com.cssClass">
+        <tab-button
+          v-for="btn in com.layoutFiledList" :key="btn.filedId" :disabled="filedReadOnly(btn)" :class="btn.cssClass"
+          @click.native="btnClick(com,btn)">
+          <section v-html="btn.btnContent || btn.filedName"/>
+        </tab-button>
+      </bottom-tab>
+    </template>
+  </section>
+</template>
+<script>
+export default {
+  name: 'HLayout',
+  props: {
+    layoutData: {
+      type: Array,
+      default: () => [],
+    },
+    showFormTitle: {
+      type: Boolean,
+      default: true,
+    },
+    showTabDivider: {
+      type: Boolean,
+      default: true,
+    },
+    showTabBorder: {
+      type: Boolean,
+      default: false,
+    },
+    showBtnDivider: {
+      type: Boolean,
+      default: true,
+    },
+    showBtn: {
+      type: Boolean,
+      default: true,
+    },
+    formData: {
+      type: Object,
+      default: () => {},
+    },
+    readOnly: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data () {
+    return {
+      tabIndex: 0,
+      data: {},
+      layoutConfig: [],
+      activeTab: null,
+      activeTabFiled: null,
+      hasBottom: false,
+    }
+  },
+  computed: {
+  },
+  /**
+   * 通过布局代码解析出form表单中定义了那些字端。取出字端的默认值等
+   * 取出布局中的全部按钮，返回给父组件，用于按钮逻辑的处理
+   * 取出后通过$set以及$email函数把值传递给父组件
+   */
+  created () {
+    let vm = this
+    if (vm.layoutData.length && vm.layoutData[0].layoutConfigList.length) {
+      vm.layoutConfig = vm.layoutData[0].layoutConfigList
+      let btns = []
+      vm.layoutConfig.forEach((com, index) => {
+        if (com.configType === 'BottomTab') {
+          vm.hasBottom = true
+        }
+        if (com.configType === 'Form') {
+          let form = com
+          let temp = {}
+          if (form.layoutFiledList.length) {
+            let fileds = form.layoutFiledList
+            fileds.forEach((filed, index) => {
+              if (vm.formData[form.configCode] && (vm.formData[form.configCode][filed.filedCode] !== undefined)) {
+                temp[filed.filedCode] = vm.formData[form.configCode][filed.filedCode]
+                if (filed.filedType === 'SELECT') {
+                  temp[filed.filedCode + '_n'] = vm.formData[form.configCode][filed.filedCode + '_n']
+                }
+              } else {
+                if (filed.filedType === 'SELECT') {
+                  temp[filed.filedCode] = filed.defaultValue
+                  temp[filed.filedCode + '_n'] = filed.defaultValueN
+                } else if (filed.filedType === 'SWITCH') {
+                  temp[filed.filedCode] = !!filed.defaultValue
+                } else if (filed.filedType === 'CHECKBOX') {
+                  temp[filed.filedCode] = !!filed.defaultValue
+                } else {
+                  temp[filed.filedCode] = filed.defaultValue
+                }
+              }
+            })
+            // 保留父组件data的值
+            if (vm.formData[form.configCode]) {
+              temp = Object.assign(temp, vm.formData[form.configCode])
+            }
+            vm.$set(vm.data, [form.configCode], temp)
+          }
+        } else if (com.configType === 'Stab') {
+          vm.activeTab = com.configCode
+          vm.activeTabFiled = com.layoutFiledList.length ? com.layoutFiledList[vm.tabIndex].filedCode : ''
+        } else if (com.configType === 'Button' || com.configType === 'BottomTab') {
+          if (com.layoutFiledList.length) {
+            let btnFileds = com.layoutFiledList
+            btnFileds.forEach((btnFiled, index) => {
+              let btn = {'btnType': com.configType, 'btnCode': btnFiled.filedCode, 'btnName': btnFiled.filedName}
+              btns.push(btn)
+            })
+            vm.$set(vm.data, 'btns', btns)
+          }
+        }
+      })
+      vm.$emit('input', vm.data)
+    }
+  },
+  methods: {
+    filedReadOnly (filed) {
+      let vm = this
+      return vm.readOnly ? true : (filed.inputMode === 'readOnly')
+    },
+    /**
+     * item左右距离查询出来为字符串 在此转换为数组
+     * @param proportion
+     * @returns {*}
+     */
+    proportionArray (proportion) {
+      return proportion.split(',')
+    },
+    /**
+     * STAB的点击事件
+     * @param index
+     */
+    layoutTabClick (index) {
+      let vm = this
+      vm.tabIndex = index
+      this.$emit('tabClick', index)
+    },
+    /**
+     * tab的点击事件用于判断当前的哪个tab的哪个子元素是活跃状态，用于动态切换显示form
+     * @param com 当前组件
+     */
+    tabNativeClick (com) {
+      let vm = this
+      vm.activeTab = com.configCode
+      vm.activeTabFiled = com.layoutFiledList.length ? com.layoutFiledList[vm.tabIndex].filedCode : ''
+    },
+    /**
+     * 根据tab的显示动态判断tab下的form显示情况
+     * @param com 当前的form组件
+     */
+    checkFromHide (com) {
+      let vm = this
+      if (com.tabConfigCode && com.tabFiledCode) {
+        if (com.tabConfigCode === vm.activeTab && com.tabFiledCode === vm.activeTabFiled) {
+          return true
+        }
+      }
+      return false
+    },
+    /**
+     * Form title点击事件用于隐藏form下的内容
+     * @param index
+     */
+    hideFormClick (index) {
+      let vm = this
+      vm.layoutConfig[index]['hideForm'] = !vm.layoutConfig[index]['hideForm']
+    },
+    /**
+     * 下拉框点击函数 交由父组件处理 传递父组件当前点击对象以及字端名
+     * @param com 当前组件
+     * @param filed 当前字端
+     */
+    showSelect (com, filed) {
+      if (this.readOnly) return
+      if (filed.inputMode !== 'readOnly') {
+        this.$emit('showSelect', com.configCode, filed.filedCode)
+      }
+    },
+    /**
+     * 时间点击函数 交由父组件处理 传递父组件当前点击对象以及字端名
+     * @param com 当前组件
+     * @param filed 当前字端
+     */
+    showTime (com, filed) {
+      if (this.readOnly) return
+      if (filed.inputMode !== 'readOnly') {
+        this.$emit('showTime', com.configCode, filed.filedCode)
+      }
+    },
+    /**
+     * 其他非input的字端点击函数 用于超链接等其他字端的逻辑处理 暴露给父组件一个点击事件传递父组件当前点击对象以及字端名
+     * @param com 当前组件
+     * @param filed 当前字端
+     */
+    filedClick (com, filed) {
+      if (!this.readOnly) {
+        this.$emit('filedClick', com.configCode, filed.filedCode)
+      }
+    },
+    /**
+     * 按钮点击事件 交由父组件处理 传递当前的按钮对象
+     * @param com 当前组件
+     * @param filed 当前字端
+     */
+    btnClick (com, filed) {
+      if (!this.readOnly) {
+        let btnType = com.configType
+        let btnCode = filed.filedCode
+        this.data.btns.forEach((btn, index) => {
+          if (btn.btnType === btnType && btn.btnCode === btnCode) {
+            this.$emit('btnClick', btn)
+          }
+        })
+      }
+    },
+  },
+}
+</script>
+<style lang="less">
+  .h-form {
+    .hls-switch-tab {
+      .tab-content {
+        .h-tab-item {
+          .h-item {
+            img {
+              width: 20px;
+            }
+          }
+        }
+      }
+    }
+    .content {
+      .form-title {
+        .contents {
+          .add-name {
+            font-weight: 500;
+          }
+        }
+      }
+      .layout-button{
+        margin-top: 30px;
+        display: flex;
+        justify-content: center;
+        .hls-h-button{
+          width: 50%;
+          border-radius: 20px;
+          background-color:@theme-color;
+          border: none;
+          color: #fff;
+        }
+      }
+      .hls-item {
+        .contents {
+          .add-content {
+            .right-icon {
+              height: 12px;
+            }
+            .hide-up-icon {
+              transform: rotate(90deg);
+            }
+            .hide-down-icon {
+              transform: rotate(-90deg);
+            }
+          }
+        }
+      }
+    }
+  }
+</style>
--- a/packages/components/HLayout/right-arrow@2x.png
+++ b/packages/components/HLayout/right-arrow@2x.png
--- a/packages/components/HView/index.vue
+++ b/packages/components/HView/index.vue
@@ -20,12 +20,26 @@ export default {
      type: Boolean,
      default: true,
    },
+    title: {
+      type: String,
+      default: '',
+    },
  },
  data () {
    return {
      isIos: false,
    }
  },
+  mounted () {
+    if (this.title) {
+      document.title = this.title
+    }
+  },
+  activated () {
+    if (this.title) {
+      document.title = this.title
+    }
+  },
  created () {
    this.fullScreen && detectOS() === 'ios' && (this.isIos = true)
  },
@@ -37,12 +51,12 @@ export default {
  width: 100%;
  height: 100%;
  overflow: hidden;
-  padding-bottom: 44px;
+  // padding-bottom: 44px;
  // background-color: $bgColor;
 }
 .platform-ios{
  .h-view{
-    padding-bottom: 64px;
+   // padding-bottom: 64px;
  }
 }
@@ -50,7 +64,7 @@ export default {
 @media only screen and (device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) {
  .platform-ios {
    .h-view {
-      padding-bottom: 120px;
+     // padding-bottom: 120px;
    }
  }
 }
@@ -59,7 +73,7 @@ export default {
 @media only screen and (device-width: 414px) and (device-height: 896px) {
  .platform-ios {
    .h-view {
-      padding-bottom: 120px;
+     // padding-bottom: 120px;
    }
  }
 }

--- a/packages/components/ItemOption/index.vue
+++ b/packages/components/ItemOption/index.vue
@@ -8,8 +8,6 @@
        <slot/>
      </div>
      <slot name="buttons"/>
-      <!--<div class="function edit" @click="myEdit" v-if="showEdit">{{editText}}</div>
-      <div class="function delete" @click="myDelete" v-if="showDelete">{{deleteText}}</div>-->
    </div>
  </div>
 </template>
@@ -21,8 +19,6 @@ export default {
  name: 'ItemOption',
  components: {optionButton},
  props: {
-    showDelete: Boolean,
-    showEdit: Boolean,
    deleteText: {
      type: String,
      default: '删除',
@@ -65,14 +61,6 @@ export default {
    this.init()
  },
  methods: {
-    myDelete () {
-      this.$emit('deleteFun')
-      this.$refs.item.style.transform = 'translate3d(0px,0px,0px)'
-    },
-    myEdit () {
-      this.$emit('editFun')
-      this.$refs.item.style.transform = 'translate3d(0px,0px,0px)'
-    },
    touchStart (ev) {
      this.$refs.item.style.transform = 'translate3d(0px,0px,0px)'
      this.reset()

--- a/packages/components/ListItem/Item.vue
+++ b/packages/components/ListItem/Item.vue
 <template>
  <div
-    :class="[showActivated,cusClass]"
+    :class="[showActivated,focus]"
    :style="{'min-height':minHeight}"
    class="hls-item">
    <div
@@ -11,7 +11,9 @@
      @touchcancel="end"
      @mousedown="start"
      @mouseup="end"
-      @mouseleave="end">
+      @mouseleave="end"
+      @focusin="focusin"
+      @focusout="focusout">
      <div v-if="showName" :style="{'min-height':minHeight,'flex':proportion[0] }" class="add-name">
        <slot name="left-icon"/>
        <slot name="name"/>
@@ -53,10 +55,6 @@ export default {
      type: String,
      default: '',
    },
-    cusClass: {
-      type: String,
-      default: '',
-    },
    hasBorder: {
      type: Boolean,
      default: true,
@@ -69,6 +67,7 @@ export default {
  data () {
    return {
      showActivated: '',
+      focus: '',
      hasTouchEvent: 'ontouchstart' in document,
      Icon: require('./right-gray@2x.png'),
    }
@@ -91,9 +90,15 @@ export default {
      // 移动浏览器中长按元素会触发显示菜单，导致touchend事件不会触发，需要阻止该行为
      e.preventDefault()
    },
+    focusin (e) {
+      this.focus = 'focus'
+    },
+    focusout (e) {
+      this.focus = ''
+    },
    start (e) {
      if (e.target.readOnly) return
-      if (e.target.nodeName === 'INPUT' || e.target.nodeName === 'TEXTAREA' || e.target.nodeName === 'BUTTON') return
+      if (e.target.nodeName === 'INPUT' || e.target.nodeName === 'TEXTAREA' || e.target.nodeName === 'BUTTON' || e.target.nodeName === 'LABEL') return
      this.showActivated = 'activated'
    },
    end (e) {
@@ -109,6 +114,7 @@ export default {
 </script>
 <style lang="less">
+  @import "../../common/styles/variables";
  .hls-item {
    //height: 100px;
    width: 100%;
@@ -158,7 +164,7 @@ export default {
          content: '*';
          color: #D24E4E;
          height: 8px;
-          padding-top: 4px;
+          padding-top: 2px;
          margin-left: 2px;
        }
      }
@@ -178,6 +184,14 @@ export default {
        word-break: break-all;
        word-wrap: break-word;
        line-height: 20px;
+        .h-checkbox{
+          .checkbox {
+            input{
+              width: 22px;
+              height: 22px;
+            }
+          }
+        }
        //输入框
        input {
@@ -219,8 +233,8 @@ export default {
        }
        .toggle.toggle-positive input:checked + .track {
-          border-color: @check-box-bg;
+          border-color: @switch-box-bg;
-          background-color: @check-box-bg;
+          background-color: @switch-box-bg;
          .handle {
            width: 22.5px;
@@ -232,4 +246,25 @@ export default {
      }
    }
  }
+  @media (device-width: 320px) and (device-height: 568px) {
+    .hls-item{
+      .contents{
+        .add-content{
+          .toggle-check {
+            .track {
+              .handle{
+                top:4px
+              }
+            }
+          }
+          .toggle.toggle-positive input:checked + .track{
+            .handle {
+              top:4px
+            }
+          }
+        }
+      }
+    }
+  }
 </style>
--- a/packages/components/Radio/README.md
+++ b/packages/components/Radio/README.md
+h-radio 单选框组建
+```html
+<template>
+  <h-view>
+    <h-content>
+      <list-item>
+        <item>
+          <section slot="name">注册国家</section>
+          <radio-group slot="content" v-model="radioValue">
+            <h-radio :checked="true" name="China" title="中国"/>
+            <h-radio :disable="true" name="Japan" title="日本"/>
+            <h-radio name="Other" title="其他"/>
+          </radio-group>
+        </item>
+      </list-item>
+      <radio-group v-model="radioValue">
+        <h-radio name="China" title="中国"/>
+        <h-radio :checked="true" :disable="true" name="Japan" title="日本"/>
+        <h-radio name="Other" title="其他"/>
+      </radio-group>
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {
+  name: 'RadioTest',
+  data () {
+    return {
+      radioValue: 'Japan',
+    }
+  },
+  watch: {
+    radioValue (value) {
+      console.log(value)
+    },
+  },
+  methods: {},
+}
+</script>
+<style scoped lang="less">
+  .hls-list-item{
+    .hls-item{
+      .radio-group{
+        display: flex;
+        .h-radio{
+          margin-right: 5px;
+        }
+      }
+    }
+  }
+</style>
+ ```     
+单选框组建必须配合radio-group使用表示一组
+style
+@radio-box-bg checkbox选中是的背景颜色
+v-model 绑定radio的选中返回的name值
+disable 是否只读 true/false
+checked 是否默认选中
+name radio选中时返回的value
+title radio对应的value描述
+@radioClick 点击radio的触发函数 返回当前选中的value值
--- a/packages/components/Radio/index.vue
+++ b/packages/components/Radio/index.vue
+/**
+* @Author think
+* @Date 2019-07-10 13:51
+*/
+<template>
+  <section class="radio-group">
+    <slot/>
+  </section>
+</template>
+<script>
+import radio from './radio'
+export default {
+  name: 'RadioGroup',
+  component: { radio },
+  props: {
+    disable: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data () {
+    return {
+      radioList: [],
+    }
+  },
+  methods: {
+    click (value) {
+      this.$emit('input', value)
+      this.$emit('radioClick', value)
+    },
+  },
+}
+</script>
+<style lang="less">
+</style>
--- a/packages/components/Radio/radio.vue
+++ b/packages/components/Radio/radio.vue
+/**
+* @Author think
+* @Date 2019-07-10 13:57
+*/
+<template>
+  <section class="h-radio" @click="click">
+    <div :class="{'disable':disable}" class="radio-icon">
+      <i :class="icon" class="icon"/>
+    </div>
+    <span class="radio-title" v-text="title"/>
+  </section>
+</template>
+<script>
+let CHECKEDCLASS = 'ion-ios-checkmark'
+let DEFAULTCLASS = 'ion-ios-circle-outline'
+export default {
+  name: 'Radio',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false,
+    },
+    title: {
+      type: String,
+      default: '',
+    },
+    name: {
+      type: String,
+      default: '',
+    },
+    checked: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data () {
+    return {
+      icon: DEFAULTCLASS,
+    }
+  },
+  watch: {},
+  mounted () {
+    this.$parent && this.$parent.radioList.push(this)
+    this.icon = this.checked ? CHECKEDCLASS : DEFAULTCLASS
+    this.disable = this.disable ? this.disable : this.$parent.disable
+  },
+  destroyed () {
+    this.$parent && this.$parent.radioList.splice(this.$parent.radioList.indexOf(this), 1)
+  },
+  methods: {
+    click () {
+      let vm = this
+      if (!vm.disable) {
+        vm.$parent.radioList.forEach(item => {
+          item.icon = DEFAULTCLASS
+        })
+        vm.icon = CHECKEDCLASS
+        this.$parent.click(this.name)
+      }
+    },
+  },
+}
+</script>
+<style lang="less">
+  @import "../../common/styles/variables";
+  .h-radio {
+    display: flex;
+    height: 100%;
+    align-items: center;
+    .radio-icon {
+      width: 26px;
+      height: 26px;
+      .icon {
+        font-size: 26px;
+      }
+      .ion-ios-circle-outline{
+        color: #d9d9d9;
+      }
+      .ion-ios-checkmark{
+        color: @radio-box-bg;
+      }
+    }
+    .disable{
+        opacity: .7;
+    }
+    .radio-title{
+      line-height: 0.5rem;
+      font-size: 16px;
+      color: #333;
+      margin-left: 6px;
+    }
+  }
+</style>
--- a/packages/components/STab/index.vue
+++ b/packages/components/STab/index.vue
 <template>
-  <section :class="[c(),tabCss, cusClass,overFlow]" >
+  <section :class="[cusClass,overFlow]" class="hls-switch-tab" >
    <section :style="transform" class="tab-content">
      <slot/>
    </section>
@@ -10,10 +10,14 @@ import { base } from '../../common/mixins'
 import stabItem from './tab-item'
 export default {
-  name: 'SwitchTab',
+  name: 'STab',
  mixins: [base],
  component: { stabItem },
  props: {
+    value: {
+      type: Number,
+      default: 0,
+    },
    position: {
      type: String,
      default: 'top',
@@ -34,6 +38,10 @@ export default {
      type: Boolean,
      default: true,
    },
+    hasBorder: {
+      type: Boolean,
+      default: false,
+    },
  },
  data () {
    return {
@@ -47,12 +55,9 @@ export default {
    overFlow () {
      return this.overflowX ? 'auto-overflow-x' : ''
    },
-    tabCss () {
-      return this.position === 'top' ? this.c('top') : this.c('bottom')
-    },
    count () {
      this.length = this.items.length
-      return this.items.length
+      return this.length
    },
    current () {
      let vm = this
@@ -68,16 +73,40 @@ export default {
    transform () {
      return {
        transform: 'translateX(' + this.translate + 'px' + ')',
-       // transition: 'right 0.3s cubic-bezier(0.35, 0, 0.25, 1), left 0.3s cubic-bezier(0.35, 0, 0.25, 1) 0.09s;',
+        // transition: 'right 0.3s cubic-bezier(0.35, 0, 0.25, 1), left 0.3s cubic-bezier(0.35, 0, 0.25, 1) 0.09s;',
+      }
+    },
+  },
+  watch: {
+    value (value) {
+      if (value > this.count - 1) {
+        throw 'tab index out of bound exception'
+      } else {
+        this.defaultActive === value
+        this.setTabActive(value)
      }
    },
  },
  mounted () {
    let vm = this
-    this.items[vm.current].$el.classList.add('activated')
+    if (vm.value > vm.count - 1) {
-    this.scrollToActiveTab(vm.current, this.items[vm.current].$el.clientWidth)
+      throw 'tab index out of bound exception'
+    } else {
+      vm.setTabActive(vm.value)
+    }
  },
  methods: {
+    setTabActive (index) {
+      let vm = this
+      vm.items.forEach(item => {
+        item.$el.classList.remove('activated')
+      })
+      setTimeout(() => {
+        this.items[index].$el.classList.add('activated')
+      }, 100)
+      let width = this.items[index].$el.clientWidth
+      this.actived(index, width)
+    },
    actived (index, clientWidth) {
      this.activedIndex = index
      this.$emit('tabClick', index)
@@ -118,7 +147,7 @@ export default {
  .hls-switch-tab {
    width: 100%;
-   // position: absolute;
+    position: relative;
    z-index: 1;
    display: flex;
    // justify-content: space-around;

--- a/packages/components/STab/tab-item.vue
+++ b/packages/components/STab/tab-item.vue
 <template>
-  <section class="h-tab-item" @click="titleClick">
+  <section :class="[tabClass]" class="h-tab-item" @click="titleClick">
    <div class="h-item">
      <slot/>
+      <div class="bottom-border"/>
    </div>
    <div v-show="showDivider" class="tab-divider"/>
  </section>
@@ -20,6 +21,11 @@ export default {
    showDivider () {
      return this.$parent.showDivider
    },
+    tabClass () {
+      if (this.$parent.hasBorder) {
+        return this.$parent.position === 'top' ? 'vue-1px-b' : 'vue-1px-t'
+      }
+    },
  },
  mounted () {
    this.$parent && this.$parent.items.push(this)
@@ -59,9 +65,11 @@ export default {
        display: flex;
        align-items: center;
        justify-content: center;
+        position: relative;
        .h-item {
-          //width: 100%;
+          width: 100%;
+          min-width: 80px;
          font-size: 14px;
          height: 40px;
          color: #7c828d;
@@ -71,12 +79,19 @@ export default {
          justify-content: center;
         // padding: 0 3px;
          border-bottom: 1px solid rgba(255, 255, 255, .0); /*no*/
+          .bottom-border{
+            bottom: 0;
+          }
        }
        &.activated {
          .h-item {
-            color: #1e8ceb;
+            color: @headerColor;
-            border-bottom: 1px solid #1e8ceb; /*no*/
+            .bottom-border{
+              width: 65%;
+              position: absolute;
+              border-bottom: 1px solid @headerColor; /*no*/
+            }
          }
        }
        .tab-divider {

--- a/packages/components/Select/select.vue
+++ b/packages/components/Select/select.vue
@@ -3,13 +3,22 @@
    <h-content
      :class="{'show-select-up': state == 1}"
      class="show-select-wrapper">
-      <popup-header
+      <!-- <popup-header
        :left-text="cancelText"
        :right-text="confirmText"
        :title="popupTitle"
        @on-click-left="returnItem(-1)"
-        @on-click-right="returnItem(1)"/>
+        @on-click-right="returnItem(1)"/>-->
-      <picker
+      <h-header style="padding-top: 0">
+        <div slot="left" class="h-header-btn" @click="returnItem(-1)">
+          {{ cancelText }}
+        </div>
+        <div slot="center">{{ popupTitle }}</div>
+        <div slot="right" class="h-header-btn" @click="returnItem(1)">
+          {{ confirmText }}
+        </div>
+      </h-header>
+      <Picker
        :data="list"
        v-model="tempValue"
        :columns="3"
@@ -30,9 +39,11 @@
    width: 100%;
    height: 100%;
    background-color: transparent;
    &.active {
      background-color: rgba(0, 0, 0, 0.2);
    }
    .show-select-wrapper {
      -webkit-transform: translate3d(0, 100%, 0);
      transform: translate3d(0, 100%, 0);
@@ -46,10 +57,15 @@
      top: auto;
      padding-top: 0px;
      background-color: #fff;
-      .vux-popup-header {
-      //  border-bottom: 1px solid rgba(0,0,0,.1) !important; /*no*/
-      }
+      .h-header {
+        .h-header-left .h-header-btn {
+          color: #828282;
+        }
+        .h-header-right .h-header-btn {
+          color: #5D98F6;
+        }
+      }
    }
    .show-select-up {
@@ -65,7 +81,12 @@
 <script>
 import assign from 'object-assign'
+import { Picker } from 'vux'
 export default {
+  components: {
+    Picker
+  },
  data () {
    return {
      defaultOptions: {
@@ -120,9 +141,9 @@ export default {
      let vm = this
      if (index > -1) {
        let code = vm.code
-        let code_name = vm.code + '_n' // eslint-disable-line
+          let code_name = vm.code + '_n' // eslint-disable-line
        vm.object[code] = vm.value
-        vm.object[code_name] = vm.name // eslint-disable-line
+          vm.object[code_name] = vm.name // eslint-disable-line
        vm.callBack(vm.index, vm.object, vm.childs)
      }
      this.state = 0

--- a/packages/components/ShowPicture/README.md
+++ b/packages/components/ShowPicture/README.md
@@ -7,6 +7,14 @@ showBigPicture查看大图 插件形式调用
        hlsPopup.showBigPicture({
          imgUrl: 'http://hlsapp.hand-china.com/hls_file/2018/05/F1B6D85E409A4714A8540504B2D133AD'
        })
-      },      
+      },
+      let list = [{imgUrl:'base64'},{imgUrl:'http://XXX'}]      
+      showBigPicture() {
+         ShowPicturePlugin.show({
+            imgList: list,
+            startPosition: 1,
+         })
+      },
 ```
--- a/packages/components/ShowPicture/showpicture.vue
+++ b/packages/components/ShowPicture/showpicture.vue
 <template>
  <div :class="{'active': state == 1}" class="show-picture show-picture-backdrop">
-    <view-box>
+    <div
-      <div
+      :class="{'show-picture-up': state == 1}"
-        :class="{'show-picture-up': state == 1}"
+      class="content scroll-content ionic-scroll show-picture-wrapper">
-        class="content scroll-content ionic-scroll show-picture-wrapper">
+      <div ref="pad" class="pad">
-        <div ref="pad" class="pad">
+        <img
-          <img
+          v-hls-img-zoom
-            v-hls-img-zoom
+          v-tap="hide"
-            v-tap="hide"
+          v-longtap="sharePicture"
-            v-longtap="sharePicture"
+          v-lazy="imgUrl"
-            :src="imgUrl"
+          v-if="!imgList.length"
-            :alt="imgTitle">
+          :alt="imgTitle">
-        </div>
+        <swipe
+          v-if="imgList.length" :index.sync="startPosition" :auto="false" :show-indicators="false">
+          <swipe-item
+            v-for="(item,index) in imgList" :key="index">
+            <img
+              v-hls-img-zoom
+              v-tap="hide"
+              v-longtap="sharePicture"
+              v-lazy="item.imgUrl || item.content"
+              :alt="imgTitle">
+          </swipe-item>
+        </swipe>
      </div>
-    </view-box>
+      <div v-if="imgList.length" class="indicators">{{ startPosition + 1 }}/{{ imgList.length }}</div>
+    </div>
  </div>
 </template>
-<style lang="less" scoped>
+<style lang="less">
  .show-picture-backdrop {
    -webkit-transition: background-color 150ms ease-in-out;
    transition: background-color 150ms ease-in-out;
@@ -27,12 +39,15 @@
    width: 100%;
    height: 100%;
    background-color: transparent;
    .weui-tab {
      width: 100%;
    }
    &.active {
      background-color: rgba(0, 0, 0, 0.6);
    }
    .show-picture-wrapper {
      -webkit-transform: translate3d(0, 100%, 0);
      transform: translate3d(0, 100%, 0);
@@ -40,6 +55,7 @@
      transition: all cubic-bezier(0.36, 0.66, 0.04, 1) 500ms;
      position: absolute;
      width: 100%;
+      background-color: rgba(0, 0, 0, .5);
      //max-width: 500px;
      height: 100%;
      margin: auto;
@@ -49,54 +65,107 @@
      -webkit-align-items: center;
      justify-content: center;
      -webkit-justify-content: center;
      .pad {
        //width: 100%;
        //height: 100%;
-        display: -webkit-flex;
        display: flex;
        justify-content: center;
        align-items: center;
-        -webkit-justify-content: center;
-        -webkit-align-items: center;
        img {
          width: 100%;
          height: 100%;
-          display: -webkit-flex;
          display: flex;
          justify-content: center;
          align-items: center;
-          -webkit-justify-content: center;
+          object-fit: cover;
-          -webkit-align-items: center;
+          width: fit-content;
        }
      }
    }
    .show-picture-up {
      -webkit-transform: translate3d(0, 0, 0);
      transform: translate3d(0, 0, 0);
    }
+    .hls-swipe {
+      .hls-swipe-track {
+        display: flex !important;
+        align-items: center !important;
+        .hls-swipe-item {
+          display: flex;
+          justify-content: center;
+        }
+      }
+    }
+    .indicators{
+      top:20px;
+      position: absolute;
+      color: #fff;
+      font-size: 16px;
+    }
  }
  .modal-open [vum-show-picture] {
    pointer-events: auto;
  }
+  .platform-ios{
+    .show-picture-backdrop {
+      .indicators{
+        top:40px;
+      }
+    }
+  }
+  // iPhoneX适配
+  @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+    .platform-ios {
+      .show-picture-backdrop {
+        .indicators{
+          top:60px;
+        }
+      }
+    }
+  }
+  // iPhoneX Max适配
+  @media (device-width: 414px) and (device-height: 896px) {
+    .platform-ios {
+      .show-picture-backdrop {
+        .indicators{
+          top:60px;
+        }
+      }
+    }
+  }
 </style>
 <script>
 import assign from 'object-assign'
+import SwipeItem from '../Swipe/SwipeItem'
+import Swipe from '../Swipe/index'
 export default {
+  component: {
+    'swipe': Swipe,
+    'swipe-item': SwipeItem,
+  },
  data () {
    return {
      defaultOptions: {
        imgUrl: '',
+        imgList: [],
+        startPosition: 0,
        imgTitle: '',
-        index: '1',
        width: '100',
      },
      imgUrl: '',
+      imgList: [],
+      startPosition: 0,
      imgTitle: '',
-      index: '1',
      state: 0,
      width: '100',
    }
@@ -117,6 +186,8 @@ export default {
      this.imgUrl = _options.imgUrl
      this.imgTitle = _options.imgTitle
      this.width = _options.width
+      this.imgList = _options.imgList || []
+      this.startPosition = _options.startPosition
      this.state = 1
      if (!this.width) {
        this.width = 100
@@ -137,7 +208,7 @@ export default {
    },
    sharePicture () {
      // var reg = /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/
-      window.plugins.socialsharing.share(null, null, this.imgUrl, null)
+      // window.plugins.socialsharing.share(null, null, this.imgUrl, null)
    },
  },
 }

--- a/packages/components/Switch/README.md
+++ b/packages/components/Switch/README.md
+checkBox 配合 ListItem组件调用
+```html
+    <list-item>
+      <item :show-arrow="true">
+         <img slot="left-icon" src="../assets/myInfo/version@2x.png" class="left-icon">
+         <div slot="name">检查更新</div>
+         <h-switch slot="content" v-model="savePhoto" @switchClick="savePhotoFun"></h-switch>
+      </item>
+    </list-item>
+    export default {
+       data() {
+         return {
+           savePhoto: false,
+         }
+       },
+       methods: {
+         savePhotoFun(value) {
+           this.savePhoto = value;
+         }
+       }
+    }
+```
+style
+@switch-box-bg switch选中时的背景颜色
+v-model 绑定value值 true/false
+disable 是否只读 true/false
+@switchClick toggle点击触发函数 返回当前value值
--- a/packages/components/Switch/index.vue
+++ b/packages/components/Switch/index.vue
+<template>
+  <label
+    :class="cusClass" class="toggle toggle-positive toggle-check"
+    @click.prevent="checked">
+    <input :checked="value" :disabled="disable" type="checkbox">
+    <div class="track">
+      <div class="handle"/>
+    </div>
+  </label>
+</template>
+<script>
+export default {
+  name: 'HSwitch',
+  props: {
+    value: {
+      type: Boolean,
+      default: false,
+    },
+    disable: {
+      type: Boolean,
+      default: false,
+    },
+    cusClass: {
+      type: String,
+      default: '',
+    },
+  },
+  data () {
+    return {
+      // clickValue: false
+    }
+  },
+  computed: {},
+  watch: {},
+  methods: {
+    checked () {
+      if (!this.disable) {
+        this.$emit('input', !this.value)
+        this.$emit('switchClick', !this.value)
+      }
+    },
+  },
+}
+</script>
+<style lang="less">
+  @import "../../common/styles/variables";
+  .toggle-check {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .track {
+      width: 40px;
+      height: 25px;
+      margin-right: 2.5px;
+      border-radius: 15px;
+      .handle {
+        width: 22.5px;
+        height: 22.5px;
+        top: 3.5px;
+        left: 2.5px;
+      }
+    }
+  }
+  .toggle.toggle-positive input:checked + .track {
+    border-color: @switch-box-bg;
+    background-color: @switch-box-bg;
+    .handle {
+      width: 22.5px;
+      height: 22.5px;
+      top: 3.5px;
+      left: 9px;
+    }
+  }
+  @media (device-width: 320px) and (device-height: 568px) {
+    .toggle-check {
+      .track {
+        .handle {
+          top: 4px
+        }
+      }
+      .toggle.toggle-positive input:checked + .track {
+        .handle {
+          top: 4px
+        }
+      }
+    }
+  }
+</style>
--- a/packages/components/component.js
+++ b/packages/components/component.js
+import VueLazyload from 'vue-lazyload'
 import HView from './HView/index'
 import HHeader from './HHeader/index'
 import HContent from './HContent/index'
@@ -10,18 +11,31 @@ import Swipe from './Swipe/index'
 import SwipeItem from './Swipe/SwipeItem'
 import ListItem from './ListItem/ListItem'
 import Item from './ListItem/Item'
-import CheckBox from './CheckBox/index'
+import Switch from './Switch/index'
 import Spin from './Spin/index'
 import TopTip from './TopTip/index'
 import Notify from './Dialog/Notify'
 import Stab from './STab/index'
 import TabItem from './STab/tab-item'
+import CheckBox from './CheckBox/index'
+import RadioGroup from './Radio/index'
+import Radio from './Radio/radio'
+import HFile from './HFile/index'
 import BottomTab from './BottomTab/index'
 import TabButton from './BottomTab/tab-button'
 import Modal from './Modal/Modal'
+import HLayout from './HLayout/index'
+import CurrencyInput from './CurrencyInput/index'
+import errLoadingPic from '../common/picture/errloading.jpg'
 export default (Vue) => {
+  Vue.use(VueLazyload, {
+    error: errLoadingPic,
+    loading: errLoadingPic,
+  })
  Vue.component('h-view', HView)
  Vue.component('h-header', HHeader)
  Vue.component('h-content', HContent)
@@ -38,10 +52,16 @@ export default (Vue) => {
  Vue.component('spin', Spin)
  Vue.component('top-tip', TopTip)
  Vue.component('notify', Notify)
-  Vue.component('check-box', CheckBox)
+  Vue.component('h-switch', Switch)
  Vue.component('s-tab', Stab)
  Vue.component('tab-item', TabItem)
  Vue.component('bottom-tab', BottomTab)
  Vue.component('tab-button', TabButton)
  Vue.component('h-modal', Modal)
+  Vue.component('h-check', CheckBox)
+  Vue.component('radio-group', RadioGroup)
+  Vue.component('h-radio', Radio)
+  Vue.component('h-file', HFile)
+  Vue.component('h-layout', HLayout)
+  Vue.component('currency-input', CurrencyInput)
 }
--- a/packages/index.js
+++ b/packages/index.js
+// components
 import BottomTab from './components/BottomTab/index'
+import Switch from './components/Switch/index'
 import CheckBox from './components/CheckBox/index'
+import RadioGroup from './components/Radio/index'
+import Radio from './components/Radio/radio'
 import Notify from './components/Dialog/Notify'
 import HButton from './components/HButton/index'
 import HContent from './components/HContent/index'
@@ -19,24 +22,22 @@ import TopTip from './components/TopTip/index'
 import Stab from './components/STab/index'
 import TabItem from './components/STab/tab-item'
 import TabButton from './components/BottomTab/tab-button'
+import HFile from './components/HFile/index'
+import HLayout from './components/HLayout/index'
+import CurrencyInput from './components/CurrencyInput/index'
+import componentInstall from './components/component'
+// compontenPlugins
 import ActionSheetPlugin from './components/ActionSheet/index'
 import ShowPicturePlugin from './components/ShowPicture/index'
 import SelectPlugin from './components/select/index'
 import NotifyPlugin from './components/Dialog/plugins/index'
-import HlsModalPlugin from './components/Modal/index'
 import NumberKeyboardPlugin from './components/NumberKeyboard/index'
-import componentInstall from './components/component'
+// styles
 import appStyle from '../packages/common/styles/app.core.less'
-import hlsPopup from '../packages/common/scripts/hlsPopup'
+const version = '0.0.5'
-import hlsUtil from '../packages/common/scripts/hlsUtil'
-import { post, get } from '../packages/common/scripts/hlsHttp'
-import directives from '../packages/common/scripts/directives'
-import filter from '../packages/common/scripts/filter'
-const version = '0.0.2'
 export {
  appStyle,
@@ -52,7 +53,10 @@ export {
  SwipeItem,
  ListItem,
  Item,
+  Switch,
  CheckBox,
+  RadioGroup,
+  Radio,
  Spin,
  TopTip,
  Notify,
@@ -60,18 +64,14 @@ export {
  TabItem,
  BottomTab,
  TabButton,
+  HFile,
+  HLayout,
+  CurrencyInput,
  ActionSheetPlugin,
  ShowPicturePlugin,
  SelectPlugin,
  NotifyPlugin,
-  HlsModalPlugin,
  NumberKeyboardPlugin,
  version,
  componentInstall,
-  hlsPopup,
-  hlsUtil,
-  post,
-  get,
-  directives,
-  filter,
 }
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,6 +17,7 @@ export default {
    return {
      pathList: [],
      transitionName: 'slide-left',
+      skeleton: require('./assets/skeleton.svg'),
    }
  },
  watch: { // 监听路由变化
@@ -35,6 +36,7 @@ export default {
        this.$router.isBack = true
        this.pathList = []
      }
+      this.$el.className = 'home-skeleton'
      let isBack = this.$router.isBack
      if (isBack) {
        this.transitionName = 'router-slide-right'
@@ -75,4 +77,8 @@ export default {
    //-webkit-overflow-scrolling: touch;
    //overflow-scrolling: touch;
  }
+  .home-skeleton{
+    background: url("assets/skeleton.svg") no-repeat fixed;
+    background-size: contain;
+  }
 </style>
--- a/src/assets/skeleton-list.svg
+++ b/src/assets/skeleton-list.svg
+<svg width="750" height="1334" xmlns="http://www.w3.org/2000/svg">
+ <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
+ <defs>
+  <filter id="svg_38_blur">
+   <feGaussianBlur stdDeviation="0" in="SourceGraphic"/>
+  </filter>
+ </defs>
+ <g>
+  <rect fill="#fff" id="canvas_background" height="1334" width="750" y="-1" x="-1"/>
+  <g display="none" overflow="visible" y="0" x="0" height="100%" width="100%" id="canvasGrid">
+   <rect fill="url(#gridpattern)" stroke-width="0" y="0" x="0" height="100%" width="100%"/>
+  </g>
+ </g>
+ <g>
+  <title>列表</title>
+  <rect id="svg_16" height="28.000015" width="0" y="839.375118" x="375.49994" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#DDDDDD"/>
+  <rect opacity="0.5" stroke="#000" id="svg_25" height="190" width="656" y="99" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect opacity="0.5" stroke="#000" id="svg_30" height="60" width="656" y="311" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect stroke="#000" opacity="0.5" id="svg_31" height="136" width="656" y="413" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <ellipse stroke="#000" filter="url(#svg_38_blur)" opacity="0.7" ry="45" rx="45" id="svg_38" cy="484" cx="112" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect opacity="0.7" stroke="#000" id="svg_40" height="24" width="302" y="431" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect opacity="0.7" stroke="#000" id="svg_41" height="24" width="388" y="471" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect opacity="0.7" stroke="#000" id="svg_42" height="24" width="448" y="509" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect stroke="#000" opacity="0.5" id="svg_31" height="136" width="656" y="573" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <ellipse stroke="#000" filter="url(#svg_38_blur)" opacity="0.7" ry="45" rx="45" id="svg_38" cy="644" cx="112" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_40" height="24.000013" width="302" y="591" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_41" height="24.000013" width="388" y="631" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_42" height="24.000013" width="448" y="669" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect stroke="#000" opacity="0.5" id="svg_31" height="136" width="656" y="733" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <ellipse stroke="#000" filter="url(#svg_38_blur)" opacity="0.7" ry="45" rx="45" id="svg_38" cy="804" cx="112" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_40" height="24.000013" width="302" y="753" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_41" height="24.000013" width="388" y="791" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_42" height="24.000013" width="448" y="829" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect stroke="#000" opacity="0.5" id="svg_31" height="136" width="656" y="893" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <ellipse stroke="#000" filter="url(#svg_38_blur)" opacity="0.7" ry="45" rx="45" id="svg_38" cy="964" cx="112" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_40" height="24.000013" width="302" y="921" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_41" height="24.000013" width="388" y="951" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_42" height="24.000013" width="448" y="989" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect stroke="#000" opacity="0.5" id="svg_31" height="136" width="656" y="1053" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <ellipse stroke="#000" filter="url(#svg_38_blur)" opacity="0.7" ry="45" rx="45" id="svg_38" cy="1124" cx="112" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_40" height="24.000013" width="302" y="1071" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_41" height="24.000013" width="388" y="1111" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+   <rect opacity="0.7" stroke="#000" id="svg_42" height="24.000013" width="448" y="1149" x="177" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+ </g>
+</svg>
--- a/src/assets/skeleton.svg
+++ b/src/assets/skeleton.svg
+<svg width="750" height="1334" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <rect fill="#fff" id="canvas_background" height="1334" width="750" y="-1" x="-1"/>
+  <g display="none" overflow="visible" y="0" x="0" height="100%" width="100%" id="canvasGrid">
+   <rect fill="url(#gridpattern)" stroke-width="0" y="0" x="0" height="100%" width="100%"/>
+  </g>
+ </g>
+ <g>
+  <rect opacity="0.7" stroke="#000" id="svg_1" height="200" width="656" y="89" x="46" stroke-width="0" fill="#DDDDDD"/>
+  <ellipse opacity="0.7" stroke="#000" ry="50" rx="50" id="svg_3" cy="408" cx="93" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <ellipse opacity="0.7" stroke="#000" ry="50" rx="50" id="svg_4" cy="408" cx="284" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <ellipse opacity="0.7" stroke="#000" ry="50" rx="50" id="svg_8" cy="408" cx="469" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <ellipse opacity="0.7" stroke="#000" ry="50" rx="50" id="svg_9" cy="408" cx="651" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <ellipse opacity="0.7" stroke="#000" ry="50" rx="50" id="svg_10" cy="576" cx="93" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <ellipse opacity="0.7" stroke="#000" ry="50" rx="50" id="svg_11" cy="576" cx="284" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <ellipse opacity="0.7" stroke="#000" ry="50" rx="50" id="svg_12" cy="576" cx="469" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <ellipse opacity="0.7" stroke="#000" ry="50" rx="50" id="svg_13" cy="576" cx="651" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect stroke="#000" opacity="0.7" id="svg_14" height="80" width="656" y="689" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect id="svg_16" height="28.000015" width="0" y="839" x="375" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#DDDDDD"/>
+  <rect stroke="#000" opacity="0.7" id="svg_17" height="30" width="656" y="805" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect stroke="#000" opacity="0.7" id="svg_18" height="30" width="656" y="867" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect stroke="#000" opacity="0.7" id="svg_19" height="30" width="656" y="927" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect stroke="#000" opacity="0.7" id="svg_20" height="30" width="656" y="987" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect stroke="#000" opacity="0.7" id="svg_21" height="30" width="656" y="1047" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect stroke="#000" opacity="0.7" id="svg_22" height="30" width="656" y="1107" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect stroke="#000" opacity="0.7" id="svg_23" height="30" width="656" y="1167" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+  <rect stroke="#000" opacity="0.7" id="svg_24" height="30" width="656" y="1227" x="46" fill-opacity="null" stroke-opacity="null" stroke-width="0" fill="#DDDDDD"/>
+ </g>
+</svg>
--- a/src/common/layout.json
+++ b/src/common/layout.json
+{
+  "layoutData": [
+   {
+      "code":"form",
+      "formName": "formOne",
+      "readOnly": false,
+      "dataName": "formOne",
+      "fileds": [
+        {
+          "filedName": "filedOne",
+          "type": "text",
+          "VModelName": "",
+          "filedType": "input",
+          "description": "第一个filed",
+          "iconPath": "http://hlsapp.hand-china.com/file/hel_dev/function/partner@2x.png",
+          "rightArrow": true,
+          "defaultValue": "",
+          "placeholder": "请输入第一个filed的值",
+          "proportion": [2,2],
+          "readOnly": false,
+          "request": true,
+          "selectList": [],
+          "moneyFormat": false
+        },
+        {
+          "filedName": "filedTwo",
+          "type": "text",
+          "VModelName": "",
+          "filedType": "select",
+          "description": "第二个filed",
+          "iconPath": "http://hlsapp.hand-china.com/file/hel_dev/function/partner@2x.png",
+          "rightArrow": true,
+          "defaultValue": "",
+          "placeholder": "请选择",
+          "proportion": [2,2],
+          "readOnly": true,
+          "request": true,
+          "selectList": [],
+          "moneyFormat": false
+        },
+        {
+          "filedName": "filedThree",
+          "type": "text",
+          "VModelName": "",
+          "filedType": "time",
+          "description": "第三个filed",
+          "iconPath": "",
+          "rightArrow": true,
+          "defaultValue": "",
+          "placeholder": "请选择时间",
+          "proportion": [2,2],
+          "readOnly": true,
+          "request": true,
+          "selectList": [],
+          "moneyFormat": false
+        },
+        {
+          "filedName": "filedFour",
+          "type": "number",
+          "VModelName": "",
+          "filedType": "div",
+          "description": "第四个filed",
+          "iconPath": "http://hlsapp.hand-china.com/file/hel_dev/function/partner@2x.png",
+          "rightArrow": false,
+          "defaultValue": "",
+          "placeholder": "",
+          "proportion": [2,2],
+          "readOnly": true,
+          "request": true,
+          "selectList": [],
+          "moneyFormat": true
+        }
+      ]
+    },
+    {
+      "code": "button",
+      "btnName": "按钮",
+      "isBottom": false,
+      "btns": [
+        {
+          "btnCode": "btnOne",
+          "btnText": "按钮1"
+        },
+        {
+          "btnCode": "btnTwo",
+          "btnText": "按钮2"
+        },
+        {
+          "btnCode": "btnThree",
+          "btnText": "按钮3"
+        }
+      ]
+    }
+  ],
+  "bottomBtns": [
+    {
+      "code": "button",
+      "btnName": "按钮",
+      "isBottom": true,
+      "btns": [
+        {
+          "btnCode": "btnFour",
+          "btnText": "按钮4"
+        },
+        {
+          "btnCode": "btnFive",
+          "btnText": "按钮5"
+        }
+      ]
+    }
+  ]
+}
--- a/src/main.js
+++ b/src/main.js
@@ -2,30 +2,36 @@
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 import Vue from 'vue'
 import FastClick from 'fastclick'
+import axios from 'axios'
 import App from './App'
-import Vuex from 'vuex'
-import vuexI18n from 'vuex-i18n'
 import router from './router/index'
 import flexible from './common/ydui.flexible'
-import {componentInstall, appStyle, hlsUtil, get, post, hlsPopup, directives, filter} from '../packages/index'
+import {componentInstall, appStyle} from '../packages/index'
 /**
- * 组件
+ * 指令
 */
+import directives from './scripts/directives'
-import {
+import filter from './scripts/filter'
-  ViewBox,
-  Tabbar,
-  TabbarItem,
-  XHeader,
-  Picker,
-  PopupHeader,
-} from 'vux'
 import './scripts/prototype'
-import './scripts/vuePlatform'
+/**
+ * 弹框组件
+ */
+import hlsPopup from './scripts/hlsPopup'
+/**
+ * http
+ */
+import {post, get} from './scripts/hlsHttp'
+/** 全局函数hlsUtil**/
+import hlsUtil from './scripts/hlsUtil'
 /** end**/
@@ -41,25 +47,9 @@ Vue.use(directives)
 Vue.use(filter)
-Vue.use(Vuex)
-// Vue.directive('transfer-dom', TransferDom);
-Vue.component('x-header', XHeader)
-Vue.component('view-box', ViewBox)
-Vue.component('tabbar', Tabbar)
-Vue.component('tabbar-item', TabbarItem)
-Vue.component('PopupHeader', PopupHeader)
-Vue.component('picker', Picker)
-/** i18n **/
-let store = new Vuex.Store({
-  modules: {
-    i18n: vuexI18n.store,
-  },
-})
-Vue.use(vuexI18n.plugin, store)
 Vue.prototype.hlsPopup = window.hlsPopup = hlsPopup
 Vue.prototype.$devicePixelRatio = 2
+Vue.prototype.axios = window.axios = axios
 Vue.prototype.$post = post
 Vue.prototype.$get = get
@@ -87,7 +77,7 @@ Vue.prototype.$routeGo = routeGo
 let hlsExit = function () {
  if (vum.Platform.isIOS()) {
    cordova.exec(null, null, 'BridgePlugin', 'closeWebView', [])
-  } else if (vum.Platform.isIOS()) {
+  } else {
    var dict = {
      'className': 'WebBridge',
      'function': 'close',
@@ -104,7 +94,8 @@ FastClick.attach(document.body)
 Vue.config.productionTip = false
 vum.$vumPlatform.ready(function () {
-  if (process.env.isMobilePlatform) {
+  if ((vum.Platform.isAndroid()) || (vum.Platform.isIOS())) {
+    cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true)
    cordova.plugins.Keyboard.disableScroll(true)
  }
 })

--- a/src/pages/fileTest.vue
+++ b/src/pages/fileTest.vue
+/**
+* @Author think
+* @Date 2019-07-11 11:04
+*/
+<template>
+  <h-view title="HFile">
+    <h-header>
+      <div slot="left" class="h-header-btn" @click="$routeGo()">
+        <i class="ion-ios-arrow-back"/>
+      </div>
+      <div slot="center">HFile</div>
+    </h-header>
+    <h-content>
+      <h-file
+        :fileList="fileList" v-model="fileList" :upload="upload"
+        :uploadConfig="uploadConfig" :disabled="disable" :accept="accept" :beforeRead="beforeRead"
+        :afterRead="afterRead" :maxCount="maxCount" :max-size="maxSize" :previewImage="previewImage"
+        :deleteImage="deleteImage"
+        :result-type="resultType"
+        @upload="uploaded"
+        @delete="deletePic"
+        @oversize="oversize">
+        <div class="file-chose">
+          文件上传 <i class="icon ion-ios-cloud-upload"/>
+        </div>
+      </h-file>
+      <list-item>
+        <item>
+          <div slot="name">融资额</div>
+          <currency-input slot="content" v-model="money"/>
+          <div slot="right-icon">¥</div>
+        </item>
+      </list-item>
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {
+  name: 'FileTest',
+  data () {
+    return {
+      fileList: [], // 文件数组 必填
+      disable: false, // 是否禁用文件上传 默认false 可选
+      accept: 'image/png,image/jpeg', // 接受的文件类型 可选
+      upload: false, // 选取完成是否自动上传 默认 false 可选
+      maxSize: 2000000, // 文件大小限制，单位为byte 可选 超过大小的文件会自动取消
+      maxCount: 5, // 文件上传数量限制 可选超过数量自动隐藏选择按钮
+      deleteImage: true, // 是否删除文件 默认true 可选
+      previewImage: true, // 是否在选取完成后展示预览图 默认true 可选
+      resultType: 'dataUrl', // 文件读取结果类型 dataUrl 可选值为text
+      uploadConfig: { // 文件上传配置
+        uploadUrl: $config.rootPath + '/app/fileUploadSvc?sysName=HLS_APP&apiName=attachment_upload', // 上传的URL
+        params: { // 上传的额外参数
+          user_id: 1,
+          source_type: 'HLS_DOC_FILE_TEMPLET',
+          pkvalue: 42,
+        },
+        uploadSuccess: this.fileSuccess, // 上传成功后的回调函数 用于给文件添加服务端唯一标示或其他
+      },
+      money: null,
+    }
+  },
+  methods: {
+    /**
+     * email事件 可选
+     * 删除文件后触发 返回当前文件以及 对应的index
+     * @param file
+     * @param index
+     */
+    deletePic (file, index) {
+      debugger
+    },
+    /**
+     * 可选
+     * 文件选择完成后读取前触发 返回当前选择的文件数组
+     * 返回 ture 或者promise对象 标示继续读取，否则终止 操作
+     * @param files 选择的文件数组
+     * @returns {boolean}
+     */
+    beforeRead (files) {
+      files.forEach((file, index) => {
+        console.log(file.size)
+      })
+      return true
+    },
+    /**
+     * 可选
+     * 文件读取成功后触发添加了文件的content内容
+     * @param files 选择的文件数组
+     * @returns {boolean}
+     */
+    afterRead (files) {
+      files.forEach((item, index) => {
+        console.log(item.file.name)
+      })
+      return true
+    },
+    /**
+     * email事件 可选
+     * 全部文件上传成功后触发
+     * @param fileList 全部文件数组
+     */
+    uploaded (fileList) {
+      debugger
+    },
+    /**
+     * email事件 可选
+     * 文件大小超过配置的大小
+     * @param files
+     */
+    oversize (files) {
+      debugger
+    },
+    /**
+     * 每个文件上传成功后的回调 可选配置
+     * @param fileList 文件数组
+     * @param result 上传返回结果
+     */
+    fileSuccess (fileList, result) {
+      this.fileList = fileList
+      debugger
+      this.fileList.forEach((itemFile, index) => {
+        if (result.response && itemFile.file && !itemFile.attachment_id && result.response.fileName === itemFile.file.name) {
+          itemFile.attachment_id = result.response.attachment_id
+        }
+      })
+    },
+  },
+}
+</script>
+<style scoped lang="less">
+.content{
+  .h-file{
+    .file-chose{
+      width: 110px;
+      height: 44px;
+      background-color: #07c160;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: #fff;
+      border-radius: 4px;
+      .icon{
+        margin-left: 10px;
+        font-size: 20px;
+        //color: #fff;
+      }
+    }
+  }
+}
+</style>
--- a/src/pages/form.vue
+++ b/src/pages/form.vue
+/**
+* @Author think
+* @Date 2019-07-16 20:00
+*/
+<template>
+  <h-view class="form" title="From">
+    <h-header>
+      <div slot="left" class="h-header-btn" @click="$hlsExit()">
+        <i class="ion-ios-arrow-back"/>
+      </div>
+      <div slot="center">From</div>
+      <div slot="right" class="h-header-btn">右边</div>
+    </h-header>
+    <h-layout
+      v-if="layoutShow"
+      :layout-data="layoutData" :show-form-title="showFormTitle" :show-btn-divider="true"
+      :show-tab-divider="true" :formData="data" v-model="data" :read-only="readOnly"
+      :show-btn="showBtn"
+      @tabClick="tabClick"
+      @showSelect="showSelect" @showTime="showTime" @filedClick="filedClick"
+      @btnClick="btnClick"/>
+  </h-view>
+</template>
+<script>
+import layoutData from './layout.json'
+export default {
+  name: 'Form',
+  data () {
+    return {
+      showFormTitle: true,
+      layoutData: [],
+      layoutShow: false,
+      readOnly: false,
+      showBtn: true,
+      data: {
+        contract: {
+          contract_id: 1,
+          postion: '01',
+          postion_n: '技术顾问',
+          enable_flag: false,
+          checkValue: true,
+        },
+      },
+      postionList: [
+        {code: '01', code_name: '技术顾问'},
+        {code: '02', code_name: '技术经理'},
+        {code: '03', code_name: '项目经理'},
+      ],
+    }
+  },
+  created () {
+    let vm = this
+    /* axios.get('http://leafservice.hand-china.com/r/api/get/layoutCode?layoutCode=CON_QURERY', {
+      header: {'Content-Type': 'application/json',
+        'Authorization': 'bearer SRHJVdrftyGUYguyhiHiuiojmgrrcgv' },
+    }).then(res => {
+      vm.layoutData = res.rows
+      vm.layoutShow = true
+    }) */
+    setTimeout(() => {
+      vm.layoutData = layoutData
+      vm.layoutShow = true
+    }, 100)
+  },
+  methods: {
+    /**
+     * tab的点击事件
+     * @param index
+     */
+    tabClick (index) {
+      this.tabIndex = index
+    },
+    showPostion (configCode, filedCode) {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.postionList,
+        code: filedCode,
+        object: vm.data[configCode],
+        returnItem (index) {
+          vm.data[configCode][filedCode] = vm.postionList[index].code
+          vm.data[configCode][filedCode + '_n'] = vm.postionList[index].code_name
+        },
+      })
+    },
+    /**
+     * 下拉框点击事件
+     * @param configCode
+     * @param filedCode
+     */
+    showSelect (configCode, filedCode) {
+      let vm = this
+      switch (filedCode) {
+        case 'postion':
+          vm.showPostion(configCode, filedCode)
+          break
+        default:
+      }
+    },
+    showOrderDate (configCode, filedCode) {
+      let vm = this
+      vm.hlsPopup.showTime({
+        callback (time) {
+          vm.data[configCode][filedCode] = time
+        },
+      })
+    },
+    /**
+     * 事件选择事件
+     * @param configCode
+     * @param filedCode
+     */
+    showTime (configCode, filedCode) {
+      let vm = this
+      switch (filedCode) {
+        case 'order_date':
+          vm.showOrderDate(configCode, filedCode)
+          break
+        default:
+      }
+    },
+    /**
+     * 其他字端的点击事件
+     * @param configCode
+     * @param filedCode
+     */
+    filedClick (configCode, filedCode) {
+      debugger
+    },
+    /**
+     * 按钮点击事件
+     * @param btn
+     */
+    btnClick (btn) {
+      console.log(JSON.stringify(this.data, '', 2))
+      if (btn.btnType === 'BottomTab') {
+        if (btn.btnCode === 'save') {
+          alert('底部固定按钮的保存')
+        }
+        if (btn.btnCode === 'submit') {
+          alert('底部固定按钮的提交')
+        }
+      } if (btn.btnType === 'Button') {
+        if (btn.btnCode === 'nextBtn') {
+          alert('按钮继续')
+        }
+      }
+    },
+  },
+}
+</script>
+<style  lang="less">
+  .form {
+  }
+</style>
--- a/src/pages/hlsPopup.vue
+++ b/src/pages/hlsPopup.vue
 <template>
-  <h-view class="public-style hls-popup" style="height: 100%">
+  <h-view class="public-style hls-popup" style="height: 100%" title="封装测试">
    <h-header class="bar-custom">
      <div slot="left" class="h-header-btn" @click="$routeGo()">
        <i class="ion-ios-arrow-back"/>
@@ -9,7 +9,7 @@
        操作
      </div>
    </h-header>
-   <!-- <s-tab :overflowX="true" :showDivider="true" class="has-header" :defaultActive="6">
+    <s-tab :overflowX="true" :showDivider="true" :defaultActive="6" :has-border="true">
      <tab-item>工商资料</tab-item>
      <tab-item>股东成员</tab-item>
      <tab-item>对外投资</tab-item>
@@ -22,8 +22,8 @@
      <tab-item>失信记录</tab-item>
      <tab-item>涉诉公告</tab-item>
      <tab-item>司法协助</tab-item>
-    </s-tab>-->
+    </s-tab>
-    <s-content class="has-footer">
+    <h-content class="has-footer">
      <h-button class="button-class" type="primary" @click.native="showLoading">showLoading</h-button>
      <h-button class="button-class" type="primary" @click.native="hideLoading">hideLoading</h-button>
      <h-button class="button-class" type="primary" @click.native="showLongTop">showLongTop</h-button>
@@ -79,7 +79,9 @@
      <h-button class="button-class radius-small" disabled>基础按钮(禁用)</h-button>
      <h2 class="item-title">Swip基础使用</h2>
-      <swipe :interval="5000" @start="start" @move="move" @change="change" :defaultWidth="200">
+      <swipe
+        :interval="5000" :defaultWidth="200" @start="start" @move="move"
+        @change="change">
        <swipe-item>
          <div :style="{'background': bgColor[0]}" class="item-bg">0</div>
        </swipe-item>
@@ -92,7 +94,7 @@
      </swipe>
      <h2 class="item-title">纵向滚动</h2>
-      <swipe :vertical="true"  style="height: 200px">
+      <swipe :vertical="true" style="height: 200px">
        <swipe-item v-for="key in count" :key="key" :style="{'background': bgColor[key-1]}">
          <div class="item-bg">{{ key-1 }}</div>
        </swipe-item>
@@ -180,14 +182,6 @@
          </div>
        </item-option>
      </div>
-      <h2>picker</h2>
-      <picker
-        ref="picker1" :data="year7" :columns="3" v-model="year7Value"
-        style="width: 100%"
-        @on-change="change"/>
      <list-item :item-height="45">
        <item>
          <img slot="left-icon" src="../assets/image/warning@2x.png" class="left-icon">
@@ -209,18 +203,21 @@
          <img slot="left-icon" src="../assets/image/warning@2x.png" class="left-icon">
          <div slot="name">保存照片</div>
          <label slot="right" class="toggle toggle-positive toggle-check" @click="savePhotoFun">
-            <input :checked="savePhoto" type="checkbox" >
+            <input :checked="savePhoto" type="checkbox">
            <div class="track">
              <div class="handle"/>
            </div>
          </label>
-          <check-box slot="content" v-model="savePhoto" @checkClick="savePhotoFun"/>
+          <h-switch slot="content" :disable="true" v-model="savePhoto" @switchClick="savePhotoFun"/>
+        </item>
+        <item>
+          <h-check slot="left-icon" v-model="radioValue" @checkClick="radioClick"/>
+          <section slot="content">CheckBox</section>
        </item>
      </list-item>
      <h2 class="item-title">s-tab</h2>
      <div class="local-region">
-        <s-tab :show-divider="true" @tabClick="stabClick" :overflowX="true">
+        <s-tab :show-divider="true" :overflowX="true" @tabClick="stabClick">
          <tab-item>测试</tab-item>
          <tab-item>你好</tab-item>
          <tab-item>再见</tab-item>
@@ -230,7 +227,9 @@
          <tab-item>按钮4</tab-item>
        </s-tab>
-        <s-tab :default-active="2" :show-divider="true" position="bottom" cusClass="class" @tabClick="stabClick" :overflowX="true">
+        <s-tab
+          :default-active="2" :show-divider="true" :overflowX="true" position="bottom"
+          cusClass="class" @tabClick="stabClick">
          <tab-item><img src="../assets/image/warning@2x.png" style="width: 18px"></tab-item>
          <tab-item><img src="../assets/image/warning@2x.png" style="width: 18px"></tab-item>
          <tab-item><img src="../assets/image/warning@2x.png" style="width: 18px"></tab-item>
@@ -239,8 +238,8 @@
      </div>
      <h2 class="item-title">Modal</h2>
      <h-button class="button-class" type="primary" @click.native="showModal">Modal</h-button>
+    </h-content>
-    </s-content>
    <bottom-tab :show-divider="true">
      <tab-button cusClass="button-exit" @click.native="showConfirm"><img
@@ -284,72 +283,18 @@ export default {
      infiniteCount: 0,
      deleteText: '删除',
      editText: '编辑',
-      colors: [{name: 'Yellow', hex: '#f4d03f'}, {name: 'Green', hex: '#229954'}, {name: 'Purple', hex: '#9b59b6'}],
+      colors: [{ name: 'Yellow', hex: '#f4d03f' }, { name: 'Green', hex: '#229954' }, {
+        name: 'Purple',
+        hex: '#9b59b6',
+      }],
      svgSrc: svg,
      show1: false,
      show2: false,
      bp_name: '',
      savePhoto: new Boolean(window.localStorage.savePhoto) || false,
-      year7Value: [],
-      year7: [{
-        name: '中国',
-        value: 'china',
-        parent: '0', // 为一级时可以不写 parent，但是此时允许为数字 0、空字符串或者字符串 '0'
-      }, {
-        name: '美国',
-        value: 'USA',
-        parent: '0',
-      }, {
-        name: '广东',
-        value: 'china001',
-        parent: 'china',
-      }, {
-        name: '广西',
-        value: 'china002',
-        parent: 'china',
-      }, {
-        name: '美国001',
-        value: 'usa001',
-        parent: 'USA',
-      }, {
-        name: '美国002',
-        value: 'usa002',
-        parent: 'USA',
-      }, {
-        name: '广州',
-        value: 'gz',
-        parent: 'china001',
-      }, {
-        name: '深圳',
-        value: 'sz',
-        parent: 'china001',
-      }, {
-        name: '广西001',
-        value: 'gx001',
-        parent: 'china002',
-      }, {
-        name: '广西002',
-        value: 'gx002',
-        parent: 'china002',
-      }, {
-        name: '美国001_001',
-        value: '0003',
-        parent: 'usa001',
-      }, {
-        name: '美国001_002',
-        value: '0004',
-        parent: 'usa001',
-      }, {
-        name: '美国002_001',
-        value: '0005',
-        parent: 'usa002',
-      }, {
-        name: '美国002_002',
-        value: '0006',
-        parent: 'usa002',
-      }],
      modal: '',
      showModalValue: false,
+      radioValue: true,
    }
  },
  watch: {
@@ -369,16 +314,16 @@ export default {
  },
  mounted () {
    /* HlsModal.fromComponent(popup, {
-        cusClass:"login-modal",
+          cusClass:"login-modal",
-        onHide: () => {
+          onHide: () => {
-          console.log('modal hide')
+            console.log('modal hide')
-        },
+          },
-        onShow: () => {
+          onShow: () => {
-          console.log('modal show')
+            console.log('modal show')
-        }
+          }
-      }).then((modal) => {
+        }).then((modal) => {
-        this.modal = modal;
+          this.modal = modal;
-      }) */
+        }) */
  },
  methods: {
    stab () {
@@ -424,13 +369,13 @@ export default {
      this.hlsPopup.hideLoading()
    },
    showLongTop () {
-      this.hlsPopup.showLongTop('操作成功操作成功操作成功操作成功操作成功操作成功操作成功操作成功操作成功')
+      this.hlsPopup.showLongTop('操作成功操作成功')
    },
    showLongCenter () {
-      this.hlsPopup.showLongCenter('操作成功操作成功操作成功')
+      this.hlsPopup.showLongCenter('操作成功操作成功')
    },
    showLongBottom () {
-      this.hlsPopup.showLongBottom('操作成功操作成功操作成功操作成功')
+      this.hlsPopup.showLongBottom('操作成功操作成功')
    },
    showSuccess () {
      this.hlsPopup.showSuccess('操作成功')
@@ -468,7 +413,7 @@ export default {
    showActionSheetButton () {
      this.hlsPopup.showActionSheet({
        titleText: '照片',
-        buttonArray: [{text: '拍照', type: 'warn'}, {text: '从相册取', type: 'primary'}],
+        buttonArray: [{ text: '拍照', type: 'warn' }, { text: '从相册取', type: 'primary' }],
        callback: (index) => {
          alert(index)
        },
@@ -662,6 +607,11 @@ export default {
    showModal () {
      this.showModalValue = true
    },
+    radioClick (value) {
+      this.radioValue = value
+      console.log(value)
+    },
  },
 }
 </script>
@@ -670,8 +620,9 @@ export default {
  .hls-popup {
    height: 100%;
    width: 100%;
    .hls-switch-tab {
-      .tab-content .h-tab-item .h-item{
+      .tab-content .h-tab-item .h-item {
        width: 80px;
      }
@@ -680,9 +631,11 @@ export default {
    .vue-better-scroll__wrapper {
      width: 100%;
    }
    .list {
      width: 100%;
    }
    .content {
      .scrollContent {
        display: flex;
@@ -692,6 +645,7 @@ export default {
        flex-direction: column;
        -webkit-flex-direction: column;
      }
      .button-class {
        width: 90%;
        margin: 10px 5%;
@@ -731,6 +685,7 @@ export default {
        background-color: #7e57c2;
        border: 1px solid #7e57c2;
      }
      .button {
        background-color: @theme-color;
        color: #ffffff;
@@ -740,6 +695,7 @@ export default {
        margin-top: 20px;
      }
    }
    .item-bg {
      height: 200px;
      line-height: 200px;
@@ -747,6 +703,7 @@ export default {
      font-size: 20px;
      font-weight: 500;
    }
    .indicators {
      height: 14px;
      width: 14px;
@@ -770,6 +727,7 @@ export default {
    .sign-modal {
      top: 50%;
      .content {
        background-color: #fff;
      }

--- a/src/pages/home.vue
+++ b/src/pages/home.vue
 <template>
-  <h-view id="home" class="public-style">
+  <h-view id="home" class="public-style" title="小易">
    <h-header :has-border="false" class="bar-custom">
      <div slot="left" class="h-header-btn" @click="$hlsExit()">
        <i class="ion-ios-arrow-back"/>
      </div>
      <div slot="center">小易</div>
    </h-header>
-    <scroll id="home-content" class="has-footer">
+    <s-tab>
-      <div v-for="item in message" class="message">
+      <tab-item>Vue</tab-item>
-        <p v-show="false" class="message-time" v-text="item.time"/>
+      <tab-item>APP</tab-item>
-        <div v-show="!item.isFromeMe" class="message-wrap">
+    </s-tab>
-          <img src="../assets/image/robot/robot.png" class="head-pic">
+    <h-content >
-          <span class="triangle-left"/>
-          <p class="message" @click="showImg($event)" v-html="item.content"/>
-        </div>
-        <div v-show="item.isFromeMe" class="message-wrap">
-          <img v-show="userImg" :src="userImg" class="head-pic-right">
-          <img v-show="!userImg" src="../assets/image/robot/user7.png" class="head-pic-right">
-          <span class="triangle-right"/>
-          <p class="message-right" v-text="item.content"/>
-        </div>
-      </div>
-      <input style="width: 100%;height: 50px;margin-top: 300px">
      <list-item>
        <item>
-          <div slot="name">客户名称</div>
+          <section slot="name">姓名</section>
-          <input slot="content" type="text" placeholder="请输入">
+          <input slot="content" type="text">
+        </item>
+        <item>
+          <section slot="name">年龄</section>
+          <input slot="content" type="text">
+        </item>
+        <item>
+          <section slot="name">性别</section>
+          <input slot="content" type="text">
        </item>
        <item>
-          <div slot="name">蜘蛛侠</div>
+          <section slot="name">出生日前</section>
-          <input slot="content" type="text" placeholder="请输入">
+          <input slot="content" type="text">
        </item>
        <item>
-          <div slot="name">蝙蝠侠</div>
+          <section slot="name">体重</section>
-          <input slot="content" type="text" placeholder="请输入">
+          <input slot="content" type="text">
        </item>
        <item>
-          <div slot="name">超人</div>
+          <section slot="name">身高</section>
-          <input slot="content" type="text" placeholder="请输入" readonly>
+          <input slot="content" type="text">
        </item>
        <item>
-          <div slot="name">钢铁侠</div>
+          <section slot="name">血型</section>
-          <input slot="content" type="text" placeholder="请输入">
+          <input slot="content" type="text" >
        </item>
        <item>
-          <div slot="name">蚁人</div>
+          <section slot="name">胸围</section>
-          <input slot="content" type="text" placeholder="请输入">
+          <input slot="content" type="text">
        </item>
        <item>
-          <div slot="name">黄蜂女</div>
+          <section slot="name">腰围</section>
-          <input slot="content" type="text" placeholder="请输入">
+          <input slot="content" type="text">
        </item>
        <item>
-          <div slot="name">雷神</div>
+          <section slot="name">tun</section>
-          <input slot="content" type="text" placeholder="请输入">
+          <input slot="content" type="text">
        </item>
        <item>
-          <div slot="name">洛基</div>
+          <section slot="name">tun</section>
-          <input slot="content" type="text" placeholder="请输入">
+          <input slot="content" type="text">
        </item>
        <item>
-          <div slot="name">绿巨人</div>
+          <section slot="name">tun</section>
-          <input slot="content" type="text" placeholder="请输入">
+          <input slot="content" type="text">
+        </item>
+        <item>
+          <section slot="name">tun</section>
+          <input slot="content" type="text">
+        </item>
+        <item>
+          <section slot="name">tun</section>
+          <input slot="content" type="text">
        </item>
      </list-item>
-    </scroll>
+    </h-content>
-    <bottom-tab class="bar bar-footer bar-light">
+    <!-- <s-tab>
-      <label class="item item-input footer-input">
+      <tab-item>Vue</tab-item>
-        <textarea
+      <tab-item>APP</tab-item>
-          v-auto-size ref="textarea" v-model="robot_message.question" placeholder="请输入"
+    </s-tab> -->
-          rows="1"/>
+    <!-- <div style="height: 40px;"/> -->
-      </label>
+    <bottom-tab/>
-      <div class="footer-btn-wrap" @click="sendMsg()">
-        <div class="send-button">
-          <p>发送</p>
-        </div>
-      </div>
-    </bottom-tab>
  </h-view>
 </template>
@@ -101,7 +100,7 @@ export default {
  },
  mounted () {
-    this.height = this.$refs.textarea.clientHeight
+    // this.height = this.$refs.textarea.clientHeight
  },
  methods: {
    scrollBottom () {
@@ -197,7 +196,6 @@ export default {
    .content {
      background-color: #eeeeee;
      //border: 1px solid red;
-      padding-bottom: 120px;
      .message {
        position: relative;
      }

--- a/src/pages/layout.json
+++ b/src/pages/layout.json
+[
+    {
+      "_token": "130a4b2b38e53217cd0f9b8b721b993f",
+      "objectVersionNumber": null,
+      "layoutId": "1",
+      "layoutCode": "CON_QURERY",
+      "layoutName": "合同查询",
+      "layoutCategory": "CONTRACT",
+      "enableFlag": "Y",
+      "layoutConfigList": [
+        {
+          "_token": "a540543e635ad256625882eb171e18c8",
+          "objectVersionNumber": null,
+          "configId": "123",
+          "layoutId": "1",
+          "configCode": "wflTab",
+          "configName": "工作流tab",
+          "configType": "Stab",
+          "configOrder": "10",
+          "tabFlag": "N",
+          "tabConfigId": null,
+          "tabFiledId": null,
+          "cssClass": null,
+          "enableFlag": "Y",
+          "hideForm": false,
+          "tabConfigCode": null,
+          "tabFiledCode": null,
+          "tabFiledName": null,
+          "layoutFiledList": [
+            {
+              "_token": "b2da5ba751a117c7f273344fe6831a6e",
+              "objectVersionNumber": 2,
+              "filedId": "1234",
+              "layoutId": "1",
+              "configId": "123",
+              "filedCode": "TODO",
+              "filedName": "代办",
+              "defaultValue": null,
+              "filedType": "OTHES",
+              "inputType": null,
+              "placeholder": null,
+              "filedOrder": "1",
+              "inputMode": "readOnly",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": null,
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": "<img src=\"http://hlsapp.hand-china.com/file/hel_dev/function/project@2x.png\"/>",
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "9b7c0408500deed8a315d16260881ccc",
+              "objectVersionNumber": 1,
+              "filedId": "1235",
+              "layoutId": "1",
+              "configId": "123",
+              "filedCode": "DONING",
+              "filedName": "已办",
+              "defaultValue": null,
+              "filedType": "OTHES",
+              "inputType": null,
+              "placeholder": null,
+              "filedOrder": "2",
+              "inputMode": "readOnly",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": null,
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "490fe24d223be5973ac2cf951a54dbf3",
+              "objectVersionNumber": 1,
+              "filedId": "0e1c1faa32af474ab8dc44635c0e9c20",
+              "layoutId": "1",
+              "configId": "123",
+              "filedCode": "MY",
+              "filedName": "我的",
+              "defaultValue": null,
+              "filedType": "OTHES",
+              "inputType": "text",
+              "placeholder": null,
+              "filedOrder": "3",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            }
+          ]
+        },
+        {
+          "_token": "29a5d0d4729fd7b32abe9f7f42d4a865",
+          "objectVersionNumber": null,
+          "configId": "124",
+          "layoutId": "1",
+          "configCode": "contract",
+          "configName": "合同信息",
+          "configType": "Form",
+          "configOrder": "20",
+          "tabFlag": "Y",
+          "tabConfigId": "123",
+          "tabFiledId": "1235",
+          "cssClass": null,
+          "enableFlag": "Y",
+          "hideForm": false,
+          "tabConfigCode": "wflTab",
+          "tabFiledCode": "DONING",
+          "tabFiledName": "已办",
+          "layoutFiledList": [
+            {
+              "_token": "57c06359869b966afe5715d5ebe60b45",
+              "objectVersionNumber": 1,
+              "filedId": "5e27dff547dd4eec9fb78b88b6af63ab",
+              "layoutId": "1",
+              "configId": "124",
+              "filedCode": "contract_number",
+              "filedName": "合同名称",
+              "defaultValue": null,
+              "filedType": "INPUT",
+              "inputType": "text",
+              "placeholder": "合同名称",
+              "filedOrder": "1",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "e50fbd51f9a3e046769ae19b1680b1d0",
+              "objectVersionNumber": 1,
+              "filedId": "ff061ecb37664c6e976df4255c449b2c",
+              "layoutId": "1",
+              "configId": "124",
+              "filedCode": "contract_name",
+              "filedName": "合同名称",
+              "defaultValue": "小兵的合同",
+              "filedType": "INPUT",
+              "inputType": "text",
+              "placeholder": null,
+              "filedOrder": "2",
+              "inputMode": "other",
+              "leftIcon": "http://hlsapp.hand-china.com/file/hel_dev/function/partner@2x.png",
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": true,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "b018faca7586b0b8a26798fc9100284a",
+              "objectVersionNumber": 3,
+              "filedId": "5e6b05bf5d9c4f3a8c78e60c1ce58add",
+              "layoutId": "1",
+              "configId": "124",
+              "filedCode": "postion",
+              "filedName": "岗位",
+              "defaultValue": null,
+              "filedType": "SELECT",
+              "inputType": "text",
+              "placeholder": "请选择岗位",
+              "filedOrder": "3",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": true,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "23ff236267272b11ff4acc468c220a5f",
+              "objectVersionNumber": 1,
+              "filedId": "fde9d1d26d5b4823a894f20ff3ffab7d",
+              "layoutId": "1",
+              "configId": "124",
+              "filedCode": "order_date",
+              "filedName": "订单时间",
+              "defaultValue": "2019-07-11",
+              "filedType": "TIME",
+              "inputType": "text",
+              "placeholder": "请输入时间",
+              "filedOrder": "4",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": true,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "b993cccaf742d01d77d672f182047a36",
+              "objectVersionNumber": 1,
+              "filedId": "d4664c3a8ef34e1fb47acb325bb9bfb4",
+              "layoutId": "1",
+              "configId": "124",
+              "filedCode": "enable_flag",
+              "filedName": "启用标志",
+              "defaultValue": "true",
+              "filedType": "SWITCH",
+              "inputType": "text",
+              "placeholder": null,
+              "filedOrder": "5",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": true,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "b993cccaf742d01d77d672f182047a36",
+              "objectVersionNumber": 1,
+              "filedId": "d4664c3a8ef34e1bg7y1cb325bb9bfb4",
+              "layoutId": "1",
+              "configId": "124",
+              "filedCode": "checkValue",
+              "filedName": "单选框",
+              "defaultValue": "true",
+              "filedType": "CHECKBOX",
+              "inputType": "text",
+              "placeholder": null,
+              "filedOrder": "15",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": true,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "0ee346cf559acb4917da57bfdbaf334c",
+              "objectVersionNumber": 1,
+              "filedId": "199658a5b961490a90238a9e9f95fe8d",
+              "layoutId": "1",
+              "configId": "124",
+              "filedCode": "note",
+              "filedName": "备注",
+              "defaultValue": "请在经销商指导下操作",
+              "filedType": "OTHES",
+              "inputType": "text",
+              "placeholder": null,
+              "filedOrder": "5",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": false,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": false,
+              "filedHeight": 30,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": "tip-note"
+            }
+          ]
+        },
+        {
+          "_token": "422270f06a330254f7c3b473f1a4f07f",
+          "objectVersionNumber": null,
+          "configId": "125",
+          "layoutId": "1",
+          "configCode": "project",
+          "configName": "项目信息",
+          "configType": "Form",
+          "configOrder": "30",
+          "tabFlag": "Y",
+          "tabConfigId": "123",
+          "tabFiledId": "1234",
+          "cssClass": null,
+          "enableFlag": "Y",
+          "hideForm": false,
+          "tabConfigCode": "wflTab",
+          "tabFiledCode": "TODO",
+          "tabFiledName": "代办",
+          "layoutFiledList": [
+            {
+              "_token": "5d6bd09fb12bb662a437923bd9d4b40c",
+              "objectVersionNumber": 1,
+              "filedId": "e04940d051ca4a06b20804bb3bb3b434",
+              "layoutId": "1",
+              "configId": "125",
+              "filedCode": "project_name",
+              "filedName": "项目名称",
+              "defaultValue": "常州XX公司500万项目",
+              "filedType": "INPUT",
+              "inputType": "text",
+              "placeholder": null,
+              "filedOrder": "10",
+              "inputMode": "readOnly",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "72100f0745ba12c51b2efab6dc651831",
+              "objectVersionNumber": 1,
+              "filedId": "ff400ff5c6294de39d5db2b59793a79f",
+              "layoutId": "1",
+              "configId": "125",
+              "filedCode": "bp_name",
+              "filedName": "客户名称",
+              "defaultValue": null,
+              "filedType": "INPUT",
+              "inputType": "text",
+              "placeholder": "请输入客户名称",
+              "filedOrder": "20",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "b546faa6ce70545804ba24e0266376b3",
+              "objectVersionNumber": 1,
+              "filedId": "e9467eab249e4c119771c4610dfb9e04",
+              "layoutId": "1",
+              "configId": "125",
+              "filedCode": "phone",
+              "filedName": "联系电话",
+              "defaultValue": null,
+              "filedType": "INPUT",
+              "inputType": "tel",
+              "placeholder": "请输入电话",
+              "filedOrder": "30",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "dff2744a00eeb86424a580019f8583e0",
+              "objectVersionNumber": 1,
+              "filedId": "91ad3a6b85a0486d8d8c25dee2076b63",
+              "layoutId": "1",
+              "configId": "125",
+              "filedCode": "email",
+              "filedName": "邮箱",
+              "defaultValue": null,
+              "filedType": "INPUT",
+              "inputType": "email",
+              "placeholder": "请输入邮箱",
+              "filedOrder": "40",
+              "inputMode": "required",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "a7c494a2d917ce2d2db6be6d10a9a136",
+              "objectVersionNumber": 2,
+              "filedId": "6f58ed5f1d7e48b6b25a788683dfde3b",
+              "layoutId": "1",
+              "configId": "125",
+              "filedCode": "account",
+              "filedName": "账户号",
+              "defaultValue": null,
+              "filedType": "INPUT",
+              "inputType": "number",
+              "placeholder": "请输入账户号",
+              "filedOrder": "50",
+              "inputMode": "required",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            },
+            {
+              "_token": "8ef5e51e90109e434b06771cd6264744",
+              "objectVersionNumber": 2,
+              "filedId": "8c675685769b40b48f2a594af7cecb25",
+              "layoutId": "1",
+              "configId": "125",
+              "filedCode": "password",
+              "filedName": "账户密码",
+              "defaultValue": "123456",
+              "filedType": "INPUT",
+              "inputType": "password",
+              "placeholder": "请输入账户密码",
+              "filedOrder": "60",
+              "inputMode": "required",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            }
+          ]
+        },
+        {
+          "_token": "c7a4b6551eebfdf5df85a8d5f09d2760",
+          "objectVersionNumber": null,
+          "configId": "f71d2a8c68e44f15a38bc3b8f8d9a0a5",
+          "layoutId": "1",
+          "configCode": "bp",
+          "configName": "客户信息",
+          "configType": "Form",
+          "configOrder": "35",
+          "tabFlag": "Y",
+          "tabConfigId": "123",
+          "tabFiledId": "1235",
+          "cssClass": null,
+          "enableFlag": "Y",
+          "hideForm": false,
+          "tabConfigCode": "wflTab",
+          "tabFiledCode": "DONING",
+          "tabFiledName": "已办",
+          "layoutFiledList": [
+            {
+              "_token": "a02b08a5b823463114111ad18fc68884",
+              "objectVersionNumber": 1,
+              "filedId": "ab5988de79ff4110bd6ffb53ad2bbbf6",
+              "layoutId": "1",
+              "configId": "f71d2a8c68e44f15a38bc3b8f8d9a0a5",
+              "filedCode": "bp_name",
+              "filedName": "客户名称",
+              "defaultValue": null,
+              "filedType": "INPUT",
+              "inputType": "text",
+              "placeholder": "请输入客户名称",
+              "filedOrder": "10",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            }
+          ]
+        },
+        {
+          "_token": "1cfcb4450cae4787d54f470ee230abb9",
+          "objectVersionNumber": null,
+          "configId": "f9b7ca36be6c4ca4986f14f6d72f98cf",
+          "layoutId": "1",
+          "configCode": "Buttons",
+          "configName": "按钮",
+          "configType": "Button",
+          "configOrder": "40",
+          "tabFlag": "N",
+          "tabConfigId": null,
+          "tabFiledId": null,
+          "cssClass": null,
+          "enableFlag": "Y",
+          "hideForm": false,
+          "tabConfigCode": null,
+          "tabFiledCode": null,
+          "tabFiledName": null,
+          "layoutFiledList": [
+            {
+              "_token": "22bc7380d03b3c21a825cf889c8ca50a",
+              "objectVersionNumber": 1,
+              "filedId": "dc5f17677d594706883c1fc351fb35ed",
+              "layoutId": "1",
+              "configId": "f9b7ca36be6c4ca4986f14f6d72f98cf",
+              "filedCode": "nextBtn",
+              "filedName": "继续",
+              "defaultValue": null,
+              "filedType": "OTHES",
+              "inputType": "text",
+              "placeholder": null,
+              "filedOrder": "5",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            }
+          ]
+        },
+        {
+          "_token": "c808f1b7a50693668269ffa2096d6424",
+          "objectVersionNumber": null,
+          "configId": "5c95cde581a64f42a86900712c53502a",
+          "layoutId": "1",
+          "configCode": "BottomTab",
+          "configName": "底部按钮",
+          "configType": "BottomTab",
+          "configOrder": "45",
+          "tabFlag": "N",
+          "tabConfigId": null,
+          "tabFiledId": null,
+          "cssClass": "btn-button",
+          "enableFlag": "Y",
+          "hideForm": false,
+          "tabConfigCode": null,
+          "tabFiledCode": null,
+          "tabFiledName": null,
+          "layoutFiledList": [
+            {
+              "_token": "c82b9adf192fe280a9db69ec936669f2",
+              "objectVersionNumber": 2,
+              "filedId": "3d7ba60e16594e1fb170790d166c8bb1",
+              "layoutId": "1",
+              "configId": "5c95cde581a64f42a86900712c53502a",
+              "filedCode": "save",
+              "filedName": "保存",
+              "defaultValue": null,
+              "filedType": "OTHES",
+              "inputType": "text",
+              "placeholder": null,
+              "filedOrder": "1",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": "save-btn"
+            },
+            {
+              "_token": "af813e63b3f61b59b2514e86fa744458",
+              "objectVersionNumber": 1,
+              "filedId": "f64a1e6b0c834f5fa0db15e999e84eb0",
+              "layoutId": "1",
+              "configId": "5c95cde581a64f42a86900712c53502a",
+              "filedCode": "submit",
+              "filedName": "提交",
+              "defaultValue": null,
+              "filedType": "OTHES",
+              "inputType": "text",
+              "placeholder": null,
+              "filedOrder": "2",
+              "inputMode": "other",
+              "leftIcon": null,
+              "rightIcon": null,
+              "format": "N",
+              "proportion": "1,2",
+              "showName": true,
+              "showContent": true,
+              "showArrow": false,
+              "hasBorder": true,
+              "filedHeight": 45,
+              "enableFlag": "Y",
+              "tabContent": null,
+              "btnContent": null,
+              "cssClass": null
+            }
+          ]
+        }
+      ]
+    }
+  ]
--- a/src/pages/radioTest.vue
+++ b/src/pages/radioTest.vue
+/**
+* @Author think
+* @Date 2019-07-10 14:04
+*/
+<template>
+  <h-view title="CheckBox">
+    <h-content>
+      <list-item>
+        <item>
+          <section slot="name">注册国家</section>
+          <radio-group slot="content" v-model="radioValue">
+            <h-radio :checked="true" name="China" title="中国"/>
+            <h-radio :disable="true" name="Japan" title="日本"/>
+            <h-radio name="Other" title="其他"/>
+          </radio-group>
+        </item>
+      </list-item>
+      <radio-group v-model="radioValue">
+        <h-radio name="China" title="中国"/>
+        <h-radio :checked="true" :disable="true" name="Japan" title="日本"/>
+        <h-radio name="Other" title="其他"/>
+      </radio-group>
+      <list-item>
+        <item>
+          <h-check slot="left-icon" v-model="checkValue"/>
+          <section slot="content">CheckBox</section>
+        </item>
+        <item>
+          <div slot="name">switch滑块切换框</div>
+          <div slot="content"><h-switch v-model="switchValue"/></div>
+        </item>
+      </list-item>
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {
+  name: 'RadioTest',
+  data () {
+    return {
+      radioValue: 'Japan',
+      checkValue: false,
+      switchValue: false,
+    }
+  },
+  watch: {
+    radioValue (value) {
+      console.log(value)
+    },
+  },
+  methods: {},
+}
+</script>
+<style scoped lang="less">
+  .hls-list-item {
+    .hls-item {
+      .radio-group {
+        display: flex;
+        .h-radio {
+          margin-right: 5px;
+        }
+      }
+    }
+  }
+</style>
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,6 +5,9 @@ import Home from '@/pages/home'
 // test工具类
 import HlsPopup from '@/pages/hlsPopup'
+import Radio from '@/pages/radioTest'
+import HFile from '@/pages/fileTest'
+import Form from '@/pages/form'
 Vue.use(Router)
@@ -14,9 +17,12 @@ export default new Router({
      path: '/',
      redirect: '/home',
    },
-    {path: '/home', component: Home, name: 'Home', meta: {keepAlive: true}},
+    {path: '/home', component: Home, name: 'Home', meta: {keepAlive: false}},
    // test工具类
    {path: '/hls-popup', component: HlsPopup, name: 'HlsPopup', meta: {keepAlive: false}},
+    {path: '/Radio', component: Radio, name: 'Radio', meta: {keepAlive: true}},
+    {path: '/HFile', component: HFile, name: 'HFile', meta: {keepAlive: true}},
+    {path: '/Form', component: Form, name: 'Form', meta: {keepAlive: true}}
  ],
  scrollBehavior (to, from, savedPosition) {
    if (to.hash) {

--- a/src/scripts/directives.js
+++ b/src/scripts/directives.js
+import Autosize from 'autosize'
+function vueTouch (el, binding, type) {
+  var _this = this
+  this.obj = el
+  this.binding = binding
+  this.touchType = type
+  this.vueTouches = {x: 0, y: 0}
+  this.vueMoves = true
+  this.vueLeave = true
+  this.longTouch = true
+  this.vueCallBack = typeof (binding.value) === 'object' ? binding.value.fn : binding.value
+  this.obj.addEventListener('touchstart', function (e) {
+    _this.start(e)
+  }, false)
+  this.obj.addEventListener('touchend', function (e) {
+    _this.end(e)
+  }, false)
+  this.obj.addEventListener('touchmove', function (e) {
+    _this.move(e)
+  }, false)
+};
+vueTouch.prototype = {
+  start: function (e) {
+    this.vueMoves = true
+    this.vueLeave = true
+    this.longTouch = true
+    this.vueTouches = {x: e.changedTouches[0].pageX, y: e.changedTouches[0].pageY}
+    this.time = setTimeout(function () {
+      if (this.vueLeave && this.vueMoves) {
+        this.touchType === 'longtap' && this.vueCallBack(this.binding.value, e)
+        this.longTouch = false
+      }
+    }.bind(this), 1000)
+  },
+  end: function (e) {
+    var disX = e.changedTouches[0].pageX - this.vueTouches.x
+    var disY = e.changedTouches[0].pageY - this.vueTouches.y
+    clearTimeout(this.time)
+    if (Math.abs(disX) > 100 || Math.abs(disY) > 100) {
+      this.touchType === 'swipe' && this.vueCallBack(this.binding.value, e)
+      if (Math.abs(disX) > Math.abs(disY)) {
+        if (disX > 100) {
+          this.touchType === 'swiperight' && this.vueCallBack(this.binding.value, e)
+        }
+        if (disX < -100) {
+          this.touchType === 'swipeleft' && this.vueCallBack(this.binding.value, e)
+        }
+      } else {
+        if (disY > 100) {
+          this.touchType === 'swipedown' && this.vueCallBack(this.binding.value, e)
+        }
+        if (disY < -100) {
+          this.touchType === 'swipeup' && this.vueCallBack(this.binding.value, e)
+        }
+      }
+    } else {
+      if (this.longTouch && this.vueMoves) {
+        this.touchType === 'tap' && this.vueCallBack(this.binding.value, e)
+        this.vueLeave = false
+      }
+    }
+  },
+  move: function (e) {
+    this.vueMoves = false
+  },
+} // prop.autosize
+export default (Vue) => {
+  Vue.directive('focus', {
+    // 自动获取鼠标焦点
+    inserted: function (el) {
+      el.focus()
+    },
+  })
+  Vue.directive('tap', {// 点击事件
+    bind: function (el, binding) {
+      new vueTouch(el, binding, 'tap') // eslint-disable-line
+    },
+  })
+  Vue.directive('swipe', {// 滑动事件
+    bind: function (el, binding) {
+      new vueTouch(el, binding, 'swipe') // eslint-disable-line
+    },
+  })
+  Vue.directive('swipeleft', {// 左滑事件
+    bind: function (el, binding) {
+      new vueTouch(el, binding, 'swipeleft') // eslint-disable-line
+    },
+  })
+  Vue.directive('swiperight', {// 右滑事件
+    bind: function (el, binding) {
+      new vueTouch(el, binding, 'swiperight') // eslint-disable-line
+    },
+  })
+  Vue.directive('swipedown', {// 下滑事件
+    bind: function (el, binding) {
+      new vueTouch(el, binding, 'swipedown') // eslint-disable-line
+    },
+  })
+  Vue.directive('swipeup', {// 上滑事件
+    bind: function (el, binding) {
+      new vueTouch(el, binding, 'swipeup') // eslint-disable-line
+    },
+  })
+  Vue.directive('longtap', {// 长按事件
+    bind: function (el, binding) {
+      new vueTouch(el, binding, 'longtap') // eslint-disable-line
+    },
+  })
+  Vue.directive('hlsImgZoom', {
+    componentUpdated: function (element) {
+      var elWidth, elHeight
+      // mode : 'pinch' or 'swipe'
+      var mode = ''
+      // distance between two touche points (mode : 'pinch')
+      var distance = 0
+      var initialDistance = 0
+      // image scaling
+      var scale = 1
+      var relativeScale = 1
+      var initialScale = 1
+      var maxScale = 5
+      if (isNaN(maxScale) || maxScale <= 1) {
+        maxScale = 3
+      }
+      // position of the upper left corner of the element
+      var positionX = 0
+      var positionY = 0
+      var initialPositionX = 0
+      var initialPositionY = 0
+      // central origin (mode : 'pinch')
+      var originX = 0
+      var originY = 0
+      // start coordinate and amount of movement (mode : 'swipe')
+      var startX = 0
+      var startY = 0
+      var moveX = 0
+      var moveY = 0
+      var image = new Image()
+      image.onload = function () {
+        elWidth = element.clientWidth
+        elHeight = element.clientHeight
+        element.style.webkitTransformOrigin = '0px 0px 0px'
+        element.style.transformOrigin = '0px 0px 0px'
+        element.addEventListener('touchstart', touchstartHandler)
+        element.addEventListener('touchmove', touchmoveHandler)
+        element.addEventListener('touchend', touchendHandler)
+      }
+      image.src = element.src
+      /**
+       * @param {object} evt
+       */
+      function touchstartHandler (evt) {
+        var touches = evt.originalEvent ? evt.originalEvent.touches : evt.touches
+        startX = touches[0].clientX
+        startY = touches[0].clientY
+        initialPositionX = positionX
+        initialPositionY = positionY
+        moveX = 0
+        moveY = 0
+      }
+      /**
+       * @param {object} evt
+       */
+      function touchmoveHandler (evt) {
+        var touches = evt.originalEvent ? evt.originalEvent.touches : evt.touches
+        if (mode === '') {
+          if (touches.length === 1 && scale > 1) {
+            mode = 'swipe'
+          } else if (touches.length === 2) {
+            mode = 'pinch'
+            initialScale = scale
+            initialDistance = getDistance(touches)
+            originX = touches[0].clientX -
+              parseInt((touches[0].clientX - touches[1].clientX) / 2, 10) -
+              element.offsetLeft - initialPositionX
+            originY = touches[0].clientY -
+              parseInt((touches[0].clientY - touches[1].clientY) / 2, 10) -
+              element.offsetTop - initialPositionY
+          }
+        }
+        if (mode === 'swipe') {
+          evt.preventDefault()
+          moveX = touches[0].clientX - startX
+          moveY = touches[0].clientY - startY
+          positionX = initialPositionX + moveX
+          positionY = initialPositionY + moveY
+          transformElement()
+        } else if (mode === 'pinch') {
+          evt.preventDefault()
+          distance = getDistance(touches)
+          relativeScale = distance / initialDistance
+          scale = relativeScale * initialScale
+          positionX = originX * (1 - relativeScale) + initialPositionX + moveX
+          positionY = originY * (1 - relativeScale) + initialPositionY + moveY
+          transformElement()
+        }
+      }
+      /**
+       * @param {object} evt
+       */
+      function touchendHandler (evt) {
+        var touches = evt.originalEvent ? evt.originalEvent.touches : evt.touches
+        if (mode === '' || touches.length > 0) {
+          return
+        }
+        if (scale < 1) {
+          scale = 1
+          positionX = 0
+          positionY = 0
+        } else if (scale > maxScale) {
+          scale = maxScale
+          relativeScale = scale / initialScale
+          positionX = originX * (1 - relativeScale) + initialPositionX + moveX
+          positionY = originY * (1 - relativeScale) + initialPositionY + moveY
+        } else {
+          if (positionX > 0) {
+            positionX = 0
+          } else if (positionX < elWidth * (1 - scale)) {
+            positionX = elWidth * (1 - scale)
+          }
+          if (positionY > 0) {
+            positionY = 0
+          } else if (positionY < elHeight * (1 - scale)) {
+            positionY = elHeight * (1 - scale)
+          }
+        }
+        transformElement(0.1)
+        mode = ''
+      }
+      /**
+       * @param {Array} touches
+       * @return {number}
+       */
+      function getDistance (touches) {
+        var d = Math.sqrt(Math.pow(touches[0].clientX - touches[1].clientX, 2) +
+          Math.pow(touches[0].clientY - touches[1].clientY, 2))
+        return parseInt(d, 10)
+      }
+      /**
+       * @param {number} [duration]
+       */
+      function transformElement (duration) {
+        var transition = duration ? 'all cubic-bezier(0,0,.5,1) ' + duration + 's' : ''
+        var matrixArray = [scale, 0, 0, scale, positionX, positionY]
+        var matrix = 'matrix(' + matrixArray.join(',') + ')'
+        element.style.webkitTransition = transition
+        element.style.transition = transition
+        element.style.webkitTransform = matrix + ' translate3d(0,0,0)'
+        element.style.transform = matrix + ' translate3d(0,0,0)'
+      }
+    },
+  })
+  Vue.directive('keyboardAttach', {// 监听键盘
+    inserted: function (el, binding) {
+      let KEYBOARD_OPEN_CSS = 'foot-keyboard-open'
+      function keyboardHeight () {
+        let innerHeight = window.innerHeight
+        let innerWidth = window.innerWidth
+        if (vum.Platform.isIOS()) {
+          if (!vum.Platform.isWebView()) {
+            return 266
+          }
+          if (innerWidth >= 375 && innerHeight >= 812) {
+            return 330
+          }
+          return 300
+        } else {
+          return 275
+        }
+      }
+      let height = keyboardHeight()
+      function hasClass (element, csName) {
+        return element.className.match(RegExp('(\\s|^)' + csName + '(\\s|$)'))
+      }
+      function addClass (element, csName) {
+        if (!hasClass(element, csName)) {
+          element.className += ' ' + csName
+        }
+        element.style.marginBottom = height + 'px'
+      }
+      function removeClass (element, csName) {
+        if (hasClass(element, csName)) {
+          element.classList.remove(csName)
+        }
+        element.style.marginBottom = 0 + 'px'
+      }
+      window.addEventListener('native.keyboardshow', function (e) {
+        addClass(el, KEYBOARD_OPEN_CSS)
+      })
+      window.addEventListener('native.keyboardhide', function (e) {
+        removeClass(el, KEYBOARD_OPEN_CSS)
+      })
+    },
+    unbind: function (el, binding) {
+      let KEYBOARD_OPEN_CSS = 'foot-keyboard-open'
+      function hasClass (element, csName) {
+        return element.className.match(RegExp('(\\s|^)' + csName + '(\\s|$)'))
+      }
+      function removeClass (element, csName) {
+        if (hasClass(element, csName)) {
+          element.classList.remove(csName)
+        }
+        element.style.marginBottom = 0 + 'px'
+      }
+      removeClass(el, KEYBOARD_OPEN_CSS)
+      window.removeEventListener('native.keyboardshow', function (e) {
+      })
+      window.removeEventListener('native.keyboardhide', function (e) {
+      })
+    },
+  })
+  Vue.directive('autoSize', {
+    bind: function (el, binding) {
+      if (el.nodeName === 'TEXTAREA') {
+        Autosize(el)
+      }
+      el.addEventListener('oninput', function (e) {
+        Autosize.update(el)
+      })
+    },
+    unbind: function (el, binding) {
+      Autosize.update(el)
+      Autosize.destroy(el)
+      el.removeEventListener('oninput', function (e) {
+      })
+    },
+  })
+}
--- a/src/scripts/filter.js
+++ b/src/scripts/filter.js
+export default (Vue) => {
+  Vue.filter('currency', function (val) {
+    if (!val) return '0.00'
+    var intPart = Number(val).toFixed(0) // 获取整数部分
+    var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
+    var floatPart = '.00' // 预定义小数部分
+    var value2Array = (val + '').split('.')
+    // =2表示数据有小数位
+    if (value2Array.length === 2) {
+      floatPart = value2Array[1].toString() // 拿到小数部分
+      if (floatPart.length === 1) { // 补0,实际上用不着
+        return intPartFormat + '.' + floatPart + '0'
+      } else {
+        return intPartFormat + '.' + floatPart
+      }
+    } else {
+      return intPartFormat + floatPart
+    }
+  })
+  Vue.filter('uncurrency', function (val) {
+    if (!val) return null
+    return Number((val).replace(/,/gi, ''))
+  })
+  Vue.filter('datetime', timestamp => {
+    function format (number) {
+      return number.toString().padStart(2, '0')
+    }
+    const date = new Date(Number.parseInt(timestamp, 10))
+    const YYYY = date.getFullYear()
+    const MM = date.getMonth() + 1
+    const DD = date.getDate()
+    const hh = date.getHours()
+    const mm = date.getMinutes()
+    const ss = date.getSeconds()
+    return `${YYYY}-${format(MM)}-${format(DD)} ${format(hh)}:${format(mm)}:${format(ss)}`
+  })
+}
--- a/src/scripts/hlsHttp.js
+++ b/src/scripts/hlsHttp.js
+// 引入axios
+import axios from 'axios'
+import hlsPopup from './hlsPopup'
+let promiseArr = {}
+let cancel = {}
+const CancelToken = axios.CancelToken
+// 请求拦截器
+axios.interceptors.request.use(config => {
+  // 发起请求时，取消掉当前正在进行的相同请求
+  config.cancelToken = new CancelToken(c => {
+    cancel = c
+  })
+  if (promiseArr[config.url]) {
+    promiseArr[config.url]('操作取消')
+    promiseArr[config.url] = cancel
+  } else {
+    promiseArr[config.url] = cancel
+  }
+  return config
+}, error => {
+  return Promise.reject(error)
+})
+// 响应拦截器即异常处理
+axios.interceptors.response.use(response => {
+  if ($config.debug) {
+    let postName = 'post'
+    console.log(postName + ' success')
+    console.log(postName + ' response ' + JSON.stringify(response.data, '', 2))
+    console.log(postName + ' End!')
+  }
+  if (response.data.result === 'E' || response.data.code === 'E') {
+    hlsPopup.hideLoading()
+    const err = {}
+    err.message = response.data.message
+    hlsPopup.showError(err.message)
+    return Promise.resolve(err)
+  } else {
+    return response.data
+  }
+}, err => {
+  if (err && err.response) {
+    switch (err.response.status) {
+      case 400:
+        err.message = '错误请求'
+        break
+      case 401:
+        err.message = '登录已失效，请重新登录'
+        break
+      case 403:
+        err.message = '拒绝访问'
+        break
+      case 404:
+        err.message = '请求错误,未找到该资源'
+        break
+      case 405:
+        err.message = '不支持的请求类型'
+        break
+      case 408:
+        err.message = '请求超时'
+        break
+      case 500:
+        err.message = '服务器端出错'
+        break
+      case 501:
+        err.message = '网络未实现'
+        break
+      case 502:
+        err.message = '网络错误'
+        break
+      case 503:
+        err.message = '服务不可用'
+        break
+      case 504:
+        err.message = '网络超时'
+        break
+      case 505:
+        err.message = 'http版本不支持该请求'
+        break
+      default:
+        err.message = `连接错误${err.response.status}`
+    }
+  } else {
+    err.message = '连接到服务器失败'
+  }
+  if (err.response && err.response.status === 401) {
+    hlsPopup.hideLoading()
+    hlsPopup.showPopup({
+      title: '登录失效，重新登录',
+      onConfirm: () => {
+      },
+    })
+  } else {
+    hlsPopup.hideLoading()
+    hlsPopup.showError(err.message)
+  }
+  return Promise.resolve(err)
+})
+axios.defaults.baseURL = ''
+axios.defaults.timeout = 10000
+// get请求
+export function get (url) {
+  let param = {}
+  let headers = {}
+  if (window.localStorage.access_token) {
+    headers = {
+      'Content-Type': 'application/json',
+      'Authorization': 'Bearer ' + window.localStorage.access_token,
+    }
+  } else {
+    headers = {
+      'Content-Type': 'application/json',
+    }
+  }
+  if ($config.debug) {
+    let postName = 'GET'
+    console.log(postName + ' Start!')
+    console.log(postName + ' url ' + url)
+  }
+  return new Promise((resolve, reject) => {
+    axios({
+      method: 'get',
+      url,
+      headers: headers,
+      params: param,
+    }).then(res => {
+      resolve(res)
+    }).catch(err => {
+      reject(err)
+    })
+  })
+}
+// post请求
+export function post (url, param) {
+  param.user_id = window.localStorage.user_id
+  param.access_token = window.localStorage.access_token
+  let headers = {}
+  if (window.localStorage.access_token) {
+    headers = {
+      'Content-Type': 'application/json',
+      'Authorization': 'Bearer ' + window.localStorage.access_token,
+    }
+  } else {
+    headers = {
+      'Content-Type': 'application/json',
+    }
+  }
+  if ($config.debug) {
+    let postName = 'POST'
+    console.log(postName + ' Start!')
+    console.log(postName + ' url ' + url)
+    console.log(postName + ' parameter ' + JSON.stringify(param, '', 2))
+  }
+  return new Promise((resolve, reject) => {
+    axios({
+      method: 'post',
+      headers: headers,
+      url,
+      data: param,
+    }).then(res => {
+      resolve(res)
+    }).catch(err => {
+      reject(err)
+    })
+  })
+}
--- a/src/scripts/hlsPopup.js
+++ b/src/scripts/hlsPopup.js
+import Vue from 'vue'
+import {ToastPlugin, AlertPlugin, ConfirmPlugin, LoadingPlugin, DatetimePlugin} from 'vux'
+import {ActionSheetPlugin, ShowPicturePlugin, SelectPlugin, NotifyPlugin, NumberKeyboardPlugin} from '../../packages/index'
+Vue.use(ToastPlugin)
+Vue.use(AlertPlugin)
+Vue.use(ConfirmPlugin)
+Vue.use(LoadingPlugin)
+Vue.use(DatetimePlugin)
+Vue.use(ActionSheetPlugin)
+Vue.use(ShowPicturePlugin)
+Vue.use(SelectPlugin)
+Vue.use(NumberKeyboardPlugin)
+Vue.use(NotifyPlugin)
+export default {
+  isLoading: false,
+  SHOW_TIMES: 2000,
+  IS_SHOW_MASK: true,
+  /**
+   * 锁屏函数 超过10s后自动解屏用于防止屏幕锁死
+   * 自动截屏成弹出错误提示框
+   * @param content 锁屏内容
+   */
+  showLoading: function (content) {
+    let vm = this
+    Vue.$vux.loading.show({
+      text: content || 'Loading',
+    })
+    this.isLoading = true
+    // 10s后自动解屏用于防止屏幕锁死
+    setTimeout(() => {
+      if (vm.isLoading) {
+        Vue.$vux.loading.hide()
+        vm.isLoading = false
+        // 弹出操作失败
+        /* Vue.$vux.toast.show({
+          text: '操作失败',
+          type: 'warn',
+          time: vm.SHOW_TIMES,
+          isShowMask: vm.IS_SHOW_MASK,
+          position: 'middle',
+        }) */
+      }
+    }, 10000)
+  },
+  /**
+   * 隐藏
+   */
+  hideLoading: function () {
+    Vue.$vux.loading.hide()
+    this.isLoading = false
+  },
+  /**
+   * 长时间顶部提示toast
+   * @param content
+   */
+  showLongTop: function (content) {
+    let vm = this
+    let text = content || '操作失败'
+    Vue.$vux.toast.show({
+      text: text,
+      type: 'text',
+      time: vm.SHOW_TIMES,
+      isShowMask: vm.IS_SHOW_MASK,
+      position: 'top',
+    })
+  },
+  /**
+   * 长时间中部提示toast
+   * @param content
+   */
+  showLongCenter: function (content) {
+    let vm = this
+    let text = content || '操作失败'
+    Vue.$vux.toast.show({
+      text: text,
+      type: 'text',
+      time: vm.SHOW_TIMES,
+      isShowMask: vm.IS_SHOW_MASK,
+      position: 'middle',
+    })
+  },
+  /**
+   * 长时间中部提示toast
+   * @param content
+   */
+  showLongBottom: function (content) {
+    let vm = this
+    let text = content || '操作失败'
+    Vue.$vux.toast.show({
+      text: text,
+      time: vm.SHOW_TIMES,
+      type: 'text',
+      isShowMask: vm.IS_SHOW_MASK,
+      position: 'bottom',
+    })
+  },
+  /**
+   * 成功提示框
+   * @param content
+   */
+  showSuccess: function (content) {
+    let vm = this
+    Vue.$vux.toast.show({
+      text: content || '操作成功',
+      time: vm.SHOW_TIMES,
+      isShowMask: vm.IS_SHOW_MASK,
+      type: 'success',
+      position: 'middle',
+    })
+  },
+  /**
+   * 成功提示框
+   * @param content
+   */
+  showError: function (content) {
+    let vm = this
+    Vue.$vux.toast.show({
+      text: content || '操作失败',
+      type: 'warn',
+      isShowMask: vm.IS_SHOW_MASK,
+      time: vm.SHOW_TIMES,
+      position: 'middle',
+    })
+  },
+  /**
+   * 弹出是否确认的窗口
+   * @param confirmObject.title 标题
+   * @param confirmObject.content 内容
+   * @param confirmObject.onConfirm 确定函数
+   */
+  showConfirm: function (confirmObject) {
+    let def = {
+      title: confirmObject.title || '提示',
+      content: confirmObject.content || '',
+      confirmText: '确定',
+      cancelText: '取消',
+      onConfirm: () => {
+        confirmObject.onConfirm(1)
+      },
+      onCancel: () => {
+        confirmObject.onConfirm(0)
+      },
+    }
+    Vue.$vux.confirm.show(def)
+  },
+  /*
+   * 弹出确认的窗口
+   * @param confirmObject.title 标题
+   * @param confirmObject.content 内容
+   * @param confirmObject.onConfirm 确定函数
+   *
+   */
+  showPopup: function (confirmObject) {
+    let def = {
+      title: confirmObject.title || '提示',
+      content: confirmObject.content || '',
+      confirmText: '确定',
+      showCancelButton: false,
+      onConfirm: () => {
+        confirmObject.onConfirm()
+      },
+    }
+    Vue.$vux.confirm.show(def)
+  },
+  /**
+   * @param actionObject.titleText 弹出框的标题可空
+   * @param actionObject.callback 点击按钮的回调函数 回传buttonArray数组下标
+   * @param actionObject.buttonArray 按钮数组支持[string,string],[object,object],
+   *        当为后一种是 object为{text:'拍照',type:'primary'},type支持 primary,warn,disabled
+   *
+   *  {
+   *      titleText: '照片',
+   *      buttonArray: [{text:'拍照',type:'warn'}, {text:'从相册取',type:'primary'}],
+   *      callback: (index) => {
+   *        alert(index);
+   *      }
+   *   }
+   *
+   *    {
+   *      buttonArray: ['拍照','从相册取'],
+   *      callback: (index) => {
+   *        alert(index);
+   *      }
+   *   }
+   *
+   */
+  showActionSheet: function (actionObject) {
+    if (typeof actionObject === 'object') {
+      let buttons = []
+      for (let i = 0; i < actionObject.buttonArray.length; i++) {
+        if (typeof actionObject.buttonArray[i] === 'object') {
+          buttons.push({
+            text: actionObject.buttonArray[i].text,
+            type: actionObject.buttonArray[i].type,
+            callback: actionObject.callback,
+          })
+        } else {
+          buttons.push({
+            text: actionObject.buttonArray[i],
+            callback: actionObject.callback,
+          })
+        }
+      }
+      ActionSheetPlugin.show({
+        title: actionObject.titleText || '',
+        buttons: buttons,
+      })
+    }
+  },
+  /**
+   * 时间选择函数
+   * @param timeObject.nowDate 当前展示的时间 可不填
+   * @param timeObject.format 时间格式支持不支持秒
+   * @param timeObject.callback 点击确定的回调函数
+   *
+   */
+  showTime: function (timeObject) {
+    let date = new Date().format('yyyy-MM-dd')
+    let format = 'YYYY-MM-DD'
+    if (timeObject.nowDate) {
+      date = timeObject.nowDate
+    }
+    if (timeObject.format) {
+      format = timeObject.format || 'YYYY-MM-DD'
+    }
+    Vue.$vux.datetime.show({
+      cancelText: '取消',
+      confirmText: '确定',
+      minYear: '1900',
+      maxYear: '2200',
+      format: format,
+      value: date,
+      onConfirm (val) {
+        timeObject.callback(val)
+      },
+    })
+  },
+  /**
+   * 图片放大预览
+   * @param imgObject.imgUrl
+   */
+  showBigPicture: function (imgObject) {
+    if (typeof imgObject === 'object') {
+      ShowPicturePlugin.show({
+        imgUrl: imgObject.imgUrl,
+        width: imgObject.width,
+        imgList: imgObject.imgList || [],
+        startPosition: imgObject.startPosition,
+      })
+    }
+  },
+  /**
+   * 下拉框 支持级联操作 需指定 parent 属性
+   * @param selectOption.list Array [{"code": "NP","code_name": "个人"}]
+   * @param selectOption.code String "bp_type"
+   * @param selectOption.object Object 当前数据对象
+   * @param selectOption.returnItem function 回调函数返回index与object
+   * var bp_class_list = [
+   *    {
+   *      "code": "NP",
+   *      "code_name": "个人"
+   *    },{
+   *       "code": "NP1",
+   *       "code_name": "个人1"
+   *     }];
+   *  hlsPopup.selectList({
+   *     list: bp_class_list,
+   *     code: 'bp_type',
+   *     object: {},
+   *     returnItem: function (index, obj) {
+   *        console.log(obj)
+   *      }
+   *   })
+   *
+   */
+  selectList: function (selectOption) {
+    if (typeof selectOption === 'object') {
+      let list = []
+      let length = selectOption.list.length
+      vum.forEach(selectOption.list, function (date, index, array) {
+        list.push({
+          value: date.code,
+          name: date.code_name,
+          parent: date.parent,
+        })
+        if (index === (length - 1)) {
+          SelectPlugin.show({
+            list: list,
+            callBack: selectOption.returnItem,
+            code: selectOption.code,
+            object: selectOption.object,
+          })
+        }
+      })
+    }
+  },
+  /**
+   * 弹出数字键盘
+   * @param keyboardObject.title 键盘的title
+   * @param keyboardObject.closeButtonText 键盘的关闭按钮文字
+   * @param keyboardObject.keyDown 普通按键按下去事件
+   * @param keyboardObject.keyDelete 删除按键按下去事件
+   */
+  showNumberKeyborad: function (keyboardObject) {
+    if (typeof keyboardObject === 'object') {
+      NumberKeyboardPlugin.show({
+        title: keyboardObject.title,
+        closeButtonText: keyboardObject.closeButtonText,
+        extraKey: keyboardObject.extraKey || '.',
+        keyDown: function (text) {
+          keyboardObject.keyDown(text)
+        },
+        keyDelete: function () {
+          keyboardObject.keyDelete()
+          // console.log('delete')
+        },
+      })
+    }
+  },
+  /**
+   * 弹出Notify
+   * @param notifyObject.content 内容
+   * @param notifyObject.position 位置
+   * @param notifyObject.time 显示时长
+   * @param notifyObject.type 类型  success warning default
+   */
+  showNotify: function (notifyObject) {
+    if (typeof notifyObject === 'object') {
+      NotifyPlugin.show({
+        show: true,
+        content: notifyObject.content,
+        position: notifyObject.position || 'top',
+        time: notifyObject.time || 3000,
+        type: notifyObject.type || 'default',
+      })
+    }
+  },
+}
--- a/src/scripts/hlsUtil.js
+++ b/src/scripts/hlsUtil.js
+export default {
+  city: {
+    11: '北京',
+    12: '天津',
+    13: '河北',
+    14: '山西',
+    15: '内蒙古',
+    21: '辽宁',
+    22: '吉林',
+    23: '黑龙江',
+    31: '上海',
+    32: '江苏',
+    33: '浙江',
+    34: '安徽',
+    35: '福建',
+    36: '江西',
+    37: '山东',
+    41: '河南',
+    42: '湖北',
+    43: '湖南',
+    44: '广东',
+    45: '广西',
+    46: '海南',
+    50: '重庆',
+    51: '四川',
+    52: '贵州',
+    53: '云南',
+    54: '西藏',
+    61: '陕西',
+    62: '甘肃',
+    63: '青海',
+    64: '宁夏',
+    65: '新疆',
+    71: '台湾',
+    81: '香港',
+    82: '澳门',
+    91: '国外',
+  },
+  // 检查号码是否符合规范，包括长度，类型
+  isCardNo (card) {
+    // 身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+    card = card.toUpperCase()
+    let reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+    return reg.test(card)
+  },
+  // 取身份证前两位,校验省份
+  checkProvince: function (card) {
+    card = card.toUpperCase()
+    let province = card.substr(0, 2)
+    if (this.city[province] === undefined) {
+      return false
+    }
+    return true
+  },
+  // 检查生日是否正确
+  checkBirthday: function (card) {
+    card = card.toUpperCase()
+    let len = card.length
+    let arrData
+    let year
+    let month
+    let day
+    let birthday
+    // 身份证15位时，次序为省（3位）市（3位）年（2位）月（2位）日（2位）校验位（3位），皆为数字
+    if (len === 15) {
+      let reFifteen = /^(\d{6})(\d{2})(\d{2})(\d{2})(\d{3})$/
+      arrData = card.match(reFifteen)
+      year = arrData[2]
+      month = arrData[3]
+      day = arrData[4]
+      birthday = new Date('19' + year + '/' + month + '/' + day)
+      return this.verifyBirthday('19' + year, month, day, birthday)
+    }
+    // 身份证18位时，次序为省（3位）市（3位）年（4位）月（2位）日（2位）校验位（4位），校验位末尾可能为X
+    if (len === 18) {
+      let reEighteen = /^(\d{6})(\d{4})(\d{2})(\d{2})(\d{3})([0-9]|X)$/
+      arrData = card.match(reEighteen)
+      year = arrData[2]
+      month = arrData[3]
+      day = arrData[4]
+      birthday = new Date(year + '/' + month + '/' + day)
+      return this.verifyBirthday(year, month, day, birthday)
+    }
+    return false
+  },
+  // 校验日期
+  verifyBirthday: function (year, month, day, birthday) {
+    // 年月日是否合理
+    return (birthday.getFullYear().toString() === year && ((birthday.getMonth() + 1) < 10 ? '0' + (birthday.getMonth() + 1) : (birthday.getMonth() + 1).toString()) === month &&
+      ((birthday.getDate()) < 10 ? '0' + (birthday.getDate()).toString() : birthday.getDate().toString()) === day)
+  },
+  // 校验位的检测
+  checkParity (card) {
+    // 15位转18位
+    card = this.changeFivteenToEighteen(card)
+    var len = card.length
+    if (len === 18) {
+      let arrInt = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2)
+      let arrCh = new Array('1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2')
+      let cardTemp = 0
+      for (let i = 0; i < 17; i++) {
+        cardTemp += card.substr(i, 1) * arrInt[i]
+      }
+      let valnum = arrCh[cardTemp % 11]
+      if (valnum === card.substr(17, 1)) {
+        return true
+      }
+      return false
+    }
+    return false
+  },
+  // 15位转18位身份证号
+  changeFivteenToEighteen (card) {
+    if (card.length === 15) {
+      let arrInt = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2)
+      let arrCh = new Array('1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2')
+      let cardTemp = 0
+      card = card.substr(0, 6) + '19' + card.substr(6, card.length - 6)
+      for (let i = 0; i < 17; i++) {
+        cardTemp += card.substr(i, 1) * arrInt[i]
+      }
+      card += arrCh[cardTemp % 11]
+      return card
+    }
+    return card
+  },
+  /**
+   * 检验身份证号码
+   */
+  isCardID (card) {
+    card = card.toUpperCase()
+    if (this.isCardNo(card) === false) {
+      return '你输入的身份证长度或格式错误'
+    }
+    // 检查省份
+    if (this.checkProvince(card) === false) {
+      return '你的身份证地区非法'
+    }
+    // 校验生日
+    if (this.checkBirthday(card) === false) {
+      return '身份证上的出生日期非法'
+    }
+    // 检验位的检测
+    if (this.checkParity(card) === false) {
+      return '你输入的身份证号非法'
+    }
+    return ''
+  },
+  // 银行卡号校验
+  isBankAccount: function (bankno) {
+    if (bankno.length < 16 || bankno.length > 19) {
+      /* 银行卡号长度必须在16到19之间 */
+      return '银行卡号长度必须在16到19之间'
+    }
+    let num = /^\d*$/// 全数字
+    if (!num.exec(bankno)) {
+      /* 银行卡号必须全为数字 */
+      return '银行卡号必须全为数字'
+    }
+    var strBin = '10,18,30,35,37,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,58,60,62,65,68,69,84,87,88,94,95,98,99'
+    if (strBin.indexOf(bankno.substring(0, 2)) === -1) {
+      /* 银行卡号开头6位不符合规范 */
+      return '银行卡号开头6位不符合规范'
+    }
+    // Luhn校验
+    if (!this.luhnCheck(bankno)) {
+      return '银行卡号有误，请从新输入'
+    }
+    // return true;
+  },
+  luhnCheck: function (bankno) {
+    let lastNum = bankno.substr(bankno.length - 1, 1)// 取出最后一位（与luhn进行比较）
+    let first15Num = bankno.substr(0, bankno.length - 1)// 前15或18位
+    let newArr = []
+    for (let i = first15Num.length - 1; i > -1; i--) { // 前15或18位倒序存进数组
+      newArr.push(first15Num.substr(i, 1))
+    }
+    let arrJiShu = [] // 奇数位*2的积 <9
+    let arrJiShu2 = [] // 奇数位*2的积 >9
+    let arrOuShu = [] // 偶数位数组
+    for (let j = 0; j < newArr.length; j++) {
+      if ((j + 1) % 2 === 1) { // 奇数位
+        if (parseInt(newArr[j]) * 2 < 9) { arrJiShu.push(parseInt(newArr[j]) * 2) } else { arrJiShu2.push(parseInt(newArr[j]) * 2) }
+      } else { arrOuShu.push(newArr[j]) }
+    }
+    let jishuChild1 = []// 奇数位*2 >9 的分割之后的数组个位数
+    let jishuChild2 = []// 奇数位*2 >9 的分割之后的数组十位数
+    for (let h = 0; h < arrJiShu2.length; h++) {
+      jishuChild1.push(parseInt(arrJiShu2[h]) % 10)
+      jishuChild2.push(parseInt(arrJiShu2[h]) / 10)
+    }
+    let sumJiShu = 0 // 奇数位*2 < 9 的数组之和
+    let sumOuShu = 0 // 偶数位数组之和
+    let sumJiShuChild1 = 0 // 奇数位*2 >9 的分割之后的数组个位数之和
+    let sumJiShuChild2 = 0 // 奇数位*2 >9 的分割之后的数组十位数之和
+    for (let m = 0; m < arrJiShu.length; m++) {
+      sumJiShu = sumJiShu + parseInt(arrJiShu[m])
+    }
+    for (let n = 0; n < arrOuShu.length; n++) {
+      sumOuShu = sumOuShu + parseInt(arrOuShu[n])
+    }
+    for (let p = 0; p < jishuChild1.length; p++) {
+      sumJiShuChild1 = sumJiShuChild1 + parseInt(jishuChild1[p])
+      sumJiShuChild2 = sumJiShuChild2 + parseInt(jishuChild2[p])
+    }
+    // 计算总和
+    let sumTotal = parseInt(sumJiShu) + parseInt(sumOuShu) + parseInt(sumJiShuChild1) + parseInt(sumJiShuChild2)
+    // 计算luhn值
+    let k = parseInt(sumTotal) % 10 === 0 ? 10 : parseInt(sumTotal) % 10
+    let luhn = 10 - k
+    if (lastNum === luhn) {
+      return true
+    } else {
+      /* 银行卡号必须符合luhn校验 */
+      return false
+    }
+  },
+  /**
+   * 判断输入是否为十一位电话号码
+   * @param str 字符串
+   * @returns {boolean}
+   */
+  phoneNumber: function (str) {
+    // ^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$
+    let reg = /^((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1})|166|198|199|(147))+\d{8}$/
+    return reg.test(str)
+  },
+  /**
+   * 判断+86后11位电话号码
+   * @param str 字符串
+   * @returns {boolean}
+   */
+  phoneNumber86: function (str) {
+    let reg = /^(\+86|\+86+\s)+(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1})|166|198|199|(147))+\d{8})$/
+    return reg.test(str)
+  },
+  /**
+   * 是否是邮件格式
+   * @param str
+   * @returns {boolean|*}
+   */
+  isEmailAddress: function (str) {
+    let pattern = /^([a-zA-Z0-9_.-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
+    return pattern.test(str)
+  },
+  /**
+   *
+   * @param cameraoption 对象{quality:质量默认50,allowEdit:true||false,width:宽度,height:高度}
+   * @param onSuccess 成功回调函数
+   * @param onFail 失败回调函数
+   */
+  /* eslint-disable */
+  openCamera: function (cameraoption, onSuccess, onFail) {
+    if (typeof onSuccess === 'function' && typeof onFail === 'function') {
+      let options = {
+        quality: cameraoption.quality || 50,
+        destinationType: Camera.DestinationType.FILE_URI,
+        sourceType: Camera.PictureSourceType.CAMERA,
+        allowEdit: cameraoption.allowEdit || false,
+        targetWidth: cameraoption.width || 1024,
+        targetHeight: cameraoption.height || 768,
+        encodingType: Camera.EncodingType.JPEG,
+        popoverOptions: CameraPopoverOptions,
+        saveToPhotoAlbum: window.localStorage.savePhoto || false,
+        correctOrientation: true,
+      }
+      navigator.camera.getPicture(onSuccess, onFail, options)
+    } else {
+      window.hlsPopup.showLongCenter('参数有误!')
+    }
+  },
+  /**
+   * 最多选取10张,返回图片的存储地址数组形式
+   * @param obj {quality:质量默认50,width:宽度,height:高度}
+   * @param successFunction 成功回调函数
+   * @param errorFunction 失败函数
+   */
+  takePicture: function (obj, successFunction, errorFunction) {
+    if (typeof successFunction === 'function' && typeof errorFunction === 'function') {
+      window.imagePicker.getPictures(
+        successFunction, errorFunction, {
+          maximumImagesCount: obj.maxCount || 10,
+          quality: obj.quality || 50,
+          width: obj.width || 1024,
+          height: obj.height || 768,
+        }
+      )
+    } else {
+      window.hlsPopup.showLongBottom('参数有误!')
+    }
+  },
+  /**
+   * 拨打电话仅仅限制于手机
+   * @param number
+   */
+  callPhone: function (number) {
+    window.open('tel:' + number)
+  },
+  /**
+   * 发邮件
+   * @param email
+   */
+  callEmail: function (email) {
+    window.open('mailto:' + email)
+  },
+  /**
+   * 非ftp的上传方式
+   * @param filePath
+   * @param success
+   */
+  fileUploadHls: function (file, success) {
+    let path = file.filePath
+    let name = path.substr(path.lastIndexOf('/') + 1)
+    let url = encodeURI(process.env.rootPath + '/app/fileUploadHls?sysName=HLS_APP&apiName=attment_file_upload')
+    let options = new FileUploadOptions() // eslint-disable-line
+    options.fileKey = 'file'
+    options.headers = {
+      'Authorization': 'Bearer ' + window.localStorage.access_token,
+    }
+    options.params = {
+      'table_name': file.table_name,
+      'table_pk_value': file.table_pk_value,
+      'user_id': window.localStorage.user_id,
+      'access_token': window.localStorage.access_token,
+      'filePath': path,
+    }
+    options.fileName = name
+    options.mimeType = 'multipart/form-date'
+    let ft = new FileTransfer() // eslint-disable-line
+    ft.onprogress = function (progressEvent) {
+      if (progressEvent.lengthComputable) {
+        loadingStatus.setPercentage(progressEvent.loaded / progressEvent.total) // eslint-disable-line
+      } else {
+        loadingStatus.increment() // eslint-disable-line
+      }
+    }
+    function uploadSuccess (result) {
+      success(JSON.parse(result.response))
+    }
+    function fileError () {
+      window.hlsPopup.hideLoading()
+      console.log('upload error source ' + error.source)
+      console.log('upload error target ' + error.target)
+    }
+    ft.upload(path, url, uploadSuccess, fileError, options)
+  },
+  /**
+   * 调用系统svc进行上传
+   * @param filePath
+   * @param success
+   */
+  fileUploadSvc: function (file, success) {
+    let path = file.filePath
+    let name = path.substr(path.lastIndexOf('/') + 1)
+    let url = encodeURI(process.env.rootPath + '/app/fileUploadSvc?sysName=HLS_APP&apiName=attachment_upload')
+    let options = new FileUploadOptions() // eslint-disable-line
+    options.fileKey = 'file'
+    options.headers = {
+      'Authorization': 'Bearer ' + window.localStorage.access_token,
+    }
+    options.params = {
+      'source_type': file.table_name,
+      'pkvalue': file.table_pk_value,
+      'user_id': window.localStorage.user_id,
+      'access_token': window.localStorage.access_token,
+      'filePath': path,
+      'timestamp': file.timestamp,
+      'sequence': file.sequence,
+    }
+    options.fileName = name
+    options.mimeType = 'multipart/form-date'
+    let ft = new FileTransfer() // eslint-disable-line
+    function uploadSuccess (result) {
+      success(JSON.parse(result.response))
+    }
+    function fileError () {
+      window.hlsPopup.hideLoading()
+      console.log('upload error source ' + error.source)
+      console.log('upload error target ' + error.target)
+    }
+    ft.upload(path, url, uploadSuccess, fileError, options)
+  },
+  /**
+   * 汉王识别
+   * @param file
+   * @param url
+   * @param success
+   */
+  hangwan: function (fileUrl, postUrl, success) {
+    if (!fileUrl) {
+      return
+    }
+    let path = fileUrl
+    let name = fileUrl.substr(fileUrl.lastIndexOf('/') + 1)
+    let url = encodeURI(postUrl)
+    let options = new FileUploadOptions() // eslint-disable-line
+    options.headers = {
+      'Authorization': 'Bearer ' + window.localStorage.access_token,
+    }
+    options.fileKey = 'file'
+    options.fileName = name
+    options.mimeType = 'multipart/form-date'
+    let ft = new FileTransfer() // eslint-disable-line
+    function uploadSuccess (message) {
+      let res = JSON.parse(message.response)
+      success(res)
+    }
+    function error (e) {
+      this.hlsPopup.showLongCenter('汉王识别失败')
+    }
+    ft.upload(path, url, uploadSuccess, error, options)
+  },
+  /**
+   *
+   * @param x 输入的数字
+   * @returns {Number} 返回数字
+   */
+  toDecimal: function (x) {
+    // hlsPopup.showLongCenter(baseConfig.debug);
+    let f = parseFloat(x)
+    if (isNaN(f)) {
+      return 0
+    }
+    f = Math.round(x * 100) / 100
+    return f
+  },
+  formatFloat: function (f, digit) {
+    let m = Math.pow(100000, digit)
+    return parseInt(f * m, 100000) / m
+  },
+  /**
+   *
+   * @param ir  interest rate per month
+   * @param np  number of periods (months)
+   * @param pv  present value
+   * @param fv  future value (residual value)
+   * @returns {number} 计算结果;
+   * @constructor
+   */
+  PMT: function (ir, np, pv, fv, type) {
+    /*
+     ir - interest rate per month
+     np - number of periods (months)
+     pv - present value
+     fv - future value (residual value)
+     type - 0 or 1 need to implement that
+     */
+    if (!type) {
+      type = 0
+    }
+    if (ir === 0) {
+      return -pv / np
+    }
+    let r1 = 1 + ir
+    // let pmt = -( ir * ( pv * Math.pow((ir + 1), np) + fv ) ) / ( ( ir + 1 ) * ( Math.pow((ir + 1), np) - 1 ) );
+    let pmt = -(pv * Math.pow(r1, np) + fv) * ir / ((1 + ir * type) * (Math.pow(r1, np) - 1))
+    return this.toDecimal(pmt)
+  },
+  /**
+   *
+   * @param rate
+   * @param per
+   * @param nper
+   * @param pv
+   * @param fv
+   * @param type
+   * @returns {*}
+   * @constructor
+   */
+  IPMT: function (rate, per, nper, pv, fv, type) {
+    let ipmt = 0
+    let r = rate
+    let R1 = 1 + r
+    let t = per
+    let n = nper
+    let ct
+    if (rate === 0) {
+      return 0
+    }
+    if (fv) {
+      fv = -fv
+    } else {
+      fv = 0
+    }
+    if (type) {
+      ct = type
+    } else {
+      ct = 0
+    }
+    if (type === 1 && per === 1) {
+      return ipmt
+    } else {
+      ipmt = -(pv * Math.pow(R1, n) + fv) * r /
+        ((1 + r * ct) * (Math.pow(R1, n) - 1)) -
+        (pv / (1 + r * ct) - (pv * Math.pow(R1, n) + fv) /
+          ((1 + r * ct) * (Math.pow(R1, n) - 1))) *
+        (Math.pow(R1, t) - Math.pow(R1, (t - 1)))
+      return this.toDecimal(ipmt)
+    }
+  },
+  /**
+   *
+   * @param p_rate
+   * @param p_nper
+   * @param p_pmt
+   * @param p_fv
+   * @param p_type
+   * @returns {number|*}
+   * @constructor
+   */
+  PV: function (pRate, pNper, pPmt, pFv, pType) {
+    let pv
+    let r
+    let R1
+    let n
+    let pmt
+    let fv
+    let ct
+    r = pRate
+    R1 = 1 + r
+    n = pNper
+    if (pPmt) {
+      pmt = pPmt
+    } else {
+      pmt = 0
+    }
+    if (pFv) {
+      fv = pFv
+    } else {
+      fv = 0
+    }
+    if (pType) {
+      ct = pType
+    } else {
+      ct = 0
+    }
+    pv = -(fv + pmt * (1 + r * ct) * (Math.pow(R1, n) - 1) / r) /
+      Math.pow(R1, n)
+    return this.toDecimal(pv)
+  },
+  /**
+   *
+   * @param p_rate
+   * @param p_nper
+   * @param p_pmt
+   * @param p_pv
+   * @param p_type
+   * @returns {number|*}
+   * @constructor
+   */
+  FV: function (pRate, pNper, pPmt, pPv, pType) {
+    let fv
+    let r
+    let R1
+    let n
+    let pmt
+    let pv
+    let ct
+    r = pRate
+    R1 = 1 + r
+    n = pNper
+    if (pPmt) {
+      pmt = pPmt
+    } else {
+      pmt = 0
+    }
+    if (pPv) {
+      pv = pPv
+    } else {
+      pv = 0
+    }
+    if (pType) {
+      ct = pType
+    } else {
+      ct = 0
+    }
+    fv = -pv * Math.pow(R1, n) - pmt * (1 + r * ct) * (Math.pow(R1, n) - 1) / r
+    return this.toDecimal(fv)
+  },
+  /**
+   *
+   * @param args
+   * @param rate
+   * @returns {*}
+   * @constructor
+   */
+  NPV: function (args, rate) {
+    let rrate = (1 + rate / 100)
+    let npv = args[0]
+    for (let i = 1; i < args.length; i++) {
+      npv += (args[i] / Math.pow(rrate, i))
+    }
+    return npv
+  },
+  /**
+   *
+   * @param fn
+   * @returns {number}
+   */
+  seekZero: function (fn) {
+    let x = 1
+    while (fn(x) > 0) {
+      x += 1
+    }
+    while (fn(x) < 0) {
+      x -= 0.01
+    }
+    return x + 0.01
+  },
+  /**
+   *
+   * @param array
+   * @returns {number}
+   * @constructor
+   */
+  IRR: function (array) {
+    let args = array
+    let numberOfTries = 1
+    // Cash flow values must contain at least one positive value and one negative value
+    let positive, negative
+    Array.prototype.slice.call(args).forEach(function (value) {
+      if (value > 0) positive = true
+      if (value < 0) negative = true
+    })
+    if (!positive || !negative) throw new Error('IRR requires at least one positive value and one negative value')
+    function npv (rate) {
+      numberOfTries++
+      if (numberOfTries > 1000) {
+        throw new Error('IRR can\'t find a result')
+      }
+      let rrate = (1 + rate / 100)
+      let npv = args[0]
+      for (let i = 1; i < args.length; i++) {
+        npv += (args[i] / Math.pow(rrate, i))
+      }
+      return npv
+    }
+    return this.seekZero(npv)
+  },
+  // Returns Sum of f(x)/f'(x)
+  sumEq: function (cfs, durs, guess) {
+    let sumFx = 0
+    let sumFdx = 0
+    for (let i = 0; i < cfs.length; i++) {
+      sumFx = sumFx + (cfs[i] / Math.pow(1 + guess, durs[i]))
+    }
+    for (let i = 0; i < cfs.length; i++) {
+      sumFdx = sumFdx + (-cfs[i] * durs[i] * Math.pow(1 + guess, -1 - durs[i]))
+    }
+    return sumFx / sumFdx
+  },
+  durYear: function (first, last) {
+    return (Math.abs(last.getTime() - first.getTime()) / (1000 * 3600 * 24 * 365))
+  },
+  /**
+   *
+   * @param cfs
+   * @param dts
+   * @param guess
+   * @returns {number}
+   * @constructor
+   */
+  XIRR: function (cfs, dts, guess) {
+    if (cfs.length !== dts.length) throw new Error('Number of cash flows and dates should match')
+    let positive, negative
+    Array.prototype.slice.call(cfs).forEach(function (value) {
+      if (value > 0) positive = true
+      if (value < 0) negative = true
+    })
+    if (!positive || !negative) throw new Error('XIRR requires at least one positive value and one negative value')
+    guess = guess || 0
+    let limit = 100 // loop limit
+    let guessLast
+    let durs = []
+    durs.push(0)
+    // Create Array of durations from First date
+    for (let i = 1; i < dts.length; i++) {
+      durs.push(this.durYear(dts[0], dts[i]))
+    }
+    do {
+      guessLast = guess
+      guess = guessLast - this.sumEq(cfs, durs, guessLast)
+      limit--
+    } while (guessLast.toFixed(5) !== guess.toFixed(5) && limit > 0)
+    let xirr = guessLast.toFixed(5) !== guess.toFixed(5) ? null : guess * 100
+    return Math.round(xirr * 100) / 100
+  },
+  // 指纹
+  fingerLogin: function () {
+    if (vum.Platform.isIOS()) {
+      return this.fingerLoginIos()
+    } else {
+      return this.fingerLoginAndroid()
+    }
+  },
+  // android
+  fingerLoginAndroid: function () {
+    let isSupportFinger = 'true'
+    return new Promise(function (resolve, reject) {
+      Fingerprint.isAvailable(function (res) {  // eslint-disable-line
+        if (window.localStorage.isSupportFinger) {
+          window.localStorage.removeItem('isSupportFinger')
+        }
+        window.localStorage.setItem('isSupportFinger', isSupportFinger)
+        if (window.localStorage.isOpenFingerLogin && window.localStorage.username && window.localStorage.password) {
+          var successCallback = function (msg) {
+            resolve(msg)
+          }
+          var errorCallback = function (err) {
+            reject(err)
+          }
+          Fingerprint.show({ // eslint-disable-line
+            clientId: 'com.car.rental.easy',
+            clientSecret: 'a_very_secret_encryption_key', // Only necessary for Android
+          }, successCallback, errorCallback)
+        } else {
+          reject() // eslint-disable-line
+        }
+      }, function (error) {
+        isSupportFinger = false
+        window.localStorage.isSupportFinger = isSupportFinger
+        reject(error)
+      })
+    })
+  },
+  // ios
+  fingerLoginIos: function () {
+    return new Promise(function (resolve, reject) {
+      let isSupportFinger = true
+      window.plugins.touchid.isAvailable(
+        // 支持指纹
+        function () {
+          isSupportFinger = true
+          if (window.localStorage.isSupportFinger) {
+            window.localStorage.removeItem('isSupportFinger')
+          }
+          window.localStorage.setItem('isSupportFinger', isSupportFinger)
+          // window.localStorage.isSupportFinger = true;
+          // 判断是否开启了指纹登录
+          if (window.localStorage.isOpenFingerLogin && window.localStorage.username && window.localStorage.password) {
+            window.plugins.touchid.verifyFingerprint(
+              '通过Home键验证已有的手机指纹!', // this will be shown in the native scanner popup
+              function (msg) {
+                resolve(msg)
+              },
+              function (msg) {
+                reject(msg)
+              })
+          } else {
+            reject() // eslint-disable-line
+          }
+        }
+        // 不支持指纹
+        , function (msg) {
+          isSupportFinger = false
+          window.localStorage.isSupportFinger = isSupportFinger
+          reject(msg)
+        }
+      )
+    })
+  },
+  // 判断是否为首次登录
+  isFirstTimeLogin: function (name) {
+    if (window.localStorage.username) {
+      if (window.localStorage.username !== name) {
+        return true
+      } else {
+        return false
+      }
+    } else {
+      return true
+    }
+  },
+  // 打开指纹登陆
+  openFingerLogin: function () {
+    return new Promise(function (resolve, reject) {
+      if (vum.Platform.isIOS()) {
+        window.plugins.touchid.isAvailable(function () {
+          window.plugins.touchid.verifyFingerprint(
+            '通过Home键验证已有的手机指纹!',
+            function () {
+              resolve()
+            }, function () {
+              reject() // eslint-disable-line
+            }
+          )
+        }, function () {
+          this.hlsPopup.showLongCenter('您的设配暂不支持指纹')
+          reject() // eslint-disable-line
+        })
+      } else {
+        Fingerprint.isAvailable(function (res) { // eslint-disable-line
+          Fingerprint.show({  // eslint-disable-line
+            clientId: 'com.car.rental.easy',
+            clientSecret: 'a_very_secret_encryption_key', // Only necessary for Android
+          }, successCallback, errorCallback)
+          function successCallback (msg) {
+            resolve(msg)
+          }
+          function errorCallback (err) {
+            reject(err)
+          }
+        }, function (error) {
+          this.hlsPopup.showLongCenter('您的设配暂不支持指纹')
+          reject(error)
+        })
+      }
+    })
+  },
+  /**
+   * 判断平台
+   * @return {String} 平台
+   */
+  detectOS: function () {
+    const ua = navigator.userAgent.toLowerCase()
+    if (/MicroMessenger/i.test(ua)) {
+      return 'weixin'
+    } else if (/iPhone|iPad|iPod|iOS/i.test(ua)) {
+      return 'ios'
+    } else if (/Android/i.test(ua)) {
+      return 'android'
+    } else {
+      return 'other'
+    }
+  },
+}
--- a/src/scripts/login.js
+++ b/src/scripts/login.js
+/**
+ * hmap子应用登录逻辑
+ * @author momoko 2018/05/08
+ */
+import axios from 'axios'
+import { getUrlParam } from './utils'
+// 模拟登录
+export function analogLogin () {
+  return new Promise((resolve, reject) => {
+    const url = `${$config.hmapUrl}/oauth/token?client_id=18f58010-2831-11e8-b467-0ed5f89f718b&client_secret=2fe58f36-2831-11e8-b467-0ed5f89f718b&grant_type=password&username=%2B8618325379820&password=jingchaowu520&authType=TEL`
+    axios.post(url).then(res => {
+      window.localStorage.setItem('token', res.access_token)
+      resolve({
+        token: res.access_token,
+        tokenType: res.token_type,
+        expires: res.expires_in,
+        userId: res.userId,
+        organizationId: res.organizationId,
+      })
+    })
+  })
+}
+// 授权码登录
+export async function authorizedLogin () {
+  return new Promise((resolve, reject) => {
+    const code = getUrlParam('code')
+    const url = `${$config.hmapUrl}/oauth/token?client_id=18f58010-2831-11e8-b467-0ed5f89f718b&client_secret=2fe58f36-2831-11e8-b467-0ed5f89f718b&grant_type=authorization_code&code=${encodeURIComponent(code)}`
+    axios.post(url).then(res => {
+      window.localStorage.setItem('token', res.access_token)
+      resolve({
+        token: res.access_token,
+        tokenType: res.token_type,
+        expires: res.expires_in,
+        userId: res.userId,
+        organizationId: res.organizationId,
+        account: res.account,
+        mobile: res.phoneNumber,
+      })
+    })
+  })
+}
+// 桥登录
+export function bridgeLogin () {
+  return new Promise((resolve, reject) => {
+    // 登录成功回调
+    window.bridgeLoginSuccess = function (str) {
+      const res = JSON.parse(str)
+      window.localStorage.setItem('token', res.token)
+      const data = {
+        token: res.token,
+        tokenType: res.tokenType,
+        expires: res.expiresIn,
+        userId: res.userId,
+        organizationId: res.organizationId,
+        account: res.account,
+        mobile: res.phoneNumber,
+      }
+      resolve(data)
+    }
+    // 登录失败回调
+    window.bridgeLoginFailure = function (res) {
+      console.error(res)
+      reject(res)
+    }
+    const dict = {
+      'className': 'BaseBridge',
+      'function': 'getBaseInfo',
+      'successCallBack': 'bridgeLoginSuccess',
+      'failureCallBack': 'bridgeLoginFailure',
+    }
+    HandBridge.postMessage(JSON.stringify(dict))
+  })
+}
+// 获取用户详细信息
+export function getUserInfo (userId) {
+  const url = `${$config.hmapUrl}/i/api/staff/customDetail`
+  const data = {
+    userId,
+  }
+  const options = {
+    headers: {
+      Authorization: `Bearer ${window.localStorage.token}`,
+    },
+  }
+  return new Promise((resolve, reject) => {
+    axios.post(url, data, options).then(res => {
+      resolve({
+        account: res.accountNumber,
+        mobile: res.mobile,
+        userId: res.userId,
+        organizationId: res.organizationId,
+        email: res.email,
+      })
+    })
+  })
+}
+/**
+ * 获取中台的token
+ * @returns {Promise<*>}
+ */
+export async function getSupportToken () {
+  const url = `${$config.loginPath}appadmin`
+  const res = await axios.post(url)
+  return res
+}
+/**
+ * 获取业务系统个人信息
+ * @returns {Promise<*>}
+ */
+export async function getLeasingUserInfo (account, mobile) {
+  window.localStorage.setItem('account', account)
+  const url = `${$config.basePath}hmap_app_login`
+  const data = {
+    'user_name': account,
+    'mobile': mobile,
+  }
+  const options = {
+    headers: {
+      Authorization: `Bearer ${window.localStorage.access_token}`,
+    },
+  }
+  return new Promise((resolve, reject) => {
+    axios.post(url, data, options).then(res => {
+      //  console.log('leasingInfo:' + JSON.stringify(res))
+      if (res.result === 'S') {
+        resolve(res.user_info[0])
+      }
+    })
+  })
+}
+/**
+ * 登录总成
+ * @param  {String}  [type] 可选:'online''local'
+ * @param  {Boolean} [needInfo] 是否需要获取用户详细信息
+ * @return {Object.Promise} 若登录成功PromiseValue为数据对象/登录失败PromiseValue 为 false
+ */
+export async function login (type = 'online', needInfo = true) { // 登录
+  const env = process.env.CONFIG_ENV // 环境
+  try {
+    let result = {}
+    let tokenInfo = {}
+    tokenInfo = await getSupportToken()
+    window.localStorage.setItem('access_token', tokenInfo.access_token)
+    if (env === 'prod' || env === 'uat') { // 真机
+      if (type === 'online') result = await authorizedLogin() // 在线子应用
+      if (type === 'local') result = await bridgeLogin() // 本地子应用
+      window.localStorage.setItem('mobile', result.mobile)
+      result.userInfo = await getLeasingUserInfo(result.account, result.mobile)
+    } else {
+      result = await analogLogin()
+      result.hmapUserInfo = await getUserInfo(result.userId)
+      window.localStorage.setItem('mobile', result.hmapUserInfo.mobile)
+      result.userInfo = await getLeasingUserInfo(result.hmapUserInfo.account, result.hmapUserInfo.mobile)
+    }
+    window.localStorage.setItem('user_id', result.userInfo.user_id)
+    return result
+  } catch (e) {
+    // console.error(e)
+    return false
+  }
+}
+/**
+ * 海马汇业务系统集成登录
+ * @param type
+ * @param needInfo
+ * @returns {Promise<any>}
+ */
+export default function hmapLogin (type = 'local', needInfo = true) {
+  const env = process.env.CONFIG_ENV // 环境
+  return new Promise((resolve, reject) => {
+    try {
+      let result = {}
+      if (env === 'prod' || env === 'uat') { // 真机
+        if (type === 'online') {
+          authorizedLogin().then(res => {
+            result = res
+            window.localStorage.setItem('mobile', res.mobile)
+          })
+        }// 在线子应用
+        if (type === 'local') {
+          result = bridgeLogin().then(res => {
+            result = res
+            window.localStorage.setItem('mobile', res.mobile)
+          })
+        }
+        getSupportToken().then(res => {
+          window.localStorage.setItem('access_token', res.access_token)
+          getLeasingUserInfo(result.account, result.mobile).then(res => {
+            result.userInfo = res
+            window.localStorage.setItem('user_id', res.user_id)
+            resolve(result)
+          })
+        })
+      } else {
+        analogLogin().then(res => {
+          result = res
+          getUserInfo(res.userId).then(info => {
+            result.hmapUserInfo = info
+            window.localStorage.setItem('mobile', info.mobile)
+            getSupportToken().then(support => {
+              window.localStorage.setItem('access_token', support.access_token)
+              getLeasingUserInfo(info.account, info.mobile).then(res => {
+                result.userInfo = res
+                window.localStorage.setItem('user_id', res.user_id)
+                resolve(result)
+              })
+            })
+          })
+        })
+      }
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
--- a/src/scripts/utils.js
+++ b/src/scripts/utils.js
+/**
+ * 一些帮助函数
+ * @author momoko
+ */
+/**
+ * 取URL上的参数
+ * @param  {String} param 参数名
+ * @return {String}
+ */
+export function getUrlParam (param) {
+  const result = window.location.href.match(new RegExp('(\\?|&)' + param + '(\\[\\])?=([^&#]*)'))
+  return result ? result[3] : undefined
+}
+/**
+ * 动态插入 script to html
+ * @param url
+ * @param callback
+ */
+export function createScript (url, callback) {
+  const oScript = document.createElement('script')
+  oScript.type = 'text/javascript'
+  oScript.async = true
+  oScript.src = url
+  /**
+   * IE6/7/8                -- onreadystatechange
+   * IE9/10                 -- onreadystatechange, onload
+   * Firefox/Chrome/Opera   -- onload
+   */
+  const isIE = !-[1,] // eslint-disable-line
+  if (isIE) {
+    // 判断IE8及以下浏览器
+    oScript.onreadystatechange = function () {
+      if (this.readyState === 'loaded' || this.readyState === 'complete') {
+        callback && callback()
+      }
+    }
+  } else {
+    // IE9及以上浏览器，Firefox，Chrome，Opera
+    oScript.onload = function () {
+      callback && callback()
+    }
+  }
+  document.body.appendChild(oScript)
+}
+/**
+ * 判断平台
+ * @return {String} 平台
+ */
+export function detectOS () {
+  const ua = navigator.userAgent.toLowerCase()
+  if (/MicroMessenger/i.test(ua)) {
+    return 'weixin'
+  } else if (/iPhone|iPad|iPod|iOS/i.test(ua)) {
+    return 'ios'
+  } else if (/Android/i.test(ua)) {
+    return 'android'
+  } else {
+    return 'other'
+  }
+}
--- a/src/styles/variables.less
+++ b/src/styles/variables.less
@@ -10,16 +10,18 @@
 /**
 * 颜色
 */
-@theme-color:#5D98F6;
+@theme-color:#0041C4;
 @font-color:#666666;
 @mainColor: #000;
 @baseColor: white;
 @hintColor:rgb(181,181,181);
-@headerColor: #5D98F6;
+@headerColor: @theme-color;
 @background-color-gray: #fafafa;
-@activated-color: #5D98F6;
+@activated-color: @theme-color;
 @divider-color:#fafafa;
-@check-box-bg:#48D2A0;
+@switch-box-bg:#48D2A0;
+@check-box-bg:@theme-color;
+@radio-box-bg:@theme-color;
 /**

--- a/src/scripts/vuePlatform.js
+++ b/src/scripts/vuePlatform.js
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,9 +17,9 @@
    "@antv/util" "~1.3.1"
 "@antv/f2@^3.1.4-beta.2":
-  version "3.3.8"
+  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@antv/f2/-/f2-3.3.8.tgz#1b8a542d64c46306dfb29f123f8ccd2de1245966"
+  resolved "https://registry.yarnpkg.com/@antv/f2/-/f2-3.3.9.tgz#3793da1925aba25cf3e39d7084b69290330c1107"
-  integrity sha512-+FN++t0qC06vFDs6lodqZC/cbMIXRWgeQgAcObXPhCwpkmX53uLPi3n6hTPoD7HeB0mTAcvKzWc8lFLnGsDfQA==
+  integrity sha512-MOVhfAt5Hh8Z70sqd8zZT/Xj3FM7ow0SCCK81NKXQP2u2sJCHrZcWK9K8guz7vDQ8w5xqI7fXuaaXHwgY+ZO4g==
  dependencies:
    "@antv/adjust" "~0.1.1"
    "@antv/attr" "~0.1.0"
@@ -140,22 +140,22 @@
    to-fast-properties "^2.0.0"
 "@types/node@*":
-  version "11.13.4"
+  version "12.0.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.10.tgz#51babf9c7deadd5343620055fc8aff7995c8b031"
-  integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
+  integrity sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ==
 abbrev@1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-accepts@~1.3.4, accepts@~1.3.5:
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
-  version "1.3.5"
+  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
  dependencies:
-    mime-types "~2.1.18"
+    mime-types "~2.1.24"
-    negotiator "0.6.1"
+    negotiator "0.6.2"
 acorn-dynamic-import@^2.0.0:
  version "2.0.2"
@@ -437,10 +437,11 @@ assert-plus@^0.2.0:
  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
 assert@^1.1.1:
-  version "1.4.1"
+  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
-  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
  dependencies:
+    object-assign "^4.1.1"
    util "0.10.3"
 assign-symbols@^1.0.0:
@@ -449,9 +450,9 @@ assign-symbols@^1.0.0:
  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 async-each@^1.0.1:
-  version "1.0.2"
+  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
-  integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 async-limiter@~1.0.0:
  version "1.0.0"
@@ -1183,9 +1184,9 @@ babylon@^6.18.0:
  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 bail@^1.0.0:
-  version "1.0.3"
+  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.3.tgz#63cfb9ddbac829b02a3128cd53224be78e6c21a3"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz#7181b66d508aa3055d3f6c13f0a0c720641dde9b"
-  integrity sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==
+  integrity sha512-S8vuDB4w6YpRhICUDET3guPlQpaJl7od94tpZ0Fvnyp+MKW/HyDTcRDck+29C9g+d/qQHnddRH3+94kZdrW0Ww==
 balanced-match@^0.4.2:
  version "0.4.2"
@@ -1228,9 +1229,9 @@ bcrypt-pbkdf@^1.0.0:
    tweetnacl "^0.14.3"
 better-scroll@^1.10.3, better-scroll@^1.14.1:
-  version "1.15.1"
+  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/better-scroll/-/better-scroll-1.15.1.tgz#cd390715704fe2d1654bba0778ddf0fd28015572"
+  resolved "https://registry.yarnpkg.com/better-scroll/-/better-scroll-1.15.2.tgz#65ffc6058b8b4ff337b8dfad4bcb334d7699ceb6"
-  integrity sha512-HL+jm6tk2pBylSZBfZLtfdwNhGckLbwiBAEx+Z2+8PrHJ6QAZp96txOVEFWSBgUAwPg5YSioMOxMqws5GdkXKA==
+  integrity sha512-sSY2N8I9/B+YX/9JpIz6pMQYnmBuvspBqZG4UxYaQEfz/ZWrnxwdyKLL4t6IKpFmxqtZadVypXw7vSSHxBZpBQ==
  dependencies:
    babel-runtime "^6.0.0"
@@ -1259,9 +1260,9 @@ binary-extensions@^1.0.0:
  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 bluebird@^3.1.1, bluebird@^3.4.7, bluebird@^3.5.1:
-  version "3.5.4"
+  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
-  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
+  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
 blueimp-md5@^2.6.0:
  version "2.10.0"
@@ -1273,21 +1274,21 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
-body-parser@1.18.3:
+body-parser@1.19.0:
-  version "1.18.3"
+  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
  dependencies:
-    bytes "3.0.0"
+    bytes "3.1.0"
    content-type "~1.0.4"
    debug "2.6.9"
    depd "~1.1.2"
-    http-errors "~1.6.3"
+    http-errors "1.7.2"
-    iconv-lite "0.4.23"
+    iconv-lite "0.4.24"
    on-finished "~2.3.0"
-    qs "6.5.2"
+    qs "6.7.0"
-    raw-body "2.3.3"
+    raw-body "2.4.0"
-    type-is "~1.6.16"
+    type-is "~1.6.17"
 bonjour@^3.5.0:
  version "3.5.0"
@@ -1468,6 +1469,11 @@ bytes@3.0.0:
  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 cacache@^10.0.4:
  version "10.0.4"
  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
@@ -1502,6 +1508,13 @@ cache-base@^1.0.1:
    union-value "^1.0.0"
    unset-value "^1.0.0"
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  dependencies:
+    callsites "^2.0.0"
 caller-path@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -1509,11 +1522,23 @@ caller-path@^0.1.0:
  dependencies:
    callsites "^0.2.0"
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  dependencies:
+    caller-callsite "^2.0.0"
 callsites@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 camel-case@3.0.x:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
@@ -1570,14 +1595,14 @@ caniuse-api@^1.5.2:
    lodash.uniq "^4.5.0"
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000959"
+  version "1.0.30000976"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000959.tgz#88d38654f068f08a8f2bce943027c0829c89049d"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000976.tgz#33c6bc12934b003baaa9c1fa9de399122d26e2f9"
-  integrity sha512-KfNFd4l2pBWHQxtVSB3BCLz+3PxypJskgFNXX6k7aa84dXcNLE590FK4FOsOKhA7njxH2dOGDVuyJirxw/Oz0w==
+  integrity sha512-QvzPHBh2cYmilQAiiamun3ooHRGKFKtVwLzzx0RG7avjpj7Gii89Yzs92EKeHNqbAA2rlcFXg4GzP/tC68OGuw==
 caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844:
-  version "1.0.30000959"
+  version "1.0.30000976"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000959.tgz#215d3455866da874179c6170202f0cc64f961cfd"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000976.tgz#d30fe12662cb2a21e130d307db9907513ca830a2"
-  integrity sha512-6BvqmS0VLmY4sJCz6AbIJRQfcns8McDxi424y+3kmtisJeA9/5qslP+K8sqremDau7UU4WSsqdRP032JrqZY8Q==
+  integrity sha512-tleNB1IwPRqZiod6nUNum63xQCMN96BUO2JTeiwuRM7p9d616EHsMBjBWJMudX39qCaPuWY8KEWzMZq7A9XQMQ==
 caseless@~0.12.0:
  version "0.12.0"
@@ -1585,9 +1610,9 @@ caseless@~0.12.0:
  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 ccount@^1.0.0:
-  version "1.0.3"
+  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.3.tgz#f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"
+  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.4.tgz#9cf2de494ca84060a2a8d2854edd6dfb0445f386"
-  integrity sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==
+  integrity sha512-fpZ81yYfzentuieinmGnphk0pLkOTMm6MZdVqwd77ROvhko6iujLNGrHH5E7utq3ygWklwfmwuG+A7P+NpqT6w==
 center-align@^0.1.1:
  version "0.1.3"
@@ -1629,24 +1654,24 @@ chalk@~0.5.1:
    supports-color "^0.2.0"
 character-entities-html4@^1.0.0:
-  version "1.1.2"
+  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.2.tgz#c44fdde3ce66b52e8d321d6c1bf46101f0150610"
+  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.3.tgz#5ce6e01618e47048ac22f34f7f39db5c6fd679ef"
-  integrity sha512-sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==
+  integrity sha512-SwnyZ7jQBCRHELk9zf2CN5AnGEc2nA+uKMZLHvcqhpPprjkYhiLn0DywMHgN5ttFZuITMATbh68M6VIVKwJbcg==
 character-entities-legacy@^1.0.0:
-  version "1.1.2"
+  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz#7c6defb81648498222c9855309953d05f4d63a9c"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz#3c729991d9293da0ede6dddcaf1f2ce1009ee8b4"
-  integrity sha512-9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==
+  integrity sha512-YAxUpPoPwxYFsslbdKkhrGnXAtXoHNgYjlBM3WMXkWGTl5RsY3QmOyhwAgL8Nxm9l5LBThXGawxKPn68y6/fww==
 character-entities@^1.0.0:
-  version "1.2.2"
+  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.2.tgz#58c8f371c0774ef0ba9b2aca5f00d8f100e6e363"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.3.tgz#bbed4a52fe7ef98cc713c6d80d9faa26916d54e6"
-  integrity sha512-sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==
+  integrity sha512-yB4oYSAa9yLcGyTbB4ItFwHw43QHdH129IJ5R+WvxOkWlyFnR5FAaBNnUq4mcxsTVZGh28bHoeTHMKXH1wZf3w==
 character-reference-invalid@^1.0.0:
-  version "1.1.2"
+  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz#21e421ad3d84055952dab4a43a04e73cd425d3ed"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz#1647f4f726638d3ea4a750cf5d1975c1c7919a85"
-  integrity sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==
+  integrity sha512-VOq6PRzQBam/8Jm6XBGk2fNEnHXAdGd6go0rtd4weAGECBamHDwwCQSOT12TACIYUZegUXnV6xBXqUssijtxIg==
 chardet@^0.4.0:
  version "0.4.2"
@@ -1659,9 +1684,9 @@ check-types@^7.3.0:
  integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==
 chokidar@^2.0.2, chokidar@^2.1.2:
-  version "2.1.5"
+  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
-  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
+  integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
  dependencies:
    anymatch "^2.0.0"
    async-each "^1.0.1"
@@ -1797,9 +1822,9 @@ code-point-at@^1.0.0:
  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 collapse-white-space@^1.0.2:
-  version "1.0.4"
+  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.4.tgz#ce05cf49e54c3277ae573036a26851ba430a0091"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz#c2495b699ab1ed380d29a1091e01063e75dbbe3a"
-  integrity sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==
+  integrity sha512-703bOOmytCYAX9cXYqoikYIx6twmFCXsnzRQheBcTG3nzKYBR4P/+wkYeH+Mvj7qUz8zZDtdyzbxfnEi/kYzRQ==
 collection-visit@^1.0.0:
  version "1.0.0"
@@ -1857,9 +1882,9 @@ colors@~1.1.2:
  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.7"
+  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
  dependencies:
    delayed-stream "~1.0.0"
@@ -1889,21 +1914,21 @@ commondir@^1.0.1:
  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 compare-versions@^3.1.0:
-  version "3.4.0"
+  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.5.0.tgz#85fc22a1ae9612ff730d77fb092295acd056d311"
-  integrity sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==
+  integrity sha512-hX+4kt2Rcwu+x1U0SsEFCn1quURjEjPEGH/cPBlpME/IidGimAdwfMU+B+xDr7et/KTR7VH2+ZqWGerv4NGs2w==
 component-emitter@^1.2.1:
-  version "1.2.1"
+  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 compressible@~2.0.16:
-  version "2.0.16"
+  version "2.0.17"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
-  integrity sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==
+  integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==
  dependencies:
-    mime-db ">= 1.38.0 < 2"
+    mime-db ">= 1.40.0 < 2"
 compression@^1.7.3:
  version "1.7.4"
@@ -1967,10 +1992,12 @@ contains-path@^0.1.0:
  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
-content-disposition@0.5.2:
+content-disposition@0.5.3:
-  version "0.5.2"
+  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
-  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
 content-type@~1.0.4:
  version "1.0.4"
@@ -1989,10 +2016,10 @@ cookie-signature@1.0.6:
  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-cookie@0.3.1:
+cookie@0.4.0:
-  version "0.3.1"
+  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 copy-concurrently@^1.0.0:
  version "1.0.5"
@@ -2026,9 +2053,9 @@ copy-webpack-plugin@^4.0.1:
    serialize-javascript "^1.4.0"
 core-js@^2.4.0, core-js@^2.5.0:
-  version "2.6.5"
+  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
-  integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
+  integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
 core-util-is@1.0.2, core-util-is@~1.0.0:
  version "1.0.2"
@@ -2058,15 +2085,15 @@ cosmiconfig@^3.1.0:
    parse-json "^3.0.0"
    require-from-string "^2.0.1"
-cosmiconfig@^4.0.0:
+cosmiconfig@^5.0.0:
-  version "4.0.0"
+  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
-  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
  dependencies:
+    import-fresh "^2.0.0"
    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
+    js-yaml "^3.13.1"
    parse-json "^4.0.0"
-    require-from-string "^2.0.1"
 countup.js@^1.8.1:
  version "1.9.3"
@@ -2156,11 +2183,6 @@ crypto-browserify@^3.11.0:
    randombytes "^2.0.0"
    randomfill "^1.0.3"
-crypto-js@^3.1.9-1:
-  version "3.1.9-1"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
-  integrity sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=
 css-color-names@0.0.4:
  version "0.0.4"
  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -2289,11 +2311,12 @@ cyclist@~0.2.2:
  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 d@1:
-  version "1.0.0"
+  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
-  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
+  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
  dependencies:
-    es5-ext "^0.10.9"
+    es5-ext "^0.10.50"
+    type "^1.0.1"
 dashdash@^1.12.0:
  version "1.14.1"
@@ -2597,14 +2620,14 @@ ee-first@1.1.1:
  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 ejs@^2.5.7:
-  version "2.6.1"
+  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6"
-  integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
+  integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47:
-  version "1.3.124"
+  version "1.3.170"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.170.tgz#2dc858f8a9bb51bbfe3a429312c11f565b456e61"
-  integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
+  integrity sha512-vDEhHcwMogbM+WXDTh6ZktwQOqLcK7MJdCOM99UZXRI1ct3Y9OeYYJTrIHnswzv+IYwoXNj0Furh+K6UotcHVg==
 elliptic@^6.0.0:
  version "6.4.1"
@@ -2702,16 +2725,16 @@ es-to-primitive@^1.2.0:
    is-date-object "^1.0.1"
    is-symbol "^1.0.2"
-es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14:
-  version "0.10.49"
+  version "0.10.50"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.49.tgz#059a239de862c94494fec28f8150c977028c6c5e"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz#6d0e23a0abdb27018e5ac4fd09b412bc5517a778"
-  integrity sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==
+  integrity sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==
  dependencies:
    es6-iterator "~2.0.3"
    es6-symbol "~3.1.1"
    next-tick "^1.0.0"
-es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
+es6-iterator@^2.0.3, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
@@ -2752,13 +2775,13 @@ es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
    es5-ext "~0.10.14"
 es6-weak-map@^2.0.1:
-  version "2.0.2"
+  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
-  integrity sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=
+  integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
  dependencies:
    d "1"
-    es5-ext "^0.10.14"
+    es5-ext "^0.10.46"
-    es6-iterator "^2.0.1"
+    es6-iterator "^2.0.3"
    es6-symbol "^3.1.1"
 escape-html@~1.0.3:
@@ -2854,9 +2877,9 @@ eslint-module-utils@^2.4.0:
    pkg-dir "^2.0.0"
 eslint-plugin-import@^2.7.0:
-  version "2.17.1"
+  version "2.17.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.1.tgz#b888feb4d9b3ee155113c8dccdd4bec5db33bdf4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz#00548b4434c18faebaba04b24ae6198f280de189"
-  integrity sha512-lzD9uvRvW4MsHzIOMJEDSb5MOV9LzgxRPBaovvOhJqzgxRHYfGy9QOrMuwHIh5ehKFJ7Z3DcrcGKDQ0IbP0EdQ==
+  integrity sha512-qeVf/UwXFJbeyLbxuY8RgqDyEKCkqV7YC+E5S5uOjAp4tOc8zj01JP3ucoBM8JcEqd1qRasJSg6LLlisirfy0Q==
  dependencies:
    array-includes "^3.0.3"
    contains-path "^0.1.0"
@@ -2868,7 +2891,7 @@ eslint-plugin-import@^2.7.0:
    lodash "^4.17.11"
    minimatch "^3.0.4"
    read-pkg-up "^2.0.0"
-    resolve "^1.10.0"
+    resolve "^1.11.0"
 eslint-plugin-node@^5.2.0:
  version "5.2.1"
@@ -3030,9 +3053,9 @@ event-emitter@~0.3.5:
    es5-ext "~0.10.14"
 eventemitter3@^3.0.0:
-  version "3.1.0"
+  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
+  integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
 events@^3.0.0:
  version "3.0.0"
@@ -3107,38 +3130,38 @@ expand-range@^1.8.1:
    fill-range "^2.1.0"
 express@^4.16.2:
-  version "4.16.4"
+  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
-  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
  dependencies:
-    accepts "~1.3.5"
+    accepts "~1.3.7"
    array-flatten "1.1.1"
-    body-parser "1.18.3"
+    body-parser "1.19.0"
-    content-disposition "0.5.2"
+    content-disposition "0.5.3"
    content-type "~1.0.4"
-    cookie "0.3.1"
+    cookie "0.4.0"
    cookie-signature "1.0.6"
    debug "2.6.9"
    depd "~1.1.2"
    encodeurl "~1.0.2"
    escape-html "~1.0.3"
    etag "~1.8.1"
-    finalhandler "1.1.1"
+    finalhandler "~1.1.2"
    fresh "0.5.2"
    merge-descriptors "1.0.1"
    methods "~1.1.2"
    on-finished "~2.3.0"
-    parseurl "~1.3.2"
+    parseurl "~1.3.3"
    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.4"
+    proxy-addr "~2.0.5"
-    qs "6.5.2"
+    qs "6.7.0"
-    range-parser "~1.2.0"
+    range-parser "~1.2.1"
    safe-buffer "5.1.2"
-    send "0.16.2"
+    send "0.17.1"
-    serve-static "1.13.2"
+    serve-static "1.14.1"
-    setprototypeof "1.1.0"
+    setprototypeof "1.1.1"
-    statuses "~1.4.0"
+    statuses "~1.5.0"
-    type-is "~1.6.16"
+    type-is "~1.6.18"
    utils-merge "1.0.1"
    vary "~1.1.2"
@@ -3259,9 +3282,9 @@ faye-websocket@^0.10.0:
    websocket-driver ">=0.5.1"
 faye-websocket@~0.11.0:
-  version "0.11.1"
+  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
-  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
+  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
  dependencies:
    websocket-driver ">=0.5.1"
@@ -3324,17 +3347,17 @@ fill-range@^4.0.0:
    repeat-string "^1.6.1"
    to-regex-range "^2.1.0"
-finalhandler@1.1.1:
+finalhandler@~1.1.2:
-  version "1.1.1"
+  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
  dependencies:
    debug "2.6.9"
    encodeurl "~1.0.2"
    escape-html "~1.0.3"
    on-finished "~2.3.0"
-    parseurl "~1.3.2"
+    parseurl "~1.3.3"
-    statuses "~1.4.0"
+    statuses "~1.5.0"
    unpipe "~1.0.0"
 find-cache-dir@^0.1.1:
@@ -3482,9 +3505,9 @@ fs-extra@~0.16.3:
    rimraf "^2.2.8"
 fs-minipass@^1.2.5:
-  version "1.2.5"
+  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
-  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
+  integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
  dependencies:
    minipass "^2.2.1"
@@ -3504,12 +3527,12 @@ fs.realpath@^1.0.0:
  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 fsevents@^1.2.7:
-  version "1.2.7"
+  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
-  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
+  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
  dependencies:
-    nan "^2.9.2"
+    nan "^2.12.1"
-    node-pre-gyp "^0.10.0"
+    node-pre-gyp "^0.12.0"
 function-bind@^1.1.1:
  version "1.1.1"
@@ -3603,9 +3626,9 @@ glob@7.0.x:
    path-is-absolute "^1.0.0"
 glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3:
-  version "7.1.3"
+  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
  dependencies:
    fs.realpath "^1.0.0"
    inflight "^1.0.4"
@@ -3615,9 +3638,9 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3:
    path-is-absolute "^1.0.0"
 globals@^11.0.1, globals@^11.1.0:
-  version "11.11.0"
+  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 globals@^9.18.0:
  version "9.18.0"
@@ -3914,7 +3937,18 @@ http-deceiver@^1.2.7:
  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
+http-errors@1.7.2, http-errors@~1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+http-errors@~1.6.2:
  version "1.6.3"
  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
@@ -3924,10 +3958,10 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
    setprototypeof "1.1.0"
    statuses ">= 1.4.0 < 2"
-http-parser-js@>=0.4.0:
+"http-parser-js@>=0.4.0 <0.4.11":
-  version "0.5.0"
+  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
-  integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
+  integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
 http-proxy-middleware@^0.19.1:
  version "0.19.1"
@@ -3962,14 +3996,7 @@ https-browserify@^1.0.0:
  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-iconv-lite@0.4.23:
+iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.4:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-iconv-lite@^0.4.17, iconv-lite@^0.4.4:
  version "0.4.24"
  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4022,6 +4049,14 @@ import-cwd@^2.0.0:
  dependencies:
    import-from "^2.1.0"
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
 import-from@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
@@ -4059,11 +4094,6 @@ indexes-of@^1.0.1:
  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 inflight@^1.0.4:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -4072,16 +4102,21 @@ inflight@^1.0.4:
    once "^1.3.0"
    wrappy "1"
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
+  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 inherits@2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 ini@~1.3.0:
  version "1.3.5"
  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
@@ -4143,10 +4178,10 @@ ip@^1.1.0, ip@^1.1.5:
  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-ipaddr.js@1.8.0:
+ipaddr.js@1.9.0:
-  version "1.8.0"
+  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
-  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
+  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
 is-absolute-url@^2.0.0:
  version "2.1.0"
@@ -4176,9 +4211,9 @@ is-accessor-descriptor@^1.0.0:
    kind-of "^6.0.0"
 is-alphabetical@^1.0.0:
-  version "1.0.2"
+  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.2.tgz#1fa6e49213cb7885b75d15862fb3f3d96c884f41"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.3.tgz#eb04cc47219a8895d8450ace4715abff2258a1f8"
-  integrity sha512-V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==
+  integrity sha512-eEMa6MKpHFzw38eKm56iNNi6GJ7lf6aLLio7Kr23sJPAECscgRtZvOBYybejWDQ2bM949Y++61PY+udzj5QMLA==
 is-alphanumeric@^1.0.0:
  version "1.0.0"
@@ -4186,9 +4221,9 @@ is-alphanumeric@^1.0.0:
  integrity sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=
 is-alphanumerical@^1.0.0:
-  version "1.0.2"
+  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz#1138e9ae5040158dc6ff76b820acd6b7a181fd40"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz#57ae21c374277b3defe0274c640a5704b8f6657c"
-  integrity sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==
+  integrity sha512-A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA==
  dependencies:
    is-alphabetical "^1.0.0"
    is-decimal "^1.0.0"
@@ -4235,9 +4270,9 @@ is-date-object@^1.0.1:
  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
 is-decimal@^1.0.0:
-  version "1.0.2"
+  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.2.tgz#894662d6a8709d307f3a276ca4339c8fa5dff0ff"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.3.tgz#381068759b9dc807d8c0dc0bfbae2b68e1da48b7"
-  integrity sha512-TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==
+  integrity sha512-bvLSwoDg2q6Gf+E2LEPiklHZxxiSi3XAh4Mav65mKqTfCO1HM3uBs24TjEH8iJX3bbDdLXKJXBTmGzuTUuAEjQ==
 is-descriptor@^0.1.0:
  version "0.1.6"
@@ -4337,9 +4372,9 @@ is-glob@^4.0.0:
    is-extglob "^2.1.1"
 is-hexadecimal@^1.0.0:
-  version "1.0.2"
+  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz#b6e710d7d07bb66b98cb8cece5c9b4921deeb835"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz#e8a426a69b6d31470d3a33a47bb825cda02506ee"
-  integrity sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==
+  integrity sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA==
 is-number@^2.1.0:
  version "2.1.0"
@@ -4477,9 +4512,9 @@ is-utf8@^0.2.0:
  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 is-whitespace-character@^1.0.0:
-  version "1.0.2"
+  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz#ede53b4c6f6fb3874533751ec9280d01928d03ed"
+  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz#b3ad9546d916d7d3ffa78204bca0c26b56257fac"
-  integrity sha512-SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ==
+  integrity sha512-SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ==
 is-windows@^0.2.0:
  version "0.2.0"
@@ -4492,9 +4527,9 @@ is-windows@^1.0.0, is-windows@^1.0.2:
  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 is-word-character@^1.0.0:
-  version "1.0.2"
+  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.2.tgz#46a5dac3f2a1840898b91e576cd40d493f3ae553"
+  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.3.tgz#264d15541cbad0ba833d3992c34e6b40873b08aa"
-  integrity sha512-T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA==
+  integrity sha512-0wfcrFgOOOBdgRNT9H33xe6Zi6yhX/uoc4U8NBZGeQQB0ctU1dnlNTyL9JM2646bHDTpsDm1Brb3VPoCIMrd/A==
 is-wsl@^1.1.0:
  version "1.1.0"
@@ -4543,7 +4578,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-js-yaml@^3.4.3, js-yaml@^3.5.2, js-yaml@^3.6.1, js-yaml@^3.9.0, js-yaml@^3.9.1:
+js-yaml@^3.13.1, js-yaml@^3.4.3, js-yaml@^3.5.2, js-yaml@^3.6.1, js-yaml@^3.9.0, js-yaml@^3.9.1:
  version "3.13.1"
  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -4622,9 +4657,9 @@ json-stringify-safe@~5.0.1:
  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 json3@^3.3.2:
-  version "3.3.2"
+  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
+  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 json5@^0.5.0, json5@^0.5.1:
  version "0.5.1"
@@ -4912,14 +4947,14 @@ log-symbols@^2.0.0, log-symbols@^2.1.0:
    chalk "^2.0.1"
 loglevel@^1.4.1:
-  version "1.6.1"
+  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.3.tgz#77f2eb64be55a404c9fd04ad16d57c1d6d6b1280"
-  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
+  integrity sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==
 longest-streak@^2.0.1:
-  version "2.0.2"
+  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz#3de7a3f47ee18e9074ded8575b5c091f5d0a4105"
-  integrity sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==
+  integrity sha512-9lz5IVdpwsKLMzQi0MQ+oD9EA0mIGcWYP7jXMTZVXP8D42PwuAk+M/HBFYQoxt1G5OR8m7aSIgb1UymfWGBWEw==
 longest@^1.0.1:
  version "1.0.1"
@@ -4984,14 +5019,14 @@ map-visit@^1.0.0:
    object-visit "^1.0.0"
 markdown-escapes@^1.0.0:
-  version "1.0.2"
+  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.2.tgz#e639cbde7b99c841c0bacc8a07982873b46d2122"
+  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.3.tgz#6155e10416efaafab665d466ce598216375195f5"
-  integrity sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==
+  integrity sha512-XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw==
 markdown-table@^1.1.0:
-  version "1.1.2"
+  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz#c78db948fa879903a41bce522e3b96f801c63786"
+  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz#9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60"
-  integrity sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==
+  integrity sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==
 math-expression-evaluator@^1.2.14:
  version "1.2.17"
@@ -5004,9 +5039,9 @@ math-random@^1.0.1:
  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 mathml-tag-names@^2.0.1:
-  version "2.1.0"
+  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.0.tgz#490b70e062ee24636536e3d9481e333733d00f2c"
+  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
-  integrity sha512-3Zs9P/0zzwTob2pdgT0CHZuMbnSUSp8MB1bddfm+HDmnFWHGT4jvEZRf+2RuPoa+cjdn/z25SEt5gFTqdhvJAg==
+  integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 md5.js@^1.3.4:
  version "1.3.5"
@@ -5018,9 +5053,9 @@ md5.js@^1.3.4:
    safe-buffer "^5.1.2"
 mdast-util-compact@^1.0.0:
-  version "1.0.2"
+  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.2.tgz#c12ebe16fffc84573d3e19767726de226e95f649"
+  resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.3.tgz#98a25cc8a7865761a41477b3a87d1dcef0b1e79d"
-  integrity sha512-d2WS98JSDVbpSsBfVvD9TaDMlqPRz7ohM/11G0rp5jOBb5q96RJ6YLszQ/09AAixyzh23FeIpCGqfaamEADtWg==
+  integrity sha512-nRiU5GpNy62rZppDKbLwhhtw5DXoFMqw9UNZFmlPsNaQCZ//WLjGKUwWMdJrUH+Se7UvtO2gXtAMe0g/N+eI5w==
  dependencies:
    unist-util-visit "^1.1.0"
@@ -5136,34 +5171,24 @@ miller-rabin@^4.0.0:
    bn.js "^4.0.0"
    brorand "^1.0.1"
-"mime-db@>= 1.38.0 < 2":
+mime-db@1.40.0, "mime-db@>= 1.40.0 < 2":
-  version "1.39.0"
+  version "1.40.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-  integrity sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
-mime-db@~1.38.0:
-  version "1.38.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
-  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.7:
-  version "2.1.22"
+  version "2.1.24"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
-  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
  dependencies:
-    mime-db "~1.38.0"
+    mime-db "1.40.0"
 mime@1.3.x:
  version "1.3.6"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
  integrity sha1-WR2E02U6awtKO5343lqoEI5y5eA=
-mime@1.4.1:
+mime@1.6.0, mime@^1.2.11, mime@^1.5.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
-mime@^1.2.11, mime@^1.5.0:
  version "1.6.0"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -5213,7 +5238,7 @@ minimist@^1.1.3, minimist@^1.2.0:
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-minipass@^2.2.1, minipass@^2.3.4:
+minipass@^2.2.1, minipass@^2.3.5:
  version "2.3.5"
  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -5221,7 +5246,7 @@ minipass@^2.2.1, minipass@^2.3.4:
    safe-buffer "^5.1.2"
    yallist "^3.0.0"
-minizlib@^1.1.1:
+minizlib@^1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
@@ -5276,11 +5301,16 @@ ms@2.0.0:
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-ms@^2.1.1:
+ms@2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 multicast-dns-service-types@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -5299,10 +5329,10 @@ mute-stream@0.0.7:
  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
-nan@^2.9.2:
+nan@^2.12.1:
-  version "2.13.2"
+  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
 nanomatch@^1.2.9:
  version "1.2.13"
@@ -5332,23 +5362,23 @@ natural-compare@^1.4.0:
  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 needle@^2.2.1:
-  version "2.3.0"
+  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.0.tgz#ce3fea21197267bacb310705a7bbe24f2a3a3492"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
-  integrity sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==
+  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
  dependencies:
-    debug "^4.1.0"
+    debug "^3.2.6"
    iconv-lite "^0.4.4"
    sax "^1.2.4"
-negotiator@0.6.1:
+negotiator@0.6.2:
-  version "0.6.1"
+  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 neo-async@^2.5.0:
-  version "2.6.0"
+  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 next-tick@^1.0.0:
  version "1.0.0"
@@ -5378,9 +5408,9 @@ node-forge@0.7.5:
  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
 "node-libs-browser@^1.0.0 || ^2.0.0", node-libs-browser@^2.0.0:
-  version "2.2.0"
+  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
-  integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
  dependencies:
    assert "^1.1.1"
    browserify-zlib "^0.2.0"
@@ -5392,7 +5422,7 @@ node-forge@0.7.5:
    events "^3.0.0"
    https-browserify "^1.0.0"
    os-browserify "^0.3.0"
-    path-browserify "0.0.0"
+    path-browserify "0.0.1"
    process "^0.11.10"
    punycode "^1.2.4"
    querystring-es3 "^0.2.0"
@@ -5404,7 +5434,7 @@ node-forge@0.7.5:
    tty-browserify "0.0.0"
    url "^0.11.0"
    util "^0.11.0"
-    vm-browserify "0.0.4"
+    vm-browserify "^1.0.1"
 node-notifier@^5.1.2:
  version "5.4.0"
@@ -5417,10 +5447,10 @@ node-notifier@^5.1.2:
    shellwords "^0.1.1"
    which "^1.3.0"
-node-pre-gyp@^0.10.0:
+node-pre-gyp@^0.12.0:
-  version "0.10.3"
+  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
-  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
+  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
  dependencies:
    detect-libc "^1.0.2"
    mkdirp "^0.5.1"
@@ -5785,9 +5815,9 @@ parse-code-context@^0.2.1:
  integrity sha1-FEuK+3IZSC1+iMHranZVlvOmrA0=
 parse-entities@^1.0.2:
-  version "1.2.1"
+  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.1.tgz#2c761ced065ba7dc68148580b5a225e4918cdd69"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz#c31bf0f653b6661354f8973559cb86dd1d5edf50"
-  integrity sha512-NBWYLQm1KSoDKk7GAHyioLTvCZ5QjdH/ASBBQTD3iLiAWJXS5bg1jEWI8nIJ+vgVvsceBVBcDGRWSo0KVQBvvg==
+  integrity sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==
  dependencies:
    character-entities "^1.0.0"
    character-entities-legacy "^1.0.0"
@@ -5835,20 +5865,20 @@ parse5@^3.0.2:
  dependencies:
    "@types/node" "*"
-parseurl@~1.3.2:
+parseurl@~1.3.2, parseurl@~1.3.3:
-  version "1.3.2"
+  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 pascalcase@^0.1.1:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-path-browserify@0.0.0:
+path-browserify@0.0.1:
-  version "0.0.0"
+  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
-  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
 path-dirname@^1.0.0:
  version "1.0.2"
@@ -6092,11 +6122,11 @@ postcss-load-config@^1.1.0:
    postcss-load-plugins "^2.3.0"
 postcss-load-config@^2.0.0:
-  version "2.0.0"
+  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003"
-  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
+  integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==
  dependencies:
-    cosmiconfig "^4.0.0"
+    cosmiconfig "^5.0.0"
    import-cwd "^2.0.0"
 postcss-load-options@^1.2.0:
@@ -6402,9 +6432,9 @@ preserve@^0.2.0:
  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 prettier@^1.7.0:
-  version "1.17.0"
+  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.0.tgz#53b303676eed22cc14a9f0cec09b477b3026c008"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
-  integrity sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw==
+  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
 pretty-error@^2.0.2:
  version "2.1.1"
@@ -6420,9 +6450,9 @@ private@^0.1.6, private@^0.1.8:
  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 process-nextick-args@~2.0.0:
-  version "2.0.0"
+  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 process@^0.11.10:
  version "0.11.10"
@@ -6460,13 +6490,13 @@ promise@^7.1.1:
  dependencies:
    asap "~2.0.3"
-proxy-addr@~2.0.4:
+proxy-addr@~2.0.5:
-  version "2.0.4"
+  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
-  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
+  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
  dependencies:
    forwarded "~0.1.2"
-    ipaddr.js "1.8.0"
+    ipaddr.js "1.9.0"
 prr@~1.0.1:
  version "1.0.1"
@@ -6551,10 +6581,10 @@ qr.js@0.0.0:
  resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
  integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
-qs@6.5.2:
+qs@6.7.0:
-  version "6.5.2"
+  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 qs@~6.4.0:
  version "6.4.0"
@@ -6579,7 +6609,7 @@ querystring@0.2.0, querystring@^0.2.0:
  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-querystringify@^2.0.0:
+querystringify@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
@@ -6618,19 +6648,19 @@ randomfill@^1.0.3:
    randombytes "^2.0.5"
    safe-buffer "^5.1.0"
-range-parser@^1.0.3, range-parser@~1.2.0:
+range-parser@^1.0.3, range-parser@~1.2.1:
-  version "1.2.0"
+  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-raw-body@2.3.3:
+raw-body@2.4.0:
-  version "2.3.3"
+  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
  dependencies:
-    bytes "3.0.0"
+    bytes "3.1.0"
-    http-errors "1.6.3"
+    http-errors "1.7.2"
-    iconv-lite "0.4.23"
+    iconv-lite "0.4.24"
    unpipe "1.0.0"
 rc@^1.2.7:
@@ -6715,9 +6745,9 @@ read-pkg@^3.0.0:
    util-deprecate "~1.0.1"
 readable-stream@^3.0.6, readable-stream@^3.1.1:
-  version "3.3.0"
+  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
-  integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==
+  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
  dependencies:
    inherits "^2.0.3"
    string_decoder "^1.1.1"
@@ -7031,10 +7061,10 @@ resolve-url@^0.2.1:
  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.2.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.2.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
-  version "1.10.0"
+  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
-  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
+  integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
  dependencies:
    path-parse "^1.0.6"
@@ -7099,7 +7129,7 @@ rx-lite@*, rx-lite@^4.0.8:
  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
  integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -7163,10 +7193,10 @@ semver@5.3.0:
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
-send@0.16.2:
+send@0.17.1:
-  version "0.16.2"
+  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
  dependencies:
    debug "2.6.9"
    depd "~1.1.2"
@@ -7175,17 +7205,17 @@ send@0.16.2:
    escape-html "~1.0.3"
    etag "~1.8.1"
    fresh "0.5.2"
-    http-errors "~1.6.2"
+    http-errors "~1.7.2"
-    mime "1.4.1"
+    mime "1.6.0"
-    ms "2.0.0"
+    ms "2.1.1"
    on-finished "~2.3.0"
-    range-parser "~1.2.0"
+    range-parser "~1.2.1"
-    statuses "~1.4.0"
+    statuses "~1.5.0"
 serialize-javascript@^1.4.0:
-  version "1.6.1"
+  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
-  integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
+  integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
 serve-index@^1.9.1:
  version "1.9.1"
@@ -7200,15 +7230,15 @@ serve-index@^1.9.1:
    mime-types "~2.1.17"
    parseurl "~1.3.2"
-serve-static@1.13.2:
+serve-static@1.14.1:
-  version "1.13.2"
+  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
  dependencies:
    encodeurl "~1.0.2"
    escape-html "~1.0.3"
-    parseurl "~1.3.2"
+    parseurl "~1.3.3"
-    send "0.16.2"
+    send "0.17.1"
 set-blocking@^2.0.0, set-blocking@~2.0.0:
  version "2.0.0"
@@ -7245,6 +7275,11 @@ setprototypeof@1.1.0:
  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
 sha.js@^2.4.0, sha.js@^2.4.8:
  version "2.4.11"
  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -7509,9 +7544,9 @@ stackframe@^1.0.4:
  integrity sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==
 state-toggle@^1.0.0:
-  version "1.0.1"
+  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.1.tgz#c3cb0974f40a6a0f8e905b96789eb41afa1cde3a"
+  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.2.tgz#75e93a61944116b4959d665c8db2d243631d6ddc"
-  integrity sha512-Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og==
+  integrity sha512-8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw==
 static-extend@^0.1.1:
  version "0.1.2"
@@ -7521,16 +7556,11 @@ static-extend@^0.1.1:
    define-property "^0.2.5"
    object-copy "^0.1.0"
-"statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
  version "1.5.0"
  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 stream-browserify@^2.0.1:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -7876,17 +7906,17 @@ tapable@^0.2.7:
  integrity sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==
 tar@^4:
-  version "4.4.8"
+  version "4.4.10"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
-  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
+  integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
  dependencies:
    chownr "^1.1.1"
    fs-minipass "^1.2.5"
-    minipass "^2.3.4"
+    minipass "^2.3.5"
-    minizlib "^1.1.1"
+    minizlib "^1.2.1"
    mkdirp "^0.5.0"
    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
+    yallist "^3.0.3"
 text-table@^0.2.0, text-table@~0.2.0:
  version "0.2.0"
@@ -7970,6 +8000,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
    regex-not "^1.0.2"
    safe-regex "^1.1.0"
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 toposort@^1.0.0:
  version "1.0.7"
  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
@@ -8005,9 +8040,9 @@ trim-right@^1.0.1:
  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 trim-trailing-lines@^1.0.0:
-  version "1.1.1"
+  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz#e0ec0810fd3c3f1730516b45f49083caaf2774d9"
+  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz#d2f1e153161152e9f02fabc670fb40bec2ea2e3a"
-  integrity sha512-bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==
+  integrity sha512-MUjYItdrqqj2zpcHFTkMa9WAv4JHTI6gnRQGPFLrt5L9a6tRMiDnIqYl8JBvu2d2Tc3lWJKQwlGCp0K8AvCM+Q==
 trim@0.0.1:
  version "0.0.1"
@@ -8015,9 +8050,9 @@ trim@0.0.1:
  integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
 trough@^1.0.0:
-  version "1.0.3"
+  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.3.tgz#e29bd1614c6458d44869fc28b255ab7857ef7c24"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
-  integrity sha512-fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw==
+  integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
 tryer@^1.0.0:
  version "1.0.1"
@@ -8048,13 +8083,18 @@ type-check@~0.3.2:
  dependencies:
    prelude-ls "~1.1.2"
-type-is@~1.6.16:
+type-is@~1.6.17, type-is@~1.6.18:
-  version "1.6.16"
+  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
  dependencies:
    media-typer "0.3.0"
-    mime-types "~2.1.18"
+    mime-types "~2.1.24"
+type@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/type/-/type-1.0.1.tgz#084c9a17fcc9151a2cdb1459905c2e45e4bb7d61"
+  integrity sha512-MAM5dBMJCJNKs9E7JXo4CXRAansRfG0nlJxW7Wf6GZzSOvH31zClSaHdIMWLehe/EGMBkqeC55rrkaOr5Oo7Nw==
 typedarray@^0.0.6:
  version "0.0.6"
@@ -8104,9 +8144,9 @@ underscore@^1.8.3:
  integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
 unherit@^1.0.4:
-  version "1.1.1"
+  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.1.tgz#132748da3e88eab767e08fabfbb89c5e9d28628c"
+  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz#14f1f397253ee4ec95cec167762e77df83678449"
-  integrity sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==
+  integrity sha512-W3tMnpaMG7ZY6xe/moK04U9fBhi6wEiCYHUW5Mop/wQHf12+79EQGwxYejNdhEz2mkqkBlGwm7pxmgBKMVUj0w==
  dependencies:
    inherits "^2.0.1"
    xtend "^4.0.1"
@@ -8151,28 +8191,28 @@ unique-filename@^1.1.0:
    unique-slug "^2.0.0"
 unique-slug@^2.0.0:
-  version "2.0.1"
+  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
  dependencies:
    imurmurhash "^0.1.4"
 unist-util-find-all-after@^1.0.1:
-  version "1.0.2"
+  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.2.tgz#9be49cfbae5ca1566b27536670a92836bf2f8d6d"
+  resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.4.tgz#2eeaba818fd98492d69c44f9bee52c6a25282eef"
-  integrity sha512-nDl79mKpffXojLpCimVXnxhlH/jjaTnDuScznU9J4jjsaUtBdDbxmlc109XtcqxY4SDO0SwzngsxxW8DIISt1w==
+  integrity sha512-CaxvMjTd+yF93BKLJvZnEfqdM7fgEACsIpQqz8vIj9CJnUb9VpyymFS3tg6TCtgrF7vfCJBF5jbT2Ox9CBRYRQ==
  dependencies:
-    unist-util-is "^2.0.0"
+    unist-util-is "^3.0.0"
-unist-util-is@^2.0.0, unist-util-is@^2.1.2:
+unist-util-is@^3.0.0:
-  version "2.1.2"
+  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.2.tgz#1193fa8f2bfbbb82150633f3a8d2eb9a1c1d55db"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd"
-  integrity sha512-YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==
+  integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==
 unist-util-remove-position@^1.0.0:
-  version "1.1.2"
+  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz#86b5dad104d0bbfbeb1db5f5c92f3570575c12cb"
+  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz#d91aa8b89b30cb38bad2924da11072faa64fd972"
-  integrity sha512-XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==
+  integrity sha512-CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA==
  dependencies:
    unist-util-visit "^1.1.0"
@@ -8182,16 +8222,16 @@ unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
  integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==
 unist-util-visit-parents@^2.0.0:
-  version "2.0.1"
+  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz#63fffc8929027bee04bfef7d2cce474f71cb6217"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz#25e43e55312166f3348cae6743588781d112c1e9"
-  integrity sha512-6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA==
+  integrity sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==
  dependencies:
-    unist-util-is "^2.1.2"
+    unist-util-is "^3.0.0"
 unist-util-visit@^1.1.0:
-  version "1.4.0"
+  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.0.tgz#1cb763647186dc26f5e1df5db6bd1e48b3cc2fb1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3"
-  integrity sha512-FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw==
+  integrity sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==
  dependencies:
    unist-util-visit-parents "^2.0.0"
@@ -8239,11 +8279,11 @@ url-loader@^0.5.8:
    mime "1.3.x"
 url-parse@^1.1.8, url-parse@^1.4.3:
-  version "1.4.6"
+  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.6.tgz#baf91d6e6783c8a795eb476892ffef2737fc0456"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
-  integrity sha512-/B8AD9iQ01seoXmXf9z/MjLZQIdOoYl/+gvsQF6+mpnxaTfG9P7srYaiqaDMyKkR36XMXfhqSHss5MyFAO8lew==
+  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
  dependencies:
-    querystringify "^2.0.0"
+    querystringify "^2.1.1"
    requires-port "^1.0.0"
 url@^0.11.0:
@@ -8322,9 +8362,9 @@ vconsole@^3.2.0:
  integrity sha512-0b3p8PseD8JQG2mraWmsi/5Zto3wRakCu+tByb06Tkz3XeQ8n4UAkGVDz8iSr3c2e33d+EXDH0K4ZaS7SmiLPg==
 vendors@^1.0.0:
-  version "1.0.2"
+  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz#a6467781abd366217c050f8202e7e50cc9eef8c0"
-  integrity sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==
+  integrity sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==
 verror@1.10.0:
  version "1.10.0"
@@ -8336,9 +8376,9 @@ verror@1.10.0:
    extsprintf "^1.2.0"
 vfile-location@^2.0.0:
-  version "2.0.4"
+  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.4.tgz#2a5e7297dd0d9e2da4381464d04acc6b834d3e55"
+  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.5.tgz#c83eb02f8040228a8d2b3f10e485be3e3433e0a2"
-  integrity sha512-KRL5uXQPoUKu+NGvQVL4XLORw45W62v4U4gxJ3vRlDfI9QsT4ZN1PNXn/zQpKUulqGDpYuT0XDfp5q9O87/y/w==
+  integrity sha512-Pa1ey0OzYBkLPxPZI3d9E+S4BmvfVwNAAXrrqGbwTVXWaX2p9kM1zZ+n35UtVM06shmWKH4RPRN8KI80qE3wNQ==
 vfile-message@^1.0.0:
  version "1.1.1"
@@ -8357,12 +8397,10 @@ vfile@^2.0.0:
    unist-util-stringify-position "^1.0.0"
    vfile-message "^1.0.0"
-vm-browserify@0.0.4:
+vm-browserify@^1.0.1:
-  version "0.0.4"
+  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
-  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
+  integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
-  dependencies:
-    indexof "0.0.1"
 vue-class-component@^6.0.0, vue-class-component@^6.1.0:
  version "6.3.2"
@@ -8391,6 +8429,11 @@ vue-infinite-scroll@^2.0.2:
  resolved "https://registry.yarnpkg.com/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz#ca37a91fe92ee0ad3b74acf8682c00917144b711"
  integrity sha512-n+YghR059YmciANGJh9SsNWRi1YZEBVlODtmnb/12zI+4R72QZSWd+EuZ5mW6auEo/yaJXgxzwsuhvALVnm73A==
+vue-lazyload@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.2.3.tgz#901f9ec15c7e6ca78781a2bae4a343686bdedb2c"
+  integrity sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g==
 vue-loader@^13.3.0:
  version "13.7.3"
  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.7.3.tgz#e07440f78230a639d00ada4da7b96d0e9d62037f"
@@ -8428,14 +8471,14 @@ vue-property-decorator@^6.0.0:
    vue-class-component "^6.1.0"
 vue-router@^3.0.1:
-  version "3.0.4"
+  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.4.tgz#d6023e9db64d0b335771f0316c8bde8956f2d75d"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.6.tgz#2e4f0f9cbb0b96d0205ab2690cfe588935136ac3"
-  integrity sha512-wjirAFeMR53FFTRIM2ofLKH5BJte6Q9+MUiOj6fLzqhgerjVyQVeMmvgiQDslPJJHSqFfQ559EDvIi0lA1Lr6g==
+  integrity sha512-Ox0ciFLswtSGRTHYhGvx2L44sVbTPNS+uD2kRISuo8B39Y79rOo0Kw0hzupTmiVtftQYCZl87mwldhh2L9Aquw==
 vue-slim-better-scroll@^1.4.1:
-  version "1.5.1"
+  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/vue-slim-better-scroll/-/vue-slim-better-scroll-1.5.1.tgz#f7fbba7cbcc7ec4c5675484a52770494755ac480"
+  resolved "https://registry.yarnpkg.com/vue-slim-better-scroll/-/vue-slim-better-scroll-1.7.1.tgz#80349443f46c0a12d5c59e3d3ab9972228fead22"
-  integrity sha512-AV0NTjAB6mqWMmmgqAPQAToCE2cWYmNIxWh/lfjQ7pMd2xXTKW62RFljBs8y5tYFXIQ0vEoywfpiUQ3jUI05RQ==
+  integrity sha512-k8a/6UgBXiLRmYdVaKkJeT8BQlQBFiH5Ebao3wr6KW567hX7PLBVgMUtVk7XJiL3jaKazN/7I+lTVFQfc4S5Vw==
  dependencies:
    better-scroll "^1.14.1"
@@ -8465,22 +8508,12 @@ vue@^2.5.16, vue@^2.5.2:
  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz#a72b1a42a4d82a721ea438d1b6bf55e66195c637"
  integrity sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==
-vuex-i18n@^1.3.1:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/vuex-i18n/-/vuex-i18n-1.11.0.tgz#e6cdc95080c445ab2c211cc6b64a907d217639d3"
-  integrity sha512-+Eme0C7FS3VFLIWpAwisohC3KcRDw+YcXFANssUZZq16P2C4z8V2VGbEtFHFw0DzkvZcdM2CAkUj6rdMl9wYmg==
-vuex@^2.1.1:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/vuex/-/vuex-2.5.0.tgz#20f0265ade6c9a5ac6724a405d3ffdb4726c9741"
-  integrity sha512-5oJPOJySBgSgSzoeO+gZB/BbN/XsapgIF6tz34UwJqnGZMQurzIO3B4KIBf862gfc9ya+oduY5sSkq+5/oOilQ==
 vux-blazy@^1.6.4:
  version "1.6.4"
  resolved "https://registry.yarnpkg.com/vux-blazy/-/vux-blazy-1.6.4.tgz#e33073d902e0a3844ef1a463cce3ca2e0aab47bf"
  integrity sha1-4zBz2QLgo4RO8aRjzOPKLgqrR78=
-vux-loader@^1.0.56:
+vux-loader@latest:
  version "1.2.9"
  resolved "https://registry.yarnpkg.com/vux-loader/-/vux-loader-1.2.9.tgz#51de423753332ce102eae1551a28b2b1155142b3"
  integrity sha512-AjaD08eyeflQgGwAVJjcwA245h2hTJgXR5pRfLajgmIeEXpbzXs41FnuKLig5U2EQpYyMJ7/f/2Rdlr7cYrIOA==
@@ -8511,9 +8544,9 @@ vux-xscroll@^3.1.10:
  integrity sha1-41Ln+dxfn+6SU9szHJZ91Ws7yVA=
 vux@^2.9.2:
-  version "2.9.3"
+  version "2.9.4"
-  resolved "https://registry.yarnpkg.com/vux/-/vux-2.9.3.tgz#17129310c7496bf3b788c0f6b8eb842c7f59ca2f"
+  resolved "https://registry.yarnpkg.com/vux/-/vux-2.9.4.tgz#3964df4f0ac54b3fbf6cc9beb072e44dce00afaa"
-  integrity sha512-2ZcDvu3z6bKj6C3zlRODp21UIOHj/4SEf+/FpzPv9Dnjkk07UZxQ9YEIpVw2dX4DTjwxcNJr00bTw5E5HOVaNw==
+  integrity sha512-KSqrK8f1gBJjxb0wvltFfc6Bjs8N4OoIlo3RS6qrN5uZV/ouosrcXgmLpXe2vesDalLG3bVHX08/WTJhZ/qbdA==
  dependencies:
    "@antv/f2" "^3.1.4-beta.2"
    array-filter "^1.0.0"
@@ -8616,9 +8649,9 @@ webpack-dev-server@^2.9.1:
    yargs "6.6.0"
 webpack-hot-middleware@^2.16.1:
-  version "2.24.3"
+  version "2.25.0"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.24.3.tgz#5bb76259a8fc0d97463ab517640ba91d3382d4a6"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz#4528a0a63ec37f8f8ef565cf9e534d57d09fe706"
-  integrity sha512-pPlmcdoR2Fn6UhYjAhp1g/IJy1Yc9hD+T6O9mjRcWV2pFbBjIFoJXhP0CoD0xPOhWJuWXuZXGBga9ybbOdzXpg==
+  integrity sha512-xs5dPOrGPCzuRXNi8F6rwhawWvQQkeli5Ro48PRuQh8pYPCPmNnltP9itiUPT4xI8oW+y0m59lyyeQk54s5VgA==
  dependencies:
    ansi-html "0.0.7"
    html-entities "^1.2.0"
@@ -8690,11 +8723,12 @@ webpack@^3.6.0:
    yargs "^8.0.2"
 websocket-driver@>=0.5.1:
-  version "0.7.0"
+  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
-  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
+  integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
  dependencies:
-    http-parser-js ">=0.4.0"
+    http-parser-js ">=0.4.0 <0.4.11"
+    safe-buffer ">=5.1.0"
    websocket-extensions ">=0.1.1"
 websocket-extensions@>=0.1.1:
@@ -8809,7 +8843,7 @@ yallist@^2.1.2:
  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-yallist@^3.0.0, yallist@^3.0.2:
+yallist@^3.0.0, yallist@^3.0.3:
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==