feat: 完成订单和会员充值开发

9f8f6327 · 郭志伟 · b2b17557 · 9f8f6327 · 9f8f6327 · 9f8f6327
Commit 9f8f6327 authored Jul 04, 2021 by 郭志伟
32 changed files
--- a/package-lock.json
+++ b/package-lock.json
@@ -1159,9 +1159,9 @@
      }
    },
    "@qg/ui-request": {
-      "version": "0.0.5",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fui-request/-/ui-request-0.0.5.tgz",
-      "integrity": "sha512-6RAAMxEzud18N0WQk5CR5vnrQ+FvBdejK+Ig5HAEyBMbFJ6sE1EfuccfYqx7qQ3CizHL58VpIa9pM+zhhdztFw==",
+      "version": "0.0.7",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fui-request/-/ui-request-0.0.7.tgz",
+      "integrity": "sha512-C6qxG0HMskn0KDc9TDfmYf2ysPcD8ewEGQCpRv505A89oW28qTA8FpGHEVGWEO20ZJ9I6KAmfMkNaPxIZXHgKg==",
      "requires": {
        "axios": "^0.19.2"
      }

--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
    "@qg/cherry-ui": "^2.20.22",
    "@qg/js-bridge": "^1.1.9",
    "@qg/qg-scroll": "^1.4.2",
-    "@qg/ui-request": "^0.0.5",
+    "@qg/ui-request": "^0.0.7",
    "core-js": "^3.6.5",
    "js-cookie": "^2.2.1",
    "raven-js": "^3.27.2",

--- a/src/api/order.api.js
+++ b/src/api/order.api.js
+import config from '@/config';
+import http from '@/service/httpDecorator';
+const { talosHost } = config;
+
+export default {
+  // 订单列表
+  orderList(data) {
+    // TODO 测试
+    return http.get(`${talosHost}/api/kdsp/order-info/virtual-recharge/list`, { params: data });
+  },
+  // 用户订单确认收货接口
+  orderConfirm(data) {
+    return http.post(`${talosHost}/api/kdsp/order-info/receipt/confirm`, data);
+  },
+  // 用户订单取消接口【未付款】
+  orderCancel(data) {
+    return http.post(`${talosHost}/api/kdsp/order-info/cancel`, data);
+  },
+  // 订单详情查询接口
+  orderDetail(data) {
+    return http.get(`${talosHost}/api/kdsp/order-info/virtual-recharge/detail`, data);
+  },
+  // 订单创建
+  orderCreate(data) {
+    return http.get(`${talosHost}/api/kdsp/order-info/e/vmSubmit`, data);
+  }
+};
--- a/src/api/recharge.api.js
+++ b/src/api/recharge.api.js
+import config from '@/config';
+import http from '@/service/httpDecorator';
+const { talosHost } = config;
+
+export default {
+  // 虚拟充值中心配置文件
+  getSpuList() {
+    return http.get(talosHost + '/api/kdsp/virtual/recharge-center/config');
+  },
+  // VIP充值中心SKU列表
+  getSkuList() {
+    return http.get(talosHost + '/api/kdsp/virtual/recharge-center/recharge-list');
+  },
+  // 查询归属地
+  getPhoneHome() {
+    return http.get(talosHost + '/api/kdsp/virtual/recharge-center/phone-home');
+  }
+};
--- a/src/api/tips.js
+++ b/src/api/tips.js
+export default {
+  101: `<p>充值类商品售出<strong>后无法进行退换</strong>，非充值用户请谨慎购买。</p>`,
+  102: `<p>充值类商品售出<strong>后无法进行退换</strong>，非充值用户请谨慎购买。</p>`
+};
--- a/src/assets/images/order/11.png
+++ b/src/assets/images/order/11.png
--- a/src/assets/images/order/21.png
+++ b/src/assets/images/order/21.png
--- a/src/assets/images/order/41.png
+++ b/src/assets/images/order/41.png
--- a/src/assets/images/order/51.png
+++ b/src/assets/images/order/51.png
--- a/src/config/env.config.js
+++ b/src/config/env.config.js
@@ -2,7 +2,7 @@
 * @Description:
 * @Date: 2021-03-31 19:59:17
 * @LastEditors: gzw
- * @LastEditTime: 2021-03-31 19:59:17
+ * @LastEditTime: 2021-07-01 17:02:56
 */
 /*
 * @Description:
@@ -14,7 +14,8 @@ let protocol = window.location.protocol;

 let payHost = protocol + '//mapi-qa.liangkebang.net/pay';
 let shenceHost = 'https://bn.xyqb.com/sa?project=default'; // 测试地址
-let talosHost = 'https://talos-vcc2.liangkebang.net'; // 电商分期测试环境服务地址
+let talosHost = 'http://yapi.quantgroups.com/mock/351'; // 电商分期测试环境服务地址
+// let talosHost = 'https://talos-vcc2.liangkebang.net'; // 电商分期测试环境服务地址
 let operatorHost = 'https://operator.liangkebang.com';
 export default {
  talosHost,

--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -4,18 +4,28 @@ export default [
    redirect: '/error'
  },
  {
-    path: '/demo',
-    alias: ['/demo-page'],
-    name: 'demo-page',
-    back: false,
+    path: '/vipLife',
+    name: 'vipLife',
    meta: {
-      title: 'DEMO',
-      has: {
-        header: true,
-        footer: true
-      }
+      title: '充值中心'
+    },
+    component: () => import('../views/vipLife')
+  },
+  {
+    path: '/orderList',
+    name: 'orderList',
+    meta: {
+      title: '我的订单'
+    },
+    component: () => import('../views/orderList')
+  },
+  {
+    path: '/orderDetail',
+    name: 'orderDetail',
+    meta: {
+      title: '订单详情'
    },
-    component: () => import('../views/demo')
+    component: () => import('../views/orderDetail')
  },
  {
    path: '/error',

--- a/src/service/cherryUI.service.js
+++ b/src/service/cherryUI.service.js
@@ -7,6 +7,8 @@ import {
  Icon,
  Cell,
  CellGroup,
+  Radio,
+  RadioGroup,
  Row,
  Col,
  Dialog,
@@ -24,7 +26,8 @@ import {
  Form,
  Sticky,
  Tab,
-  Tabs
+  Tabs,
+  Empty
 } from '@qg/cherry-ui';
 import DialogFn from '@qg/cherry-ui/src/dialog/func';
 // import "@qg/cherry-ui/dist/cherry.css";
@@ -33,6 +36,8 @@ Vue.use(Button);
 Vue.use(Image);
 Vue.use(Cell);
 Vue.use(CellGroup);
+Vue.use(Radio);
+Vue.use(RadioGroup);
 Vue.use(Row);
 Vue.use(Col);
 Vue.use(Popup);
@@ -52,6 +57,7 @@ Vue.use(Loading);
 Vue.use(List);
 Vue.use(Tab);
 Vue.use(Tabs);
+Vue.use(Empty);

 // const _proto = Vue.prototype;
 // const proto = Object.create(_proto);

--- a/src/service/httpDecorator.js
+++ b/src/service/httpDecorator.js
@@ -10,6 +10,6 @@ const http = new HttpRequest(
  function(loadingState) {
    store.dispatch('change_loading', loadingState);
  }
-);
+).getInstance();

 export default http;
--- a/src/service/utils.service.js
+++ b/src/service/utils.service.js
@@ -310,6 +310,11 @@ export function idNoFormat(value) {
    return $1 + ' ' + $2 + ' ' + $3;
  });
 }
+
 export function dateFormat(value) {
  return value.replace(/(\d{4})(\d{2})(\d{2})/, '$1.$2.$3');
 }
+
+export function phoneFormat(value) {
+  return value.replace(/(\d{3})(\d{4})(\d{4})/, '$1 $2 $3');
+}
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -102,3 +102,11 @@ strong {
    border-bottom: 0.026667rem solid #f2f3f5;
    transform: scaleY(0.5);
 }
+.Vl__panel-tips {
+  color: @text-grey;
+  min-height: 143px;
+  p {
+  .text-14();
+  margin-bottom: @padding-xs;
+  }
+}
\ No newline at end of file
--- a/src/style/theme.less
+++ b/src/style/theme.less
 // 覆盖cherry-ui样式
 @import "./var.less";
-@button-border-width: 0;
+@button-border-width: 1px;
 @button-default-height: 37px;
 @button-default-line-height: 37px;
 @button-default-font-size: 16px;
@@ -25,9 +25,10 @@
 @cell-group-title-color: @orange;
 @cell-group-title-padding: @padding-xs @padding-lg @padding-xs;
 @cell-group-title-font-size: 12px;
-@cell-border-color: @grey-border;
+@cell-border-color: @gray-2;
 @cell-right-icon-color: @gray-3;
 @cell-icon-size: 16px;
+@cell-clear-color: @gray-4;
 @field-label-width: 75px;

 @dialog-width: 290px;
@@ -41,5 +42,4 @@
 @picker-toolbar-padding: @padding-unit - 2 @padding-md;
 @picker-font-size: 14px;

-@loading-color: @white;
-@loading-text-color: @white;
\ No newline at end of file
+@tabs-nav-background-color: @background-color;
\ No newline at end of file
--- a/src/style/var.less
+++ b/src/style/var.less
@@ -44,9 +44,9 @@
 @padding-xl: @padding-unit * 8;

 // Font
-@font-size-list: 10,11, 12, 13, 14, 16, 17, 18, 20, 26, 28, 30, 52;
+@font-size-list: 10,11, 12, 13, 14, 15, 16, 17, 18, 20, 24, 26, 28, 30, 52;

-.generate-text(12);
+.generate-text(14);
 .generate-text(@n, @i: 1) when (@i =< @n) {
  @font: extract(@font-size-list, @i);
  .text-@{font} {

--- a/src/views/demo/index.less
+++ b/src/views/demo/index.less
-@import '../../style/var.less';
-
-.page {
-  padding: @page-padding-lg @page-padding-lg 0;
-  height: calc(100% - @page-padding-lg);
-}
-
-.banner {
-  position: relative;
-  display: flex;
-  justify-content: center;
-  background-image: @gradient-red;
-  background-repeat: no-repeat;
-  margin: -1 * @page-padding-lg -1 * @page-padding-lg 48px -1 * @page-padding-lg;
-  padding: @padding-md @padding-lg 0;
-
-  
-}
-.card {
-  &__icon {
-    height: 200px;
-    width: 200px;
-    margin: 0 auto;
-    display: block;
-  }
-
-  &__info {
-    padding: 20px 0;
-    color: #fff;
-    font-size: 28px;
-    text-align: center;
-  }
-}
--- a/src/views/demo/index.vue
+++ b/src/views/demo/index.vue
-<template>
-  <div class="page">
-    <div class="banner">
-      <div class="card">
-        <p class="card__info">{{ list.length }}</p>
-      </div>
-    </div>
-    <svg-icon icon-class="ufo" class="card__icon" />
-  </div>
-</template>
-<script>
-import demoApi from '@/api/demo.auth';
-export default {
-  data() {
-    return {
-      list: []
-    };
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    async getList() {
-      const res = await demoApi.recommendLike();
-      this.list = res;
-    }
-  }
-};
-</script>
-<style lang="less" src="./index.less" scoped></style>
--- a/src/views/orderDetail/index.less
+++ b/src/views/orderDetail/index.less
+@bottom-height: 60px;
+.order-detail {
+  padding-bottom: @bottom-height;
+}
+.Od {
+  &__item {
+    background-color: @white;
+    border-radius: @border-radius-sm;
+    margin: @padding-sm 0;
+    padding: 0 @padding-xs;
+  }
+  &__status {
+    padding-top: 8px;
+    padding-bottom: 8px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    &-desc {
+      margin-right: 10px;
+      width: 142px;
+    }
+    &-statusTxt {
+      .text-16();
+      color: @text-color;
+    }
+    &-txt {
+      .text-12();
+      color: @text-grey;
+    }
+    &-img {
+      width: 100px;
+      height: 100px;
+    }
+  }
+  &__price {
+    color: @text-grey;
+    .text-13();
+    &-statistic {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 8px 0;
+      span:last-child {
+        color: @text-color;
+      }
+    }
+    &-bold {
+      font-weight: @font-weight-bold - 100;
+      color: @red-light !important;
+      .text-15();
+    }
+  }
+  &__info {
+    &-item {
+      padding: 8px 0;
+      color: @text-grey;
+      .text-13();
+      span {
+        color: @gray-5;
+      }
+    }
+  }
+  &__bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    width: calc(100% - @padding-sm * 2);
+    background-color: @white;
+    padding: 0 @padding-sm;
+    height: @bottom-height;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    .cr-button {
+      margin-left: @padding-xs;
+    }
+  }
+}
\ No newline at end of file
--- a/src/views/orderDetail/index.vue
+++ b/src/views/orderDetail/index.vue
+<template>
+  <div class="page order-detail">
+    <div class="Od__item Od__status">
+      <div class="Od__status-desc">
+        <div class="Od__status-statusTxt">{{ orderInfo.orderStatusInfo.orderStatusText }}</div>
+        <div class="Od__status-txt">{{ orderInfo.orderStatusInfo.text }}</div>
+      </div>
+      <cr-image
+        width="2.666667rem"
+        height="2.666667rem"
+        class="Od__status-img"
+        :src="orderStatus"
+      />
+    </div>
+    <div class="Od__item Od__list">
+      <list-item :list="orderInfo.skuList" :show-copy="true" />
+    </div>
+    <div class="Od__item Od__price">
+      <!-- 活动优惠金额 -->
+      <div v-if="orderInfo.feeInfo.activityDeductionFee" class="Od__price-statistic">
+        <span>活动优惠</span>
+        <span>¥{{ orderInfo.feeInfo.activityDeductionFee || 0 }}</span>
+      </div>
+      <!-- 优惠券抵扣金额 -->
+      <div v-if="orderInfo.feeInfo.couponDeductionFee" class="Od__price-statistic">
+        <span>优惠</span>
+        <span>¥{{ orderInfo.feeInfo.couponDeductionFee || 0 }}</span>
+      </div>
+      <!-- 运费优惠券抵扣金额 -->
+      <div v-if="orderInfo.feeInfo.freightDeductionFee" class="Od__price-statistic">
+        <span>运费优惠</span>
+        <span>¥{{ orderInfo.feeInfo.freightDeductionFee || 0 }}</span>
+      </div>
+      <div class="Od__price-statistic">
+        <span>运费</span>
+        <!-- 订单运费总金额 -->
+        <span>¥{{ orderInfo.feeInfo.totalFreightFee || 0 }}</span>
+      </div>
+      <div class="Od__price-statistic">
+        <span v-if="orderInfo.orderStatusInfo.orderStatus == 11">待付款</span>
+        <span v-else>实付款</span>
+        <!-- 订单总金额 -->
+        <span class="Od__price-bold">¥{{ orderInfo.feeInfo.totalFee || 0 }}</span>
+      </div>
+    </div>
+    <div class="Od__item Od__info">
+      <div class="Od__info-item">
+        订单编号：<span>{{ orderInfo.orderDetail.orderNo || '' }}</span>
+      </div>
+      <div class="Od__info-item">
+        下单时间：<span>{{ orderInfo.orderDetail.orderTime || '' }}</span>
+      </div>
+      <div v-if="orderInfo.orderDetail.payTime" class="Od__info-item">
+        支付时间：<span>{{ orderInfo.orderDetail.payTime || '' }}</span>
+      </div>
+      <div v-if="orderInfo.payDetail && orderInfo.payDetail.aliPayAmt" class="Od__info-item">
+        支付宝支付金额：<span>{{ orderInfo.payDetail.aliPayAmt || '' }}</span>
+      </div>
+      <div v-if="orderInfo.payDetail && orderInfo.payDetail.wxPayAmt" class="Od__info-item">
+        微信支付金额：<span>{{ orderInfo.payDetail.wxPayAmt || '' }}</span>
+      </div>
+      <div v-if="orderInfo.orderDetail.payType" class="Od__info-item">
+        支付方式：<span>{{ payType }}</span>
+      </div>
+    </div>
+    <div class="Od__bottom">
+      <cr-button
+        v-if="orderInfo.orderStatusInfo.orderStatus !== 41"
+        size="small"
+        plain
+        type="default"
+        shape="circle"
+        @click="contractCS"
+      >
+        联系客服
+      </cr-button>
+      <cr-button
+        v-if="orderInfo.orderStatusInfo.orderStatus === 11"
+        size="small"
+        plain
+        type="primary"
+        shape="circle"
+        @click="openCancelPopup"
+      >
+        取消订单
+      </cr-button>
+      <cr-button
+        v-if="orderInfo.orderStatusInfo.orderStatus === 11"
+        size="small"
+        plain
+        type="primary"
+        shape="circle"
+        @click="toPay"
+      >
+        付款</cr-button
+      >
+      <cr-button
+        v-if="orderInfo.orderStatusInfo.orderStatus === 21"
+        size="small"
+        plain
+        type="primary"
+        shape="circle"
+        @click="orderNotify"
+      >
+        提醒发货
+      </cr-button>
+      <cr-button
+        v-if="orderInfo.orderStatusInfo.orderStatus === 31"
+        size="small"
+        plain
+        type="primary"
+        shape="circle"
+        @click="toGoods"
+      >
+        再次购买
+      </cr-button>
+    </div>
+    <cancel-popup v-model="showCancelPopup" :order-info="currentOrder" />
+  </div>
+</template>
+<script>
+import ListItem from '../orderList/components/ListItem.vue';
+import CancelPopup from '../orderList/components/CancelPopup.vue';
+
+import orderApi from '@/api/order.api';
+import img11 from '@/assets/images/order/11.png';
+import img21 from '@/assets/images/order/21.png';
+import img41 from '@/assets/images/order/41.png';
+import img51 from '@/assets/images/order/51.png';
+const orderStatusImgs = {
+  11: img11,
+  21: img21,
+  41: img41,
+  51: img51,
+  61: img51,
+  62: img51
+};
+export default {
+  name: 'OrderDetail',
+  components: {
+    ListItem,
+    CancelPopup
+  },
+  data() {
+    return {
+      orderInfo: {
+        feeInfo: {},
+        orderDetail: {},
+        orderStatusInfo: {},
+        receiverInfo: {},
+        skuList: [],
+        payDetail: {},
+        orderNo: ''
+      },
+      showCancelPopup: false
+    };
+  },
+  computed: {
+    orderStatus() {
+      return orderStatusImgs[this.orderInfo.orderStatusInfo.orderStatus] || '';
+    },
+    currentOrder() {
+      return {
+        orderNo: this.orderNo
+      };
+    },
+    payType() {
+      return this.orderInfo.orderDetail.payType === 1 ? '微信' : '支付宝';
+    }
+  },
+  mounted() {
+    this.orderNo = this.$route.query.orderNo;
+    this.getDetail();
+  },
+  methods: {
+    async getDetail() {
+      const [res] = await orderApi.orderDetail({ orderNo: this.orderNo });
+      this.orderInfo = res;
+    },
+    contractCS() {
+      window.location.href =
+        'https://www.sobot.com/chat/h5/v2/index.html?sysnum=84ed0ad93caa47b0a9d1600824546b35&source=2';
+    },
+    openCancelPopup() {
+      this.showCancelPopup = true;
+    },
+    toPay() {
+      this.$router.push({ path: '/pay', query: { orderNo: this.currentOrder.orderNo } });
+    },
+    toGoods() {
+      this.$router.push({ path: '/goods' });
+    },
+    orderNotify() {
+      this.$toast.success('已通知卖家');
+    },
+    copyPwd(item) {
+      this.$toast.success('已复制');
+      console.log(item);
+    }
+  }
+};
+</script>
+<style lang="less" src="./index.less" scoped></style>
--- a/src/views/orderList/components/CancelPopup.vue
+++ b/src/views/orderList/components/CancelPopup.vue
+<template>
+  <cr-popup
+    v-model="show"
+    closeable
+    round
+    position="bottom"
+    get-container="body"
+    class="cancel-popup"
+  >
+    <div class="Cp__head">
+      <div class="Cp__head-title">请选择原因</div>
+      <div class="Cp__head-desc">订单一旦取消，无法恢复，金额/积分将原路返还</div>
+    </div>
+    <cr-radio-group v-model="reasonType" class="Cp__list-wrap">
+      <cr-cell-group class="Cp__list">
+        <cr-cell
+          v-for="(item, index) in reasonList"
+          :key="index"
+          :title="item.cancelReason"
+          @click="onCellClick(item.cancelReasonType)"
+        >
+          <template #right-icon>
+            <cr-radio ref="checkboxes" :name="item.cancelReasonType" class="Cp__list-radio" />
+          </template>
+        </cr-cell>
+      </cr-cell-group>
+    </cr-radio-group>
+    <div class="Cp__button">
+      <cr-button block type="primary" shape="circle" @click="handleRadioSubmit">提交</cr-button>
+    </div>
+  </cr-popup>
+</template>
+<script>
+const EVENT_INPUT = 'input';
+import orderApi from '@/api/order.api';
+export default {
+  name: 'CancelPopup',
+  props: {
+    value: Boolean,
+    orderInfo: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      show: false,
+      reasonType: '',
+      reasonList: [
+        {
+          cancelReasonType: 1,
+          cancelReason: '收货地址填错了'
+        },
+        {
+          cancelReasonType: 2,
+          cancelReason: '忘记支付密码/余额不足'
+        },
+        {
+          cancelReasonType: 3,
+          cancelReason: '无法正常支付'
+        },
+        {
+          cancelReasonType: 4,
+          cancelReason: '不想买了'
+        },
+        {
+          cancelReasonType: 5,
+          cancelReason: '其他原因'
+        }
+      ]
+    };
+  },
+  computed: {
+    reason() {
+      return this.reasonList.find(item => item.cancelReasonType === this.reasonList);
+    }
+  },
+  watch: {
+    value(val) {
+      this.show = val;
+    }
+  },
+  methods: {
+    onCellClick(name) {
+      this.reasonType = name;
+    },
+    async handleRadioSubmit() {
+      const [res] = await orderApi.orderCancel({
+        orderNo: this.orderInfo.orderNo,
+        ...this.reason
+      });
+      if (res) {
+        this.$toast('已取消');
+        this.$emit(EVENT_INPUT, false);
+      }
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.order-list {
+  padding: 0 @padding-sm;
+}
+.Cp {
+  &__head {
+    text-align: center;
+    height: 60px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    padding: 0 @padding-md;
+    &-title {
+      .text-16();
+      color: @text-color;
+      font-weight: bold;
+    }
+    &-desc {
+      .text-13();
+      color: @text-grey;
+    }
+  }
+  &__list {
+    flex: 1;
+    &-radio {
+      margin-right: 0;
+    }
+  }
+  &__button {
+    border-top: 1px solid @grey-border;
+    padding: @padding-sm - 2 @padding-xs;
+  }
+}
+</style>
--- a/src/views/orderList/components/List.vue
+++ b/src/views/orderList/components/List.vue
+<template>
+  <div class="order-list">
+    <cr-list
+      v-if="list.length"
+      v-model="listLoading"
+      :finished="listFinished"
+      finished-text="没有更多了"
+      @load="onLoad"
+    >
+      <div v-for="(item, index) in list" :key="index" class="Ol__item" @click="toDetail(item)">
+        <div class="Ol__head">
+          <span class="Ol__head-title">当前订单状态</span>
+          <span class="Ol__head-state">{{ item.orderStatusText }}</span>
+        </div>
+        <div class="Ol__body">
+          <list-item :list="item.skuList" />
+        </div>
+        <div class="Ol__foot">
+          <div class="Ol__foot-settle">
+            <span>总价¥{{ item.totalFee }}，</span>
+            <span>优惠¥{{ item.reduceFee }}，</span>
+            <span>
+              实付款<strong>¥{{ item.originalFee }}</strong>
+            </span>
+          </div>
+          <div class="Ol__foot-btns">
+            <cr-button
+              v-if="item.orderStatus == 11"
+              size="small"
+              plain
+              type="default"
+              shape="circle"
+              @click="onOptionClick(item, 'cancel')"
+            >
+              取消订单
+            </cr-button>
+            <cr-button
+              v-if="item.orderStatus == 11"
+              size="small"
+              plain
+              type="primary"
+              shape="circle"
+              @click="onOptionClick(item, 'pay')"
+            >
+              付款
+            </cr-button>
+            <cr-button
+              v-if="item.orderStatus == 21"
+              size="small"
+              plain
+              type="default"
+              shape="circle"
+              @click="onOptionClick(item, 'notify')"
+            >
+              提醒发货
+            </cr-button>
+            <cr-button
+              v-if="item.orderStatus == 31"
+              size="small"
+              plain
+              type="primary"
+              shape="circle"
+              @click="onOptionClick(item, 'again')"
+            >
+              再次购买
+            </cr-button>
+          </div>
+        </div>
+      </div>
+    </cr-list>
+    <div v-else class="Ol__noData">
+      <cr-empty
+        image="https://img.lkbang.net/xcx/empty@2x.png"
+        image-size="4rem"
+        description="暂无订单～"
+      >
+        <cr-button size="small" plain type="primary" shape="circle" @click="toHome">
+          返回充值中心
+        </cr-button>
+      </cr-empty>
+    </div>
+  </div>
+</template>
+<script>
+import ListItem from './ListItem.vue';
+const EVENT_LOADING = 'load';
+const EVENT_CLICK = 'option-click';
+export default {
+  name: 'OrderSkuList',
+  components: {
+    ListItem
+  },
+  props: {
+    list: {
+      type: Array,
+      default: () => []
+    },
+    loading: Boolean,
+    finished: Boolean
+  },
+  data() {
+    return {
+      listLoading: false,
+      listFinished: false
+    };
+  },
+  watch: {
+    loading(val) {
+      this.listLoading = val;
+    },
+    finished(val) {
+      this.listFinished = val;
+    }
+  },
+  methods: {
+    toDetail(order) {
+      this.$router.push({ path: '/orderDetail', query: { orderNo: order.orderNo } });
+    },
+    onLoad() {
+      this.$emit(EVENT_LOADING);
+    },
+    onOptionClick(orderInfo, eventType) {
+      this.$emit(EVENT_CLICK, { orderInfo, eventType });
+    },
+    toHome() {
+      this.$router.replace({ path: '/home' });
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.order-list {
+  padding: 0 @padding-sm;
+  .cr-empty {
+    text-align: center;
+  }
+  @{deep} .cr-empty__image {
+    height: auto !important;
+  }
+}
+.Ol {
+  &__item {
+    .text-12();
+    background-color: @white;
+    border-radius: @border-radius-md;
+    margin-bottom: @padding-sm;
+  }
+  &__head {
+    padding: @padding-sm @padding-xs;
+    border-bottom: 1px solid @grey-border;
+    display: flex;
+    justify-content: space-between;
+    &-title {
+      color: @text-grey;
+    }
+    &-state {
+      color: @red;
+    }
+  }
+  &__foot {
+    border-top: 1px solid @grey-border;
+    padding: @padding-sm - 2 @padding-xs;
+    &-settle {
+      text-align: right;
+      color: @text-grey;
+      span {
+        vertical-align: baseline;
+        &:last-child {
+          color: @text-color;
+          .text-13();
+          strong {
+            .text-14();
+            margin-left: @padding-unit;
+          }
+        }
+      }
+    }
+    &-btns {
+      text-align: right;
+      margin-top: @padding-sm - 2;
+      .cr-button {
+        margin-left: @padding-unit;
+      }
+    }
+  }
+  &__noData {
+    .cr-button {
+      background: transparent;
+    }
+  }
+}
+</style>
--- a/src/views/orderList/components/ListItem.vue
+++ b/src/views/orderList/components/ListItem.vue
+<template functional>
+  <div class="Ol__body">
+    <div v-for="(it, idx) in props.list" :key="idx" class="Ol__body-item">
+      <cr-image :src="it.imageUrl" width="2.266667rem" height="2.266667rem" class="Ol__body-img" />
+      <div class="Ol__body-content">
+        <div class="Ol__body-row">
+          <span class="Ol__body-title">
+            {{ it.skuName }}
+          </span>
+          <span v-if="it.salePrice" class="Ol__body-salePrice">¥{{ it.salePrice }}</span>
+        </div>
+        <div v-if="it.count" class="Ol__body-row">
+          <span class="Ol__body-count">{{ it.count }}件</span>
+        </div>
+        <div class="Ol__body-skus">
+          <div v-if="it.virtualChargeAttrs.account" class="Ol__body-sku">
+            <span>充值帐户：</span>
+            <span class="Ol__body-val">{{ it.virtualChargeAttrs.account }}</span>
+          </div>
+          <div v-if="it.virtualChargeAttrs.registrationLocation" class="Ol__body-sku">
+            <span>归属地：</span>
+            <span class="Ol__body-val">{{ it.virtualChargeAttrs.account }}</span>
+          </div>
+          <div v-if="it.virtualChargeAttrs.cardNo" class="Ol__body-sku">
+            <span>卡号：</span>
+            <span class="Ol__body-val">{{ it.virtualChargeAttrs.cardNo }}</span>
+          </div>
+          <div v-if="it.virtualChargeAttrs.cardPassword" class="Ol__body-sku">
+            <span>卡密：</span>
+            <span class="Ol__body-val">{{ it.virtualChargeAttrs.cardPassword }}</span>
+            <a
+              v-if="props.showCopy"
+              href="javascript:;"
+              @click="parent.copyPwd(it.virtualChargeAttrs)"
+            >
+              复制
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ListItem',
+  props: {
+    list: {
+      type: Array,
+      default: () => []
+    },
+    showCopy: Boolean
+  }
+};
+</script>
+<style lang="less" scoped>
+.Ol {
+  &__body {
+    &-item {
+      padding: @padding-sm - 2 @padding-xs;
+      display: flex;
+      border-bottom: 1px solid @grey-border;
+      &:last-child {
+        border-bottom: 0;
+      }
+    }
+    &-img {
+      width: 85px;
+      height: 85px;
+    }
+    &-content {
+      margin-left: @padding-sm - 2;
+      flex: 1;
+    }
+    &-row {
+      display: flex;
+      justify-content: space-between;
+    }
+    &-title {
+      .text-13();
+      color: @text-color;
+      flex: 1;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      overflow: hidden;
+    }
+    &-salePrice {
+      .text-13();
+      color: @text-color;
+      width: 78px;
+      text-align: right;
+    }
+    &-count {
+      .text-12();
+      margin-left: auto;
+      color: @text-grey;
+    }
+    &-sku {
+      .text-12();
+      display: flex;
+      align-items: center;
+      color: @text-grey;
+      a {
+        .text-12();
+        margin-left: auto;
+        color: @red;
+      }
+    }
+    &-val {
+      color: @gray-5 !important;
+    }
+  }
+}
+</style>
--- a/src/views/orderList/index.less
+++ b/src/views/orderList/index.less
+.cr-tabs {
+  margin-top: 0 !important;
+}
\ No newline at end of file
--- a/src/views/orderList/index.vue
+++ b/src/views/orderList/index.vue
+<template>
+  <div class="page page__nopad">
+    <cr-tabs v-model="currentTab" sticky :offset-top="isApp ? 0 : 48" @change="handleTabChange">
+      <cr-tab v-for="(item, index) in navList" :key="index" :title="item.title" :name="index">
+        <list
+          :list="item.list"
+          :loading="item.loading"
+          :finished="item.finished"
+          @load="handleLoad"
+          @option-click="handleOptionClick"
+        />
+      </cr-tab>
+    </cr-tabs>
+    <cancel-popup v-model="showCancelPopup" :order-info="currentOrder" />
+  </div>
+</template>
+<script>
+import orderApi from '@/api/order.api';
+import List from './components/List';
+import { isApp } from '@/service/validation.service';
+import CancelPopup from './components/CancelPopup';
+const commonParams = {
+  loading: false,
+  finished: false,
+  page: 1,
+  pageSize: 10,
+  list: []
+};
+export default {
+  name: 'OrderList',
+  components: {
+    List,
+    CancelPopup
+  },
+  data() {
+    return {
+      isApp,
+      showCancelPopup: false,
+      currentTab: 0,
+      navList: [
+        {
+          state: 0,
+          title: '全部',
+          ...JSON.parse(JSON.stringify(commonParams))
+        },
+        {
+          state: 1,
+          title: '待付款',
+          ...JSON.parse(JSON.stringify(commonParams))
+        },
+        {
+          state: 2,
+          title: '待发货',
+          ...JSON.parse(JSON.stringify(commonParams))
+        },
+        {
+          state: 3,
+          title: '待收货',
+          ...JSON.parse(JSON.stringify(commonParams))
+        },
+        {
+          state: 4,
+          title: '已完成',
+          ...JSON.parse(JSON.stringify(commonParams))
+        }
+      ],
+      currentOrder: {}
+    };
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    handleTabChange(name) {
+      this.currentTab = name;
+      this.getList();
+    },
+    handleLoad() {
+      this.getList();
+    },
+    handleOptionClick(info) {
+      this.currentOrder = info.orderInfo || {};
+      switch (info.eventType) {
+        case 'cancel':
+          this.orderCancelPopup();
+          break;
+        case 'pay':
+          this.toPay();
+          break;
+        case 'notify':
+          this.orderNotify();
+          break;
+        case 'again':
+          this.toGoods();
+          break;
+        default:
+          this.currentItems = {};
+          break;
+      }
+    },
+    orderCancelPopup() {
+      this.showCancelPopup = true;
+    },
+    toPay() {
+      this.$router.push({ path: '/pay', query: { orderNo: this.currentOrder.orderNo } });
+    },
+    toGoods() {
+      this.$router.push({ path: '/goods' });
+    },
+    orderNotify() {
+      this.$toast.success('已通知卖家');
+    },
+    setNavListData(key, val) {
+      this.$set(this.navList[this.currentTab], key, val);
+    },
+    async getList() {
+      let { finished, page, pageSize, list, state: orderStatus } = this.navList[this.currentTab];
+      if (finished) return;
+      this.setNavListData('loading', true);
+      const [res] = await orderApi.orderList({
+        page,
+        pageSize,
+        orderStatus
+      });
+      if (res) {
+        this.setNavListData('loading', false);
+        list = [...list, ...res.orderList];
+        this.setNavListData('list', list);
+        if (!res.hasNext) {
+          this.setNavListData('finished', true);
+        } else {
+          page++;
+          this.setNavListData('page', page);
+        }
+      }
+    }
+  }
+};
+</script>
+<style lang="less" src="./index.less" scoped></style>
--- a/src/views/vipLife/components/AccountInput.vue
+++ b/src/views/vipLife/components/AccountInput.vue
+<template>
+  <div class="Vl__account">
+    <cr-field
+      v-model="accountMask"
+      :placeholder="`请输入${info.name || ''}账号`"
+      clearable
+      @focus="inputBlur = false"
+      @blur="inputBlur = true"
+    >
+      <template #button>
+        <cr-image v-if="info.icon" :src="info.icon" width="0.64rem" height="0.64rem" />
+      </template>
+    </cr-field>
+    <div class="Vl__list" :class="{ show: !inputBlur }">
+      <div
+        v-for="(item, index) in list"
+        :key="index"
+        class="Vl__list-item"
+        @click="handleSelectPhone(item)"
+      >
+        <span class="phone">{{ phoneFormat(item.phone) }}</span>
+        <span class="phone-home">{{ item.home }}</span>
+        <span v-if="index === 0" class="current">上次充值</span>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import rechargeApi from '@/api/recharge.api';
+import { phoneFormat } from '@/service/utils.service';
+export default {
+  name: 'AccountInput',
+  props: {
+    value: String,
+    info: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data: function() {
+    return {
+      inputBlur: true,
+      showList: false,
+      list: [
+        {
+          phone: '17165445433',
+          home: '北京 移动'
+        },
+        {
+          phone: '17165345433',
+          home: '北京 移动'
+        },
+        {
+          phone: '17165345435',
+          home: '北京 移动'
+        }
+      ]
+    };
+  },
+  computed: {
+    accountMask: {
+      get() {
+        return this.phoneFormat(this.value);
+      },
+      set(val) {
+        this.$emit('input', val.replace(/\s/g, ''));
+        // this.getPhoneHome();
+      }
+    }
+  },
+  methods: {
+    phoneFormat,
+    handleSelectPhone(item) {
+      this.$emit('input', item.phone);
+    },
+    async getPhoneHome() {
+      const [res] = await rechargeApi({ phoneNo: this.value });
+      this.phoneHome = res.phoneHome;
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.Vl {
+  &__account {
+    position: relative;
+    @{deep} .cr-field {
+      padding: @padding-xs + 2 0;
+      &--control-in {
+        .text-24();
+      }
+      &::after {
+        right: 0;
+        left: 0;
+      }
+    }
+  }
+  &__list {
+    display: none;
+    position: absolute;
+    top: 50px;
+    left: -@padding-lg;
+    right: -@padding-lg;
+    z-index: 3;
+    background-color: @white;
+    box-shadow: 0px 7px 12px 0px rgba(0, 0, 0, 0.1);
+    &.show {
+      display: block;
+    }
+    &-item {
+      display: flex;
+      align-items: center;
+      padding: @padding-lg / 2 @padding-lg;
+      .phone {
+        color: @text-color;
+        .text-14();
+        margin-right: @padding-xs;
+      }
+      .phone-home {
+        color: @text-color;
+        .text-12();
+        max-width: 180px;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+        flex-shrink: 0;
+        overflow: hidden;
+      }
+      .current {
+        color: @text-grey;
+        .text-10();
+        margin-left: auto;
+      }
+    }
+  }
+}
+</style>
--- a/src/views/vipLife/components/SkuList.vue
+++ b/src/views/vipLife/components/SkuList.vue
+<template functional>
+  <div class="Vl__sku" :class="{ disabled: props.disabled, 'three-col': props.threeCol }">
+    <div
+      v-for="(item, index) in props.list"
+      :key="index"
+      class="Vl__sku-item"
+      :class="{
+        cheap: item.price - item.salePrice > 0,
+        active: props.info.skuNo === item.skuNo
+      }"
+      @click="parent.handleSkuSelected(item, index)"
+    >
+      <div class="Vl__sku-name">{{ item.skuName }}</div>
+      <div class="Vl__sku-price">{{ item.salePrice }}</div>
+      <div class="Vl__sku-tag">优惠</div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'SkuList',
+  props: {
+    threeCol: Boolean,
+    list: {
+      type: Array,
+      default: () => []
+    },
+    info: {
+      type: Object,
+      default: () => {}
+    },
+    disabled: Boolean
+  }
+};
+</script>
+<style lang="less" scoped>
+.Vl {
+  &__sku {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    position: relative;
+    z-index: 1;
+    &.disabled::before {
+      content: ' ';
+      z-index: 2;
+      display: block;
+      position: absolute;
+      top: 0;
+      left: 0;
+      height: 100%;
+      width: 100%;
+      background: rgba(255, 255, 255, 0.6);
+    }
+    &.three-col {
+      .Vl__sku-item {
+        width: 103px;
+      }
+    }
+    &-item {
+      width: 162px;
+      height: 72px;
+      border-radius: @border-radius-sm - 2;
+      border: 1px solid @grey-border;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+      position: relative;
+      margin-bottom: @padding-xs;
+      transition: all 0.1s linear;
+      &.cheap {
+        .Vl__sku-tag {
+          display: block;
+          color: @white;
+          background: linear-gradient(269deg, #ff5d00 12%, #ff1900 86%);
+        }
+      }
+      &.active {
+        background: #fff5f5;
+        border: 1px solid @red;
+        .Vl__sku-name {
+          color: @red;
+        }
+        .Vl__sku-price {
+          color: @red;
+        }
+      }
+    }
+    &-name {
+      color: @text-color;
+      .text-17();
+      font-weight: @font-weight-bold - 100;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      flex-shrink: 0;
+      overflow: hidden;
+    }
+    &-price {
+      color: @gray-5;
+      .text-12();
+    }
+    &-tag {
+      background: @gray-2;
+      .text-10();
+      border-radius: 0 @border-radius-sm - 2 0 @border-radius-sm - 2;
+      padding: 0 @padding-unit;
+      position: absolute;
+      top: 0;
+      right: 0;
+      display: none;
+    }
+  }
+}
+</style>
--- a/src/views/vipLife/components/SpuList.vue
+++ b/src/views/vipLife/components/SpuList.vue
+<template functional>
+  <div class="Vl__spu">
+    <div
+      v-for="(item, index) in props.list"
+      :key="index"
+      class="Vl__spu-item"
+      :class="{ 'Vl__spu-item_active': props.info.spuNo === item.spuNo }"
+      @click="parent.handleSpuSelected(item, index)"
+    >
+      <cr-image :src="item.icon" height="1.093333rem" width="1.093333rem" class="Vl__spu-icon" />
+      <div class="Vl__spu-name">{{ item.name }}</div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'SpuList',
+  props: {
+    list: {
+      type: Array,
+      default: () => []
+    },
+    info: {
+      type: Object,
+      default: () => {}
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.Vl {
+  &__spu {
+    padding: @padding-sm 0;
+    display: flex;
+    align-items: center;
+    overflow: auto;
+    &::before,
+    &::after {
+      content: ' ';
+      flex-shrink: 0;
+      display: block;
+      width: @padding-sm;
+      height: 97px;
+    }
+    &::after {
+      width: @padding-unit;
+    }
+    &-item {
+      height: 97px;
+      width: 95px;
+      border-radius: @border-radius-md;
+      background-color: @white;
+      flex-shrink: 0;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      margin-right: @padding-xs;
+      transition: all 0.2s linear;
+      &_active {
+        box-shadow: 0px 2px 12px 0px rgba(100, 101, 102, 0.12);
+        transform: scale(1.03);
+      }
+    }
+    &-name {
+      .text-14();
+      color: @text-grey;
+      padding: 0 @padding-sm;
+      margin-top: @padding-xs;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      flex-shrink: 0;
+      overflow: hidden;
+    }
+  }
+}
+</style>
--- a/src/views/vipLife/index.less
+++ b/src/views/vipLife/index.less
+@bottom-height: 60px;
+.Vl {
+  &__spu {
+    padding: @padding-sm 0;
+    display: flex;
+    align-items: center;
+    overflow: auto;
+    &::before, &::after {
+      content: ' ';
+      flex-shrink: 0;
+      display: block;
+      width: @padding-sm;
+      height: 97px;
+    }
+    &::after {
+      width: @padding-unit;
+    }
+    &-item {
+      height: 97px;
+      width: 95px;
+      border-radius: @border-radius-md;
+      background-color: @white;
+      flex-shrink: 0;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      margin-right: @padding-xs;
+      transition: all .2s linear;
+      &_active {
+        box-shadow: 0px 2px 12px 0px rgba(100, 101, 102, 0.12);
+        transform: scale(1.03);
+      }
+    }
+    &-name {
+      .text-14();
+      color: @text-grey;
+      padding: 0 @padding-sm;
+      margin-top: @padding-xs;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      flex-shrink: 0;
+      overflow: hidden;
+    }
+  }
+  &__sku {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    position: relative;
+    z-index: 1;
+    &.disabled::before {
+      content: ' ';
+      z-index: 2;
+      display: block;
+      position: absolute;
+      top: 0;
+      left: 0;
+      height: 100%;
+      width: 100%;
+      background: rgba(255, 255, 255, 0.6);
+    }
+    &-item {
+      width: 162px;
+      height: 72px;
+      border-radius: @border-radius-sm - 2;
+      border: 1px solid @grey-border;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+      position: relative;
+      margin-bottom: @padding-xs;
+      transition: all .1s linear;
+      &.cheap {
+        .Vl__sku-tag {
+          display: block;
+          color: @white;
+          background: linear-gradient(269deg, #FF5D00 12%, #FF1900 86%);
+        }
+      }
+      &.active {
+        background: #FFF5F5;
+        border: 1px solid @red;
+        .Vl__sku-name {
+          color: @red;
+        }
+        .Vl__sku-price {
+          color: @red;
+        }
+      }
+    }
+    &-name {
+      color: @text-color;
+      .text-17();
+      font-weight: @font-weight-bold - 100;
+    }
+    &-price {
+      color: @gray-5;
+      .text-12();
+    }
+    &-tag {
+      background: @gray-2;
+      .text-10();
+      border-radius: 0 @border-radius-sm - 2 0 @border-radius-sm - 2;
+      padding: 0 @padding-unit;
+      position: absolute;
+      top: 0;
+      right: 0;
+      display: none;
+    }
+  }
+  &__panel {
+    background-color: @white;
+    border-radius: @border-radius-lx @border-radius-lx 0 0;
+    padding: @padding-lg @padding-lg @bottom-height;
+    min-height: 340px;
+    &-placeholder {
+      margin-bottom: -@padding-lg;
+    }
+    &-title {
+      color: @text-color;
+      .text-16();
+      font-weight: @font-weight-bold - 100;
+      margin: @padding-lg + @padding-unit 0 @padding-sm;
+    }
+  }
+  &__bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 2;
+    right: 0;
+    width: calc(100% - @padding-sm * 2);
+    background-color: @white;
+    border-top: 1px solid @grey-border;
+    padding: 0 @padding-sm;
+    height: 60px;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+
+}
\ No newline at end of file
--- a/src/views/vipLife/index.vue
+++ b/src/views/vipLife/index.vue
+<template>
+  <div class="page page__nopad">
+    <cr-tabs v-model="currentTab" @change="handleTabChange">
+      <cr-tab v-for="(item, index) in spuData" :key="index" :title="item.name" :name="index" />
+    </cr-tabs>
+    <spu-list :list="spuList" :info="spuInfo" />
+    <div class="Vl__panel">
+      <account-input v-if="spuInfo.rechargeAccountType !== 2" v-model="account" :info="spuInfo" />
+      <div v-else class="Vl__panel-placeholder" />
+      <div class="Vl__panel-title">充值类型</div>
+      <sku-list :list="skuList" :info="skuInfo" />
+      <template v-if="tips">
+        <div class="Vl__panel-title">温馨提示</div>
+        <div class="Vl__panel-tips" v-html="tips" />
+      </template>
+    </div>
+    <div class="Vl__bottom">
+      <cr-button type="primary" block shape="circle" :disabled="disabled" @click="goOrder">
+        立即充值
+      </cr-button>
+    </div>
+  </div>
+</template>
+<script>
+import rechargeApi from '@/api/recharge.api';
+import orderApi from '@/api/order.api';
+import tipsData from '@/api/tips';
+import SpuList from './components/SpuList.vue';
+import SkuList from './components/SkuList.vue';
+import AccountInput from './components/AccountInput.vue';
+export default {
+  name: 'VipLife',
+  components: {
+    SpuList,
+    SkuList,
+    AccountInput
+  },
+  data() {
+    return {
+      account: '',
+      currentTab: 0,
+      spuData: [],
+      spuInfo: {},
+      skuInfo: {},
+      skuList: []
+    };
+  },
+  computed: {
+    disabled() {
+      return this.spuInfo.rechargeAccountType !== 2 && !this.account;
+    },
+    spuList() {
+      return this.spuData[this.currentTab] ? this.spuData[this.currentTab].itemList : [];
+    },
+    tips() {
+      return tipsData[this.spuInfo.spuNo];
+    }
+  },
+  mounted() {
+    this.currentTab = +this.$route.query.spuType || 0;
+    this.$nextTick(() => {
+      this.getList();
+    });
+  },
+  methods: {
+    handleTabChange(name) {
+      this.currentTab = name;
+      this.spuInfo = this.spuData[name].itemList[0];
+      this.getSkuList();
+    },
+    handleSpuSelected(item, index) {
+      this.spuInfo = item;
+      this.spuInfo.index = index;
+      this.getSkuList();
+    },
+    handleSkuSelected(item, index) {
+      this.skuInfo = item;
+      this.skuInfo.index = index;
+    },
+    async getList() {
+      const [res] = await rechargeApi.getSpuList();
+      if (res) {
+        this.spuData = res.vipLife;
+        this.spuInfo = this.spuData[this.currentTab].itemList[0];
+        this.getSkuList();
+      }
+    },
+    async getSkuList() {
+      this.skuList = [];
+      const { spuNo: spuNos, type } = this.spuInfo;
+      const [res] = await rechargeApi.getSkuList({ spuNos, type });
+      if (res) {
+        this.skuList = res.rechargeList;
+      }
+    },
+    async goOrder() {
+      if (!this.account && this.spuInfo.rechargeAccountType !== 2)
+        return this.$toast.fail('请填写账号！');
+      if (!this.skuInfo.skuNo) return this.$toast.fail('请选择类型！');
+      const { skuNo, salePrice } = this.skuInfo;
+      const [res] = await orderApi.orderCreate({
+        totalFee: salePrice,
+        orderCouponIds: '',
+        freightCouponIds: '',
+        skuList: [
+          {
+            skuNo,
+            count: 1
+          }
+        ]
+      });
+      res && this.$router.push({ path: '/pay', query: { orderNo: res.orderNo } });
+    }
+  }
+};
+</script>
+<style lang="less" src="./index.less" scoped></style>
--- a/yarn.lock
+++ b/yarn.lock
@@ -175,6 +175,11 @@
  resolved "http://npmprivate.quantgroups.com/@babel%2fhelper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==

+"@babel/helper-plugin-utils@^7.13.0":
+  version "7.13.0"
+  resolved "http://npmprivate.quantgroups.com/@babel%2fhelper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
+  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
+
 "@babel/helper-regex@^7.10.4":
  version "7.10.5"
  resolved "http://npmprivate.quantgroups.com/@babel%2fhelper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
@@ -310,21 +315,13 @@
    "@babel/helper-plugin-utils" "^7.10.4"
    "@babel/plugin-syntax-json-strings" "^7.8.0"

-"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
-  version "7.10.4"
-  resolved "http://npmprivate.quantgroups.com/@babel%2fplugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
-  integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
-  version "7.12.1"
-  resolved "http://npmprivate.quantgroups.com/@babel%2fplugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
-  integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
+  version "7.13.8"
+  resolved "http://npmprivate.quantgroups.com/@babel%2fplugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"
+  integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==
  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"

 "@babel/plugin-proposal-numeric-separator@^7.10.4":
  version "7.10.4"
@@ -351,22 +348,14 @@
    "@babel/helper-plugin-utils" "^7.10.4"
    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"

-"@babel/plugin-proposal-optional-chaining@^7.10.4":
-  version "7.10.4"
-  resolved "http://npmprivate.quantgroups.com/@babel%2fplugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7"
-  integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==
+"@babel/plugin-proposal-optional-chaining@^7.10.4", "@babel/plugin-proposal-optional-chaining@^7.12.7":
+  version "7.13.12"
+  resolved "http://npmprivate.quantgroups.com/@babel%2fplugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866"
+  integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==
  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-
-"@babel/plugin-proposal-optional-chaining@^7.12.7":
-  version "7.12.7"
-  resolved "http://npmprivate.quantgroups.com/@babel%2fplugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
-  integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.13.0"
    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"

 "@babel/plugin-proposal-private-methods@^7.10.4":
  version "7.10.4"
@@ -426,7 +415,7 @@
  dependencies:
    "@babel/helper-plugin-utils" "^7.10.4"

-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
  version "7.8.3"
  resolved "http://npmprivate.quantgroups.com/@babel%2fplugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
@@ -454,7 +443,7 @@
  dependencies:
    "@babel/helper-plugin-utils" "^7.8.0"

-"@babel/plugin-syntax-optional-chaining@^7.8.0":
+"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
  version "7.8.3"
  resolved "http://npmprivate.quantgroups.com/@babel%2fplugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
@@ -809,14 +798,7 @@
    "@babel/types" "^7.4.4"
    esutils "^2.0.2"

-"@babel/runtime@^7.0.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.9.2":
-  version "7.11.2"
-  resolved "http://npmprivate.quantgroups.com/@babel%2fruntime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
-  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.8.4", "@babel/runtime@^7.9.6":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.6":
  version "7.10.5"
  resolved "http://npmprivate.quantgroups.com/@babel%2fruntime/-/runtime-7.10.5.tgz#303d8bd440ecd5a491eae6117fd3367698674c5c"
  integrity sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg==
@@ -857,22 +839,22 @@
    to-fast-properties "^2.0.0"

 "@babel/types@^7.12.1":
-  version "7.12.12"
-  resolved "http://npmprivate.quantgroups.com/@babel%2ftypes/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299"
-  integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==
+  version "7.13.14"
+  resolved "http://npmprivate.quantgroups.com/@babel%2ftypes/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
+  integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
  dependencies:
    "@babel/helper-validator-identifier" "^7.12.11"
    lodash "^4.17.19"
    to-fast-properties "^2.0.0"

 "@better-scroll/core@^2.0.0-beta.6":
-  version "2.0.0-beta.10"
-  resolved "http://npmprivate.quantgroups.com/@better-scroll%2fcore/-/core-2.0.0-beta.10.tgz#d76eb4b11e599b4c5b91e64d496f630d74f1ad84"
-  integrity sha512-rVnw+VNit+o4rU5tn8NzasMGvuFSQOrZIKttzaCC1KY+RgCYNRw3mcaCWjW06rWRXXaBIcV+AsiviKGRteJF2g==
+  version "2.0.0-beta.6"
+  resolved "http://npmprivate.quantgroups.com/@better-scroll%2fcore/-/core-2.0.0-beta.6.tgz#aaa4d0f51e110dafa2f7e1249049d3658d494359"
+  integrity sha512-nZ4kWDAPdrYKGGxKYdKP65hnwXsyWl0bymI9H97t8fRgDj//LS5g8EEhva8JlEIxBz8SjWo7tNgcLXq+9i5Ivg==
  dependencies:
-    "@better-scroll/shared-utils" "^2.0.0-beta.10"
+    "@better-scroll/shared-utils" "^2.0.0-beta.6"

-"@better-scroll/shared-utils@^2.0.0-beta.10":
+"@better-scroll/shared-utils@^2.0.0-beta.6":
  version "2.0.0-beta.10"
  resolved "http://npmprivate.quantgroups.com/@better-scroll%2fshared-utils/-/shared-utils-2.0.0-beta.10.tgz#077a245926ddcdbf5493aeda6724e2bf3bebf42f"
  integrity sha512-47JP+4Of++oD7V0oGhZ2adFRMydMAfcsz1Xp+gqeGpPwULWVpDUoFj5yZwz58MBoGmawZKw0diPyjPEvAGJ1cg==
@@ -932,23 +914,25 @@
  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==

 "@popperjs/core@^2.5.4":
-  version "2.6.0"
-  resolved "http://npmprivate.quantgroups.com/@popperjs%2fcore/-/core-2.6.0.tgz#f022195afdfc942e088ee2101285a1d31c7d727f"
-  integrity sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw==
+  version "2.9.2"
+  resolved "http://npmprivate.quantgroups.com/@popperjs%2fcore/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
+  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==

-"@qg/cherry-ui@^2.16.65":
-  version "2.16.65"
-  resolved "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.16.65.tgz#104b365d4276707e7ae5c01182ee57146681f361"
-  integrity sha512-bTyNNBc5xtF1rVFIZQb2Pvyyfk3oOQrCLFJnwUgEBdOMXaMS3o62omb7pOyPqcTDSAiNMgIC/irHS1tAPSEOmQ==
+"@qg/cherry-ui@^2.20.22":
+  version "2.20.22"
+  resolved "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.20.22.tgz#a777bf5e040105132407e45014cdfd86fa2a24ef"
+  integrity sha512-uuhHwat5SUUMUkPM56TK89o49EyXExUjQSW5pdPr0vQ6QpJRUnT+TsOzIxEGyBKQOFHsAIyqWSP2L1CvPWiIHg==
  dependencies:
    "@popperjs/core" "^2.5.4"
    vue-lazyload "^1.3.3"
    vue-video-player "^5.0.2"

 "@qg/js-bridge@^1.1.9":
-  version "1.1.9"
-  resolved "http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.1.9.tgz#22df0597143f290ed3d4c24066c753149a94ea77"
-  integrity sha512-ZIBzdYBae+5QLdCH8/8qjixvIrQNoVvxMYEKJv6wpFF9J/xEV2e3f+3KkPAlAjjyKSjSYarmYwZGgIGov53psg==
+  version "1.1.11"
+  resolved "http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.1.11.tgz#f33e16ef64e9ed4b4ebc5379cc3af47dad2a2131"
+  integrity sha512-WVvkSUg2zcc2nblzYGxM/bVo+VDcANy/dw7vcbxLoW1Jega9Jm2d5FGSb7uS6m4746waghUUqcAWNJZ0Q5yeqA==
+  dependencies:
+    rollup "^2.41.3"

 "@qg/qg-scroll@^1.4.2":
  version "1.4.2"
@@ -1039,37 +1023,6 @@
  resolved "http://npmprivate.quantgroups.com/@types%2fq/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
  integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==

-"@videojs/http-streaming@1.13.2":
-  version "1.13.2"
-  resolved "http://npmprivate.quantgroups.com/@videojs%2fhttp-streaming/-/http-streaming-1.13.2.tgz#9e91f9f440ccaf6c8ed640a3614216397bb38558"
-  integrity sha512-U4Xhh+HxGpRBx9Gm0LlEadq85k9BwckzFgZmyhacauhK/27Mz0goKKFAt+BpxBNp2oHVdAdk8NHfneinsqni3Q==
-  dependencies:
-    aes-decrypter "3.0.0"
-    global "^4.3.0"
-    m3u8-parser "4.4.0"
-    mpd-parser "0.10.0"
-    mux.js "5.5.1"
-    url-toolkit "^2.1.3"
-    video.js "^6.8.0 || ^7.0.0"
-
-"@videojs/vhs-utils@^1.1.0":
-  version "1.3.0"
-  resolved "http://npmprivate.quantgroups.com/@videojs%2fvhs-utils/-/vhs-utils-1.3.0.tgz#04fe402f603af9a5df4b88881fabba0cf13814c2"
-  integrity sha512-oiqXDtHQqDPun7JseWkirUHGrgdYdeF12goUut5z7vwAj4DmUufEPFJ4xK5hYGXGFDyDhk2rSFOR122Ze6qXyQ==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    global "^4.3.2"
-    url-toolkit "^2.1.6"
-
-"@videojs/xhr@2.5.1":
-  version "2.5.1"
-  resolved "http://npmprivate.quantgroups.com/@videojs%2fxhr/-/xhr-2.5.1.tgz#26bc5a79dbb3b03bfb13742c6ce559f89e90719e"
-  integrity sha512-wV9nGESHseSK+S9ePEru2+OJZ1jq/ZbbzniGQ4weAmTIepuBMSYPx5zrxxQA0E786T5ykpO8ts+LayV+3/oI2w==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    global "~4.4.0"
-    is-function "^1.0.1"
-
 "@vue/babel-helper-vue-jsx-merge-props@^1.0.0":
  version "1.0.0"
  resolved "http://npmprivate.quantgroups.com/@vue%2fbabel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040"
@@ -1461,6 +1414,11 @@
  resolved "http://npmprivate.quantgroups.com/@xtuc%2flong/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==

+abbrev@1:
+  version "1.1.1"
+  resolved "http://npmprivate.quantgroups.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.7:
  version "1.3.7"
  resolved "http://npmprivate.quantgroups.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -1501,15 +1459,6 @@ aes-decrypter@1.0.3:
  dependencies:
    pkcs7 "^0.2.3"

-aes-decrypter@3.0.0:
-  version "3.0.0"
-  resolved "http://npmprivate.quantgroups.com/aes-decrypter/-/aes-decrypter-3.0.0.tgz#7848a1c145b9fdbf57ae3e2b5b1bc7cf0644a8fb"
-  integrity sha1-eEihwUW5/b9Xrj4rWxvHzwZEqPs=
-  dependencies:
-    commander "^2.9.0"
-    global "^4.3.2"
-    pkcs7 "^1.0.2"
-
 aggregate-error@^3.0.0:
  version "3.0.1"
  resolved "http://npmprivate.quantgroups.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0"
@@ -1651,7 +1600,7 @@ anymatch@~3.1.1:
    normalize-path "^3.0.0"
    picomatch "^2.0.4"

-aproba@^1.1.1:
+aproba@^1.0.3, aproba@^1.1.1:
  version "1.2.0"
  resolved "http://npmprivate.quantgroups.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
@@ -1661,6 +1610,14 @@ arch@^2.1.1:
  resolved "http://npmprivate.quantgroups.com/arch/-/arch-2.1.2.tgz#0c52bbe7344bb4fa260c443d2cbad9c00ff2f0bf"
  integrity sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==

+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "http://npmprivate.quantgroups.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 argparse@^1.0.7:
  version "1.0.10"
  resolved "http://npmprivate.quantgroups.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2505,6 +2462,11 @@ coa@^2.0.2:
    chalk "^2.4.1"
    q "^1.1.2"

+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "http://npmprivate.quantgroups.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
 collection-visit@^1.0.0:
  version "1.0.0"
  resolved "http://npmprivate.quantgroups.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -2527,12 +2489,12 @@ color-convert@^2.0.1:
  dependencies:
    color-name "~1.1.4"

-color-name@1.1.3:
+color-name@1.1.3, color-name@^1.0.0:
  version "1.1.3"
  resolved "http://npmprivate.quantgroups.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=

-color-name@^1.0.0, color-name@~1.1.4:
+color-name@~1.1.4:
  version "1.1.4"
  resolved "http://npmprivate.quantgroups.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -2570,7 +2532,7 @@ commander@2.17.x:
  resolved "http://npmprivate.quantgroups.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==

-commander@^2.18.0, commander@^2.20.0, commander@^2.9.0:
+commander@^2.18.0, commander@^2.20.0:
  version "2.20.3"
  resolved "http://npmprivate.quantgroups.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2667,6 +2629,11 @@ console-browserify@^1.1.0:
  resolved "http://npmprivate.quantgroups.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==

+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "http://npmprivate.quantgroups.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
 consolidate@^0.15.1:
  version "0.15.1"
  resolved "http://npmprivate.quantgroups.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
@@ -2752,9 +2719,9 @@ core-js-compat@^3.6.2, core-js-compat@^3.6.5:
    semver "7.0.0"

 core-js@^2.4.0:
-  version "2.6.11"
-  resolved "http://npmprivate.quantgroups.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
-  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+  version "2.6.10"
+  resolved "http://npmprivate.quantgroups.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
+  integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==

 core-js@^3.6.5:
  version "3.6.5"
@@ -3086,7 +3053,7 @@ debug@=3.1.0:
  dependencies:
    ms "2.0.0"

-debug@^3.1.1, debug@^3.2.5:
+debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
  version "3.2.6"
  resolved "http://npmprivate.quantgroups.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3127,6 +3094,11 @@ deep-equal@^1.0.1:
    object-keys "^1.1.1"
    regexp.prototype.flags "^1.2.0"

+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "http://npmprivate.quantgroups.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
 deep-is@~0.1.3:
  version "0.1.3"
  resolved "http://npmprivate.quantgroups.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -3211,6 +3183,11 @@ delayed-stream@~1.0.0:
  resolved "http://npmprivate.quantgroups.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=

+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "http://npmprivate.quantgroups.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
 depd@~1.1.2:
  version "1.1.2"
  resolved "http://npmprivate.quantgroups.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -3229,6 +3206,11 @@ destroy@~1.0.4:
  resolved "http://npmprivate.quantgroups.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=

+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "http://npmprivate.quantgroups.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
 detect-node@^2.0.4:
  version "2.0.4"
  resolved "http://npmprivate.quantgroups.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
@@ -3531,9 +3513,9 @@ es-to-primitive@^1.2.1:
    is-symbol "^1.0.2"

 es5-shim@^4.5.1:
-  version "4.5.14"
-  resolved "http://npmprivate.quantgroups.com/es5-shim/-/es5-shim-4.5.14.tgz#90009e1019d0ea327447cb523deaff8fe45697ef"
-  integrity sha512-7SwlpL+2JpymWTt8sNLuC2zdhhc+wrfe5cMPI2j0o6WsPdfAiPwmFy2f0AocPB4RQVBOZ9kNTgi5YF7TdhkvEg==
+  version "4.5.15"
+  resolved "http://npmprivate.quantgroups.com/es5-shim/-/es5-shim-4.5.15.tgz#6a26869b261854a3b045273f5583c52d390217fe"
+  integrity sha512-FYpuxEjMeDvU4rulKqFdukQyZSTpzhg4ScQHrAosrlVpR6GFyaw14f74yn2+4BugniIS0Frpg7TvwZocU4ZMTw==

 es6-promise-pool@^2.5.0:
  version "2.5.0"
@@ -3892,16 +3874,11 @@ extglob@^2.0.2, extglob@^2.0.4:
    snapdragon "^0.8.1"
    to-regex "^3.0.1"

-extsprintf@1.3.0:
+extsprintf@1.3.0, extsprintf@^1.2.0:
  version "1.3.0"
  resolved "http://npmprivate.quantgroups.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=

-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "http://npmprivate.quantgroups.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
 fast-deep-equal@^3.1.1:
  version "3.1.3"
  resolved "http://npmprivate.quantgroups.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -4168,6 +4145,13 @@ fs-extra@~0.16.3:
    jsonfile "^2.0.0"
    rimraf "^2.2.8"

+fs-minipass@^1.2.5:
+  version "1.2.7"
+  resolved "http://npmprivate.quantgroups.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+  dependencies:
+    minipass "^2.6.0"
+
 fs-minipass@^2.0.0:
  version "2.1.0"
  resolved "http://npmprivate.quantgroups.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -4191,9 +4175,9 @@ fs.realpath@^1.0.0:
  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=

 fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "http://npmprivate.quantgroups.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
+  version "1.2.12"
+  resolved "http://npmprivate.quantgroups.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"
+  integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
  dependencies:
    bindings "^1.5.0"
    nan "^2.12.1"
@@ -4203,6 +4187,11 @@ fsevents@~2.1.2:
  resolved "http://npmprivate.quantgroups.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==

+fsevents@~2.3.1:
+  version "2.3.2"
+  resolved "http://npmprivate.quantgroups.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 function-bind@^1.1.1:
  version "1.1.1"
  resolved "http://npmprivate.quantgroups.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -4213,6 +4202,20 @@ functional-red-black-tree@^1.0.1:
  resolved "http://npmprivate.quantgroups.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=

+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "http://npmprivate.quantgroups.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
 gensync@^1.0.0-beta.1:
  version "1.0.0-beta.1"
  resolved "http://npmprivate.quantgroups.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -4296,7 +4299,7 @@ glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

-global@4.3.2, global@~4.3.0:
+global@4.3.2, global@^4.3.0, global@^4.3.1, global@~4.3.0:
  version "4.3.2"
  resolved "http://npmprivate.quantgroups.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
  integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=
@@ -4304,7 +4307,7 @@ global@4.3.2, global@~4.3.0:
    min-document "^2.19.0"
    process "~0.5.1"

-global@^4.3.0, global@^4.3.1, global@^4.3.2, global@^4.4.0, global@~4.4.0:
+global@^4.4.0:
  version "4.4.0"
  resolved "http://npmprivate.quantgroups.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
@@ -4433,6 +4436,11 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
  resolved "http://npmprivate.quantgroups.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==

+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "http://npmprivate.quantgroups.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
 has-value@^0.3.1:
  version "0.3.1"
  resolved "http://npmprivate.quantgroups.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4610,7 +4618,7 @@ http-deceiver@^1.2.7:
  resolved "http://npmprivate.quantgroups.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=

-http-errors@1.7.2:
+http-errors@1.7.2, http-errors@~1.7.2:
  version "1.7.2"
  resolved "http://npmprivate.quantgroups.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
@@ -4631,22 +4639,6 @@ http-errors@~1.6.2:
    setprototypeof "1.1.0"
    statuses ">= 1.4.0 < 2"

-http-errors@~1.7.2:
-  version "1.7.3"
-  resolved "http://npmprivate.quantgroups.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
-  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
-http-parser-js@>=0.5.1:
-  version "0.5.2"
-  resolved "http://npmprivate.quantgroups.com/http-parser-js/-/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77"
-  integrity sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==
-
 http-proxy-middleware@0.19.1:
  version "0.19.1"
  resolved "http://npmprivate.quantgroups.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
@@ -4701,7 +4693,7 @@ husky@^4.2.5:
    slash "^3.0.0"
    which-pm-runs "^1.0.0"

-iconv-lite@0.4.24, iconv-lite@^0.4.24:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
  version "0.4.24"
  resolved "http://npmprivate.quantgroups.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4725,6 +4717,13 @@ iferr@^0.1.5:
  resolved "http://npmprivate.quantgroups.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=

+ignore-walk@^3.0.1:
+  version "3.0.3"
+  resolved "http://npmprivate.quantgroups.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^3.3.5:
  version "3.3.10"
  resolved "http://npmprivate.quantgroups.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -4811,7 +4810,7 @@ inflight@^1.0.4:
    once "^1.3.0"
    wrappy "1"

-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
  version "2.0.4"
  resolved "http://npmprivate.quantgroups.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4826,6 +4825,11 @@ inherits@2.0.3:
  resolved "http://npmprivate.quantgroups.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=

+ini@~1.3.0:
+  version "1.3.5"
+  resolved "http://npmprivate.quantgroups.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
 inquirer@^7.0.0, inquirer@^7.1.0:
  version "7.3.2"
  resolved "http://npmprivate.quantgroups.com/inquirer/-/inquirer-7.3.2.tgz#25245d2e32dc9f33dbe26eeaada231daa66e9c7c"
@@ -5021,6 +5025,13 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
  resolved "http://npmprivate.quantgroups.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=

+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "http://npmprivate.quantgroups.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
 is-fullwidth-code-point@^2.0.0:
  version "2.0.0"
  resolved "http://npmprivate.quantgroups.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -5339,11 +5350,6 @@ jsprim@^1.2.2:
    json-schema "0.2.3"
    verror "1.10.0"

-keycode@^2.2.0:
-  version "2.2.0"
-  resolved "http://npmprivate.quantgroups.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
-  integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
-
 killable@^1.0.1:
  version "1.0.1"
  resolved "http://npmprivate.quantgroups.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -5632,13 +5638,6 @@ m3u8-parser@2.1.0:
  resolved "http://npmprivate.quantgroups.com/m3u8-parser/-/m3u8-parser-2.1.0.tgz#c8170329ec1cd515d0d58bb8b762da9896cb0368"
  integrity sha1-yBcDKewc1RXQ1Yu4t2LamJbLA2g=

-m3u8-parser@4.4.0:
-  version "4.4.0"
-  resolved "http://npmprivate.quantgroups.com/m3u8-parser/-/m3u8-parser-4.4.0.tgz#adf606c0af6d97f6750095a42006c2ae03dde177"
-  integrity sha512-iH2AygTFILtato+XAgnoPYzLHM4R3DjATj7Ozbk7EHdB2XoLF2oyOUguM7Kc4UVHbQHHL/QPaw98r7PbWzG0gg==
-  dependencies:
-    global "^4.3.2"
-
 make-dir@^2.0.0, make-dir@^2.1.0:
  version "2.1.0"
  resolved "http://npmprivate.quantgroups.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -5799,25 +5798,13 @@ mime-db@1.44.0, "mime-db@>= 1.43.0 < 2":
  resolved "http://npmprivate.quantgroups.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==

-mime-db@1.46.0:
-  version "1.46.0"
-  resolved "http://npmprivate.quantgroups.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee"
-  integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==
-
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+mime-types@^2.1.12, mime-types@^2.1.24, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
  version "2.1.27"
  resolved "http://npmprivate.quantgroups.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
  dependencies:
    mime-db "1.44.0"

-mime-types@^2.1.24:
-  version "2.1.29"
-  resolved "http://npmprivate.quantgroups.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2"
-  integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==
-  dependencies:
-    mime-db "1.46.0"
-
 mime@1.6.0, mime@^1.4.1:
  version "1.6.0"
  resolved "http://npmprivate.quantgroups.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -5903,6 +5890,14 @@ minipass-pipeline@^1.2.2:
  dependencies:
    minipass "^3.0.0"

+minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "http://npmprivate.quantgroups.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
 minipass@^3.0.0, minipass@^3.1.1:
  version "3.1.3"
  resolved "http://npmprivate.quantgroups.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
@@ -5910,6 +5905,13 @@ minipass@^3.0.0, minipass@^3.1.1:
  dependencies:
    yallist "^4.0.0"

+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "http://npmprivate.quantgroups.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+  dependencies:
+    minipass "^2.9.0"
+
 mississippi@^3.0.0:
  version "3.0.0"
  resolved "http://npmprivate.quantgroups.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -5939,6 +5941,13 @@ mixin-deep@^1.2.0:
    for-in "^1.0.2"
    is-extendable "^1.0.1"

+mkdirp@^0.5.0:
+  version "0.5.3"
+  resolved "http://npmprivate.quantgroups.com/mkdirp/-/mkdirp-0.5.3.tgz#5a514b7179259287952881e94410ec5465659f8c"
+  integrity sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==
+  dependencies:
+    minimist "^1.2.5"
+
 mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
  version "0.5.5"
  resolved "http://npmprivate.quantgroups.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
@@ -5958,16 +5967,6 @@ move-concurrently@^1.0.1:
    rimraf "^2.5.4"
    run-queue "^1.0.3"

-mpd-parser@0.10.0:
-  version "0.10.0"
-  resolved "http://npmprivate.quantgroups.com/mpd-parser/-/mpd-parser-0.10.0.tgz#e48a39a4ecd3b5bbd0ed4ac5991b9cc36bcd9599"
-  integrity sha512-eIqkH/2osPr7tIIjhRmDWqm2wdJ7Q8oPfWvdjealzsLV2D2oNe0a0ae2gyYYs1sw5e5hdssDA2V6Sz8MW+Uvvw==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    "@videojs/vhs-utils" "^1.1.0"
-    global "^4.3.2"
-    xmldom "^0.1.27"
-
 ms@2.0.0:
  version "2.0.0"
  resolved "http://npmprivate.quantgroups.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -6006,11 +6005,6 @@ mux.js@4.3.2:
  resolved "http://npmprivate.quantgroups.com/mux.js/-/mux.js-4.3.2.tgz#576d537df037dc5ec35ec1316b948d815d35c210"
  integrity sha512-g0q6DPdvb3yYcoK7ElBGobdSSrhY/RjPt19U7uUc733aqvc5bCS/aCvL9z+448y+IoCZnYDwyZfQBBXMSmGOaQ==

-mux.js@5.5.1:
-  version "5.5.1"
-  resolved "http://npmprivate.quantgroups.com/mux.js/-/mux.js-5.5.1.tgz#5bd5d7b2e5e5560da8126928e93af3c532e08372"
-  integrity sha512-5VmmjADBqS4++8pTI6poSRJ+chHdaoI4XErcQPM5w4QfwaDl+FQlSI0iOgWbYDn6CBCbDRKaSCcEiN2K5aHNGQ==
-
 mz@^2.4.0:
  version "2.7.0"
  resolved "http://npmprivate.quantgroups.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
@@ -6062,6 +6056,15 @@ natural-compare@^1.4.0:
  resolved "http://npmprivate.quantgroups.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=

+needle@^2.2.1:
+  version "2.3.3"
+  resolved "http://npmprivate.quantgroups.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117"
+  integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.2:
  version "0.6.2"
  resolved "http://npmprivate.quantgroups.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -6127,11 +6130,35 @@ node-libs-browser@^2.2.1:
    util "^0.11.0"
    vm-browserify "^1.0.1"

+node-pre-gyp@*:
+  version "0.14.0"
+  resolved "http://npmprivate.quantgroups.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
+  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4.4.2"
+
 node-releases@^1.1.58:
  version "1.1.59"
  resolved "http://npmprivate.quantgroups.com/node-releases/-/node-releases-1.1.59.tgz#4d648330641cec704bff10f8e4fe28e453ab8e8e"
  integrity sha512-H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw==

+nopt@^4.0.1:
+  version "4.0.3"
+  resolved "http://npmprivate.quantgroups.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
 normalize-package-data@^2.5.0:
  version "2.5.0"
  resolved "http://npmprivate.quantgroups.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6179,6 +6206,27 @@ normalize-url@^3.0.0:
  resolved "http://npmprivate.quantgroups.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
  integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==

+npm-bundled@^1.0.1:
+  version "1.1.1"
+  resolved "http://npmprivate.quantgroups.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "http://npmprivate.quantgroups.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-packlist@^1.1.6:
+  version "1.4.8"
+  resolved "http://npmprivate.quantgroups.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
+
 npm-run-path@^2.0.0:
  version "2.0.2"
  resolved "http://npmprivate.quantgroups.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6193,6 +6241,16 @@ npm-run-path@^4.0.0:
  dependencies:
    path-key "^3.0.0"

+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "http://npmprivate.quantgroups.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
 nth-check@^1.0.2, nth-check@~1.0.1:
  version "1.0.2"
  resolved "http://npmprivate.quantgroups.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -6205,6 +6263,11 @@ num2fraction@^1.2.2:
  resolved "http://npmprivate.quantgroups.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=

+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "http://npmprivate.quantgroups.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
 oauth-sign@~0.9.0:
  version "0.9.0"
  resolved "http://npmprivate.quantgroups.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -6394,11 +6457,24 @@ os-browserify@^0.3.0:
  resolved "http://npmprivate.quantgroups.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=

-os-tmpdir@~1.0.2:
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "http://npmprivate.quantgroups.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
  version "1.0.2"
  resolved "http://npmprivate.quantgroups.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=

+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "http://npmprivate.quantgroups.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
 p-finally@^1.0.0:
  version "1.0.0"
  resolved "http://npmprivate.quantgroups.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -6668,13 +6744,6 @@ pkcs7@^0.2.3:
  resolved "http://npmprivate.quantgroups.com/pkcs7/-/pkcs7-0.2.3.tgz#22d60666d01065c5f24439098e4a4830452273be"
  integrity sha1-ItYGZtAQZcXyRDkJjkpIMEUic74=

-pkcs7@^1.0.2:
-  version "1.0.4"
-  resolved "http://npmprivate.quantgroups.com/pkcs7/-/pkcs7-1.0.4.tgz#6090b9e71160dabf69209d719cbafa538b00a1cb"
-  integrity sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-
 pkg-dir@^1.0.0:
  version "1.0.0"
  resolved "http://npmprivate.quantgroups.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
@@ -6991,9 +7060,9 @@ postcss-ordered-values@^4.1.2:
    postcss-value-parser "^3.0.0"

 postcss-prefix-selector@^1.6.0:
-  version "1.7.2"
-  resolved "http://npmprivate.quantgroups.com/postcss-prefix-selector/-/postcss-prefix-selector-1.7.2.tgz#3adeed903985734298f19d8f5e0b657f9d90d43c"
-  integrity sha512-ddmzjWNmGs7E/nyolJ021/Gk6oBLRQLyyXKGV4Mu+Y0gquo+XlXSDP0/Y2J8C/cad/GLyftf2H0XtuDFQZxN3w==
+  version "1.9.0"
+  resolved "http://npmprivate.quantgroups.com/postcss-prefix-selector/-/postcss-prefix-selector-1.9.0.tgz#db549802b79f9f91f7419c8c1f86d31d974aff5e"
+  integrity sha512-tTUHUNP+/Qfgg+fvbljUIeLs1ijICWb8+CT3bZM2joE2pkd+EnuBzSfZNHY2RMmozNRp44yEFv+I+6IIiLcoCg==
  dependencies:
    postcss "^7.0.0"

@@ -7107,9 +7176,9 @@ posthtml-rename-id@^1.0:
    escape-string-regexp "1.0.5"

 posthtml-render@^1.0.5, posthtml-render@^1.0.6:
-  version "1.2.2"
-  resolved "http://npmprivate.quantgroups.com/posthtml-render/-/posthtml-render-1.2.2.tgz#f554a19ed40d40e2bfc160826b0a91d4a23656cd"
-  integrity sha512-MbIXTWwAfJ9qET6Zl29UNwJcDJEEz9Zkr5oDhiujitJa7YBJwEpbkX2cmuklCDxubTMoRWpid3q8DrSyGnUUzQ==
+  version "1.4.0"
+  resolved "http://npmprivate.quantgroups.com/posthtml-render/-/posthtml-render-1.4.0.tgz#40114070c45881cacb93347dae3eff53afbcff13"
+  integrity sha512-W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw==

 posthtml-svg-mode@^1.0.3:
  version "1.0.3"
@@ -7350,6 +7419,16 @@ raw-body@2.4.0:
    iconv-lite "0.4.24"
    unpipe "1.0.0"

+rc@^1.2.7:
+  version "1.2.8"
+  resolved "http://npmprivate.quantgroups.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
 read-pkg@^5.1.1:
  version "5.2.0"
  resolved "http://npmprivate.quantgroups.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
@@ -7360,7 +7439,7 @@ read-pkg@^5.1.1:
    parse-json "^5.0.0"
    type-fest "^0.6.0"

-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
  version "2.3.7"
  resolved "http://npmprivate.quantgroups.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7653,6 +7732,13 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
    hash-base "^3.0.0"
    inherits "^2.0.1"

+rollup@^2.41.3:
+  version "2.44.0"
+  resolved "http://npmprivate.quantgroups.com/rollup/-/rollup-2.44.0.tgz#8da324d1c4fd12beef9ae6e12f4068265b6d95eb"
+  integrity sha512-rGSF4pLwvuaH/x4nAS+zP6UNn5YUDWf/TeEU5IoXSZKBbKRNTCI3qMnYXKZgrC0D2KzS2baiOZt1OlqhMu5rnQ==
+  optionalDependencies:
+    fsevents "~2.3.1"
+
 run-async@^2.4.0:
  version "2.4.1"
  resolved "http://npmprivate.quantgroups.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
@@ -7680,16 +7766,16 @@ rxjs@^6.5.5, rxjs@^6.6.0:
    tslib "^1.9.0"

 sa-sdk-javascript@^1.15.16:
-  version "1.15.18"
-  resolved "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.15.18.tgz#de67f0f3446901e57d173486646452f9735c200b"
-  integrity sha512-wGhLFoWBQ8N3q+Nmt6ORqQ8DIBo3w86J320N1cTMu4XYa5b4a8/3t8Y6uaX23RI7c5JNgnEurOJBOxp9UgY0jg==
+  version "1.15.16"
+  resolved "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.15.16.tgz#212313eb0cc8bdbf73f0438c0b9e4314121a6117"
+  integrity sha512-UIFJBYk8EEcMAg6kSeUdjYAnl3IEXA8DDk/7xqS1aU4bZV3+iUXo2hT1rzGPsSWanVvcDZ/uSGUNZqojsfZaGA==

-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+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:
  version "5.1.2"
  resolved "http://npmprivate.quantgroups.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

-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.2.0, safe-buffer@~5.2.0:
+safe-buffer@^5.2.0:
  version "5.2.1"
  resolved "http://npmprivate.quantgroups.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -7713,7 +7799,7 @@ safe-regex@^1.1.0:
  resolved "http://npmprivate.quantgroups.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

-sax@>=0.6.0, sax@~1.2.4:
+sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
  version "1.2.4"
  resolved "http://npmprivate.quantgroups.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -7758,7 +7844,7 @@ semver-regex@^2.0.0:
  resolved "http://npmprivate.quantgroups.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
  integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==

-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
  version "5.7.1"
  resolved "http://npmprivate.quantgroups.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -7834,7 +7920,7 @@ serve-static@1.14.1:
    parseurl "~1.3.3"
    send "0.17.1"

-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
  version "2.0.0"
  resolved "http://npmprivate.quantgroups.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -8213,6 +8299,15 @@ string-argv@0.3.1:
  resolved "http://npmprivate.quantgroups.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==

+string-width@^1.0.1, "string-width@^1.0.2 || 2":
+  version "1.0.2"
+  resolved "http://npmprivate.quantgroups.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
 string-width@^2.0.0:
  version "2.1.1"
  resolved "http://npmprivate.quantgroups.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
@@ -8255,14 +8350,7 @@ string.prototype.trimstart@^1.0.1:
    define-properties "^1.1.3"
    es-abstract "^1.17.5"

-string_decoder@^1.0.0, string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "http://npmprivate.quantgroups.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
+string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@~1.1.1:
  version "1.1.1"
  resolved "http://npmprivate.quantgroups.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
@@ -8333,6 +8421,11 @@ strip-json-comments@^3.0.1:
  resolved "http://npmprivate.quantgroups.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==

+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "http://npmprivate.quantgroups.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
 stylehacks@^4.0.0:
  version "4.0.3"
  resolved "http://npmprivate.quantgroups.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
@@ -8461,6 +8554,19 @@ tapable@^1.0.0, tapable@^1.1.3:
  resolved "http://npmprivate.quantgroups.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==

+tar@^4.4.2:
+  version "4.4.13"
+  resolved "http://npmprivate.quantgroups.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
 terser-webpack-plugin@^1.4.3:
  version "1.4.4"
  resolved "http://npmprivate.quantgroups.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz#2c63544347324baafa9a56baaddf1634c8abfc2f"
@@ -8841,10 +8947,10 @@ url-slug@2.0.0:
  dependencies:
    unidecode "0.1.8"

-url-toolkit@^2.1.3, url-toolkit@^2.1.6:
-  version "2.2.0"
-  resolved "http://npmprivate.quantgroups.com/url-toolkit/-/url-toolkit-2.2.0.tgz#9a57b89f315d4b7dc340e150bcfa548ddf5f5ce9"
-  integrity sha512-Rde0c9S4fJK3FaHim3DSgdQ8IFrSXcZCpAJo9T7/FA+BoQGhK0ow3mpwGQLJCPYsNn6TstpW7/7DzMpSpz9F9w==
+url-toolkit@^2.1.3:
+  version "2.2.2"
+  resolved "http://npmprivate.quantgroups.com/url-toolkit/-/url-toolkit-2.2.2.tgz#51ef27b56d3187185f9ecf4a8ac7e8f55203c89d"
+  integrity sha512-l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug==

 url@^0.11.0:
  version "0.11.0"
@@ -8943,7 +9049,7 @@ verror@1.10.0:
    core-util-is "1.0.2"
    extsprintf "^1.2.0"

-"video.js@^5.17.0 || ^6.2.0", "video.js@^5.19.1 || ^6.2.0", video.js@^6.6.0:
+"video.js@^5.17.0 || ^6.2.0", "video.js@^5.19.1 || ^6.2.0", "video.js@^6 || ^7", video.js@^6.6.0:
  version "6.13.0"
  resolved "http://npmprivate.quantgroups.com/video.js/-/video.js-6.13.0.tgz#f9487d46327340fa48ecd51372a2981dbb6cde4c"
  integrity sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg==
@@ -8957,20 +9063,6 @@ verror@1.10.0:
    videojs-vtt.js "0.12.6"
    xhr "2.4.0"

-"video.js@^6 || ^7", "video.js@^6.8.0 || ^7.0.0":
-  version "7.8.4"
-  resolved "http://npmprivate.quantgroups.com/video.js/-/video.js-7.8.4.tgz#645bf40400b413047d2b873c0c65fc8b42128f2a"
-  integrity sha512-XTWWrhfdrk7nTBkqhWKslfXMpUhsDRsZ2L3ISxjuAgadpiomxFV/OARchtwxO+FdnxTm4njJstPmXbVe3F765g==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-    "@videojs/http-streaming" "1.13.2"
-    "@videojs/xhr" "2.5.1"
-    global "4.3.2"
-    keycode "^2.2.0"
-    safe-json-parse "4.0.0"
-    videojs-font "3.2.0"
-    videojs-vtt.js "^0.15.2"
-
 videojs-contrib-hls@^5.12.2:
  version "5.15.0"
  resolved "http://npmprivate.quantgroups.com/videojs-contrib-hls/-/videojs-contrib-hls-5.15.0.tgz#fe4957367e5d68b7d23f78ed32e37a9dd892a0a8"
@@ -9009,11 +9101,6 @@ videojs-font@2.1.0:
  resolved "http://npmprivate.quantgroups.com/videojs-font/-/videojs-font-2.1.0.tgz#a25930a67f6c9cfbf2bb88dacb8c6b451f093379"
  integrity sha1-olkwpn9snPvyu4jay4xrRR8JM3k=

-videojs-font@3.2.0:
-  version "3.2.0"
-  resolved "http://npmprivate.quantgroups.com/videojs-font/-/videojs-font-3.2.0.tgz#212c9d3f4e4ec3fa7345167d64316add35e92232"
-  integrity sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==
-
 videojs-hotkeys@^0.2.20:
  version "0.2.27"
  resolved "http://npmprivate.quantgroups.com/videojs-hotkeys/-/videojs-hotkeys-0.2.27.tgz#0df97952b9dff0e6cc1cf8a439fed7eac9c73f01"
@@ -9038,13 +9125,6 @@ videojs-vtt.js@0.12.6:
  dependencies:
    global "^4.3.1"

-videojs-vtt.js@^0.15.2:
-  version "0.15.2"
-  resolved "http://npmprivate.quantgroups.com/videojs-vtt.js/-/videojs-vtt.js-0.15.2.tgz#a828c4ea0aac6303fa471fd69bc7586a5ba1a273"
-  integrity sha512-kEo4hNMvu+6KhPvVYPKwESruwhHC3oFis133LwhXHO9U7nRnx0RiJYMiqbgwjgazDEXHR6t8oGJiHM6wq5XlAw==
-  dependencies:
-    global "^4.3.1"
-
 vm-browserify@^1.0.1:
  version "1.1.2"
  resolved "http://npmprivate.quantgroups.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -9309,22 +9389,13 @@ webpack@^4.0.0:
    watchpack "^1.6.1"
    webpack-sources "^1.4.1"

-websocket-driver@0.6.5:
+websocket-driver@0.6.5, websocket-driver@>=0.5.1:
  version "0.6.5"
  resolved "http://npmprivate.quantgroups.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
  integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
  dependencies:
    websocket-extensions ">=0.1.1"

-websocket-driver@>=0.5.1:
-  version "0.7.4"
-  resolved "http://npmprivate.quantgroups.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
-  dependencies:
-    http-parser-js ">=0.5.1"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
-
 websocket-extensions@>=0.1.1:
  version "0.1.4"
  resolved "http://npmprivate.quantgroups.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
@@ -9359,6 +9430,13 @@ which@^2.0.1:
  dependencies:
    isexe "^2.0.0"

+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "http://npmprivate.quantgroups.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
 word-wrap@~1.2.3:
  version "1.2.3"
  resolved "http://npmprivate.quantgroups.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -9431,11 +9509,6 @@ xmlbuilder@~11.0.0:
  resolved "http://npmprivate.quantgroups.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==

-xmldom@^0.1.27:
-  version "0.1.31"
-  resolved "http://npmprivate.quantgroups.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
-  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
-
 xtend@^4.0.0, xtend@~4.0.1:
  version "4.0.2"
  resolved "http://npmprivate.quantgroups.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -9451,7 +9524,7 @@ yallist@^2.1.2:
  resolved "http://npmprivate.quantgroups.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=

-yallist@^3.0.2:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
  version "3.1.1"
  resolved "http://npmprivate.quantgroups.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==