Merge branch 'pay' into 'master'

Pay

See merge request !1

package-lock.json

@@ -1133,9 +1133,9 @@
       "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
     },
     "@qg/cherry-ui": {
-      "version": "2.20.22",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.20.22.tgz",
-      "integrity": "sha512-uuhHwat5SUUMUkPM56TK89o49EyXExUjQSW5pdPr0vQ6QpJRUnT+TsOzIxEGyBKQOFHsAIyqWSP2L1CvPWiIHg==",
+      "version": "2.20.23",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.20.23.tgz",
+      "integrity": "sha512-wDS1ag1Jk8dbXVVH+dtg2PZfTYHMHOA88fojWQjZMtZC5+cNbrFtpK/DlITyKJrNvhEQWHQ7dm59Bh6oG4U3Tw==",
       "requires": {
         "@popperjs/core": "^2.5.4",
         "vue-lazyload": "^1.3.3",
@@ -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"
       }

package.json

@@ -10,10 +10,10 @@
   },
   "dependencies": {
     "@better-scroll/core": "^2.0.0-beta.6",
-    "@qg/cherry-ui": "^2.20.22",
+    "@qg/cherry-ui": "^2.20.23",
     "@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",

src/App.vue

@@ -46,6 +46,7 @@ export default {
 };
 </script>
 <style lang="less">
+@import './style/var.less';
 .app {
   user-select: none;
   height: 100%;
@@ -74,4 +75,24 @@ export default {
     }
   }
 }
+/*边框*/
+.b-b:after,
+.b-t:after {
+  position: absolute;
+  z-index: 3;
+  left: 0;
+  right: 0;
+  height: 0;
+  content: '';
+  transform: scaleY(0.5);
+  border-bottom: 1px solid @border-color-base;
+}
+
+.b-b:after {
+  bottom: 0;
+}
+
+.b-t:after {
+  top: 0;
+}
 </style>

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);
+  }
+};

src/api/pay.api.js

+import request from '@/service/httpDecorator';
+import config from '@/config';
+const { talosApi } = config;
+
+const queryPayInfo = function(data) {
+  return request.post(`${talosApi}/open/checkout`, data);
+};
+const prepay = function(data) {
+  console.log('prepay-param', data);
+  return request.post(`${talosApi}/open/checkout/prepay`, data);
+};
+
+const pay = function(data) {
+  return request.post(`${talosApi}/open/checkout/pay`, data, {
+    needScDeviceId: true
+  });
+};
+
+const queryPayStatus = function(data) {
+  return request.post(`${talosApi}/open/checkout/pay_status/query`, data);
+};
+
+const sendSms = function(data) {
+  return request.post(`${talosApi}/open/checkout/send_sms`, data);
+};
+
+const desSalt = function() {
+  return request.get(`${talosApi}/vcc/account/salt`);
+};
+
+const h5AppyUrl = function() {
+  return request.get(`${talosApi}/vcc/xyqb_mall/app_url`);
+};
+
+const getCoupon = function(params) {
+  return request.post(`${talosApi}/open/checkout/pay_coupon_list`, params);
+};
+
+const ocrFaceId = function(params) {
+  return request.post(`${talosApi}open/checkout/ocr_faceId`, params);
+};
+
+export {
+  pay,
+  prepay,
+  sendSms,
+  queryPayInfo,
+  queryPayStatus,
+  desSalt,
+  h5AppyUrl,
+  getCoupon,
+  ocrFaceId
+};

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');
+  }
+};

src/api/tips.js

+export default {
+  101: `<p>充值类商品售出<strong>后无法进行退换</strong>，非充值用户请谨慎购买。</p>`,
+  102: `<p>充值类商品售出<strong>后无法进行退换</strong>，非充值用户请谨慎购买。</p>`
+};

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,12 +14,11 @@ 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'; // 电商分期测试环境服务地址
+<<<<<<< HEAD
+let talosHost = 'http://yapi.quantgroups.com/mock/351'; // 电商分期测试环境服务地址
+// let talosHost = 'https://talos-vcc2.liangkebang.net'; // 电商分期测试环境服务地址
+=======
+let talosApi = 'http://yapi.quantgroups.com/mock/410'; // 电商分期测试环境服务地址
+>>>>>>> 支付开发
 let operatorHost = 'https://operator.liangkebang.com';
-export default {
-  talosHost,
-  operatorHost,
-  payHost,
-  test: true,
-  shenceHost
-};
+export default { talosApi, operatorHost, payHost, shenceHost, test: true };

src/pay/STATIC_DATA.js

+const creditPayStatusType = {
+  1: 'pwd',
+  2: 'sms'
+};
+const payTypeText = ['享花卡支付', '微信支付'];
+const status = ['未申请', '审核中', '审核失败', '已有额度未激活', '开户成功'];
+const payTypeE = [
+  'PD_YXMMAEC_UserClickCashierSelectXiangHuaCardPay',
+  'PD_YXMMAEC_UserClickCashierSelectWechatPay'
+];
+
+const codeArr = ['4034', '4035', '4036'];
+// (4034, "密码错误"),
+// (4035, "密码重试超限，无法验证"),
+// (4036, "验证码错误");
+
+const payStatus = [3, 5]; // 展示支付文案
+const creditStatus = [1, 2]; //展示开通文案
+
+// (1, "VCC未申请"),
+// (2, "VCC审核中"),
+// (3, "VCC审核失败"),
+// (4, "VCC审核成功未开户（包含开户失败）"),
+// (5, "已开户"),;
+const ACCOUNT_NO_APPLY = 1;
+const ACCOUNT_APPLY_AUDITING = 2;
+const ACCOUNT_APPLY_AUDIT_FAIL = 3;
+const ACCOUNT_APPLY_FAIL = 4;
+const ACCOUNT_APPLY_SUCCESS = 5;
+
+// 1信用支付 2微信支付 3支付宝支付 4信用支付_微信支付 5信用支付_支付宝支付 6虚拟支付0元
+const CREDIT_PAY = 1;
+const WECHAT_PAY = 2;
+const ALIPAY_PAY = 3;
+const CREDIT_AND_WECHAT_PAY = 4;
+const CREDIT_AND_ALIPAY_PAY = 5;
+
+// 三方支付
+const IS_THIRD_PAY = method => [WECHAT_PAY, ALIPAY_PAY].indexOf(method) > -1;
+//组合支付
+const IS_GROUP_PAY = method => [CREDIT_AND_WECHAT_PAY, CREDIT_AND_ALIPAY_PAY].indexOf(method) > -1;
+//信用支付
+const IS_CREDIT_PAY = method =>
+  [CREDIT_AND_WECHAT_PAY, CREDIT_AND_ALIPAY_PAY, CREDIT_PAY].indexOf(method) > -1;
+
+const PAYMENT_CODE_PAY = 1; // 支付密码
+const SMS_VERIFICATION_CODE_PAY = 2; //短信验证码
+
+const PAY_SUCCESS = 3; // 支付成功
+const PAY_PAYING = 2; //支付中
+
+function isDetentionFn() {
+  // 推荐开通享花卡
+  if (this.creditPayInfo.accountStatus !== ACCOUNT_APPLY_SUCCESS) {
+    this.$dialog({
+      message: '您有一笔免费额度可以使用，40天免息等你拿',
+      confirmButtonText: '立即开通',
+      cancelButtonText: '继续支付',
+      confirmButtonColor: '#EC1500',
+      onCancel: () => {
+        this.pay();
+      },
+      onConfirm: () => {
+        this.goApply();
+      }
+    });
+  } else if (
+    // 推荐享花卡支付
+    this.creditPayInfo.accountStatus === ACCOUNT_APPLY_SUCCESS &&
+    this.creditPayList.isGroupPay
+  ) {
+    this.$dialog({
+      message: '使用组合支付部分金额可免洗使用40天哦！',
+      confirmButtonText: '组合支付',
+      cancelButtonText: '继续支付',
+      confirmButtonColor: '#EC1500',
+      onCancel: () => {
+        this.pay();
+      },
+      onConfirm: () => {
+        // 推荐组合支付
+        for (let key in this.creditPayList.payList) {
+          if (this.creditPayList.payList[key].isRecommend) {
+            const type = this.creditPayList.payList[key].payType;
+            this.changePayType(type, this.creditPayList.payList[key].mergePayPretreatmentInfo);
+            this.pay();
+            return;
+          }
+        }
+      }
+    });
+  } else if (
+    this.creditPayInfo.accountStatus === ACCOUNT_APPLY_SUCCESS &&
+    !this.creditPayList.isGroupPay
+  ) {
+    this.$dialog({
+      message: '使用享花卡支付可免洗使用40天哦',
+      confirmButtonText: '享花卡支付',
+      cancelButtonText: '继续支付',
+      confirmButtonColor: '#EC1500',
+      onCancel: () => {
+        this.pay();
+      },
+      onConfirm: () => {
+        // 切换享花卡支付
+        this.changePayType(CREDIT_PAY);
+        this.pay();
+      }
+    });
+  }
+}
+function filterAllPayList(type, data) {
+  for (let item in data.payList) {
+    if (data.payList[item].payType === type) {
+      data.payList[item].isCheck = true;
+      continue;
+    }
+    data.payList[item].isCheck = false;
+  }
+  return data;
+}
+export {
+  status,
+  codeArr,
+  payTypeE,
+  payStatus,
+  PAY_PAYING,
+  CREDIT_PAY,
+  WECHAT_PAY,
+  ALIPAY_PAY,
+  PAY_SUCCESS,
+  payTypeText,
+  creditStatus,
+  IS_THIRD_PAY,
+  IS_GROUP_PAY,
+  IS_CREDIT_PAY,
+  isDetentionFn,
+  filterAllPayList,
+  ACCOUNT_NO_APPLY,
+  PAYMENT_CODE_PAY,
+  ACCOUNT_APPLY_FAIL,
+  creditPayStatusType,
+  CREDIT_AND_WECHAT_PAY,
+  CREDIT_AND_ALIPAY_PAY,
+  ACCOUNT_APPLY_SUCCESS,
+  ACCOUNT_APPLY_AUDITING,
+  ACCOUNT_APPLY_AUDIT_FAIL,
+  SMS_VERIFICATION_CODE_PAY
+};

src/pay/components/Contract.vue

+<template>
+  <div class="contract">
+    <cr-checkbox
+      v-model="isCheck"
+      shape="round"
+      class="contract-checkbox"
+      btn-size="mini"
+      @change="change"
+    />
+    <p class="contract-list">
+      勾选同意
+      <span
+        v-for="contract in contractList"
+        :key="contract.contractName"
+        @click="goview(contract.contractVisitUrl)"
+      >
+        《{{ contract.contractName }}》</span
+      >
+    </p>
+  </div>
+</template>
+<script>
+export default {
+  name: 'Contract',
+  props: {
+    contractList: Array
+  },
+  data() {
+    return {
+      isCheck: false
+    };
+  },
+  methods: {
+    goview(url) {
+      window.location.href = url;
+    },
+    change(e) {
+      this.$emit('change', e);
+    }
+  }
+};
+</script>
+<style lang="less">
+.contract {
+  width: 100%;
+  position: relative;
+  display: flex;
+  align-items: flex-start;
+  color: @gray-5;
+  .text-10;
+  &-checkbox {
+    // margin-right: 2px;
+    // height: 14px;
+  }
+  &-list {
+    display: inline-flex;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+    color: @gray-5;
+    span {
+      color: @red;
+    }
+  }
+}
+</style>

src/pay/components/PayCard.vue

+<template>
+  <div class="pay-type-list">
+    <p class="type-title b-b">{{ value.title }}</p>
+    <payGroupItem
+      v-if="value.isGroupPay"
+      v-model="payList"
+      :pay-type="payType"
+      :disabled="disabled"
+      :coupon-info="couponInfo"
+      :show-coupon="showCoupon"
+      :risk-limit="riskLimit"
+      :coupon-disabled="showCoupon && !payCouponCouldBeUsed"
+    />
+    <template v-else>
+      <template v-for="(item, key) of payList">
+        <payCardItem
+          v-if="item.show"
+          :key="key"
+          :pay-type="payType"
+          :value="item"
+          :disabled="disabled"
+          :coupon-info="couponInfo"
+          :show-coupon="showCoupon"
+          :risk-limit="riskLimit"
+          :coupon-disabled="showCoupon && !payCouponCouldBeUsed"
+        />
+      </template>
+    </template>
+  </div>
+</template>
+<script>
+import payCardItem from './PayCardItem';
+import payGroupItem from './PayGroupCard.vue';
+export default {
+  name: 'PayCard',
+  components: {
+    payCardItem,
+    payGroupItem
+  },
+  provide() {
+    return {
+      payCard: this
+    };
+  },
+  props: {
+    value: Object,
+    payType: Number,
+    payText: String,
+    disabled: Boolean,
+    couponInfo: Object,
+    riskLimit: Boolean,
+    showCoupon: Boolean,
+    payCouponCouldBeUsed: Boolean,
+    single: { type: Boolean, default: false },
+    creditPay: { type: Boolean, default: false }
+  },
+  data() {
+    return {
+      payList: this?.value?.payList || {}
+    };
+  },
+  mounted() {
+    console.log(this.value, 'value');
+  },
+  methods: {
+    changePayType(payType) {
+      // 需要初始化全部的选中状态
+      for (let item in this.payList) {
+        if (this.payList[item].payType === payType) {
+          this.payList[item].isCheck = true;
+          continue;
+        }
+        this.payList[item].isCheck = false;
+      }
+      this.$emit('changePayType', payType);
+    }
+  }
+};
+</script>
+<style lang="less">
+.pay-type-list {
+  background-color: #fff;
+  border-radius: @border-radius-sm;
+  margin-top: @padding-sm;
+  .type-title {
+    height: 48px;
+    .text-16;
+    padding-left: @padding-md;
+    position: relative;
+    line-height: 48px;
+  }
+}
+</style>

src/pay/components/PayCardItem.vue

+<template>
+  <div class="payCardItem">
+    <div :class="['type-item', { 'b-t': !isGroupPay }]">
+      <div class="type-item-content">
+        <div class="type-item-content-info">
+          <cr-image :src="value.icon" class="icon" mode="aspectFit" width="39" height="39" />
+          <div class="content-info-con">
+            <div class="content-info-tit">
+              <p class="content-info-tit">{{ value.name }}</p>
+              <p v-if="value.tagName" class="content-info-tit_tag">{{ value.tagName }}</p>
+            </div>
+            <p>{{ value.accountStatusDesc }}</p>
+          </div>
+          <p v-if="isGroupPay && value.mergePayPretreatmentInfo" class="content-info-amount">
+            {{ value.mergePayPretreatmentInfo && value.mergePayPretreatmentInfo.creditPayAmt }}
+          </p>
+        </div>
+        <div
+          v-if="showCoupon && value.payType === 1"
+          class="couponDes"
+          :class="{ disable: couponDisabled }"
+          @click.stop="openCouponModal"
+        >
+          {{ couponInfo.name || '未选择优惠券' }}
+          <cr-icon type="arrow" class="selectArrow" size="15px" />
+        </div>
+      </div>
+      <cr-checkbox
+        v-if="!isGroupPay"
+        v-model="value.isCheck"
+        shape="round"
+        class="type-item-checkbox"
+        checked-color="#EC1500"
+        :disabled="disabled || value.disabled"
+        @click.native="changePayType(value)"
+      />
+    </div>
+    <p v-if="riskLimit && value.riskManagementDesc && !disabled" class="limitDes">
+      {{ value.riskManagementDesc }}
+    </p>
+  </div>
+</template>
+<script>
+// import { registeredEvents } from '@/utils/sa';
+const payTypeE = [
+  'PD_YXMMAEC_UserClickCashierSelectXiangHuaCardPay',
+  'PD_YXMMAEC_UserClickCashierSelectWechatPay'
+];
+const payTypeMiniAppE = ['c_cashierselectxianghuacardpay', 'c_cashierselectwechatpay'];
+export default {
+  name: 'PayCardItem',
+  inject: ['payCard', 'pay'],
+  props: {
+    value: Object,
+    payType: Number,
+    disabled: Boolean,
+    couponInfo: Object,
+    riskLimit: Boolean,
+    showCoupon: Boolean,
+    isGroupPay: Boolean,
+    couponDisabled: Boolean
+  },
+  methods: {
+    changePayType({ payType }) {
+      if (this.disabled || this.value.disabled) {
+        return;
+      }
+      this.$emit('click');
+      this.pay.changePayType(payType);
+    },
+    openCouponModal() {
+      if (this.couponDisabled) return;
+      this.pay.openCouponModal(this.pay.orderNo);
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.payCardItem {
+  width: 100%;
+  padding-bottom: 2px;
+}
+.couponDes {
+  margin-left: 50px;
+  display: inline-block;
+  color: @text-color-red;
+  .text-12;
+  border: @border-width-base solid @text-color-light;
+  border-radius: 3px;
+  padding: 0 0 0 3px;
+  &.disable {
+    color: @font-color-disabled;
+    border-color: @font-color-disabled;
+  }
+  text {
+    color: @text-color-red;
+    .text-12;
+    &.disable {
+      color: @font-color-disabled;
+    }
+  }
+}
+.limitDes {
+  color: #ed6a0c;
+  background: #fffbe8;
+  .text-12;
+  padding: 10px 8px;
+  margin: 8px;
+  border-radius: 3px;
+}
+.type-item {
+  width: 100%;
+  // height: 134rpx;
+  padding: 12px 8px 12px 12px;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+  &-content {
+    width: 100%;
+  }
+  &-content-info {
+    width: 100%;
+    display: flex;
+    // width: 308px;
+    align-items: center;
+  }
+  &-checkbox {
+    width: 18px;
+  }
+}
+.icon {
+  width: 39px;
+  height: 39px;
+  margin-right: @padding-sm;
+}
+.content-info-tit {
+  font-size: 15px;
+  color: @font-color-dark;
+  margin-bottom: 2px;
+  display: flex;
+  align-items: center;
+  &_tag {
+    display: inline-flex;
+    align-items: center;
+    height: 16px;
+    border: @border-width-base solid @text-color-light;
+    border-radius: 3px;
+    font-size: 11px;
+    color: @text-color-light;
+    margin-left: @padding-unit;
+    padding: 0 2px;
+  }
+}
+.content-info-con {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  .text-12;
+  color: @font-color-light;
+}
+.content-info-amount {
+  &::before {
+    content: '¥';
+  }
+  .text-15;
+  color: @black;
+}
+.selectArrow {
+  vertical-align: text-top;
+}
+</style>

src/pay/components/PayGroupCard.vue

+<template>
+  <div>
+    <div class="groupCard">
+      <PayCardItem
+        :is-group-pay="true"
+        :value="creditPayInfo"
+        :coupon-info="couponInfo"
+        :show-coupon="showCoupon"
+        :risk-limit="riskLimit"
+      />
+      <p class="dashed">
+        <cr-checkbox
+          v-model="thirdPayInfo.isCheck"
+          shape="round"
+          checked-color="#EC1500"
+          :disabled="disabled || thirdPayInfo.disabled"
+          class="dashed-checkbox"
+          @click.native="changePayType(thirdPayInfo)"
+        />
+      </p>
+      <PayCardItem :is-group-pay="true" :value="thirdPayInfo" />
+    </div>
+    <p class="group-more b-t" @click="openMore">更多支付组合<cr-icon type="arrow" size="15px" /></p>
+    <cr-popup v-model="morePopup" round position="bottom" :style="{ height: '30%' }" closeable>
+      <p class="more-title">更换支付组合</p>
+      <PayCardItem
+        v-for="item in thirdPayList"
+        :key="item.payType"
+        :value="item"
+        :coupon-info="couponInfo"
+        :show-coupon="showCoupon"
+        :risk-limit="riskLimit"
+        @click="morePopup = false"
+      />
+    </cr-popup>
+  </div>
+</template>
+<script>
+// import { registeredEvents } from '@/utils/sa';
+import PayCardItem from './PayCardItem.vue';
+export default {
+  name: 'PayGroupCard',
+  inject: ['payCard', 'pay'],
+  components: {
+    PayCardItem
+  },
+  props: {
+    value: Object,
+    payType: Number,
+    disabled: Boolean,
+    couponInfo: Object,
+    showCoupon: Boolean,
+    riskLimit: Boolean,
+    couponDisabled: Boolean
+  },
+  data() {
+    return {
+      morePopup: false,
+      thirdPayList: [],
+      creditPayInfo: this.value.creditPayInfo || {}
+    };
+  },
+  computed: {
+    thirdPayInfo: function() {
+      let temp = {};
+      for (const key in this.value) {
+        if (this.value[key].isRecommend || this.value[key].isCheck) {
+          temp = { ...this.value[key] };
+        }
+      }
+      return temp;
+    }
+  },
+  mounted() {
+    for (const key in this.value) {
+      if (this.value[key].isGroupPay) {
+        this.thirdPayList.push(this.value[key]);
+      }
+    }
+  },
+  methods: {
+    changePayType({ payType, mergePayPretreatmentInfo }) {
+      if (this.disabled || this.creditPayInfo.disabled) {
+        return;
+      }
+      this.payCard.changePayType(payType, mergePayPretreatmentInfo);
+    },
+    openCouponModal() {
+      if (this.couponDisabled) return;
+      this.pay.openCouponModal(this.pay.orderNo);
+    },
+    openMore() {
+      this.morePopup = true;
+    }
+  }
+};
+</script>
+<style lang="less">
+.groupCard {
+  width: 320px;
+}
+.group-more {
+  .text-13;
+  width: 335px;
+  height: 36px;
+  margin: auto;
+  display: flex;
+  color: #ec1500;
+  position: relative;
+  align-items: center;
+  justify-content: center;
+}
+.cr-popup--close-top-right {
+  z-index: 2;
+}
+.dashed {
+  width: 309px;
+  margin: auto;
+  position: relative;
+  border-bottom: 1px dashed #dcdcdc;
+  &-checkbox {
+    width: 18px;
+    position: absolute;
+    right: -22px;
+    top: -8px;
+  }
+  &::after {
+    content: '';
+    width: 24px;
+    height: 28px;
+    position: absolute;
+    margin-top: -12px;
+    left: 50%;
+    margin-left: -12px;
+    background: url('../../assets/images/addicon.png') no-repeat;
+    background-size: 100%;
+  }
+}
+.more-title {
+  .text-16;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 48px;
+  color: @black;
+  position: relative;
+}
+</style>

src/pay/components/SmsModal.vue

+<template>
+  <cr-overlay :show="value" @click="closeModal">
+    <div class="sms-modal">
+      <div class="sms">
+        <p class="sms-icon"><cr-icon type="cross" color="#999999" @click="closeModal" /></p>
+        <p class="sms-title">请输入短信验证码</p>
+        <p class="sms-des">为保证您账户安全，此笔交易需要短信验证</p>
+        <p class="sms-des phone">已发送至 {{ getPhone() }}17611682272</p>
+        <cr-authcode-field
+          span-size="20px"
+          type="number"
+          border-type="bottom"
+          :number="6"
+          height="40px"
+          span-color="#000"
+          input-color="#000"
+          input-size="20px"
+          class="sms-input"
+          :success="success"
+        />
+      </div>
+      <div slot="footer" class="sms-action">
+        <p v-if="errorInfo" class="sms-error">{{ errorInfo }}</p>
+        <p v-if="!send" class="sms-set" @click="sendSms()">获取验证码</p>
+        <p v-else class="sms-set grey">{{ time }}s后重新获取验证码</p>
+      </div>
+    </div>
+  </cr-overlay>
+</template>
+
+<script>
+// import { registeredEvents } from '@/utils/sa';
+import { sendSms as sendSmsApi } from '@/api/pay.api';
+export default {
+  props: {
+    value: {
+      type: Boolean,
+      default: true
+    },
+    errorInfo: String
+  },
+  data() {
+    return {
+      send: false,
+      time: 60,
+      timer: null
+    };
+  },
+  computed: {},
+  watch: {
+    value: function(val) {
+      console.log(val);
+      if (val) {
+        this.sendSms(1);
+      }
+    },
+    errorInfo: function() {}
+  },
+  onShow() {},
+  onLoad() {},
+  onReady() {},
+  methods: {
+    closeModal() {
+      this.clearTimer();
+      this.$emit('close');
+    },
+    success(smsCode) {
+      this.$emit('submit', smsCode);
+    },
+    async sendSms(val) {
+      // 页面摧毁清掉定时器
+      if (this.send) return;
+      if (!val) {
+        // registeredEvents('PD_YXMMACP_UserClickResendCaptcha');
+      }
+      const [, error] = await sendSmsApi({ orderNo: this.orderNo, flowOrderNo: this.flowOrderNo });
+      if (!error) {
+        this.send = true;
+        this.timer = setInterval(() => {
+          --this.time;
+          if (!this.time) {
+            this.clearTimer();
+          }
+        }, 1000);
+      }
+    },
+    getPhone() {
+      // const phone = uni.getStorageSync('phone');
+      // const phoneS = phone.replace(/(\d{3})\d*(\d{4})/, '+86 $1 **** $2');
+      // return phoneS;
+    },
+    sendSa() {
+      // if (!this.numberArr.length && !this.isDel) {
+      //   registeredEvents('PD_YXMMACP_UserClickAgainVerificationCodeInputbox');
+      //   wx.reportAnalytics('c_againverificationcodeinputbox', {});
+      // }
+    },
+    clearTimer() {
+      clearInterval(this.timer);
+      this.send = false;
+      this.time = 60;
+    }
+  }
+};
+</script>
+
+<style lang="less">
+.sms-modal {
+  box-sizing: border-box;
+  position: absolute;
+  left: 50%;
+  top: 26%;
+  margin-left: -150px;
+  padding: 12px 12px 24px;
+  width: 300px;
+  border-radius: 16px;
+  background: #fff;
+}
+.sms {
+  &-icon {
+    width: 100%;
+    height: 20px;
+    line-height: 20px;
+    text-align: right;
+  }
+  &-title {
+    text-align: center;
+    width: 100%;
+    font-size: 16px;
+  }
+  &-des {
+    padding: 10px 0 0 8px;
+    display: flex;
+    justify-content: flex-start;
+    font-size: 12px;
+    color: #999999;
+  }
+  &-input {
+    margin: auto;
+  }
+  .phone {
+    margin-top: 8px;
+    color: #323233;
+    font-size: 14px;
+  }
+  &-sms {
+    margin-top: 4px;
+    font-size: 30px;
+    color: #333333;
+    &:before {
+      content: '￥';
+      .text-12;
+    }
+  }
+  &-input {
+    margin: 20px 0;
+  }
+}
+.sms-action {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  p {
+    font-size: 14px;
+    color: #666666;
+  }
+  .sms-error {
+    flex: 1;
+    color: #ee0a24;
+  }
+  .sms-set {
+    flex: 1;
+    text-align: right;
+  }
+  .grey {
+    color: #999999;
+  }
+}
+</style>

src/pay/index.less

+.app {
+  // width: 100%;
+  padding: @padding-xs;
+}
+.price-box {
+  background-color: @white;
+  height: 120px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  .text-13;
+  color: @black;
+  border-radius: @border-radius-sm;
+
+  .price{
+    .text-30;
+    color: @font-color-red;
+    margin-top: @padding-xs;
+    &:before{
+      content: '￥';
+      .text-14;
+      font-weight: bold;
+    }
+  }
+  .time{
+    display: flex;
+    align-items: center;
+    margin-top: @padding-unit;
+  }
+}
+.payBtn{
+  width: 100%;
+  position: fixed;
+  padding: @padding-xs @padding-lg;
+  box-sizing: border-box;
+  z-index: 99;
+  bottom: 0;
+  left:0;
+  background-color:@white;
+  button{
+    width: 100%;
+    color: @white;
+    font-size: @line-height-sm;
+    border-radius: @border-radius-lx;
+  }
+  button[disabled] {
+    color: rgba(255,255,255,.6);
+  }
+  &-primary {
+    @primary-bg();
+  }
+}
+.btn{
+  height:50px;
+  width: 100%;
+  position: fixed;
+  padding: 0 @padding-lg;
+  box-sizing: border-box;
+  bottom: 0;
+  left:0;
+  background-color:@white;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  button{
+    flex:1;
+    color: @white;
+    font-size: @line-height-sm;
+    border-radius: @border-radius-lx;
+  }
+  button[disabled] {
+    color: rgba(255,255,255,.6);
+  }
+  &-primary {
+    @primary-bg();
+  }
+  &-default{
+    border: 1px solid @cherry-color-error;
+    color: @cherry-color-error !important;
+    margin-right: @padding-xs;
+    background-color: @white !important;
+  }
+
+}
+.placeholder{
+  width: 100%;
+  height: 100px;
+}
\ No newline at end of file

src/pay/index.vue

+<template>
+  <div class="app">
+    <!-- 支付倒计时 -->
+    <div class="price-box">
+      <p class="price">{{ displayInfo.orderAmt }}100</p>
+      <p v-if="!overtime" class="time">
+        支付剩余时间：
+        <cr-count-down :time="displayInfo.periodSeconds" @finish="timeup" />
+      </p>
+      <p v-else>支付超时，订单关闭</p>
+    </div>
+
+    <!-- 推荐信用支付 -->
+    <cr-pay-card
+      v-model="creditPayList"
+      :pay-type="payType"
+      :disabled="overtime"
+      :risk-limit="riskLimit"
+      :show-coupon="showCoupon"
+      :coupon-info="selectedCoupon"
+      :has-pwd="creditPayInfo.hasPwd"
+      :pay-coupon-could-be-used="displayInfo.payCouponInfo.payCouponCouldBeUsed"
+      @changePayType="changePayType"
+    />
+
+    <!-- 其他支付方式 -->
+    <cr-pay-card
+      v-model="thirdPayList"
+      :pay-type="payType"
+      :disabled="overtime"
+      :risk-limit="riskLimit"
+      :show-coupon="showCoupon"
+      :coupon-info="selectedCoupon"
+      :has-pwd="creditPayInfo.hasPwd"
+      :pay-coupon-could-be-used="displayInfo.payCouponInfo.payCouponCouldBeUsed"
+      @changePayType="changePayType"
+    />
+
+    <!-- 支付按钮 -->
+    <p v-if="isReady && !overtime" class="payBtn">
+      <cr-contract
+        v-if="isShowProtocol"
+        ref="agreement"
+        :contract-list="payContractInfo.contractInfos"
+        @change="$event => (isCheckAgreement = $event)"
+      />
+      <cr-button
+        type="primary"
+        class="btn-primary"
+        :disabled="!payType || (isShowProtocol && !isCheckAgreement)"
+        @click="nextAction"
+      >
+        {{ accountS.text }}
+      </cr-button>
+    </p>
+    <p v-if="overtime" class="btn">
+      <cr-button type="default" class="btn-default" @click="goOrderDetail">查看订单</cr-button>
+      <cr-button type="primary" class="btn-primary" @click="goHome">返回商城</cr-button>
+    </p>
+    <p class="placeholder" />
+    <!-- 支付密码弹窗 -->
+    <cr-pwd-field
+      ref="pwd"
+      v-model="pwdModal"
+      :amount="amount"
+      @getData="getPwd"
+      @retrieveLink="retrieveLink"
+    />
+
+    <!-- 短信验证弹窗 -->
+    <cr-sms-code-modal
+      v-model="smsModal"
+      :error-info="error"
+      @close="smsModal = false"
+      @submit="getSms"
+    />
+
+    <!-- 享花券弹窗 -->
+    <cr-popup v-model="couponPopup" closeable round position="bottom">
+      <cr-coupon-list
+        no-render-disable-tab
+        :show-coupon="couponPopup"
+        :enable-list="payCouponList"
+        :value="selectedCoupon.pickupId"
+        @click="selectCouponItem"
+        @change="handleSelectCoupon"
+      />
+    </cr-popup>
+  </div>
+</template>
+
+<script>
+import crPayCard from './components/PayCard';
+import { payByWay } from '@/service/pay';
+import crContract from './components/Contract.vue';
+import crSmsCodeModal from './components/SmsModal';
+import { isWechat } from '@/service/validation.service';
+import { encryptByDESModeEBC } from '@/service/encrypt';
+import { registeredEvents } from '@/service/sa.service';
+import localStorage from '@/service/localStorage.service';
+import {
+  status,
+  codeArr,
+  payTypeE,
+  PAY_PAYING,
+  CREDIT_PAY,
+  WECHAT_PAY,
+  ALIPAY_PAY,
+  PAY_SUCCESS,
+  payTypeText,
+  creditStatus,
+  IS_THIRD_PAY,
+  IS_GROUP_PAY,
+  IS_CREDIT_PAY,
+  isDetentionFn,
+  filterAllPayList,
+  PAYMENT_CODE_PAY, // 支付密码
+  ACCOUNT_APPLY_FAIL,
+  creditPayStatusType,
+  ACCOUNT_APPLY_SUCCESS,
+  ACCOUNT_APPLY_AUDIT_FAIL,
+  SMS_VERIFICATION_CODE_PAY //短信验证码
+} from './STATIC_DATA';
+import { pay, prepay, getCoupon, h5AppyUrl, ocrFaceId, queryPayInfo } from '@/api/pay.api.js';
+const VCC_CHANNEL = localStorage.get('vccChannel');
+export default {
+  components: {
+    crPayCard,
+    crContract,
+    crSmsCodeModal
+  },
+  provide() {
+    return {
+      pay: this
+    };
+  },
+  data() {
+    return {
+      error: '',
+      random: '',
+      orderNo: '',
+      payType: null,
+      isReady: false,
+      overtime: false,
+      pwdModal: false,
+      smsModal: false,
+      showCoupon: true,
+      flowOrderNo: null,
+      couponPopup: false,
+      showGoFaceTip: false, // h5支付活体提示怎么处理
+      payTypeList: {},
+      creditPayList: {
+        title: '推荐信用支付',
+        payList: {}
+      },
+      thirdPayList: {
+        title: '其他支付方式',
+        payList: {}
+      },
+      displayInfo: {
+        payCouponInfo: {}
+      },
+      creditPayInfo: {},
+      accountS: {
+        text: '确认支付',
+        fn: this.pay
+      },
+
+      payCouponList: [],
+      isDetention: false,
+      selectedCoupon: {},
+      payContractInfo: {},
+      isCheckAgreement: false,
+      mergePayPretreatmentInfo: {},
+      tradeType: isWechat ? 'JSAPI' : 'MWEB'
+    };
+  },
+  computed: {
+    riskLimit() {
+      return this.isRiskLimit();
+    },
+    amount() {
+      return this.payType === WECHAT_PAY || !this.selectedCoupon.faceValue
+        ? this.displayInfo.orderAmt
+        : (this.displayInfo.orderAmt - this.selectedCoupon.faceValue).toFixed(2);
+    },
+    isShowProtocol() {
+      return (
+        !IS_THIRD_PAY(this.payType) &&
+        this.payContractInfo.payContractIsSign &&
+        this.creditPayInfo.accountStatus === ACCOUNT_APPLY_SUCCESS
+      );
+    }
+  },
+  watch: {
+    payType() {
+      this.getBtnStatus(this.isRiskLimit());
+    }
+  },
+  mounted() {
+    this.orderNo = this.$route.query.orderNo;
+    this.queryPayInfo();
+    this.getCouponList(this.orderNo);
+  },
+  methods: {
+    /* 查询支付信息 */
+    async queryPayInfo() {
+      const [data, error] = await queryPayInfo({ orderNo: this.orderNo });
+      if (error) return;
+      this.isReady = true;
+      const { displayInfo = {}, payMethods } = data || {};
+      if (displayInfo.payCouponInfo && displayInfo.payCouponInfo.optimalPayCoupon) {
+        this.selectedCoupon = displayInfo.payCouponInfo.optimalPayCoupon;
+        this.showCoupon = displayInfo.payCouponInfo.optimalType === 3;
+      }
+      this.payContractInfo = displayInfo.payContractInfo || {};
+      for (const p of payMethods) {
+        // 默认支付方式
+        if (p.isDefault) {
+          this.payType = p.method;
+        }
+        for (const key in displayInfo) {
+          const payType = displayInfo[key].payType;
+          if (!payType) {
+            continue;
+          }
+          /* 三方支付 */
+          if (IS_THIRD_PAY(p.method) && p.method === payType) {
+            this.$set(this.thirdPayList.payList, key, {
+              ...displayInfo[key],
+              ...p,
+              show: true,
+              isCheck: p.isDefault || false
+            });
+            break;
+          }
+          /* 信用支付 */
+          if (
+            IS_CREDIT_PAY(p.method) &&
+            (p.method === payType || (p.method > 3 && p.method - 2 === payType))
+          ) {
+            if (key === 'creditPayInfo' && this.checkStatus(displayInfo[key], displayInfo)) {
+              displayInfo[key].disabled = true;
+            }
+            this.creditPayList.isGroupPay = IS_GROUP_PAY(p.method);
+            this.$set(this.creditPayList.payList, key, {
+              ...displayInfo[key],
+              ...p,
+              show: true,
+              payType: p.method,
+              isCheck: p.isDefault || false,
+              isGroupPay: IS_GROUP_PAY(p.method)
+            });
+            break;
+          }
+        }
+      }
+      if (this.payType === CREDIT_PAY && displayInfo.creditPayInfo.disabled) {
+        this.payType = null;
+      }
+      this.payType &&
+        registeredEvents(payTypeE[this.payType - 1], {
+          order_id: this.orderNo
+        });
+      this.displayInfo = displayInfo || {};
+
+      this.creditPayInfo = displayInfo.creditPayInfo || {};
+      this.overtime = displayInfo.periodSeconds <= 0;
+      this.getBtnStatus(this.isRiskLimit());
+    },
+    checkStatus({ accountStatus, canAmt }, { orderAmt }) {
+      // 开户成功已有额度小于订单额度和审核被拒
+      if (!this.selectedCoupon.faceValue) {
+        return (
+          (accountStatus === ACCOUNT_APPLY_SUCCESS && +orderAmt > +canAmt) ||
+          accountStatus === ACCOUNT_APPLY_AUDIT_FAIL
+        );
+      }
+      return (
+        (accountStatus === ACCOUNT_APPLY_SUCCESS &&
+          +orderAmt > +canAmt + +this.selectedCoupon.faceValue) ||
+        accountStatus === ACCOUNT_APPLY_AUDIT_FAIL
+      );
+    },
+    isRiskLimit() {
+      const { accountStatus, riskManagementAmt } = this.creditPayInfo;
+      const { orderAmt } = this.displayInfo;
+      if (accountStatus === ACCOUNT_APPLY_SUCCESS) {
+        const coupon = +this.selectedCoupon.faceValue || 0;
+        return +riskManagementAmt + coupon < +orderAmt;
+      } else {
+        return false;
+      }
+    },
+    getBtnStatus(isRiskLimit) {
+      const { accountStatus } = this.creditPayInfo;
+      if (!accountStatus) return;
+      if (IS_CREDIT_PAY(this.payType)) {
+        // payType=1--享花卡支付，payType=2微信支付
+        if (accountStatus === ACCOUNT_APPLY_FAIL) {
+          this.accountS = {
+            text: '立即激活',
+            fn: this.goApply
+          };
+        } else if (creditStatus.indexOf(accountStatus) > -1) {
+          this.accountS = {
+            text: '立即开通',
+            fn: this.goApply
+          };
+        } else if (isRiskLimit) {
+          // 展示限额提示
+          this.accountS = {
+            text: '认证提额',
+            fn: this.goOcr
+          };
+        } else if (accountStatus === ACCOUNT_APPLY_SUCCESS) {
+          const finalCount = this.showCoupon
+            ? (this.displayInfo.orderAmt - (this.selectedCoupon.faceValue || 0)).toFixed(2)
+            : this.displayInfo.orderAmt;
+          const txt = `实际支付${finalCount || '0.00'}`;
+          this.accountS = {
+            text: txt,
+            fn: this.pay
+          };
+        }
+      } else {
+        const txt = `确认付款`;
+        this.accountS = {
+          text: txt,
+          fn: this.pay
+        };
+      }
+    },
+    /* 获取优惠券信息 */
+    async getCouponList(orderNo) {
+      const [data] = await getCoupon({ orderNo: orderNo });
+      if (data && data.coupons) {
+        this.payCouponList = data.coupons.filter(item => {
+          if (item.couponCategory === 21) {
+            return {
+              ...item,
+              id: item.pickupId
+            };
+          }
+        });
+      }
+      this.payCouponList = [
+        {
+          id: 33,
+          name: '仅新用户购买自营商品',
+          startDate: '2020.8.6',
+          endDate: '2021.8.16',
+          faceValue: 200,
+          limitAmount: '满99元可用',
+          couponCategory: 1,
+          iconUrl: 'http://talos-image-fe.liangkebang.net/pcm/1599553158123.png',
+          pickupAble: 1
+        },
+        {
+          id: 44,
+          name: '仅新用户购买自营商品',
+          startDate: '2020.8.6',
+          endDate: '2021.8.16',
+          faceValue: 200,
+          limitAmount: '满99元可用',
+          couponCategory: 1,
+          iconUrl: 'http://talos-image-fe.liangkebang.net/pcm/1599553158123.png',
+          pickupAble: 1
+        }
+      ];
+    },
+    nextAction() {
+      registeredEvents('PD_YXMMACP_UserClickCashierConfirmPaymentBtn', {
+        order_id: this.orderNo,
+        pay_method: payTypeText[this.payType - 1],
+        vcc_state: status[this.creditPayInfo.accountStatus - 1],
+        buttons_name: this.accountS.text
+      });
+      this.accountS.fn();
+    },
+    /* 预支付 */
+    async pay(params) {
+      // 组合支付的提示和享花卡支付逻辑
+      this.error = '';
+      if (!params && !this.isDetention && IS_THIRD_PAY(this.payType)) {
+        this.isDetention = true;
+        isDetentionFn.call(this);
+        return;
+      }
+      this.isDetention = false;
+      /* 设置密码 */
+      if (this.payType === CREDIT_PAY && !this.creditPayInfo.hasPwd) {
+        const url = `${this.creditPayInfo.pwdSetJumpUrl}&vccChannel=${VCC_CHANNEL}`;
+        this.goH5(url);
+        return;
+      }
+      const paramsData = {
+        ...params,
+        ocrAuth: {
+          isH5: true
+        },
+        orderNo: this.orderNo,
+        payMethod: this.payType,
+        payCouponId: this.selectedCoupon.pickupId || ''
+      };
+      const [data, error] = params ? await pay(paramsData) : await prepay(paramsData);
+      /* 支付失败 */
+      if (error) {
+        if (codeArr.indexOf(error.response.businessCode) < 0) {
+          this.payResult('Fail', error.msg);
+          return;
+        }
+        this.error = error.msg;
+        return;
+      }
+      const { creditPayInfo = {}, wxPayInfo, flowOrderNo, aliPayInfo } = data;
+      const creditPayStatus = creditPayInfo.creditPayStatus;
+      this.flowOrderNo = flowOrderNo;
+
+      if (!params && this.payType === WECHAT_PAY) {
+        /* 微信支付 */
+        payByWay(this.tradeType, { ...wxPayInfo, url: wxPayInfo.mwebUrl });
+        return;
+      }
+      if (!params && this.payType === ALIPAY_PAY) {
+        /* 支付宝支付 */
+        payByWay('ALIWEB', aliPayInfo);
+        return;
+      }
+      if (creditPayStatus === PAY_PAYING) {
+        /*  支付中 */
+        this.payResult('Waiting');
+        return;
+      }
+      if (creditPayStatus === PAY_SUCCESS) {
+        /*  支付成功 */
+        this.payResult('Success');
+        return;
+      }
+      if (creditPayStatus === PAYMENT_CODE_PAY || creditPayStatus === SMS_VERIFICATION_CODE_PAY) {
+        /* 密码或者短信鉴权 */
+        this.close();
+        this[`${creditPayStatusType[creditPayStatus]}Modal`] = true;
+      }
+    },
+    payResult(type, error) {
+      const finalAmt =
+        this.payType === WECHAT_PAY || !this.showCoupon
+          ? this.displayInfo.orderAmt || '0.00'
+          : (this.displayInfo.orderAmt - this.selectedCoupon.faceValue || 0).toFixed(2);
+      const freeAmount = this.showCoupon ? this.selectedCoupon.faceValue || '0.00' : '0.00';
+      /* 跳转支付结果页面 */
+      this.$router.push({
+        name: `pay${type}`,
+        query: {
+          freeAmount,
+          reason: error,
+          amount: finalAmt,
+          orderNo: this.orderNo
+        }
+      });
+    },
+    /* 选择支付方式 */
+    changePayType(type, mergePayPretreatmentInfo) {
+      this.payType = type;
+      this.isDetention = false;
+      this.thirdPayList = filterAllPayList(type, this.thirdPayList);
+      this.creditPayList = filterAllPayList(type, this.creditPayList);
+      this.mergePayPretreatmentInfo = mergePayPretreatmentInfo || null;
+    },
+    openCouponModal() {
+      registeredEvents('PD_YXMMACP_UserClickCouponBanner');
+      this.random = Math.random();
+      this.couponPopup = true;
+    },
+    /* 选取优惠券 */
+    handleSelectCoupon(id, selectedCoupon) {
+      console.log(id, selectedCoupon);
+      registeredEvents('PD_YXMMACP_UserClickCouponPopupWindowComfirmBtn');
+      this.selectedCoupon = selectedCoupon || {};
+      console.log(this.selectedCoupon);
+      const status = this.checkStatus(this.creditPayInfo, this.displayInfo);
+      if (status) {
+        this.displayInfo.creditPayInfo.disabled = true;
+        this.payType = WECHAT_PAY;
+      } else {
+        this.displayInfo.creditPayInfo.disabled = false;
+      }
+      this.getBtnStatus(this.isRiskLimit());
+      this.couponPopup = false;
+    },
+    close() {
+      this.pwdModal = false;
+      this.smsModal = false;
+    },
+    /* 支付时间超时 */
+    timeup() {
+      this.overtime = true;
+      this.payType = null;
+      this.close();
+    },
+    /* 获取支付密码 */
+    async getPwd({ pwd }) {
+      this.retrieve();
+      this.pay({ flowOrderNo: this.flowOrderNo, password: await encryptByDESModeEBC(pwd) });
+    },
+    /*  短信验证码回调 */
+    getSms(e) {
+      this.pay({ flowOrderNo: this.flowOrderNo, smsAuthorizationCode: e });
+    },
+    /* 进入h5授信流程 */
+    async goApply() {
+      const [{ url }] = await h5AppyUrl();
+      if (url) return;
+      window.location.href = url;
+    },
+    /* 走h5活体流程 */
+    async goOcr() {
+      const [{ url }] = await ocrFaceId({
+        isH5: true,
+        type: 'xyqb',
+        orderNo: this.orderNo,
+        flowOrderNo: this.flowOrderNo,
+        callBackUrl: window.location.href
+      });
+      if (url) return;
+      window.location.href = url;
+    },
+    selectCouponItem(isSelected, couponInfo) {
+      registeredEvents('PD_YXMMACP_UserClickCouponPopupWindowCoupon', {
+        check_or_not: isSelected ? '勾选' : '取消',
+        coupon_id: couponInfo.id
+      });
+    },
+    /* 密码支付失败 */
+    retrieve() {
+      this.$refs.pwd.tips(false, this.error);
+    },
+    /* 忘记密码 */
+    retrieveLink() {
+      const url = `${this.creditPayInfo.forgetPwdJumpUrl}&vccChannel=${VCC_CHANNEL}`;
+      window.location.href = url;
+    },
+    goHome() {
+      // 商城地址
+    },
+    goOrderDetail() {
+      // 订单详情地址
+    }
+  }
+};
+</script>
+
+<style lang="less">
+@import './index';
+</style>

src/pay/payResult.vue

+<template>
+  <div v-if="isSuccess" class="card">
+    <div class="info">
+      <cr-image
+        width="100px"
+        height="100px"
+        class="info__image"
+        src="https://img.lkbang.net/xcx/pay-success.png"
+      />
+      <div class="info__desc">
+        <p class="info__text">订单支付成功!</p>
+        <p class="info__text info__money">实付¥{{ money }}</p>
+        <p v-if="freeAmount > 0" class="info__text info__free">已优惠¥{{ freeAmount }}</p>
+      </div>
+    </div>
+    <p class="tips">
+      您可在“我的-我的订单”中查看详情
+    </p>
+    <div class="actions">
+      <cr-button shape="circle" class="actions__back" :plain="true" type="primary" @click="goHome"
+        >返回首页</cr-button
+      >
+      <cr-button shape="circle" type="primary" @click="goOrderDetail">查看订单</cr-button>
+    </div>
+  </div>
+  <div v-else class="card">
+    <div class="info">
+      <cr-image
+        width="100px"
+        height="100px"
+        class="info__image"
+        src="https://img.lkbang.net/xcx/pay-fail.png"
+      />
+      <p class="info__text">订单支付失败!</p>
+    </div>
+    <p class="tips">
+      {{ reason }}
+    </p>
+    <cr-button type="primary" shape="circle" class="info_button" @click="goPay">重新支付</cr-button>
+  </div>
+</template>
+<script>
+import { registeredEvents } from '@/service/sa.service';
+export default {
+  components: {},
+  data() {
+    return {
+      money: '00.00',
+      orderNo: null,
+      isSuccess: null,
+      freeAmount: null
+    };
+  },
+  created() {
+    const { amount, orderNo, freeAmount, reason } = this.$route.query;
+    const { success } = this.$route.meta;
+    console.log(this.$route.meta);
+    this.money = amount;
+    this.orderNo = orderNo;
+    this.reason = reason || '';
+    this.isSuccess = success || false;
+    this.freeAmount = freeAmount;
+  },
+  methods: {
+    goHome() {
+      // 去页面
+    },
+    goOrderDetail() {
+      registeredEvents('PD_YXMMAEC_UserClickCashierCheckOrderBtn', {
+        order_id: this.orderNo
+      });
+      // 去订单详情页面
+    },
+    goPay() {
+      registeredEvents('PD_YXMMAEC_UserClickCashierPaymentAgainBtn', {
+        order_id: this.orderNo
+      });
+      this.$router.push({ name: 'pay', query: { order: this.orderNo } });
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.card {
+  margin: @padding-sm;
+  background-color: @white;
+  border-radius: @border-radius-sm;
+  padding: 28px @padding-sm @padding-sm @padding-sm;
+
+  .info {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &__image {
+      width: 100px;
+      height: 100px;
+    }
+
+    &__text {
+      .text-16;
+      margin-left: @padding-md;
+    }
+
+    &__desc {
+      display: flex;
+      flex-direction: column;
+    }
+
+    &__money {
+      margin-top: @padding-xs;
+    }
+    &__free {
+      .text-13;
+      margin-top: @padding-xs;
+      color: @font-color-light;
+    }
+  }
+
+  .tips {
+    .text-12;
+    text-align: center;
+    margin-top: @padding-lg;
+    color: @font-color-light;
+  }
+
+  .actions {
+    display: flex;
+    flex-direction: row;
+    margin-top: @padding-lg;
+    justify-content: space-between;
+    &__back {
+      color: @cherry-color-error;
+      border: 1px solid @cherry-color-error;
+    }
+
+    &__order {
+      @primary-bg();
+      margin-left: @padding-sm;
+    }
+
+    button {
+      // flex: 1;
+      .text-17;
+      width: 161px;
+    }
+  }
+  .info_button {
+    width: 100%;
+  }
+}
+</style>

src/pay/payWaiting.vue

+<template>
+  <div class="card">
+    <div class="info">
+      <cr-image width="63px" height="63px" class="info__image" src="../assets/images/paying.png" />
+      <div class="info__desc">
+        <p class="info__text">（{{ time }}s）支付中...</p>
+      </div>
+    </div>
+    <p class="tips">
+      努力返回支付结果中，请留心查看！
+    </p>
+    <div class="actions">
+      <cr-button class="actions__back" :plain="true" type="primary" shape="circle" @click="goHome"
+        >返回首页</cr-button
+      >
+      <cr-button shape="circle" type="primary" @click="goOrderDetail">查看订单</cr-button>
+    </div>
+  </div>
+</template>
+<script>
+import { registeredEvents } from '@/service/sa.service';
+import { queryPayStatus } from '../api/pay.api';
+export default {
+  components: {},
+  data() {
+    return {
+      orderNo: null,
+      timer: null,
+      time: 10
+    };
+  },
+  created() {
+    const { orderNo } = this.$route.query;
+    this.orderNo = orderNo;
+  },
+  mounted() {
+    this.timer = setInterval(() => {
+      this.time -= 1;
+      if (this.time % 2 === 0) {
+        queryPayStatus({ orderNo: this.orderNo });
+      }
+      if (this.time < 1) {
+        clearInterval(this.timer);
+      }
+    }, 2000);
+  },
+  methods: {
+    goHome() {
+      // 去页面
+    },
+    goOrderDetail() {
+      registeredEvents('PD_YXMMAEC_UserClickCashierCheckOrderBtn', {
+        order_id: this.orderNo
+      });
+      // 去订单详情页面
+    },
+    goPay() {
+      registeredEvents('PD_YXMMAEC_UserClickCashierPaymentAgainBtn', {
+        order_id: this.orderNo
+      });
+      this.$router.push({ name: 'pay', query: { order: this.orderNo } });
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.card {
+  margin: @padding-sm;
+  background-color: @white;
+  border-radius: @border-radius-sm;
+  padding: 28px @padding-sm @padding-sm @padding-sm;
+
+  .info {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &__image {
+      width: 100px;
+      height: 100px;
+    }
+
+    &__text {
+      .text-16;
+      margin-left: @padding-md;
+    }
+
+    &__desc {
+      display: flex;
+      flex-direction: column;
+    }
+
+    &__money {
+      margin-top: @padding-xs;
+    }
+    &__free {
+      .text-13;
+      margin-top: @padding-xs;
+      color: @font-color-light;
+    }
+  }
+
+  .tips {
+    .text-12;
+    text-align: center;
+    margin-top: @padding-lg;
+    color: @font-color-light;
+  }
+
+  .actions {
+    display: flex;
+    flex-direction: row;
+    margin-top: @padding-lg;
+    justify-content: space-between;
+
+    &__back {
+      color: @cherry-color-error;
+      border: 1px solid @cherry-color-error;
+    }
+
+    &__order {
+      @primary-bg();
+      margin-left: @padding-sm;
+    }
+
+    button {
+      .text-17;
+      width: 161px;
+    }
+  }
+  .info_button {
+    width: 100%;
+  }
+}
+</style>

src/router/routes.js

 export default [
   {
     path: '/',
-    redirect: '/error'
+    redirect: '/pay'
+  },
+  {
+    path: '/pay',
+    name: 'pay',
+    meta: {
+      title: '收银台'
+    },
+    component: () => import('../pay')
+  },
+  {
+    path: '/payFail',
+    name: 'payFail',
+    alias: ['/payFail'],
+    meta: {
+      title: '支付失败'
+    },
+    component: () => import('../pay/payResult')
+  },
+  {
+    path: '/paySuccess',
+    name: 'paySuccess',
+    alias: ['/paySuccess'], // 有问题🤨
+    meta: {
+      title: '支付成功',
+      success: true
+    },
+    component: () => import('../pay/payResult')
+  },
+  {
+    path: '/vipLife',
+    name: 'vipLife',
+    meta: {
+      title: '充值中心'
+    },
+    component: () => import('../views/vipLife')
+  },
+  {
+    path: '/orderList',
+    name: 'orderList',
+    meta: {
+      title: '我的订单'
+    },
+    component: () => import('../views/orderList')
+  },
+  {
+    path: '/orderDetail',
+    name: 'orderDetail',
+    meta: {
+      title: '订单详情'
+    },
+    component: () => import('../views/orderDetail')
+ },{
+    path: '/payWaiting',
+    name: 'payWaiting',
+    meta: {
+      title: '支付中',
+      success: true
+    },
+    component: () => import('../pay/payWaiting')
   },
   {
     path: '/demo',

src/service/cherryUI.service.js

@@ -7,6 +7,8 @@ import {
   Icon,
   Cell,
   CellGroup,
+  Radio,
+  RadioGroup,
   Row,
   Col,
   Dialog,
@@ -24,7 +26,15 @@ import {
   Form,
   Sticky,
   Tab,
-  Tabs
+  Tabs,
+<<<<<<< HEAD
+  Empty
+=======
+  CountDown,
+  PwdField,
+  AuthcodeField,
+  CouponList
+>>>>>>> 支付开发
 } from '@qg/cherry-ui';
 import DialogFn from '@qg/cherry-ui/src/dialog/func';
 // import "@qg/cherry-ui/dist/cherry.css";
@@ -33,6 +43,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 +64,14 @@ Vue.use(Loading);
 Vue.use(List);
 Vue.use(Tab);
 Vue.use(Tabs);
+<<<<<<< HEAD
+Vue.use(Empty);
+=======
+Vue.use(CountDown);
+Vue.use(PwdField);
+Vue.use(AuthcodeField);
+Vue.use(CouponList);
+>>>>>>> 支付开发
 
 // const _proto = Vue.prototype;
 // const proto = Object.create(_proto);

src/service/crypto.min.js

+!function(t,r){"object"==typeof exports?module.exports=exports=r():"function"==typeof define&&define.amd?define([],r):t.CryptoJS=r()}(this,function(){var t=t||function(t,r){var e=Object.create||function(){function t(){}return function(r){var e;return t.prototype=r,e=new t,t.prototype=null,e}}(),i={},n=i.lib={},o=n.Base=function(){return{extend:function(t){var r=e(this);return t&&r.mixIn(t),r.hasOwnProperty("init")&&this.init!==r.init||(r.init=function(){r.$super.init.apply(this,arguments)}),r.init.prototype=r,r.$super=this,r},create:function(){var t=this.extend();return t.init.apply(t,arguments),t},init:function(){},mixIn:function(t){for(var r in t)t.hasOwnProperty(r)&&(this[r]=t[r]);t.hasOwnProperty("toString")&&(this.toString=t.toString)},clone:function(){return this.init.prototype.extend(this)}}}(),s=n.WordArray=o.extend({init:function(t,e){t=this.words=t||[],e!=r?this.sigBytes=e:this.sigBytes=4*t.length},toString:function(t){return(t||c).stringify(this)},concat:function(t){var r=this.words,e=t.words,i=this.sigBytes,n=t.sigBytes;if(this.clamp(),i%4)for(var o=0;o<n;o++){var s=e[o>>>2]>>>24-o%4*8&255;r[i+o>>>2]|=s<<24-(i+o)%4*8}else for(var o=0;o<n;o+=4)r[i+o>>>2]=e[o>>>2];return this.sigBytes+=n,this},clamp:function(){var r=this.words,e=this.sigBytes;r[e>>>2]&=4294967295<<32-e%4*8,r.length=t.ceil(e/4)},clone:function(){var t=o.clone.call(this);return t.words=this.words.slice(0),t},random:function(r){for(var e,i=[],n=function(r){var r=r,e=987654321,i=4294967295;return function(){e=36969*(65535&e)+(e>>16)&i,r=18e3*(65535&r)+(r>>16)&i;var n=(e<<16)+r&i;return n/=4294967296,n+=.5,n*(t.random()>.5?1:-1)}},o=0;o<r;o+=4){var a=n(4294967296*(e||t.random()));e=987654071*a(),i.push(4294967296*a()|0)}return new s.init(i,r)}}),a=i.enc={},c=a.Hex={stringify:function(t){for(var r=t.words,e=t.sigBytes,i=[],n=0;n<e;n++){var o=r[n>>>2]>>>24-n%4*8&255;i.push((o>>>4).toString(16)),i.push((15&o).toString(16))}return i.join("")},parse:function(t){for(var r=t.length,e=[],i=0;i<r;i+=2)e[i>>>3]|=parseInt(t.substr(i,2),16)<<24-i%8*4;return new s.init(e,r/2)}},h=a.Latin1={stringify:function(t){for(var r=t.words,e=t.sigBytes,i=[],n=0;n<e;n++){var o=r[n>>>2]>>>24-n%4*8&255;i.push(String.fromCharCode(o))}return i.join("")},parse:function(t){for(var r=t.length,e=[],i=0;i<r;i++)e[i>>>2]|=(255&t.charCodeAt(i))<<24-i%4*8;return new s.init(e,r)}},l=a.Utf8={stringify:function(t){try{return decodeURIComponent(escape(h.stringify(t)))}catch(t){throw new Error("Malformed UTF-8 data")}},parse:function(t){return h.parse(unescape(encodeURIComponent(t)))}},f=n.BufferedBlockAlgorithm=o.extend({reset:function(){this._data=new s.init,this._nDataBytes=0},_append:function(t){"string"==typeof t&&(t=l.parse(t)),this._data.concat(t),this._nDataBytes+=t.sigBytes},_process:function(r){var e=this._data,i=e.words,n=e.sigBytes,o=this.blockSize,a=4*o,c=n/a;c=r?t.ceil(c):t.max((0|c)-this._minBufferSize,0);var h=c*o,l=t.min(4*h,n);if(h){for(var f=0;f<h;f+=o)this._doProcessBlock(i,f);var u=i.splice(0,h);e.sigBytes-=l}return new s.init(u,l)},clone:function(){var t=o.clone.call(this);return t._data=this._data.clone(),t},_minBufferSize:0}),u=(n.Hasher=f.extend({cfg:o.extend(),init:function(t){this.cfg=this.cfg.extend(t),this.reset()},reset:function(){f.reset.call(this),this._doReset()},update:function(t){return this._append(t),this._process(),this},finalize:function(t){t&&this._append(t);var r=this._doFinalize();return r},blockSize:16,_createHelper:function(t){return function(r,e){return new t.init(e).finalize(r)}},_createHmacHelper:function(t){return function(r,e){return new u.HMAC.init(t,e).finalize(r)}}}),i.algo={});return i}(Math);return function(){function r(t,r,e){for(var i=[],o=0,s=0;s<r;s++)if(s%4){var a=e[t.charCodeAt(s-1)]<<s%4*2,c=e[t.charCodeAt(s)]>>>6-s%4*2;i[o>>>2]|=(a|c)<<24-o%4*8,o++}return n.create(i,o)}var e=t,i=e.lib,n=i.WordArray,o=e.enc;o.Base64={stringify:function(t){var r=t.words,e=t.sigBytes,i=this._map;t.clamp();for(var n=[],o=0;o<e;o+=3)for(var s=r[o>>>2]>>>24-o%4*8&255,a=r[o+1>>>2]>>>24-(o+1)%4*8&255,c=r[o+2>>>2]>>>24-(o+2)%4*8&255,h=s<<16|a<<8|c,l=0;l<4&&o+.75*l<e;l++)n.push(i.charAt(h>>>6*(3-l)&63));var f=i.charAt(64);if(f)for(;n.length%4;)n.push(f);return n.join("")},parse:function(t){var e=t.length,i=this._map,n=this._reverseMap;if(!n){n=this._reverseMap=[];for(var o=0;o<i.length;o++)n[i.charCodeAt(o)]=o}var s=i.charAt(64);if(s){var a=t.indexOf(s);a!==-1&&(e=a)}return r(t,e,n)},_map:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="}}(),function(r){function e(t,r,e,i,n,o,s){var a=t+(r&e|~r&i)+n+s;return(a<<o|a>>>32-o)+r}function i(t,r,e,i,n,o,s){var a=t+(r&i|e&~i)+n+s;return(a<<o|a>>>32-o)+r}function n(t,r,e,i,n,o,s){var a=t+(r^e^i)+n+s;return(a<<o|a>>>32-o)+r}function o(t,r,e,i,n,o,s){var a=t+(e^(r|~i))+n+s;return(a<<o|a>>>32-o)+r}var s=t,a=s.lib,c=a.WordArray,h=a.Hasher,l=s.algo,f=[];!function(){for(var t=0;t<64;t++)f[t]=4294967296*r.abs(r.sin(t+1))|0}();var u=l.MD5=h.extend({_doReset:function(){this._hash=new c.init([1732584193,4023233417,2562383102,271733878])},_doProcessBlock:function(t,r){for(var s=0;s<16;s++){var a=r+s,c=t[a];t[a]=16711935&(c<<8|c>>>24)|4278255360&(c<<24|c>>>8)}var h=this._hash.words,l=t[r+0],u=t[r+1],d=t[r+2],v=t[r+3],p=t[r+4],_=t[r+5],y=t[r+6],g=t[r+7],B=t[r+8],w=t[r+9],k=t[r+10],S=t[r+11],m=t[r+12],x=t[r+13],b=t[r+14],H=t[r+15],z=h[0],A=h[1],C=h[2],D=h[3];z=e(z,A,C,D,l,7,f[0]),D=e(D,z,A,C,u,12,f[1]),C=e(C,D,z,A,d,17,f[2]),A=e(A,C,D,z,v,22,f[3]),z=e(z,A,C,D,p,7,f[4]),D=e(D,z,A,C,_,12,f[5]),C=e(C,D,z,A,y,17,f[6]),A=e(A,C,D,z,g,22,f[7]),z=e(z,A,C,D,B,7,f[8]),D=e(D,z,A,C,w,12,f[9]),C=e(C,D,z,A,k,17,f[10]),A=e(A,C,D,z,S,22,f[11]),z=e(z,A,C,D,m,7,f[12]),D=e(D,z,A,C,x,12,f[13]),C=e(C,D,z,A,b,17,f[14]),A=e(A,C,D,z,H,22,f[15]),z=i(z,A,C,D,u,5,f[16]),D=i(D,z,A,C,y,9,f[17]),C=i(C,D,z,A,S,14,f[18]),A=i(A,C,D,z,l,20,f[19]),z=i(z,A,C,D,_,5,f[20]),D=i(D,z,A,C,k,9,f[21]),C=i(C,D,z,A,H,14,f[22]),A=i(A,C,D,z,p,20,f[23]),z=i(z,A,C,D,w,5,f[24]),D=i(D,z,A,C,b,9,f[25]),C=i(C,D,z,A,v,14,f[26]),A=i(A,C,D,z,B,20,f[27]),z=i(z,A,C,D,x,5,f[28]),D=i(D,z,A,C,d,9,f[29]),C=i(C,D,z,A,g,14,f[30]),A=i(A,C,D,z,m,20,f[31]),z=n(z,A,C,D,_,4,f[32]),D=n(D,z,A,C,B,11,f[33]),C=n(C,D,z,A,S,16,f[34]),A=n(A,C,D,z,b,23,f[35]),z=n(z,A,C,D,u,4,f[36]),D=n(D,z,A,C,p,11,f[37]),C=n(C,D,z,A,g,16,f[38]),A=n(A,C,D,z,k,23,f[39]),z=n(z,A,C,D,x,4,f[40]),D=n(D,z,A,C,l,11,f[41]),C=n(C,D,z,A,v,16,f[42]),A=n(A,C,D,z,y,23,f[43]),z=n(z,A,C,D,w,4,f[44]),D=n(D,z,A,C,m,11,f[45]),C=n(C,D,z,A,H,16,f[46]),A=n(A,C,D,z,d,23,f[47]),z=o(z,A,C,D,l,6,f[48]),D=o(D,z,A,C,g,10,f[49]),C=o(C,D,z,A,b,15,f[50]),A=o(A,C,D,z,_,21,f[51]),z=o(z,A,C,D,m,6,f[52]),D=o(D,z,A,C,v,10,f[53]),C=o(C,D,z,A,k,15,f[54]),A=o(A,C,D,z,u,21,f[55]),z=o(z,A,C,D,B,6,f[56]),D=o(D,z,A,C,H,10,f[57]),C=o(C,D,z,A,y,15,f[58]),A=o(A,C,D,z,x,21,f[59]),z=o(z,A,C,D,p,6,f[60]),D=o(D,z,A,C,S,10,f[61]),C=o(C,D,z,A,d,15,f[62]),A=o(A,C,D,z,w,21,f[63]),h[0]=h[0]+z|0,h[1]=h[1]+A|0,h[2]=h[2]+C|0,h[3]=h[3]+D|0},_doFinalize:function(){var t=this._data,e=t.words,i=8*this._nDataBytes,n=8*t.sigBytes;e[n>>>5]|=128<<24-n%32;var o=r.floor(i/4294967296),s=i;e[(n+64>>>9<<4)+15]=16711935&(o<<8|o>>>24)|4278255360&(o<<24|o>>>8),e[(n+64>>>9<<4)+14]=16711935&(s<<8|s>>>24)|4278255360&(s<<24|s>>>8),t.sigBytes=4*(e.length+1),this._process();for(var a=this._hash,c=a.words,h=0;h<4;h++){var l=c[h];c[h]=16711935&(l<<8|l>>>24)|4278255360&(l<<24|l>>>8)}return a},clone:function(){var t=h.clone.call(this);return t._hash=this._hash.clone(),t}});s.MD5=h._createHelper(u),s.HmacMD5=h._createHmacHelper(u)}(Math),function(){var r=t,e=r.lib,i=e.WordArray,n=e.Hasher,o=r.algo,s=[],a=o.SHA1=n.extend({_doReset:function(){this._hash=new i.init([1732584193,4023233417,2562383102,271733878,3285377520])},_doProcessBlock:function(t,r){for(var e=this._hash.words,i=e[0],n=e[1],o=e[2],a=e[3],c=e[4],h=0;h<80;h++){if(h<16)s[h]=0|t[r+h];else{var l=s[h-3]^s[h-8]^s[h-14]^s[h-16];s[h]=l<<1|l>>>31}var f=(i<<5|i>>>27)+c+s[h];f+=h<20?(n&o|~n&a)+1518500249:h<40?(n^o^a)+1859775393:h<60?(n&o|n&a|o&a)-1894007588:(n^o^a)-899497514,c=a,a=o,o=n<<30|n>>>2,n=i,i=f}e[0]=e[0]+i|0,e[1]=e[1]+n|0,e[2]=e[2]+o|0,e[3]=e[3]+a|0,e[4]=e[4]+c|0},_doFinalize:function(){var t=this._data,r=t.words,e=8*this._nDataBytes,i=8*t.sigBytes;return r[i>>>5]|=128<<24-i%32,r[(i+64>>>9<<4)+14]=Math.floor(e/4294967296),r[(i+64>>>9<<4)+15]=e,t.sigBytes=4*r.length,this._process(),this._hash},clone:function(){var t=n.clone.call(this);return t._hash=this._hash.clone(),t}});r.SHA1=n._createHelper(a),r.HmacSHA1=n._createHmacHelper(a)}(),function(r){var e=t,i=e.lib,n=i.WordArray,o=i.Hasher,s=e.algo,a=[],c=[];!function(){function t(t){for(var e=r.sqrt(t),i=2;i<=e;i++)if(!(t%i))return!1;return!0}function e(t){return 4294967296*(t-(0|t))|0}for(var i=2,n=0;n<64;)t(i)&&(n<8&&(a[n]=e(r.pow(i,.5))),c[n]=e(r.pow(i,1/3)),n++),i++}();var h=[],l=s.SHA256=o.extend({_doReset:function(){this._hash=new n.init(a.slice(0))},_doProcessBlock:function(t,r){for(var e=this._hash.words,i=e[0],n=e[1],o=e[2],s=e[3],a=e[4],l=e[5],f=e[6],u=e[7],d=0;d<64;d++){if(d<16)h[d]=0|t[r+d];else{var v=h[d-15],p=(v<<25|v>>>7)^(v<<14|v>>>18)^v>>>3,_=h[d-2],y=(_<<15|_>>>17)^(_<<13|_>>>19)^_>>>10;h[d]=p+h[d-7]+y+h[d-16]}var g=a&l^~a&f,B=i&n^i&o^n&o,w=(i<<30|i>>>2)^(i<<19|i>>>13)^(i<<10|i>>>22),k=(a<<26|a>>>6)^(a<<21|a>>>11)^(a<<7|a>>>25),S=u+k+g+c[d]+h[d],m=w+B;u=f,f=l,l=a,a=s+S|0,s=o,o=n,n=i,i=S+m|0}e[0]=e[0]+i|0,e[1]=e[1]+n|0,e[2]=e[2]+o|0,e[3]=e[3]+s|0,e[4]=e[4]+a|0,e[5]=e[5]+l|0,e[6]=e[6]+f|0,e[7]=e[7]+u|0},_doFinalize:function(){var t=this._data,e=t.words,i=8*this._nDataBytes,n=8*t.sigBytes;return e[n>>>5]|=128<<24-n%32,e[(n+64>>>9<<4)+14]=r.floor(i/4294967296),e[(n+64>>>9<<4)+15]=i,t.sigBytes=4*e.length,this._process(),this._hash},clone:function(){var t=o.clone.call(this);return t._hash=this._hash.clone(),t}});e.SHA256=o._createHelper(l),e.HmacSHA256=o._createHmacHelper(l)}(Math),function(){function r(t){return t<<8&4278255360|t>>>8&16711935}var e=t,i=e.lib,n=i.WordArray,o=e.enc;o.Utf16=o.Utf16BE={stringify:function(t){for(var r=t.words,e=t.sigBytes,i=[],n=0;n<e;n+=2){var o=r[n>>>2]>>>16-n%4*8&65535;i.push(String.fromCharCode(o))}return i.join("")},parse:function(t){for(var r=t.length,e=[],i=0;i<r;i++)e[i>>>1]|=t.charCodeAt(i)<<16-i%2*16;return n.create(e,2*r)}};o.Utf16LE={stringify:function(t){for(var e=t.words,i=t.sigBytes,n=[],o=0;o<i;o+=2){var s=r(e[o>>>2]>>>16-o%4*8&65535);n.push(String.fromCharCode(s))}return n.join("")},parse:function(t){for(var e=t.length,i=[],o=0;o<e;o++)i[o>>>1]|=r(t.charCodeAt(o)<<16-o%2*16);return n.create(i,2*e)}}}(),function(){if("function"==typeof ArrayBuffer){var r=t,e=r.lib,i=e.WordArray,n=i.init,o=i.init=function(t){if(t instanceof ArrayBuffer&&(t=new Uint8Array(t)),(t instanceof Int8Array||"undefined"!=typeof Uint8ClampedArray&&t instanceof Uint8ClampedArray||t instanceof Int16Array||t instanceof Uint16Array||t instanceof Int32Array||t instanceof Uint32Array||t instanceof Float32Array||t instanceof Float64Array)&&(t=new Uint8Array(t.buffer,t.byteOffset,t.byteLength)),t instanceof Uint8Array){for(var r=t.byteLength,e=[],i=0;i<r;i++)e[i>>>2]|=t[i]<<24-i%4*8;n.call(this,e,r)}else n.apply(this,arguments)};o.prototype=i}}(),function(r){function e(t,r,e){return t^r^e}function i(t,r,e){return t&r|~t&e}function n(t,r,e){return(t|~r)^e}function o(t,r,e){return t&e|r&~e}function s(t,r,e){return t^(r|~e)}function a(t,r){return t<<r|t>>>32-r}var c=t,h=c.lib,l=h.WordArray,f=h.Hasher,u=c.algo,d=l.create([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,7,4,13,1,10,6,15,3,12,0,9,5,2,14,11,8,3,10,14,4,9,15,8,1,2,7,0,6,13,11,5,12,1,9,11,10,0,8,12,4,13,3,7,15,14,5,6,2,4,0,5,9,7,12,2,10,14,1,3,8,11,6,15,13]),v=l.create([5,14,7,0,9,2,11,4,13,6,15,8,1,10,3,12,6,11,3,7,0,13,5,10,14,15,8,12,4,9,1,2,15,5,1,3,7,14,6,9,11,8,12,2,10,0,4,13,8,6,4,1,3,11,15,0,5,12,2,13,9,7,10,14,12,15,10,4,1,5,8,7,6,2,13,14,0,3,9,11]),p=l.create([11,14,15,12,5,8,7,9,11,13,14,15,6,7,9,8,7,6,8,13,11,9,7,15,7,12,15,9,11,7,13,12,11,13,6,7,14,9,13,15,14,8,13,6,5,12,7,5,11,12,14,15,14,15,9,8,9,14,5,6,8,6,5,12,9,15,5,11,6,8,13,12,5,12,13,14,11,8,5,6]),_=l.create([8,9,9,11,13,15,15,5,7,7,8,11,14,14,12,6,9,13,15,7,12,8,9,11,7,7,12,7,6,15,13,11,9,7,15,11,8,6,6,14,12,13,5,14,13,13,7,5,15,5,8,11,14,14,6,14,6,9,12,9,12,5,15,8,8,5,12,9,12,5,14,6,8,13,6,5,15,13,11,11]),y=l.create([0,1518500249,1859775393,2400959708,2840853838]),g=l.create([1352829926,1548603684,1836072691,2053994217,0]),B=u.RIPEMD160=f.extend({_doReset:function(){this._hash=l.create([1732584193,4023233417,2562383102,271733878,3285377520])},_doProcessBlock:function(t,r){for(var c=0;c<16;c++){var h=r+c,l=t[h];t[h]=16711935&(l<<8|l>>>24)|4278255360&(l<<24|l>>>8)}var f,u,B,w,k,S,m,x,b,H,z=this._hash.words,A=y.words,C=g.words,D=d.words,R=v.words,E=p.words,M=_.words;S=f=z[0],m=u=z[1],x=B=z[2],b=w=z[3],H=k=z[4];for(var F,c=0;c<80;c+=1)F=f+t[r+D[c]]|0,F+=c<16?e(u,B,w)+A[0]:c<32?i(u,B,w)+A[1]:c<48?n(u,B,w)+A[2]:c<64?o(u,B,w)+A[3]:s(u,B,w)+A[4],F|=0,F=a(F,E[c]),F=F+k|0,f=k,k=w,w=a(B,10),B=u,u=F,F=S+t[r+R[c]]|0,F+=c<16?s(m,x,b)+C[0]:c<32?o(m,x,b)+C[1]:c<48?n(m,x,b)+C[2]:c<64?i(m,x,b)+C[3]:e(m,x,b)+C[4],F|=0,F=a(F,M[c]),F=F+H|0,S=H,H=b,b=a(x,10),x=m,m=F;F=z[1]+B+b|0,z[1]=z[2]+w+H|0,z[2]=z[3]+k+S|0,z[3]=z[4]+f+m|0,z[4]=z[0]+u+x|0,z[0]=F},_doFinalize:function(){var t=this._data,r=t.words,e=8*this._nDataBytes,i=8*t.sigBytes;r[i>>>5]|=128<<24-i%32,r[(i+64>>>9<<4)+14]=16711935&(e<<8|e>>>24)|4278255360&(e<<24|e>>>8),t.sigBytes=4*(r.length+1),this._process();for(var n=this._hash,o=n.words,s=0;s<5;s++){var a=o[s];o[s]=16711935&(a<<8|a>>>24)|4278255360&(a<<24|a>>>8)}return n},clone:function(){var t=f.clone.call(this);return t._hash=this._hash.clone(),t}});c.RIPEMD160=f._createHelper(B),c.HmacRIPEMD160=f._createHmacHelper(B)}(Math),function(){var r=t,e=r.lib,i=e.Base,n=r.enc,o=n.Utf8,s=r.algo;s.HMAC=i.extend({init:function(t,r){t=this._hasher=new t.init,"string"==typeof r&&(r=o.parse(r));var e=t.blockSize,i=4*e;r.sigBytes>i&&(r=t.finalize(r)),r.clamp();for(var n=this._oKey=r.clone(),s=this._iKey=r.clone(),a=n.words,c=s.words,h=0;h<e;h++)a[h]^=1549556828,c[h]^=909522486;n.sigBytes=s.sigBytes=i,this.reset()},reset:function(){var t=this._hasher;t.reset(),t.update(this._iKey)},update:function(t){return this._hasher.update(t),this},finalize:function(t){var r=this._hasher,e=r.finalize(t);r.reset();var i=r.finalize(this._oKey.clone().concat(e));return i}})}(),function(){var r=t,e=r.lib,i=e.Base,n=e.WordArray,o=r.algo,s=o.SHA1,a=o.HMAC,c=o.PBKDF2=i.extend({cfg:i.extend({keySize:4,hasher:s,iterations:1}),init:function(t){this.cfg=this.cfg.extend(t)},compute:function(t,r){for(var e=this.cfg,i=a.create(e.hasher,t),o=n.create(),s=n.create([1]),c=o.words,h=s.words,l=e.keySize,f=e.iterations;c.length<l;){var u=i.update(r).finalize(s);i.reset();for(var d=u.words,v=d.length,p=u,_=1;_<f;_++){p=i.finalize(p),i.reset();for(var y=p.words,g=0;g<v;g++)d[g]^=y[g]}o.concat(u),h[0]++}return o.sigBytes=4*l,o}});r.PBKDF2=function(t,r,e){return c.create(e).compute(t,r)}}(),function(){var r=t,e=r.lib,i=e.Base,n=e.WordArray,o=r.algo,s=o.MD5,a=o.EvpKDF=i.extend({cfg:i.extend({keySize:4,hasher:s,iterations:1}),init:function(t){this.cfg=this.cfg.extend(t)},compute:function(t,r){for(var e=this.cfg,i=e.hasher.create(),o=n.create(),s=o.words,a=e.keySize,c=e.iterations;s.length<a;){h&&i.update(h);var h=i.update(t).finalize(r);i.reset();for(var l=1;l<c;l++)h=i.finalize(h),i.reset();o.concat(h)}return o.sigBytes=4*a,o}});r.EvpKDF=function(t,r,e){return a.create(e).compute(t,r)}}(),function(){var r=t,e=r.lib,i=e.WordArray,n=r.algo,o=n.SHA256,s=n.SHA224=o.extend({_doReset:function(){this._hash=new i.init([3238371032,914150663,812702999,4144912697,4290775857,1750603025,1694076839,3204075428])},_doFinalize:function(){var t=o._doFinalize.call(this);return t.sigBytes-=4,t}});r.SHA224=o._createHelper(s),r.HmacSHA224=o._createHmacHelper(s)}(),function(r){var e=t,i=e.lib,n=i.Base,o=i.WordArray,s=e.x64={};s.Word=n.extend({init:function(t,r){this.high=t,this.low=r}}),s.WordArray=n.extend({init:function(t,e){t=this.words=t||[],e!=r?this.sigBytes=e:this.sigBytes=8*t.length},toX32:function(){for(var t=this.words,r=t.length,e=[],i=0;i<r;i++){var n=t[i];e.push(n.high),e.push(n.low)}return o.create(e,this.sigBytes)},clone:function(){for(var t=n.clone.call(this),r=t.words=this.words.slice(0),e=r.length,i=0;i<e;i++)r[i]=r[i].clone();return t}})}(),function(r){var e=t,i=e.lib,n=i.WordArray,o=i.Hasher,s=e.x64,a=s.Word,c=e.algo,h=[],l=[],f=[];!function(){for(var t=1,r=0,e=0;e<24;e++){h[t+5*r]=(e+1)*(e+2)/2%64;var i=r%5,n=(2*t+3*r)%5;t=i,r=n}for(var t=0;t<5;t++)for(var r=0;r<5;r++)l[t+5*r]=r+(2*t+3*r)%5*5;for(var o=1,s=0;s<24;s++){for(var c=0,u=0,d=0;d<7;d++){if(1&o){var v=(1<<d)-1;v<32?u^=1<<v:c^=1<<v-32}128&o?o=o<<1^113:o<<=1}f[s]=a.create(c,u)}}();var u=[];!function(){for(var t=0;t<25;t++)u[t]=a.create()}();var d=c.SHA3=o.extend({cfg:o.cfg.extend({outputLength:512}),_doReset:function(){for(var t=this._state=[],r=0;r<25;r++)t[r]=new a.init;this.blockSize=(1600-2*this.cfg.outputLength)/32},_doProcessBlock:function(t,r){for(var e=this._state,i=this.blockSize/2,n=0;n<i;n++){var o=t[r+2*n],s=t[r+2*n+1];o=16711935&(o<<8|o>>>24)|4278255360&(o<<24|o>>>8),s=16711935&(s<<8|s>>>24)|4278255360&(s<<24|s>>>8);var a=e[n];a.high^=s,a.low^=o}for(var c=0;c<24;c++){for(var d=0;d<5;d++){for(var v=0,p=0,_=0;_<5;_++){var a=e[d+5*_];v^=a.high,p^=a.low}var y=u[d];y.high=v,y.low=p}for(var d=0;d<5;d++)for(var g=u[(d+4)%5],B=u[(d+1)%5],w=B.high,k=B.low,v=g.high^(w<<1|k>>>31),p=g.low^(k<<1|w>>>31),_=0;_<5;_++){var a=e[d+5*_];a.high^=v,a.low^=p}for(var S=1;S<25;S++){var a=e[S],m=a.high,x=a.low,b=h[S];if(b<32)var v=m<<b|x>>>32-b,p=x<<b|m>>>32-b;else var v=x<<b-32|m>>>64-b,p=m<<b-32|x>>>64-b;var H=u[l[S]];H.high=v,H.low=p}var z=u[0],A=e[0];z.high=A.high,z.low=A.low;for(var d=0;d<5;d++)for(var _=0;_<5;_++){var S=d+5*_,a=e[S],C=u[S],D=u[(d+1)%5+5*_],R=u[(d+2)%5+5*_];a.high=C.high^~D.high&R.high,a.low=C.low^~D.low&R.low}var a=e[0],E=f[c];a.high^=E.high,a.low^=E.low}},_doFinalize:function(){var t=this._data,e=t.words,i=(8*this._nDataBytes,8*t.sigBytes),o=32*this.blockSize;e[i>>>5]|=1<<24-i%32,e[(r.ceil((i+1)/o)*o>>>5)-1]|=128,t.sigBytes=4*e.length,this._process();for(var s=this._state,a=this.cfg.outputLength/8,c=a/8,h=[],l=0;l<c;l++){var f=s[l],u=f.high,d=f.low;u=16711935&(u<<8|u>>>24)|4278255360&(u<<24|u>>>8),d=16711935&(d<<8|d>>>24)|4278255360&(d<<24|d>>>8),h.push(d),h.push(u)}return new n.init(h,a)},clone:function(){for(var t=o.clone.call(this),r=t._state=this._state.slice(0),e=0;e<25;e++)r[e]=r[e].clone();return t}});e.SHA3=o._createHelper(d),e.HmacSHA3=o._createHmacHelper(d)}(Math),function(){function r(){return s.create.apply(s,arguments)}var e=t,i=e.lib,n=i.Hasher,o=e.x64,s=o.Word,a=o.WordArray,c=e.algo,h=[r(1116352408,3609767458),r(1899447441,602891725),r(3049323471,3964484399),r(3921009573,2173295548),r(961987163,4081628472),r(1508970993,3053834265),r(2453635748,2937671579),r(2870763221,3664609560),r(3624381080,2734883394),r(310598401,1164996542),r(607225278,1323610764),r(1426881987,3590304994),r(1925078388,4068182383),r(2162078206,991336113),r(2614888103,633803317),r(3248222580,3479774868),r(3835390401,2666613458),r(4022224774,944711139),r(264347078,2341262773),r(604807628,2007800933),r(770255983,1495990901),r(1249150122,1856431235),r(1555081692,3175218132),r(1996064986,2198950837),r(2554220882,3999719339),r(2821834349,766784016),r(2952996808,2566594879),r(3210313671,3203337956),r(3336571891,1034457026),r(3584528711,2466948901),r(113926993,3758326383),r(338241895,168717936),r(666307205,1188179964),r(773529912,1546045734),r(1294757372,1522805485),r(1396182291,2643833823),r(1695183700,2343527390),r(1986661051,1014477480),r(2177026350,1206759142),r(2456956037,344077627),r(2730485921,1290863460),r(2820302411,3158454273),r(3259730800,3505952657),r(3345764771,106217008),r(3516065817,3606008344),r(3600352804,1432725776),r(4094571909,1467031594),r(275423344,851169720),r(430227734,3100823752),r(506948616,1363258195),r(659060556,3750685593),r(883997877,3785050280),r(958139571,3318307427),r(1322822218,3812723403),r(1537002063,2003034995),r(1747873779,3602036899),r(1955562222,1575990012),r(2024104815,1125592928),r(2227730452,2716904306),r(2361852424,442776044),r(2428436474,593698344),r(2756734187,3733110249),r(3204031479,2999351573),r(3329325298,3815920427),r(3391569614,3928383900),r(3515267271,566280711),r(3940187606,3454069534),r(4118630271,4000239992),r(116418474,1914138554),r(174292421,2731055270),r(289380356,3203993006),r(460393269,320620315),r(685471733,587496836),r(852142971,1086792851),r(1017036298,365543100),r(1126000580,2618297676),r(1288033470,3409855158),r(1501505948,4234509866),r(1607167915,987167468),r(1816402316,1246189591)],l=[];!function(){for(var t=0;t<80;t++)l[t]=r()}();var f=c.SHA512=n.extend({_doReset:function(){this._hash=new a.init([new s.init(1779033703,4089235720),new s.init(3144134277,2227873595),new s.init(1013904242,4271175723),new s.init(2773480762,1595750129),new s.init(1359893119,2917565137),new s.init(2600822924,725511199),new s.init(528734635,4215389547),new s.init(1541459225,327033209)])},_doProcessBlock:function(t,r){for(var e=this._hash.words,i=e[0],n=e[1],o=e[2],s=e[3],a=e[4],c=e[5],f=e[6],u=e[7],d=i.high,v=i.low,p=n.high,_=n.low,y=o.high,g=o.low,B=s.high,w=s.low,k=a.high,S=a.low,m=c.high,x=c.low,b=f.high,H=f.low,z=u.high,A=u.low,C=d,D=v,R=p,E=_,M=y,F=g,P=B,W=w,O=k,U=S,I=m,K=x,X=b,L=H,j=z,N=A,T=0;T<80;T++){var Z=l[T];if(T<16)var q=Z.high=0|t[r+2*T],G=Z.low=0|t[r+2*T+1];else{var J=l[T-15],$=J.high,Q=J.low,V=($>>>1|Q<<31)^($>>>8|Q<<24)^$>>>7,Y=(Q>>>1|$<<31)^(Q>>>8|$<<24)^(Q>>>7|$<<25),tt=l[T-2],rt=tt.high,et=tt.low,it=(rt>>>19|et<<13)^(rt<<3|et>>>29)^rt>>>6,nt=(et>>>19|rt<<13)^(et<<3|rt>>>29)^(et>>>6|rt<<26),ot=l[T-7],st=ot.high,at=ot.low,ct=l[T-16],ht=ct.high,lt=ct.low,G=Y+at,q=V+st+(G>>>0<Y>>>0?1:0),G=G+nt,q=q+it+(G>>>0<nt>>>0?1:0),G=G+lt,q=q+ht+(G>>>0<lt>>>0?1:0);Z.high=q,Z.low=G}var ft=O&I^~O&X,ut=U&K^~U&L,dt=C&R^C&M^R&M,vt=D&E^D&F^E&F,pt=(C>>>28|D<<4)^(C<<30|D>>>2)^(C<<25|D>>>7),_t=(D>>>28|C<<4)^(D<<30|C>>>2)^(D<<25|C>>>7),yt=(O>>>14|U<<18)^(O>>>18|U<<14)^(O<<23|U>>>9),gt=(U>>>14|O<<18)^(U>>>18|O<<14)^(U<<23|O>>>9),Bt=h[T],wt=Bt.high,kt=Bt.low,St=N+gt,mt=j+yt+(St>>>0<N>>>0?1:0),St=St+ut,mt=mt+ft+(St>>>0<ut>>>0?1:0),St=St+kt,mt=mt+wt+(St>>>0<kt>>>0?1:0),St=St+G,mt=mt+q+(St>>>0<G>>>0?1:0),xt=_t+vt,bt=pt+dt+(xt>>>0<_t>>>0?1:0);j=X,N=L,X=I,L=K,I=O,K=U,U=W+St|0,O=P+mt+(U>>>0<W>>>0?1:0)|0,P=M,W=F,M=R,F=E,R=C,E=D,D=St+xt|0,C=mt+bt+(D>>>0<St>>>0?1:0)|0}v=i.low=v+D,i.high=d+C+(v>>>0<D>>>0?1:0),_=n.low=_+E,n.high=p+R+(_>>>0<E>>>0?1:0),g=o.low=g+F,o.high=y+M+(g>>>0<F>>>0?1:0),w=s.low=w+W,s.high=B+P+(w>>>0<W>>>0?1:0),S=a.low=S+U,a.high=k+O+(S>>>0<U>>>0?1:0),x=c.low=x+K,c.high=m+I+(x>>>0<K>>>0?1:0),H=f.low=H+L,f.high=b+X+(H>>>0<L>>>0?1:0),A=u.low=A+N,u.high=z+j+(A>>>0<N>>>0?1:0)},_doFinalize:function(){var t=this._data,r=t.words,e=8*this._nDataBytes,i=8*t.sigBytes;r[i>>>5]|=128<<24-i%32,r[(i+128>>>10<<5)+30]=Math.floor(e/4294967296),r[(i+128>>>10<<5)+31]=e,t.sigBytes=4*r.length,this._process();var n=this._hash.toX32();return n},clone:function(){var t=n.clone.call(this);return t._hash=this._hash.clone(),t},blockSize:32});e.SHA512=n._createHelper(f),e.HmacSHA512=n._createHmacHelper(f)}(),function(){var r=t,e=r.x64,i=e.Word,n=e.WordArray,o=r.algo,s=o.SHA512,a=o.SHA384=s.extend({_doReset:function(){this._hash=new n.init([new i.init(3418070365,3238371032),new i.init(1654270250,914150663),new i.init(2438529370,812702999),new i.init(355462360,4144912697),new i.init(1731405415,4290775857),new i.init(2394180231,1750603025),new i.init(3675008525,1694076839),new i.init(1203062813,3204075428)])},_doFinalize:function(){var t=s._doFinalize.call(this);return t.sigBytes-=16,t}});r.SHA384=s._createHelper(a),r.HmacSHA384=s._createHmacHelper(a)}(),t.lib.Cipher||function(r){var e=t,i=e.lib,n=i.Base,o=i.WordArray,s=i.BufferedBlockAlgorithm,a=e.enc,c=(a.Utf8,a.Base64),h=e.algo,l=h.EvpKDF,f=i.Cipher=s.extend({cfg:n.extend(),createEncryptor:function(t,r){return this.create(this._ENC_XFORM_MODE,t,r)},createDecryptor:function(t,r){return this.create(this._DEC_XFORM_MODE,t,r)},init:function(t,r,e){this.cfg=this.cfg.extend(e),this._xformMode=t,this._key=r,this.reset()},reset:function(){s.reset.call(this),this._doReset()},process:function(t){return this._append(t),this._process()},finalize:function(t){t&&this._append(t);var r=this._doFinalize();return r},keySize:4,ivSize:4,_ENC_XFORM_MODE:1,_DEC_XFORM_MODE:2,_createHelper:function(){function t(t){return"string"==typeof t?m:w}return function(r){return{encrypt:function(e,i,n){return t(i).encrypt(r,e,i,n)},decrypt:function(e,i,n){return t(i).decrypt(r,e,i,n)}}}}()}),u=(i.StreamCipher=f.extend({_doFinalize:function(){var t=this._process(!0);return t},blockSize:1}),e.mode={}),d=i.BlockCipherMode=n.extend({createEncryptor:function(t,r){return this.Encryptor.create(t,r)},createDecryptor:function(t,r){return this.Decryptor.create(t,r)},init:function(t,r){this._cipher=t,this._iv=r}}),v=u.CBC=function(){function t(t,e,i){var n=this._iv;if(n){var o=n;this._iv=r}else var o=this._prevBlock;for(var s=0;s<i;s++)t[e+s]^=o[s]}var e=d.extend();return e.Encryptor=e.extend({processBlock:function(r,e){var i=this._cipher,n=i.blockSize;t.call(this,r,e,n),i.encryptBlock(r,e),this._prevBlock=r.slice(e,e+n)}}),e.Decryptor=e.extend({processBlock:function(r,e){var i=this._cipher,n=i.blockSize,o=r.slice(e,e+n);i.decryptBlock(r,e),t.call(this,r,e,n),this._prevBlock=o}}),e}(),p=e.pad={},_=p.Pkcs7={pad:function(t,r){for(var e=4*r,i=e-t.sigBytes%e,n=i<<24|i<<16|i<<8|i,s=[],a=0;a<i;a+=4)s.push(n);var c=o.create(s,i);t.concat(c)},unpad:function(t){var r=255&t.words[t.sigBytes-1>>>2];t.sigBytes-=r}},y=(i.BlockCipher=f.extend({cfg:f.cfg.extend({mode:v,padding:_}),reset:function(){f.reset.call(this);var t=this.cfg,r=t.iv,e=t.mode;if(this._xformMode==this._ENC_XFORM_MODE)var i=e.createEncryptor;else{var i=e.createDecryptor;this._minBufferSize=1}this._mode&&this._mode.__creator==i?this._mode.init(this,r&&r.words):(this._mode=i.call(e,this,r&&r.words),this._mode.__creator=i)},_doProcessBlock:function(t,r){this._mode.processBlock(t,r)},_doFinalize:function(){var t=this.cfg.padding;if(this._xformMode==this._ENC_XFORM_MODE){t.pad(this._data,this.blockSize);var r=this._process(!0)}else{var r=this._process(!0);t.unpad(r)}return r},blockSize:4}),i.CipherParams=n.extend({init:function(t){this.mixIn(t)},toString:function(t){return(t||this.formatter).stringify(this)}})),g=e.format={},B=g.OpenSSL={stringify:function(t){var r=t.ciphertext,e=t.salt;if(e)var i=o.create([1398893684,1701076831]).concat(e).concat(r);else var i=r;return i.toString(c)},parse:function(t){var r=c.parse(t),e=r.words;if(1398893684==e[0]&&1701076831==e[1]){var i=o.create(e.slice(2,4));e.splice(0,4),r.sigBytes-=16}return y.create({ciphertext:r,salt:i})}},w=i.SerializableCipher=n.extend({cfg:n.extend({format:B}),encrypt:function(t,r,e,i){i=this.cfg.extend(i);var n=t.createEncryptor(e,i),o=n.finalize(r),s=n.cfg;return y.create({ciphertext:o,key:e,iv:s.iv,algorithm:t,mode:s.mode,padding:s.padding,blockSize:t.blockSize,formatter:i.format})},decrypt:function(t,r,e,i){i=this.cfg.extend(i),r=this._parse(r,i.format);var n=t.createDecryptor(e,i).finalize(r.ciphertext);return n},_parse:function(t,r){return"string"==typeof t?r.parse(t,this):t}}),k=e.kdf={},S=k.OpenSSL={execute:function(t,r,e,i){i||(i=o.random(8));var n=l.create({keySize:r+e}).compute(t,i),s=o.create(n.words.slice(r),4*e);return n.sigBytes=4*r,y.create({key:n,iv:s,salt:i})}},m=i.PasswordBasedCipher=w.extend({cfg:w.cfg.extend({kdf:S}),encrypt:function(t,r,e,i){i=this.cfg.extend(i);var n=i.kdf.execute(e,t.keySize,t.ivSize);i.iv=n.iv;var o=w.encrypt.call(this,t,r,n.key,i);return o.mixIn(n),o},decrypt:function(t,r,e,i){i=this.cfg.extend(i),r=this._parse(r,i.format);var n=i.kdf.execute(e,t.keySize,t.ivSize,r.salt);i.iv=n.iv;var o=w.decrypt.call(this,t,r,n.key,i);return o}})}(),t.mode.CFB=function(){function r(t,r,e,i){var n=this._iv;if(n){var o=n.slice(0);this._iv=void 0}else var o=this._prevBlock;i.encryptBlock(o,0);for(var s=0;s<e;s++)t[r+s]^=o[s]}var e=t.lib.BlockCipherMode.extend();return e.Encryptor=e.extend({processBlock:function(t,e){var i=this._cipher,n=i.blockSize;r.call(this,t,e,n,i),this._prevBlock=t.slice(e,e+n)}}),e.Decryptor=e.extend({processBlock:function(t,e){var i=this._cipher,n=i.blockSize,o=t.slice(e,e+n);r.call(this,t,e,n,i),this._prevBlock=o}}),e}(),t.mode.ECB=function(){var r=t.lib.BlockCipherMode.extend();return r.Encryptor=r.extend({processBlock:function(t,r){this._cipher.encryptBlock(t,r)}}),r.Decryptor=r.extend({processBlock:function(t,r){this._cipher.decryptBlock(t,r)}}),r}(),t.pad.AnsiX923={pad:function(t,r){var e=t.sigBytes,i=4*r,n=i-e%i,o=e+n-1;t.clamp(),t.words[o>>>2]|=n<<24-o%4*8,t.sigBytes+=n},unpad:function(t){var r=255&t.words[t.sigBytes-1>>>2];t.sigBytes-=r}},t.pad.Iso10126={pad:function(r,e){var i=4*e,n=i-r.sigBytes%i;r.concat(t.lib.WordArray.random(n-1)).concat(t.lib.WordArray.create([n<<24],1))},unpad:function(t){var r=255&t.words[t.sigBytes-1>>>2];t.sigBytes-=r}},t.pad.Iso97971={pad:function(r,e){r.concat(t.lib.WordArray.create([2147483648],1)),t.pad.ZeroPadding.pad(r,e)},unpad:function(r){t.pad.ZeroPadding.unpad(r),r.sigBytes--}},t.mode.OFB=function(){var r=t.lib.BlockCipherMode.extend(),e=r.Encryptor=r.extend({processBlock:function(t,r){var e=this._cipher,i=e.blockSize,n=this._iv,o=this._keystream;n&&(o=this._keystream=n.slice(0),this._iv=void 0),e.encryptBlock(o,0);for(var s=0;s<i;s++)t[r+s]^=o[s]}});return r.Decryptor=e,r}(),t.pad.NoPadding={pad:function(){},unpad:function(){}},function(r){var e=t,i=e.lib,n=i.CipherParams,o=e.enc,s=o.Hex,a=e.format;a.Hex={stringify:function(t){return t.ciphertext.toString(s)},parse:function(t){var r=s.parse(t);return n.create({ciphertext:r})}}}(),function(){var r=t,e=r.lib,i=e.BlockCipher,n=r.algo,o=[],s=[],a=[],c=[],h=[],l=[],f=[],u=[],d=[],v=[];!function(){for(var t=[],r=0;r<256;r++)r<128?t[r]=r<<1:t[r]=r<<1^283;for(var e=0,i=0,r=0;r<256;r++){var n=i^i<<1^i<<2^i<<3^i<<4;n=n>>>8^255&n^99,o[e]=n,s[n]=e;var p=t[e],_=t[p],y=t[_],g=257*t[n]^16843008*n;a[e]=g<<24|g>>>8,c[e]=g<<16|g>>>16,h[e]=g<<8|g>>>24,l[e]=g;var g=16843009*y^65537*_^257*p^16843008*e;f[n]=g<<24|g>>>8,u[n]=g<<16|g>>>16,d[n]=g<<8|g>>>24,v[n]=g,e?(e=p^t[t[t[y^p]]],i^=t[t[i]]):e=i=1}}();var p=[0,1,2,4,8,16,32,64,128,27,54],_=n.AES=i.extend({_doReset:function(){if(!this._nRounds||this._keyPriorReset!==this._key){for(var t=this._keyPriorReset=this._key,r=t.words,e=t.sigBytes/4,i=this._nRounds=e+6,n=4*(i+1),s=this._keySchedule=[],a=0;a<n;a++)if(a<e)s[a]=r[a];else{var c=s[a-1];a%e?e>6&&a%e==4&&(c=o[c>>>24]<<24|o[c>>>16&255]<<16|o[c>>>8&255]<<8|o[255&c]):(c=c<<8|c>>>24,c=o[c>>>24]<<24|o[c>>>16&255]<<16|o[c>>>8&255]<<8|o[255&c],c^=p[a/e|0]<<24),s[a]=s[a-e]^c}for(var h=this._invKeySchedule=[],l=0;l<n;l++){var a=n-l;if(l%4)var c=s[a];else var c=s[a-4];l<4||a<=4?h[l]=c:h[l]=f[o[c>>>24]]^u[o[c>>>16&255]]^d[o[c>>>8&255]]^v[o[255&c]]}}},encryptBlock:function(t,r){this._doCryptBlock(t,r,this._keySchedule,a,c,h,l,o)},decryptBlock:function(t,r){var e=t[r+1];t[r+1]=t[r+3],t[r+3]=e,this._doCryptBlock(t,r,this._invKeySchedule,f,u,d,v,s);var e=t[r+1];t[r+1]=t[r+3],t[r+3]=e},_doCryptBlock:function(t,r,e,i,n,o,s,a){for(var c=this._nRounds,h=t[r]^e[0],l=t[r+1]^e[1],f=t[r+2]^e[2],u=t[r+3]^e[3],d=4,v=1;v<c;v++){var p=i[h>>>24]^n[l>>>16&255]^o[f>>>8&255]^s[255&u]^e[d++],_=i[l>>>24]^n[f>>>16&255]^o[u>>>8&255]^s[255&h]^e[d++],y=i[f>>>24]^n[u>>>16&255]^o[h>>>8&255]^s[255&l]^e[d++],g=i[u>>>24]^n[h>>>16&255]^o[l>>>8&255]^s[255&f]^e[d++];h=p,l=_,f=y,u=g}var p=(a[h>>>24]<<24|a[l>>>16&255]<<16|a[f>>>8&255]<<8|a[255&u])^e[d++],_=(a[l>>>24]<<24|a[f>>>16&255]<<16|a[u>>>8&255]<<8|a[255&h])^e[d++],y=(a[f>>>24]<<24|a[u>>>16&255]<<16|a[h>>>8&255]<<8|a[255&l])^e[d++],g=(a[u>>>24]<<24|a[h>>>16&255]<<16|a[l>>>8&255]<<8|a[255&f])^e[d++];t[r]=p,t[r+1]=_,t[r+2]=y,t[r+3]=g},keySize:8});r.AES=i._createHelper(_)}(),function(){function r(t,r){var e=(this._lBlock>>>t^this._rBlock)&r;this._rBlock^=e,this._lBlock^=e<<t}function e(t,r){var e=(this._rBlock>>>t^this._lBlock)&r;this._lBlock^=e,this._rBlock^=e<<t;
+}var i=t,n=i.lib,o=n.WordArray,s=n.BlockCipher,a=i.algo,c=[57,49,41,33,25,17,9,1,58,50,42,34,26,18,10,2,59,51,43,35,27,19,11,3,60,52,44,36,63,55,47,39,31,23,15,7,62,54,46,38,30,22,14,6,61,53,45,37,29,21,13,5,28,20,12,4],h=[14,17,11,24,1,5,3,28,15,6,21,10,23,19,12,4,26,8,16,7,27,20,13,2,41,52,31,37,47,55,30,40,51,45,33,48,44,49,39,56,34,53,46,42,50,36,29,32],l=[1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28],f=[{0:8421888,268435456:32768,536870912:8421378,805306368:2,1073741824:512,1342177280:8421890,1610612736:8389122,1879048192:8388608,2147483648:514,2415919104:8389120,2684354560:33280,2952790016:8421376,3221225472:32770,3489660928:8388610,3758096384:0,4026531840:33282,134217728:0,402653184:8421890,671088640:33282,939524096:32768,1207959552:8421888,1476395008:512,1744830464:8421378,2013265920:2,2281701376:8389120,2550136832:33280,2818572288:8421376,3087007744:8389122,3355443200:8388610,3623878656:32770,3892314112:514,4160749568:8388608,1:32768,268435457:2,536870913:8421888,805306369:8388608,1073741825:8421378,1342177281:33280,1610612737:512,1879048193:8389122,2147483649:8421890,2415919105:8421376,2684354561:8388610,2952790017:33282,3221225473:514,3489660929:8389120,3758096385:32770,4026531841:0,134217729:8421890,402653185:8421376,671088641:8388608,939524097:512,1207959553:32768,1476395009:8388610,1744830465:2,2013265921:33282,2281701377:32770,2550136833:8389122,2818572289:514,3087007745:8421888,3355443201:8389120,3623878657:0,3892314113:33280,4160749569:8421378},{0:1074282512,16777216:16384,33554432:524288,50331648:1074266128,67108864:1073741840,83886080:1074282496,100663296:1073758208,117440512:16,134217728:540672,150994944:1073758224,167772160:1073741824,184549376:540688,201326592:524304,218103808:0,234881024:16400,251658240:1074266112,8388608:1073758208,25165824:540688,41943040:16,58720256:1073758224,75497472:1074282512,92274688:1073741824,109051904:524288,125829120:1074266128,142606336:524304,159383552:0,176160768:16384,192937984:1074266112,209715200:1073741840,226492416:540672,243269632:1074282496,260046848:16400,268435456:0,285212672:1074266128,301989888:1073758224,318767104:1074282496,335544320:1074266112,352321536:16,369098752:540688,385875968:16384,402653184:16400,419430400:524288,436207616:524304,452984832:1073741840,469762048:540672,486539264:1073758208,503316480:1073741824,520093696:1074282512,276824064:540688,293601280:524288,310378496:1074266112,327155712:16384,343932928:1073758208,360710144:1074282512,377487360:16,394264576:1073741824,411041792:1074282496,427819008:1073741840,444596224:1073758224,461373440:524304,478150656:0,494927872:16400,511705088:1074266128,528482304:540672},{0:260,1048576:0,2097152:67109120,3145728:65796,4194304:65540,5242880:67108868,6291456:67174660,7340032:67174400,8388608:67108864,9437184:67174656,10485760:65792,11534336:67174404,12582912:67109124,13631488:65536,14680064:4,15728640:256,524288:67174656,1572864:67174404,2621440:0,3670016:67109120,4718592:67108868,5767168:65536,6815744:65540,7864320:260,8912896:4,9961472:256,11010048:67174400,12058624:65796,13107200:65792,14155776:67109124,15204352:67174660,16252928:67108864,16777216:67174656,17825792:65540,18874368:65536,19922944:67109120,20971520:256,22020096:67174660,23068672:67108868,24117248:0,25165824:67109124,26214400:67108864,27262976:4,28311552:65792,29360128:67174400,30408704:260,31457280:65796,32505856:67174404,17301504:67108864,18350080:260,19398656:67174656,20447232:0,21495808:65540,22544384:67109120,23592960:256,24641536:67174404,25690112:65536,26738688:67174660,27787264:65796,28835840:67108868,29884416:67109124,30932992:67174400,31981568:4,33030144:65792},{0:2151682048,65536:2147487808,131072:4198464,196608:2151677952,262144:0,327680:4198400,393216:2147483712,458752:4194368,524288:2147483648,589824:4194304,655360:64,720896:2147487744,786432:2151678016,851968:4160,917504:4096,983040:2151682112,32768:2147487808,98304:64,163840:2151678016,229376:2147487744,294912:4198400,360448:2151682112,425984:0,491520:2151677952,557056:4096,622592:2151682048,688128:4194304,753664:4160,819200:2147483648,884736:4194368,950272:4198464,1015808:2147483712,1048576:4194368,1114112:4198400,1179648:2147483712,1245184:0,1310720:4160,1376256:2151678016,1441792:2151682048,1507328:2147487808,1572864:2151682112,1638400:2147483648,1703936:2151677952,1769472:4198464,1835008:2147487744,1900544:4194304,1966080:64,2031616:4096,1081344:2151677952,1146880:2151682112,1212416:0,1277952:4198400,1343488:4194368,1409024:2147483648,1474560:2147487808,1540096:64,1605632:2147483712,1671168:4096,1736704:2147487744,1802240:2151678016,1867776:4160,1933312:2151682048,1998848:4194304,2064384:4198464},{0:128,4096:17039360,8192:262144,12288:536870912,16384:537133184,20480:16777344,24576:553648256,28672:262272,32768:16777216,36864:537133056,40960:536871040,45056:553910400,49152:553910272,53248:0,57344:17039488,61440:553648128,2048:17039488,6144:553648256,10240:128,14336:17039360,18432:262144,22528:537133184,26624:553910272,30720:536870912,34816:537133056,38912:0,43008:553910400,47104:16777344,51200:536871040,55296:553648128,59392:16777216,63488:262272,65536:262144,69632:128,73728:536870912,77824:553648256,81920:16777344,86016:553910272,90112:537133184,94208:16777216,98304:553910400,102400:553648128,106496:17039360,110592:537133056,114688:262272,118784:536871040,122880:0,126976:17039488,67584:553648256,71680:16777216,75776:17039360,79872:537133184,83968:536870912,88064:17039488,92160:128,96256:553910272,100352:262272,104448:553910400,108544:0,112640:553648128,116736:16777344,120832:262144,124928:537133056,129024:536871040},{0:268435464,256:8192,512:270532608,768:270540808,1024:268443648,1280:2097152,1536:2097160,1792:268435456,2048:0,2304:268443656,2560:2105344,2816:8,3072:270532616,3328:2105352,3584:8200,3840:270540800,128:270532608,384:270540808,640:8,896:2097152,1152:2105352,1408:268435464,1664:268443648,1920:8200,2176:2097160,2432:8192,2688:268443656,2944:270532616,3200:0,3456:270540800,3712:2105344,3968:268435456,4096:268443648,4352:270532616,4608:270540808,4864:8200,5120:2097152,5376:268435456,5632:268435464,5888:2105344,6144:2105352,6400:0,6656:8,6912:270532608,7168:8192,7424:268443656,7680:270540800,7936:2097160,4224:8,4480:2105344,4736:2097152,4992:268435464,5248:268443648,5504:8200,5760:270540808,6016:270532608,6272:270540800,6528:270532616,6784:8192,7040:2105352,7296:2097160,7552:0,7808:268435456,8064:268443656},{0:1048576,16:33555457,32:1024,48:1049601,64:34604033,80:0,96:1,112:34603009,128:33555456,144:1048577,160:33554433,176:34604032,192:34603008,208:1025,224:1049600,240:33554432,8:34603009,24:0,40:33555457,56:34604032,72:1048576,88:33554433,104:33554432,120:1025,136:1049601,152:33555456,168:34603008,184:1048577,200:1024,216:34604033,232:1,248:1049600,256:33554432,272:1048576,288:33555457,304:34603009,320:1048577,336:33555456,352:34604032,368:1049601,384:1025,400:34604033,416:1049600,432:1,448:0,464:34603008,480:33554433,496:1024,264:1049600,280:33555457,296:34603009,312:1,328:33554432,344:1048576,360:1025,376:34604032,392:33554433,408:34603008,424:0,440:34604033,456:1049601,472:1024,488:33555456,504:1048577},{0:134219808,1:131072,2:134217728,3:32,4:131104,5:134350880,6:134350848,7:2048,8:134348800,9:134219776,10:133120,11:134348832,12:2080,13:0,14:134217760,15:133152,2147483648:2048,2147483649:134350880,2147483650:134219808,2147483651:134217728,2147483652:134348800,2147483653:133120,2147483654:133152,2147483655:32,2147483656:134217760,2147483657:2080,2147483658:131104,2147483659:134350848,2147483660:0,2147483661:134348832,2147483662:134219776,2147483663:131072,16:133152,17:134350848,18:32,19:2048,20:134219776,21:134217760,22:134348832,23:131072,24:0,25:131104,26:134348800,27:134219808,28:134350880,29:133120,30:2080,31:134217728,2147483664:131072,2147483665:2048,2147483666:134348832,2147483667:133152,2147483668:32,2147483669:134348800,2147483670:134217728,2147483671:134219808,2147483672:134350880,2147483673:134217760,2147483674:134219776,2147483675:0,2147483676:133120,2147483677:2080,2147483678:131104,2147483679:134350848}],u=[4160749569,528482304,33030144,2064384,129024,8064,504,2147483679],d=a.DES=s.extend({_doReset:function(){for(var t=this._key,r=t.words,e=[],i=0;i<56;i++){var n=c[i]-1;e[i]=r[n>>>5]>>>31-n%32&1}for(var o=this._subKeys=[],s=0;s<16;s++){for(var a=o[s]=[],f=l[s],i=0;i<24;i++)a[i/6|0]|=e[(h[i]-1+f)%28]<<31-i%6,a[4+(i/6|0)]|=e[28+(h[i+24]-1+f)%28]<<31-i%6;a[0]=a[0]<<1|a[0]>>>31;for(var i=1;i<7;i++)a[i]=a[i]>>>4*(i-1)+3;a[7]=a[7]<<5|a[7]>>>27}for(var u=this._invSubKeys=[],i=0;i<16;i++)u[i]=o[15-i]},encryptBlock:function(t,r){this._doCryptBlock(t,r,this._subKeys)},decryptBlock:function(t,r){this._doCryptBlock(t,r,this._invSubKeys)},_doCryptBlock:function(t,i,n){this._lBlock=t[i],this._rBlock=t[i+1],r.call(this,4,252645135),r.call(this,16,65535),e.call(this,2,858993459),e.call(this,8,16711935),r.call(this,1,1431655765);for(var o=0;o<16;o++){for(var s=n[o],a=this._lBlock,c=this._rBlock,h=0,l=0;l<8;l++)h|=f[l][((c^s[l])&u[l])>>>0];this._lBlock=c,this._rBlock=a^h}var d=this._lBlock;this._lBlock=this._rBlock,this._rBlock=d,r.call(this,1,1431655765),e.call(this,8,16711935),e.call(this,2,858993459),r.call(this,16,65535),r.call(this,4,252645135),t[i]=this._lBlock,t[i+1]=this._rBlock},keySize:2,ivSize:2,blockSize:2});i.DES=s._createHelper(d);var v=a.TripleDES=s.extend({_doReset:function(){var t=this._key,r=t.words;this._des1=d.createEncryptor(o.create(r.slice(0,2))),this._des2=d.createEncryptor(o.create(r.slice(2,4))),this._des3=d.createEncryptor(o.create(r.slice(4,6)))},encryptBlock:function(t,r){this._des1.encryptBlock(t,r),this._des2.decryptBlock(t,r),this._des3.encryptBlock(t,r)},decryptBlock:function(t,r){this._des3.decryptBlock(t,r),this._des2.encryptBlock(t,r),this._des1.decryptBlock(t,r)},keySize:6,ivSize:2,blockSize:2});i.TripleDES=s._createHelper(v)}(),function(){function r(){for(var t=this._S,r=this._i,e=this._j,i=0,n=0;n<4;n++){r=(r+1)%256,e=(e+t[r])%256;var o=t[r];t[r]=t[e],t[e]=o,i|=t[(t[r]+t[e])%256]<<24-8*n}return this._i=r,this._j=e,i}var e=t,i=e.lib,n=i.StreamCipher,o=e.algo,s=o.RC4=n.extend({_doReset:function(){for(var t=this._key,r=t.words,e=t.sigBytes,i=this._S=[],n=0;n<256;n++)i[n]=n;for(var n=0,o=0;n<256;n++){var s=n%e,a=r[s>>>2]>>>24-s%4*8&255;o=(o+i[n]+a)%256;var c=i[n];i[n]=i[o],i[o]=c}this._i=this._j=0},_doProcessBlock:function(t,e){t[e]^=r.call(this)},keySize:8,ivSize:0});e.RC4=n._createHelper(s);var a=o.RC4Drop=s.extend({cfg:s.cfg.extend({drop:192}),_doReset:function(){s._doReset.call(this);for(var t=this.cfg.drop;t>0;t--)r.call(this)}});e.RC4Drop=n._createHelper(a)}(),t.mode.CTRGladman=function(){function r(t){if(255===(t>>24&255)){var r=t>>16&255,e=t>>8&255,i=255&t;255===r?(r=0,255===e?(e=0,255===i?i=0:++i):++e):++r,t=0,t+=r<<16,t+=e<<8,t+=i}else t+=1<<24;return t}function e(t){return 0===(t[0]=r(t[0]))&&(t[1]=r(t[1])),t}var i=t.lib.BlockCipherMode.extend(),n=i.Encryptor=i.extend({processBlock:function(t,r){var i=this._cipher,n=i.blockSize,o=this._iv,s=this._counter;o&&(s=this._counter=o.slice(0),this._iv=void 0),e(s);var a=s.slice(0);i.encryptBlock(a,0);for(var c=0;c<n;c++)t[r+c]^=a[c]}});return i.Decryptor=n,i}(),function(){function r(){for(var t=this._X,r=this._C,e=0;e<8;e++)a[e]=r[e];r[0]=r[0]+1295307597+this._b|0,r[1]=r[1]+3545052371+(r[0]>>>0<a[0]>>>0?1:0)|0,r[2]=r[2]+886263092+(r[1]>>>0<a[1]>>>0?1:0)|0,r[3]=r[3]+1295307597+(r[2]>>>0<a[2]>>>0?1:0)|0,r[4]=r[4]+3545052371+(r[3]>>>0<a[3]>>>0?1:0)|0,r[5]=r[5]+886263092+(r[4]>>>0<a[4]>>>0?1:0)|0,r[6]=r[6]+1295307597+(r[5]>>>0<a[5]>>>0?1:0)|0,r[7]=r[7]+3545052371+(r[6]>>>0<a[6]>>>0?1:0)|0,this._b=r[7]>>>0<a[7]>>>0?1:0;for(var e=0;e<8;e++){var i=t[e]+r[e],n=65535&i,o=i>>>16,s=((n*n>>>17)+n*o>>>15)+o*o,h=((4294901760&i)*i|0)+((65535&i)*i|0);c[e]=s^h}t[0]=c[0]+(c[7]<<16|c[7]>>>16)+(c[6]<<16|c[6]>>>16)|0,t[1]=c[1]+(c[0]<<8|c[0]>>>24)+c[7]|0,t[2]=c[2]+(c[1]<<16|c[1]>>>16)+(c[0]<<16|c[0]>>>16)|0,t[3]=c[3]+(c[2]<<8|c[2]>>>24)+c[1]|0,t[4]=c[4]+(c[3]<<16|c[3]>>>16)+(c[2]<<16|c[2]>>>16)|0,t[5]=c[5]+(c[4]<<8|c[4]>>>24)+c[3]|0,t[6]=c[6]+(c[5]<<16|c[5]>>>16)+(c[4]<<16|c[4]>>>16)|0,t[7]=c[7]+(c[6]<<8|c[6]>>>24)+c[5]|0}var e=t,i=e.lib,n=i.StreamCipher,o=e.algo,s=[],a=[],c=[],h=o.Rabbit=n.extend({_doReset:function(){for(var t=this._key.words,e=this.cfg.iv,i=0;i<4;i++)t[i]=16711935&(t[i]<<8|t[i]>>>24)|4278255360&(t[i]<<24|t[i]>>>8);var n=this._X=[t[0],t[3]<<16|t[2]>>>16,t[1],t[0]<<16|t[3]>>>16,t[2],t[1]<<16|t[0]>>>16,t[3],t[2]<<16|t[1]>>>16],o=this._C=[t[2]<<16|t[2]>>>16,4294901760&t[0]|65535&t[1],t[3]<<16|t[3]>>>16,4294901760&t[1]|65535&t[2],t[0]<<16|t[0]>>>16,4294901760&t[2]|65535&t[3],t[1]<<16|t[1]>>>16,4294901760&t[3]|65535&t[0]];this._b=0;for(var i=0;i<4;i++)r.call(this);for(var i=0;i<8;i++)o[i]^=n[i+4&7];if(e){var s=e.words,a=s[0],c=s[1],h=16711935&(a<<8|a>>>24)|4278255360&(a<<24|a>>>8),l=16711935&(c<<8|c>>>24)|4278255360&(c<<24|c>>>8),f=h>>>16|4294901760&l,u=l<<16|65535&h;o[0]^=h,o[1]^=f,o[2]^=l,o[3]^=u,o[4]^=h,o[5]^=f,o[6]^=l,o[7]^=u;for(var i=0;i<4;i++)r.call(this)}},_doProcessBlock:function(t,e){var i=this._X;r.call(this),s[0]=i[0]^i[5]>>>16^i[3]<<16,s[1]=i[2]^i[7]>>>16^i[5]<<16,s[2]=i[4]^i[1]>>>16^i[7]<<16,s[3]=i[6]^i[3]>>>16^i[1]<<16;for(var n=0;n<4;n++)s[n]=16711935&(s[n]<<8|s[n]>>>24)|4278255360&(s[n]<<24|s[n]>>>8),t[e+n]^=s[n]},blockSize:4,ivSize:2});e.Rabbit=n._createHelper(h)}(),t.mode.CTR=function(){var r=t.lib.BlockCipherMode.extend(),e=r.Encryptor=r.extend({processBlock:function(t,r){var e=this._cipher,i=e.blockSize,n=this._iv,o=this._counter;n&&(o=this._counter=n.slice(0),this._iv=void 0);var s=o.slice(0);e.encryptBlock(s,0),o[i-1]=o[i-1]+1|0;for(var a=0;a<i;a++)t[r+a]^=s[a]}});return r.Decryptor=e,r}(),function(){function r(){for(var t=this._X,r=this._C,e=0;e<8;e++)a[e]=r[e];r[0]=r[0]+1295307597+this._b|0,r[1]=r[1]+3545052371+(r[0]>>>0<a[0]>>>0?1:0)|0,r[2]=r[2]+886263092+(r[1]>>>0<a[1]>>>0?1:0)|0,r[3]=r[3]+1295307597+(r[2]>>>0<a[2]>>>0?1:0)|0,r[4]=r[4]+3545052371+(r[3]>>>0<a[3]>>>0?1:0)|0,r[5]=r[5]+886263092+(r[4]>>>0<a[4]>>>0?1:0)|0,r[6]=r[6]+1295307597+(r[5]>>>0<a[5]>>>0?1:0)|0,r[7]=r[7]+3545052371+(r[6]>>>0<a[6]>>>0?1:0)|0,this._b=r[7]>>>0<a[7]>>>0?1:0;for(var e=0;e<8;e++){var i=t[e]+r[e],n=65535&i,o=i>>>16,s=((n*n>>>17)+n*o>>>15)+o*o,h=((4294901760&i)*i|0)+((65535&i)*i|0);c[e]=s^h}t[0]=c[0]+(c[7]<<16|c[7]>>>16)+(c[6]<<16|c[6]>>>16)|0,t[1]=c[1]+(c[0]<<8|c[0]>>>24)+c[7]|0,t[2]=c[2]+(c[1]<<16|c[1]>>>16)+(c[0]<<16|c[0]>>>16)|0,t[3]=c[3]+(c[2]<<8|c[2]>>>24)+c[1]|0,t[4]=c[4]+(c[3]<<16|c[3]>>>16)+(c[2]<<16|c[2]>>>16)|0,t[5]=c[5]+(c[4]<<8|c[4]>>>24)+c[3]|0,t[6]=c[6]+(c[5]<<16|c[5]>>>16)+(c[4]<<16|c[4]>>>16)|0,t[7]=c[7]+(c[6]<<8|c[6]>>>24)+c[5]|0}var e=t,i=e.lib,n=i.StreamCipher,o=e.algo,s=[],a=[],c=[],h=o.RabbitLegacy=n.extend({_doReset:function(){var t=this._key.words,e=this.cfg.iv,i=this._X=[t[0],t[3]<<16|t[2]>>>16,t[1],t[0]<<16|t[3]>>>16,t[2],t[1]<<16|t[0]>>>16,t[3],t[2]<<16|t[1]>>>16],n=this._C=[t[2]<<16|t[2]>>>16,4294901760&t[0]|65535&t[1],t[3]<<16|t[3]>>>16,4294901760&t[1]|65535&t[2],t[0]<<16|t[0]>>>16,4294901760&t[2]|65535&t[3],t[1]<<16|t[1]>>>16,4294901760&t[3]|65535&t[0]];this._b=0;for(var o=0;o<4;o++)r.call(this);for(var o=0;o<8;o++)n[o]^=i[o+4&7];if(e){var s=e.words,a=s[0],c=s[1],h=16711935&(a<<8|a>>>24)|4278255360&(a<<24|a>>>8),l=16711935&(c<<8|c>>>24)|4278255360&(c<<24|c>>>8),f=h>>>16|4294901760&l,u=l<<16|65535&h;n[0]^=h,n[1]^=f,n[2]^=l,n[3]^=u,n[4]^=h,n[5]^=f,n[6]^=l,n[7]^=u;for(var o=0;o<4;o++)r.call(this)}},_doProcessBlock:function(t,e){var i=this._X;r.call(this),s[0]=i[0]^i[5]>>>16^i[3]<<16,s[1]=i[2]^i[7]>>>16^i[5]<<16,s[2]=i[4]^i[1]>>>16^i[7]<<16,s[3]=i[6]^i[3]>>>16^i[1]<<16;for(var n=0;n<4;n++)s[n]=16711935&(s[n]<<8|s[n]>>>24)|4278255360&(s[n]<<24|s[n]>>>8),t[e+n]^=s[n]},blockSize:4,ivSize:2});e.RabbitLegacy=n._createHelper(h)}(),t.pad.ZeroPadding={pad:function(t,r){var e=4*r;t.clamp(),t.sigBytes+=e-(t.sigBytes%e||e)},unpad:function(t){for(var r=t.words,e=t.sigBytes-1;!(r[e>>>2]>>>24-e%4*8&255);)e--;t.sigBytes=e+1}},t});
+//# sourceMappingURL=crypto-js.min.js.map

src/service/encrypt.js

+/*
+ * @Description: 数据加密，aes加密数据主体，rsa加密aes密钥，aes密钥前端自己存储
+ * @Date: 2020-12-08 11:08:28
+ * @LastEditors: gzw
+ * @LastEditTime: 2021-01-29 19:06:27
+ */
+// perf forge.js较大，后期需要替换为其他库，以减小体积
+// const forge = require('../utils/forge.min');
+const CryptoJS = require('./crypto.min');
+import { desSalt } from '@/api/pay.api';
+// import uuidv1 from 'uuid/v1';
+// import { parseTime } from './index';
+// import { APP_ID, PUBLIC_KEY, PRIVATE_KEY } from '@/config/encrypt.config';
+
+/**
+ * @description: 数据加密
+ * @param {String} data 数据源
+ * @return {String} 加密后的数据base64
+ */
+
+// export function encryption(data = '') {
+//   if (!data) return null;
+//   const key = generateRandomStr(16);
+//   const iv = key; // 后台约定iv与key一致
+//   const plaintext = typeof data === 'object' ? JSON.stringify(data) : data;
+//   const body = encryptDataByAes(plaintext, key, iv); // AES加密数据
+//   const encryptKey = encryptDataByPb(key); // RSA公钥加密AES密钥
+//   const signData = generateSign(plaintext);
+//   return {
+//     appId: APP_ID,
+//     body,
+//     encryptKey,
+//     ...signData
+//   };
+// }
+
+/**
+ * @description: 数据加密
+ * @message {String} message 数据源
+ * @return {String} 加密后的数据16进制
+ */
+export async function encryptByDESModeEBC(message) {
+  const [{ payPwdSalt }] = await desSalt();
+  var keyHex = CryptoJS.enc.Utf8.parse(payPwdSalt);
+  var encrypted = CryptoJS.DES.encrypt(message, keyHex, {
+    mode: CryptoJS.mode.ECB,
+    padding: CryptoJS.pad.Pkcs7
+  });
+  return encrypted.ciphertext.toString().toLocaleUpperCase();
+}
+
+/**
+ * @description: AES加密数据，默认CBC, Pki#cs7
+ * @param {String} txt 数据源
+ * @param {String} key 密钥，16位字符串
+ * @param {String} iv 初始化向量
+ * @return {String} 加密后的数据base64
+ */
+// function encryptDataByAes(txt, key, iv) {
+//   const cipherInstance = forge.cipher.createCipher('AES-CBC', key);
+//   cipherInstance.start({ iv });
+//   cipherInstance.update(forge.util.createBuffer(txt, 'utf8'));
+//   cipherInstance.finish();
+//   const ciphertext = cipherInstance.output.getBytes();
+//   return buffer2Base64(ciphertext);
+// }
+
+/**
+ * @description: 使用RSA公钥加密数据
+ * @param {String} txt 数据源
+ * @return {String} 加密后的数据base64
+ */
+// function encryptDataByPb(txt) {
+//   const publicKey = forge.pki.publicKeyFromPem(PUBLIC_KEY);
+//   const pbData = publicKey.encrypt(txt);
+//   return buffer2Base64(pbData);
+// }
+
+/**
+ * @description: RSA私钥+SHA1生成签名
+ *                签名组成结构nonce+appid+timestamp+body
+ * @param {String} txt 数据源
+ * @return {Object} 生成的sign数据，时间戳、Nonce
+ */
+// function generateSign(txt) {
+//   const timestamp = parseTime('');
+//   const nonce = generateNonce();
+//   const privateKey = forge.pki.privateKeyFromPem(PRIVATE_KEY);
+//   const md = forge.md.sha1.create();
+//   md.update(nonce + APP_ID + timestamp + txt, 'utf8');
+//   let sign = privateKey.sign(md);
+//   sign = buffer2Base64(sign);
+//   return {
+//     timestamp,
+//     nonce,
+//     sign
+//   };
+// }
+
+/**
+ * @description: buffer转base64
+ * @param {Buffer} buf buffer源数据
+ * @return {String} base64 字符串
+ */
+// function buffer2Base64(buf) {
+//   return forge.util.encode64(buf);
+// }
+
+/**
+ * @description: 生成nonce(uuid)
+ *                规则：以当前时间的uuid作为name，以随机生成的uuid作为namespace，生成最终的uuid
+ * @return {String} 生成的uuid
+ */
+// function generateNonce() {
+//   return uuidv1();
+// }
+
+/**
+ * @description: 生成随机字符串
+ * @param {Number} n 位数
+ * @return {String} 生成的字符串
+ */
+// function generateRandomStr(n) {
+//   const len = n || 32;
+//   const chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz0123456789';
+//   const maxPos = chars.length;
+//   let pwd = '';
+//   for (let i = 0; i < len; i++) {
+//     pwd += chars.charAt(Math.floor(Math.random() * maxPos));
+//   }
+//   return pwd;
+// }

src/service/httpDecorator.js

@@ -10,6 +10,6 @@ const http = new HttpRequest(
   function(loadingState) {
     store.dispatch('change_loading', loadingState);
   }
-);
+).getInstance();
 
 export default http;

src/service/pay.js

+/*
+ * @Description: 支付微信h5, jsapi, 第三方收银台，跳转）
+ * @Date: 2020-07-28 15:03:52
+ * @LastEditors: gzw
+ * @LastEditTime: 2020-10-19 11:33:04
+ */
+
+import qs from 'qs';
+import { isApp as isXyqb } from '@/service/validation.service';
+/**
+ * payByWeixinJsapi
+ * @description: 微信通过jsapi支付
+ *               可以在微信浏览器调起支付
+ * @param {type}
+ * @return:
+ */
+function payByWeixinJsapi(info = {}, callback) {
+  function onBridgeReady() {
+    // eslint-disable-next-line no-undef
+    WeixinJSBridge.invoke('getBrandWCPayRequest', info, function(res) {
+      console.log(res);
+      if (res.err_msg == 'get_brand_wcpay_request:ok') {
+        // 使用以上方式判断前端返回,微信团队郑重提示：
+        //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+        callback('ok');
+      } else if (res.err_msg == 'get_brand_wcpay_request:cancel') {
+        // 支付取消
+        callback('cancel');
+      } else {
+        // 支付失败
+        callback('fail');
+      }
+    });
+  }
+  if (typeof WeixinJSBridge == 'undefined') {
+    if (document.addEventListener) {
+      document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
+    } else if (document.attachEvent) {
+      document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
+      document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
+    }
+  } else {
+    onBridgeReady();
+  }
+}
+
+/**
+ * payByWeixinH5
+ * @description: 微信通过H5支付
+ *               可以在浏览器调起微信支付
+ *               在羊小咩（信用钱包）app中调起微信支付，会先唤起微信，原来的页面会自动跳转到redirect_url设定的地址
+ * @param {type}
+ * @return:
+ */
+function payByWeixinH5(info) {
+  if (!info.url) return;
+  if (!info.params) {
+    info.params = {};
+  }
+  info.params.isXyqb = isXyqb ? 1 : 0;
+  info.params.isWxH5 = 1;
+  const currentPath = encodeURIComponent(
+    window.location.origin +
+      '/payWaiting' +
+      qs.stringify(info.params, { encode: true, addQueryPrefix: true })
+  );
+  // window.location.href = `${info.url}&redirect_url=${currentPath}`;
+  const nextPage = document.createElement('a');
+  nextPage.setAttribute('href', `${info.url}&redirect_url=${currentPath}`);
+  nextPage.click();
+}
+
+/**
+ * payByALIH5
+ * @description: 支付宝支付
+ * @param {type}
+ * @return:
+ */
+function payByALIH5(info) {
+  if (!info.order_string) return;
+  console.log('ali:', info.order_string);
+  const aliWrap = document.createElement('div');
+  aliWrap.id = 'ALIWEB_WRAP';
+  aliWrap.setAttribute('id', 'ALIWEB_WRAP');
+  aliWrap.innerHTML = info.order_string;
+  document.body.appendChild(aliWrap);
+  document.forms[0].submit();
+
+  setTimeout(() => {
+    const ALIWEB_WRAP = document.getElementById('ALIWEB_WRAP');
+    if (ALIWEB_WRAP != null) ALIWEB_WRAP.parentNode.removeChild(ALIWEB_WRAP);
+  }, 500);
+}
+
+/**
+ * payByThirdPartyCashier
+ * @description: 第三方收银台
+ * @param {type}
+ * @return:
+ */
+function payByThirdPartyCashier(info) {
+  if (!info.url) return;
+  info.params.third = 1;
+  const currentPath = encodeURIComponent(
+    window.location.origin +
+      '/payWaiting' +
+      qs.stringify(info.params, { encode: true, addQueryPrefix: true })
+  );
+  const nextPage = document.createElement('a');
+  nextPage.setAttribute('href', `${info.url}&redirect_uri=${currentPath}`);
+  nextPage.click();
+  // window.location.href = `${info.url}&redirect_uri=${currentPath}`;
+}
+
+/**
+ * @description: 支付方式判断， 返回promise
+ *              NATIVE=原生扫码支付.,APP=ap支付,,JSAPI=公众号支付/小程序支付,,MWEB=H5支付.,MICROPAY=刷卡支付,默认JSAPI
+ * @param {String} type 支付方式，THIRD -> 第三方，MWEB -> H5支付， JSAPI -> jsapi支付，默认支付方式，THIRD
+ * @param {Object/String} payInfo 支付信息
+ * @return {Promise} 回调
+ */
+export function payByWay(type = 'THIRD', payInfo) {
+  return new Promise((resolve, reject) => {
+    if (type === 'JSAPI' && !payInfo.url) {
+      payByWeixinJsapi(payInfo, function(e) {
+        if (e === 'ok') {
+          resolve();
+        } else {
+          reject();
+        }
+      });
+    } else {
+      if (payInfo.url.indexOf('tenpay') > -1) {
+        payByWeixinH5(payInfo);
+        reject();
+      } else if (type === 'ALIWEB') {
+        payByALIH5(payInfo);
+        resolve();
+      } else {
+        payByThirdPartyCashier(payInfo);
+        reject();
+      }
+      // resolve();
+    }
+  });
+}

src/service/utils.service.js

@@ -310,6 +310,16 @@ export function idNoFormat(value) {
     return $1 + ' ' + $2 + ' ' + $3;
   });
 }
+
 export function dateFormat(value) {
   return value.replace(/(\d{4})(\d{2})(\d{2})/, '$1.$2.$3');
 }
+<<<<<<< HEAD
+
+export function phoneFormat(value) {
+  return value.replace(/(\d{3})(\d{4})(\d{4})/, '$1 $2 $3');
+=======
+export function isObject(value) {
+  return Object.prototype.toString.call(value) === '[object Object]';
+>>>>>>> 支付开发
+}

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

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;
+@tabs-nav-background-color: @background-color;
\ No newline at end of file
\ No newline at end of file

src/style/var.less

@@ -11,10 +11,26 @@
 @red-dark: #ee0a24;
 @orange: #faab0c;
 
+
+@text-color-red:#E81800;
+@text-color-light: #FF5A4B;
+
+
+@font-color-disabled: #C0C4CC;
+@font-color-dark: #333333;
+@font-color-light: #909399;
+@font-color-red: #F23E33;
+
+@cherry-color-error: #dd524d;
+
 @grey-border: #f2f3f5;
 // Gradient Colors
 @gradient-red: linear-gradient(269deg, #ff5d00 12%, #ff1900 86%);
 @gradient-pink: linear-gradient(180deg, #fff7f0 0%, #ffe4dc 100%);
+@primary-bg: {
+  background-image: linear-gradient(269deg, #FF4B00 12%, #FF7705 86%);
+  background-image: linear-gradient(269deg, #FF5D00 12%, #FF1900 86%);
+}
 
 // Component Colors
 @text-color: @black;
@@ -35,6 +51,8 @@
 @border-radius-lx: 20px;
 @border-radius-max: 999px;
 
+@border-color-base: #E4E7ED;
+
 // Padding
 @padding-unit: 4px;
 @padding-xs: @padding-unit * 2;
@@ -44,9 +62,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} {

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;
-  }
-}

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>

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

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>

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>

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>

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>

src/views/orderList/index.less

+.cr-tabs {
+  margin-top: 0 !important;
+}
\ No newline at end of file

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>

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>

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>

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>

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

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>

vue.config.js

@@ -140,6 +140,7 @@ module.exports = {
     proxy: 'http://kdsp-vcc.liangkebang.net'
   },
   css: {
+    extract: false,
     loaderOptions: {
       less: {
         // 若使用 less-loader@5，请移除 lessOptions 这一级，直接配置选项。

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==