fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by 邱骏
Commit 40883f4956821da64f2c6c43add0de778c2c30f1 2 parents a7b0364f bc1b5654

Merge branch 'develop' into feature/ufo-activitys

Inline Side-by-side
Showing 23 changed files with 483 additions and 346 deletions
@@ -88,6 +88,12 @@ const xianyu = { @@ -88,6 +88,12 @@ const xianyu = {
88 88
89 try { 89 try {
90 pageParams = queryString.parse(urlSplit[1]); 90 pageParams = queryString.parse(urlSplit[1]);
  91 +
  92 + if (!pageParams.hasOwnProperty('isNeedRefresh')) {
  93 + pageParams.isNeedRefresh = false; // 添加禁止刷新参数
  94 + args.url = urlSplit[0] + '?' + queryString.stringify(pageParams);
  95 + }
  96 +
91 let arr = []; 97 let arr = [];
92 if (Object.keys(pageParams)[0] === 'openby:yohobuy') { 98 if (Object.keys(pageParams)[0] === 'openby:yohobuy') {
93 for (let key in pageParams) { 99 for (let key in pageParams) {
@@ -137,15 +143,15 @@ const xianyu = { @@ -137,15 +143,15 @@ const xianyu = {
137 } 143 }
138 144
139 if (this.isAliApp && window.WindVane) { 145 if (this.isAliApp && window.WindVane) {
  146 + args.url = encodeURI(decodeURI(args.url));
  147 +
140 window.WindVane.call('Base', 'openWindow', args, () => { 148 window.WindVane.call('Base', 'openWindow', args, () => {
141 console.log('open new window success'); 149 console.log('open new window success');
142 }, () => { 150 }, () => {
143 window.open(args.url, '_blank'); 151 window.open(args.url, '_blank');
144 }); 152 });
145 } else { 153 } else {
146 - if (args.url) {  
147 - window.open(args.url, '_blank');  
148 - } 154 + window.open(args.url, '_blank');
149 } 155 }
150 }, 156 },
151 157
@@ -130,13 +130,27 @@ export default { @@ -130,13 +130,27 @@ export default {
130 this.binded = true; 130 this.binded = true;
131 this.close(); 131 this.close();
132 this.SET_LOGIN_INFO({ uid: 999999999999 }); // 设置登录状态 132 this.SET_LOGIN_INFO({ uid: 999999999999 }); // 设置登录状态
  133 + this.reportYas('XY_YB_BIND_RESULT', {
  134 + BIND_RES: 1
  135 + });
133 } else { 136 } else {
134 this.toast(res.message); 137 this.toast(res.message);
  138 + this.reportYas('XY_YB_BIND_RESULT', {
  139 + BIND_RES: 0
  140 + });
135 } 141 }
136 }); 142 });
137 } else { 143 } else {
138 this.toast(this.phone ? '请输入短信验证码' : '请输入手机号'); 144 this.toast(this.phone ? '请输入短信验证码' : '请输入手机号');
139 } 145 }
  146 + },
  147 + reportYas(name, params) {
  148 + this.$store.dispatch('reportYas', {
  149 + params: {
  150 + appop: name,
  151 + param: params
  152 + }
  153 + });
140 } 154 }
141 }, 155 },
142 components: { 156 components: {
@@ -33,7 +33,8 @@ import 'video.js/dist/video-js.css'; @@ -33,7 +33,8 @@ import 'video.js/dist/video-js.css';
33 import sdk from 'yoho-activity-sdk'; 33 import sdk from 'yoho-activity-sdk';
34 34
35 import { 35 import {
36 - initClient 36 + initClient,
  37 + initBaseLogs
37 } from 'utils/init-client'; 38 } from 'utils/init-client';
38 import 'statics/scss/common.scss'; 39 import 'statics/scss/common.scss';
39 import 'statics/font/iconfont.css'; 40 import 'statics/font/iconfont.css';
@@ -75,6 +76,7 @@ Vue.use(ConfirmDialog); @@ -75,6 +76,7 @@ Vue.use(ConfirmDialog);
75 Vue.use(ChangeBidPriceDialog); 76 Vue.use(ChangeBidPriceDialog);
76 77
77 initClient(store); 78 initClient(store);
  79 +initBaseLogs();
78 80
79 xianyu.$router = router; 81 xianyu.$router = router;
80 yoho.auth = async(args) => { 82 yoho.auth = async(args) => {
@@ -172,6 +174,7 @@ router.onReady(() => { @@ -172,6 +174,7 @@ router.onReady(() => {
172 } 174 }
173 175
174 router.beforeResolve((to, from, next) => { 176 router.beforeResolve((to, from, next) => {
  177 + initBaseLogs();
175 if (from.query.bind_code) { 178 if (from.query.bind_code) {
176 app.$createThirdBind().close(); 179 app.$createThirdBind().close();
177 } else if (to.query.bind_code) { 180 } else if (to.query.bind_code) {
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="account-form"> 4 <div class="account-form">
5 <p class="form-title">账号</p> 5 <p class="form-title">账号</p>
6 <div class="form-input-block"> 6 <div class="form-input-block">
7 - <CubeInput class="account-input" v-model="account" placeholder="请输入您的支付宝账号"></CubeInput> 7 + <CubeInput ref="account" class="account-input" v-model="account" @blur="checkValid" placeholder="请输入您的支付宝账号"></CubeInput>
8 </div> 8 </div>
9 <p class="form-title">姓名</p> 9 <p class="form-title">姓名</p>
10 <div class="form-input-block"> 10 <div class="form-input-block">
@@ -75,7 +75,18 @@ export default { @@ -75,7 +75,18 @@ export default {
75 } 75 }
76 }); 76 });
77 }, 77 },
78 - 78 + checkValid() {
  79 + let Regex = /[\u4e00-\u9fa5]/;
  80 + if(Regex.test(this.account)) {
  81 + this.$createToast({
  82 + txt: '账号不能包含中文',
  83 + time: 1500,
  84 + type: 'txt'
  85 + }).show();
  86 + // this.account = ''
  87 + console.log(this.$refs.account.focus())
  88 + }
  89 + }
79 }, 90 },
80 components: { 91 components: {
81 Style, 92 Style,
@@ -502,6 +502,13 @@ export default { @@ -502,6 +502,13 @@ export default {
502 background: #f2f2f2; 502 background: #f2f2f2;
503 } 503 }
504 } 504 }
  505 +/deep/ .cube-scroll-nav-bar-item_active {
  506 + &:after {
  507 + width: 16px;
  508 + // left: 50%;
  509 + transform: translateX(-10px)
  510 + }
  511 +}
505 .search-header { 512 .search-header {
506 height: 64px; 513 height: 64px;
507 background: #f5f5f5; 514 background: #f5f5f5;
@@ -511,7 +518,7 @@ export default { @@ -511,7 +518,7 @@ export default {
511 color: #8e8e93; 518 color: #8e8e93;
512 line-height: 44px; 519 line-height: 44px;
513 align-items: center; 520 align-items: center;
514 - border-radius: 4px; 521 + border-radius: 64px;
515 } 522 }
516 523
517 .search-input { 524 .search-input {
@@ -520,7 +527,7 @@ export default { @@ -520,7 +527,7 @@ export default {
520 font-size: 28px; 527 font-size: 28px;
521 color: #999; 528 color: #999;
522 flex: 1; 529 flex: 1;
523 - border-radius: 4px; 530 + border-radius: 64px;
524 padding: 14px 14px 14px 10px; 531 padding: 14px 14px 14px 10px;
525 } 532 }
526 533
@@ -76,7 +76,9 @@ export default { @@ -76,7 +76,9 @@ export default {
76 } 76 }
77 77
78 .cube-scroll-nav-bar-item { 78 .cube-scroll-nav-bar-item {
79 - padding: 0 12px; 79 + // padding: 0 12px;
  80 + padding: 0;
  81 + margin: 0 12px;
80 line-height: 52px; 82 line-height: 52px;
81 font-size: 15px; 83 font-size: 15px;
82 color: #555; 84 color: #555;
@@ -5,6 +5,8 @@ import news from './news'; @@ -5,6 +5,8 @@ import news from './news';
5 import Income from './income'; 5 import Income from './income';
6 import Coupon from './coupon'; 6 import Coupon from './coupon';
7 import BindAccount from './bindAccount'; 7 import BindAccount from './bindAccount';
  8 +import Strategy from './strategy';
  9 +
8 export default [ 10 export default [
9 { 11 {
10 name: 'IndexPage', 12 name: 'IndexPage',
@@ -92,5 +94,6 @@ export default [ @@ -92,5 +94,6 @@ export default [
92 ...Favorite, 94 ...Favorite,
93 ...Income, 95 ...Income,
94 ...Coupon, 96 ...Coupon,
95 - ...BindAccount 97 + ...BindAccount,
  98 + ...Strategy
96 ]; 99 ];
@@ -66,7 +66,9 @@ export default { @@ -66,7 +66,9 @@ export default {
66 }; 66 };
67 } 67 }
68 }, 68 },
69 - mounted() {}, 69 + mounted() {
  70 +
  71 + },
70 methods: { 72 methods: {
71 goPage({ page: name, params = {} }) { 73 goPage({ page: name, params = {} }) {
72 if (!name) { 74 if (!name) {
@@ -74,14 +76,18 @@ export default { @@ -74,14 +76,18 @@ export default {
74 76
75 } 77 }
76 if(name === 'service') { 78 if(name === 'service') {
77 - this.$createDialog({  
78 - type: 'alert',  
79 - content: '请致电 <a href="tel:400-889-9646"> 400-889-9646 </a>联系有货客服',  
80 - confirmBtn: {  
81 - text: '我知道了',  
82 - active: true  
83 - }  
84 - }).show() 79 + // this.$createDialog({
  80 + // type: 'alert',
  81 + // content: '请致电 <a href="tel:400-889-9646"> 400-889-9646 </a>联系有货客服',
  82 + // confirmBtn: {
  83 + // text: '我知道了',
  84 + // active: true
  85 + // }
  86 + // }).show()
  87 + // this.$router.push({path: '/xianyu-service/service/im'})
  88 + this.$xianyu.goXianyuNewPage({
  89 + url: window.location.origin+'/xianyu-service/service/im'
  90 + });
85 return 91 return
86 } 92 }
87 this.$router.push({ name, params }); 93 this.$router.push({ name, params });
  1 +{
  2 + "status": "0",
  3 + "result": {
  4 + "standardList": [
  5 + { "image": "//cdn.yoho.cn/standard/standard_01.jpg?imageView2/2/w/750/format/jpg" },
  6 + { "image": "//cdn.yoho.cn/standard/standard_02.jpg?imageView2/2/w/750/format/jpg" },
  7 + { "image": "//cdn.yoho.cn/standard/standard_03.jpg?imageView2/2/w/750/format/jpg" },
  8 + { "image": "//cdn.yoho.cn/standard/standard_04.jpg?imageView2/2/w/750/format/jpg" },
  9 + { "image": "//cdn.yoho.cn/standard/standard_05.jpg?imageView2/2/w/750/format/jpg" },
  10 + { "image": "//cdn.yoho.cn/standard/standard_06.jpg?imageView2/2/w/750/format/jpg" },
  11 + { "image": "//cdn.yoho.cn/standard/standard_07.jpg?imageView2/2/w/750/format/jpg" }
  12 + ],
  13 + "buyerList": [
  14 + { "image": "//cdn.yoho.cn/buyerpolicy/buyer_01.jpg?imageView2/2/w/750/format/jpg" },
  15 + { "image": "//cdn.yoho.cn/buyerpolicy/buyer_02.jpg?imageView2/2/w/750/format/jpg" },
  16 + { "image": "//cdn.yoho.cn/buyerpolicy/buyer_03.jpg?imageView2/2/w/750/format/jpg" },
  17 + { "image": "//cdn.yoho.cn/buyerpolicy/buyer_04.jpg?imageView2/2/w/750/format/jpg" },
  18 + { "image": "//cdn.yoho.cn/buyerpolicy/buyer_05.jpg?imageView2/2/w/750/format/jpg" },
  19 + { "image": "//cdn.yoho.cn/buyerpolicy/buyer_06.jpg?imageView2/2/w/750/format/jpg" },
  20 + { "image": "//cdn.yoho.cn/buyerpolicy/buyer_07.jpg?imageView2/2/w/750/format/jpg" },
  21 + { "image": "//cdn.yoho.cn/buyerpolicy/buyer_08.jpg?imageView2/2/w/750/format/jpg" },
  22 + { "image": "//cdn.yoho.cn/buyerpolicy/buyer_09.jpg?imageView2/2/w/750/format/jpg" },
  23 + { "image": "//cdn.yoho.cn/buyerpolicy/buyer_10.jpg?imageView2/2/w/750/format/jpg" }
  24 + ],
  25 + "sellerList": [
  26 + { "image": "//cdn.yoho.cn/sellerpolicy/seller_01.jpg?imageView2/2/w/750/format/jpg" },
  27 + { "image": "//cdn.yoho.cn/sellerpolicy/seller_0201.jpg?imageView2/2/w/750/format/jpg" },
  28 + { "image": "//cdn.yoho.cn/sellerpolicy/seller_03.jpg?imageView2/2/w/750/format/jpg" },
  29 + { "image": "//cdn.yoho.cn/sellerpolicy/seller_04.jpg?imageView2/2/w/750/format/jpg" },
  30 + { "image": "//cdn.yoho.cn/sellerpolicy/seller_05.jpg?imageView2/2/w/750/format/jpg" },
  31 + { "image": "//cdn.yoho.cn/sellerpolicy/seller_06.jpg?imageView2/2/w/750/format/jpg" },
  32 + { "image": "//cdn.yoho.cn/sellerpolicy/seller_07.jpg?imageView2/2/w/750/format/jpg" },
  33 + { "image": "//cdn.yoho.cn/sellerpolicy/seller_08.jpg?imageView2/2/w/750/format/jpg" },
  34 + { "image": "//cdn.yoho.cn/sellerpolicy/seller_09.jpg?imageView2/2/w/750/format/jpg" },
  35 + { "image": "//cdn.yoho.cn/sellerpolicy/seller_10.jpg?imageView2/2/w/750/format/jpg" }
  36 + ],
  37 + "qiugouList": [
  38 + { "image": "//cdn.yoho.cn/qiugou/qiugou_01.jpg?imageView2/2/w/750/format/jpg" },
  39 + { "image": "//cdn.yoho.cn/qiugou/qiugou_02.jpg?imageView2/2/w/750/format/jpg" },
  40 + { "image": "//cdn.yoho.cn/qiugou/qiugou_03.jpg?imageView2/2/w/750/format/jpg" },
  41 + { "image": "//cdn.yoho.cn/qiugou/qiugou_04.jpg?imageView2/2/w/750/format/jpg" },
  42 + { "image": "//cdn.yoho.cn/qiugou/qiugou_05.jpg?imageView2/2/w/750/format/jpg" }
  43 + ],
  44 + "xianyuchaoList": [
  45 + { "image": "//cdn.yoho.cn/xianyuchao/xianyu_01.png?imageView2/2/w/750/format/jpg" },
  46 + { "image": "//cdn.yoho.cn/xianyuchao/xianyu_02.png?imageView2/2/w/750/format/jpg" },
  47 + { "image": "//cdn.yoho.cn/xianyuchao/xianyu_03.png?imageView2/2/w/750/format/jpg" },
  48 + { "image": "//cdn.yoho.cn/xianyuchao/xianyu_04.png?imageView2/2/w/750/format/jpg" },
  49 + { "image": "//cdn.yoho.cn/xianyuchao/xianyu_0501.jpeg?imageView2/2/w/750/format/jpg",
  50 + "urls": [
  51 + {
  52 + "linkName": "strategySub",
  53 + "subName": "qualityStandard",
  54 + "left": "1rem",
  55 + "top": "0.4rem",
  56 + "width": "17rem",
  57 + "height": "2.9rem"
  58 + },
  59 + {
  60 + "linkName": "strategySub",
  61 + "subName": "buyerPolicy",
  62 + "left": "2.45rem",
  63 + "top": "5.3rem",
  64 + "width": "6rem",
  65 + "height": "3.2rem"
  66 + },
  67 + {
  68 + "linkName": "strategySub",
  69 + "subName": "sellerPolicy",
  70 + "left": "10.8rem",
  71 + "top": "5.3rem",
  72 + "width": "6rem",
  73 + "height": "3.2rem"
  74 + },
  75 + {
  76 + "linkName": "ChannelPage",
  77 + "subName": "",
  78 + "left": "0rem",
  79 + "top": "10.9rem",
  80 + "width": "18.75rem",
  81 + "height": "2.5rem"
  82 + }
  83 + ]
  84 + }
  85 + ]
  86 + }
  87 +}
  1 +export default [
  2 + {
  3 + name: 'strategy',
  4 + path: '/xianyu/home/strategy.html',
  5 + component: () => import(/* webpackChunkName: "home.strategy" */ './strategy'),
  6 + },
  7 + {
  8 + name: 'strategySub',
  9 + path: '/xianyu/home/strategySub/:subName.html',
  10 + component: () => import(/* webpackChunkName: "home.strategy" */ './strategySub'),
  11 + },
  12 +];
  1 +<template>
  2 + <LayoutApp title="闲鱼潮玩转攻略" :show-back="true" :back-action="goBack">
  3 + <ul>
  4 + <li v-for="(item, index) in dataList" :key="index">
  5 + <div v-if="item.urls && item.urls.length > 0" class="link-container">
  6 + <a href="javascript:;"
  7 + v-for="linkItem in item.urls"
  8 + :key="linkItem.link"
  9 + :style="{left: linkItem.left, top: linkItem.top, width: linkItem.width, height: linkItem.height}"
  10 + @click="jumpTo"
  11 + :data-item="JSON.stringify(linkItem)"
  12 + >
  13 + </a>
  14 + </div>
  15 + <img :src="item.image" alt=""/>
  16 + </li>
  17 + </ul>
  18 + </LayoutApp>
  19 +</template>
  20 +
  21 +<script>
  22 +import data from './image.json';
  23 +
  24 +export default {
  25 + name: 'Strategy',
  26 + data() {
  27 + return {
  28 + dataList: []
  29 + }
  30 + },
  31 + methods: {
  32 + goBack() {
  33 + this.$router.go(-1);
  34 + },
  35 + jumpTo(event) {
  36 + let linkItem = JSON.parse(event.currentTarget.dataset.item || '{}') || {};
  37 +
  38 + if (linkItem.subName === '') {
  39 + this.$router.push({
  40 + name: linkItem.linkName
  41 + });
  42 + } else {
  43 + this.$router.push({
  44 + name: linkItem.linkName,
  45 + params: {
  46 + subName: linkItem.subName
  47 + }
  48 + });
  49 + }
  50 + }
  51 + },
  52 + mounted() {
  53 + let result = data.result;
  54 + this.dataList = result.xianyuchaoList;
  55 + }
  56 +};
  57 +</script>
  58 +
  59 +<style lang="scss" scoped>
  60 +ul {
  61 + width: 100%;
  62 + list-style: none;
  63 + margin: 0;
  64 + padding: 0;
  65 +
  66 + li {
  67 + position: relative;
  68 + width: 100%;
  69 + overflow: hidden;
  70 +
  71 + img {
  72 + width: 100%;
  73 + float: left;
  74 + }
  75 +
  76 + .link-container {
  77 + position: absolute;
  78 + width: 100%;
  79 + height: 100%;
  80 + left: 0;
  81 + top: 0;
  82 + z-index: 9;
  83 +
  84 + a {
  85 + position: absolute;
  86 + display: block;
  87 + width: 200px;
  88 + height: 100px;
  89 + background-color: transparent;
  90 + }
  91 + }
  92 + }
  93 +}
  94 +</style>
  1 +<template>
  2 + <LayoutApp :title="currentTitle" :show-back="true" :back-action="goBack">
  3 + <ul>
  4 + <li v-for="(item, index) in currentList" :key="index">
  5 + <img :src="item.image" alt=""/>
  6 + </li>
  7 + </ul>
  8 +
  9 + </LayoutApp>
  10 +</template>
  11 +
  12 +<script>
  13 +import data from './image.json';
  14 +
  15 +export default {
  16 + name: 'Strategy',
  17 + data() {
  18 + return {
  19 + currentList: [],
  20 + currentTitle: ''
  21 + }
  22 + },
  23 + methods: {
  24 + goBack() {
  25 + this.$router.go(-1);
  26 + }
  27 + },
  28 + mounted() {
  29 + let subName = this.$route.params.subName;
  30 + let result = data.result;
  31 +
  32 + switch (subName) {
  33 + case 'qualityStandard':
  34 + this.currentTitle = '商品质检标准';
  35 + this.currentList = result.standardList;
  36 + break;
  37 + case 'buyerPolicy':
  38 + this.currentTitle = '买家须知';
  39 + this.currentList = result.buyerList;
  40 + break;
  41 + case 'sellerPolicy':
  42 + this.currentTitle = '卖家协议';
  43 + this.currentList = result.sellerList;
  44 + break;
  45 + case 'qiugouExplain':
  46 + this.currentTitle = '什么是求购？';
  47 + this.currentList = result.qiugouList;
  48 + break;
  49 + default:
  50 + break;
  51 + }
  52 + }
  53 +};
  54 +</script>
  55 +
  56 +<style lang="scss" scoped>
  57 +ul {
  58 + width: 100%;
  59 + list-style: none;
  60 + margin: 0;
  61 + padding: 0;
  62 +
  63 + li {
  64 + position: relative;
  65 + width: 100%;
  66 + overflow: hidden;
  67 +
  68 + img {
  69 + width: 100%;
  70 + float: left;
  71 + }
  72 + }
  73 +}
  74 +</style>
@@ -5,8 +5,7 @@ @@ -5,8 +5,7 @@
5 <p class="account-tip">支付宝账号</p> 5 <p class="account-tip">支付宝账号</p>
6 <p class="account-name">{{alipayAccount?alipayAccount:nickName}}</p> 6 <p class="account-name">{{alipayAccount?alipayAccount:nickName}}</p>
7 </div> 7 </div>
8 - <p class="tip"><i class="cubeic-warn"></i><span>已绑定的支付宝账号暂无法提供系统换绑和解除，如  
9 -需要帮助可致电<a class="phone" href="tel:400-889-9646"> 400-889-9646 </a>联系电话客服</span></p> 8 + <p class="tip"><i class="cubeic-warn"></i><span>已绑定的支付宝账号暂无法提供系统换绑和解除，如需要帮助可致电<a class="phone" href="tel:400-889-9646"> 400-889-9646 </a>联系电话客服</span></p>
10 </div> 9 </div>
11 <div v-else> 10 <div v-else>
12 <div class="bind-button" @click="bindAccount">设置支付宝账号</div> 11 <div class="bind-button" @click="bindAccount">设置支付宝账号</div>
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <div class="form-input-block"> 11 <div class="form-input-block">
12 <CubeInput class="auth-input" v-model="idCode" :disabled="!!certIdCode" placeholder="请填写身份证号"></CubeInput> 12 <CubeInput class="auth-input" v-model="idCode" :disabled="!!certIdCode" placeholder="请填写身份证号"></CubeInput>
13 </div> 13 </div>
14 - <p class="form-title">上传身份证正面照片 <a :href="exampleLink" class="upload-intro"><span class="iconfont iconquestion"></span>示例照片</a></p> 14 + <p class="form-title">上传身份证正面照片 <LayoutLink :href="exampleLink" class="upload-intro"><span class="iconfont iconquestion"></span>示例照片</LayoutLink></p>
15 <div class="form-input-block"> 15 <div class="form-input-block">
16 <div class="upload-btn" @click="uploadFrontCard"> 16 <div class="upload-btn" @click="uploadFrontCard">
17 <div v-if="idCardFrontUrl" class="delete-img" @click.stop="clearInfo(['idCardFront', 'idCardFrontUrl'])">ㄨ</div> 17 <div v-if="idCardFrontUrl" class="delete-img" @click.stop="clearInfo(['idCardFront', 'idCardFrontUrl'])">ㄨ</div>
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 :emulateMask="true" 8 :emulateMask="true"
9 :full="true"> 9 :full="true">
10 <div class="buy-sheet"> 10 <div class="buy-sheet">
11 - <a class="header" @click.prevent="gotoNewPage">求购<i class="iconfont iconquestion"></i></a> 11 + <a href="javascript:;" class="header" @click="gotoNewPage">求购<i class="iconfont iconquestion"></i></a>
12 <div class="title"> 12 <div class="title">
13 <div class="title-thumbnail"> 13 <div class="title-thumbnail">
14 <square-img :src="imageUrl" :width="600" :height="600"/> 14 <square-img :src="imageUrl" :width="600" :height="600"/>
@@ -175,7 +175,13 @@ export default { @@ -175,7 +175,13 @@ export default {
175 this.$refs.popup.hide(); 175 this.$refs.popup.hide();
176 }, 176 },
177 gotoNewPage() { 177 gotoNewPage() {
178 - this.$xianyu.goXianyuNewPage({url: 'https://activity.yoho.cn/feature/6765.html?nodownload=1'}); 178 + this.hide();
  179 + this.$router.push({
  180 + name: 'strategySub',
  181 + params: {
  182 + subName: 'qiugouExplain',
  183 + },
  184 + });
179 } 185 }
180 }, 186 },
181 }; 187 };

91.3 KB | W: | H:

99.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -210,6 +210,13 @@ export default function(mergeState = {}) { @@ -210,6 +210,13 @@ export default function(mergeState = {}) {
210 210
211 param.C_ID = channel; 211 param.C_ID = channel;
212 } 212 }
  213 +
  214 + if (!param.SRC_ID) {
  215 + const srcId = cookie.get('SRC_ID') || '';
  216 +
  217 + param.SRC_ID = srcId;
  218 + }
  219 +
213 window._yas.sendAppLogs( 220 window._yas.sendAppLogs(
214 { 221 {
215 appop, 222 appop,
@@ -241,7 +248,7 @@ export default function(mergeState = {}) { @@ -241,7 +248,7 @@ export default function(mergeState = {}) {
241 isEnabled = resp.data === '1'; 248 isEnabled = resp.data === '1';
242 } 249 }
243 250
244 - commit(Types.UPDATE_SYSTEM_CONFIG_QIUGOU, { enabled: isEnabled}); 251 + commit(Types.UPDATE_SYSTEM_CONFIG_QIUGOU, { enabled: isEnabled });
245 } 252 }
246 253
247 return isEnabled; 254 return isEnabled;
@@ -48,43 +48,48 @@ function getUid() { @@ -48,43 +48,48 @@ function getUid() {
48 48
49 window.indx = 1; 49 window.indx = 1;
50 50
51 -window.appBaseLogs = {  
52 - status: [  
53 - {  
54 - ca: '',  
55 - lo: '',  
56 - cy: 'CN',  
57 - av: '',  
58 - udid: getUdid(),  
59 - ln: '',  
60 - ab: '', 51 +function initBaseLogs() {
  52 + window.appBaseLogs = {
  53 + status: [
  54 + {
  55 + ca: '',
  56 + lo: '',
  57 + cy: 'CN',
  58 + av: '',
  59 + udid: getUdid(),
  60 + ln: '',
  61 + ab: '',
  62 + sid: '',
  63 + net: '',
  64 + la: ''
  65 + }
  66 + ],
  67 + device: {
  68 + res: '',
  69 + ifa: '',
  70 + mac: '',
  71 + osv: '',
  72 + ifv: '',
  73 + ps: '',
  74 + os: xianyu.isiOS ? 'ios' : 'android',
  75 + ak: 'yoho_xianyu_' + (xianyu.isiOS ? 'ios' : 'android'),
  76 + sv: '',
  77 + ch: '',
  78 + dm: '',
  79 + tdid: '',
  80 + afp: '',
  81 + udid: getUdid()
  82 + },
  83 + events: [{
61 sid: '', 84 sid: '',
62 - net: '',  
63 - la: ''  
64 - }  
65 - ],  
66 - device: {  
67 - res: '',  
68 - ifa: '',  
69 - mac: '',  
70 - osv: '',  
71 - ifv: '',  
72 - ps: '',  
73 - os: xianyu.isiOS ? 'ios' : 'android',  
74 - ak: 'yoho_xianyu_' + (xianyu.isiOS ? 'ios' : 'android'),  
75 - sv: '',  
76 - ch: '',  
77 - dm: '',  
78 - tdid: '',  
79 - afp: '',  
80 - udid: getUdid()  
81 - },  
82 - events: [{  
83 - sid: '',  
84 - uid: getUid()  
85 - }]  
86 -}; 85 + uid: getUid()
  86 + }]
  87 + };
  88 +}
  89 +
  90 +initBaseLogs();
87 91
88 export { 92 export {
89 - initClient 93 + initClient,
  94 + initBaseLogs
90 }; 95 };
@@ -92,8 +92,19 @@ module.exports = { @@ -92,8 +92,19 @@ module.exports = {
92 debugStdout: true, 92 debugStdout: true,
93 }, 93 },
94 }, 94 },
95 - zookeeperServer: '127.0.0.1:2181',  
96 jsSdk: '//cdn.yoho.cn/js-sdk/1.3.10/jssdk.js', 95 jsSdk: '//cdn.yoho.cn/js-sdk/1.3.10/jssdk.js',
  96 + qiniu: {
  97 + ACCESS_KEY: 'BwWhoJN536BnV3CzlE20AjNKC9O2bP0l5tFpKsDU',
  98 + SECRET_KEY: '_x2VtO7fEmylgjojmLi7qwTBtRm30S8BrO0FxOPK',
  99 + BUCKET_NAME: 'cmsimg01',
  100 + },
  101 + qiniuYohoCdn: {
  102 + ACCESS_KEY: 'BwWhoJN536BnV3CzlE20AjNKC9O2bP0l5tFpKsDU',
  103 + SECRET_KEY: '_x2VtO7fEmylgjojmLi7qwTBtRm30S8BrO0FxOPK',
  104 + ORIGIN: 'https://cdn.yoho.cn',
  105 + BUCKET_NAME: 'yohocdn',
  106 + },
  107 + zookeeperServer: '127.0.0.1:2181',
97 redis: { 108 redis: {
98 connect: { 109 connect: {
99 host: '192.168.102.49', 110 host: '192.168.102.49',
@@ -119,24 +130,11 @@ module.exports = { @@ -119,24 +130,11 @@ module.exports = {
119 prefix: 'yohobuy_session:', 130 prefix: 'yohobuy_session:',
120 }, 131 },
121 }, 132 },
122 - qiniu: {  
123 - ACCESS_KEY: 'BwWhoJN536BnV3CzlE20AjNKC9O2bP0l5tFpKsDU',  
124 - SECRET_KEY: '_x2VtO7fEmylgjojmLi7qwTBtRm30S8BrO0FxOPK',  
125 - BUCKET_NAME: 'cmsimg01',  
126 - },  
127 - qiniuYohoCdn: {  
128 - ACCESS_KEY: 'BwWhoJN536BnV3CzlE20AjNKC9O2bP0l5tFpKsDU',  
129 - SECRET_KEY: '_x2VtO7fEmylgjojmLi7qwTBtRm30S8BrO0FxOPK',  
130 - ORIGIN: 'https://cdn.yoho.cn',  
131 - BUCKET_NAME: 'yohocdn',  
132 - },  
133 - mysql: {  
134 - host: 'localhost',  
135 - userName: 'root',  
136 - password: 'root',  
137 - port: '3306',  
138 - db: 'yoho_apm_test',  
139 - }, 133 + monitorReport: {
  134 + host: '192.168.102.22',
  135 + port: 8086,
  136 + db: 'web_monitor',
  137 + }
140 }; 138 };
141 139
142 if (isProduction) { 140 if (isProduction) {
@@ -239,12 +237,6 @@ if (isProduction) { @@ -239,12 +237,6 @@ if (isProduction) {
239 service: process.env.TEST_API || 'http://api-test3.dev.yohocorp.com/', 237 service: process.env.TEST_API || 'http://api-test3.dev.yohocorp.com/',
240 }, 238 },
241 useCache: true, 239 useCache: true,
242 - monitorReport: {  
243 - host: '192.168.102.22',  
244 - port: 8086,  
245 - db: 'web_monitor',  
246 - },  
247 - zookeeperServer: 'zk01-yohoops-org:2181',  
248 loggers: { 240 loggers: {
249 infoFile: { 241 infoFile: {
250 name: 'info', 242 name: 'info',
@@ -277,12 +269,37 @@ if (isProduction) { @@ -277,12 +269,37 @@ if (isProduction) {
277 debugStdout: true, 269 debugStdout: true,
278 }, 270 },
279 }, 271 },
280 - mysql: {  
281 - host: '192.168.102.219',  
282 - userName: 'yh_test',  
283 - password: 'yh_test',  
284 - port: '3306',  
285 - db: 'yoho_apm_test', 272 + zookeeperServer: 'zk.yohoops.com:2181',
  273 + monitorReport: {
  274 + // influxdb
  275 + host: 'influxdb.yohoops.com',
  276 + port: 8086,
  277 + db: 'web_monitor',
286 }, 278 },
  279 + redis: {
  280 + connect: {
  281 + host: 'redis.yohoops.com',
  282 + port: '6379',
  283 + enable_offline_queue: false,
  284 + retry_strategy(options) {
  285 + if (options.error && options.error.code === 'ECONNREFUSED') {
  286 + console.log('connect redis server fail');
  287 + }
  288 +
  289 + if (options.attempt < 10) {
  290 + return Math.min(options.attempt * 100, 1000);
  291 + } else if (options.attempt > 10 && options.attempt < 100) {
  292 + return 1000;
  293 + } else {
  294 + return 1000 * 10;
  295 + }
  296 + }
  297 + },
  298 + session: {
  299 + host: 'redis.yohoops.com',
  300 + port: '6379',
  301 + prefix: 'yohobuy_session:'
  302 + }
  303 + }
287 }); 304 });
288 } 305 }
1 -const knex = require('knex');  
2 -const config = global.yoho.config;  
3 -  
4 -function init() {  
5 - return knex({  
6 - client: 'mysql',  
7 - connection: {  
8 - host: config.mysql.host,  
9 - port: config.mysql.port,  
10 - user: config.mysql.userName,  
11 - password: config.mysql.password,  
12 - database: config.mysql.db  
13 - },  
14 - pool: { min: 0, max: 10 }  
15 - });  
16 -}  
17 -  
18 -module.exports = init();  
@@ -107,6 +107,8 @@ const getCacheKey = (req, route) => { @@ -107,6 +107,8 @@ const getCacheKey = (req, route) => {
107 return md5(ck); 107 return md5(ck);
108 }; 108 };
109 109
  110 +const ThreeDays = 3 * 24 * 60 * 60 * 1000;
  111 +
110 const render = (route) => { 112 const render = (route) => {
111 return async(req, res, next) => { 113 return async(req, res, next) => {
112 try { 114 try {
@@ -122,6 +124,15 @@ const render = (route) => { @@ -122,6 +124,15 @@ const render = (route) => {
122 }); 124 });
123 } 125 }
124 res.setHeader('X-YOHO-Version', pkg.version); 126 res.setHeader('X-YOHO-Version', pkg.version);
  127 +
  128 + if (req.query && req.query.SRC_ID) {
  129 + res.cookie('SRC_ID', req.query.SRC_ID, {
  130 + domain: 'yohobuy.com',
  131 + path: '/',
  132 + maxAge: ThreeDays
  133 + });
  134 + }
  135 +
125 const isDegrade = _.get(req.app.locals.wap, 'webapp.degrade', false); 136 const isDegrade = _.get(req.app.locals.wap, 'webapp.degrade', false);
126 137
127 logger.info(`${req.yoho.clientIp} | ${req.url} | uid:${req.user.uid} | ua:${req.get('user-agent')} | ${new Date()}`); 138 logger.info(`${req.yoho.clientIp} | ${req.url} | uid:${req.user.uid} | ua:${req.get('user-agent')} | ${new Date()}`);
@@ -173,7 +184,6 @@ const render = (route) => { @@ -173,7 +184,6 @@ const render = (route) => {
173 routeHash: routeEncode.getRouter(req) 184 routeHash: routeEncode.getRouter(req)
174 }); 185 });
175 186
176 -  
177 if (config.useCache && route.cache && ck) { 187 if (config.useCache && route.cache && ck) {
178 redis.setex(ck, route.cacheTime || 60, result); 188 redis.setex(ck, route.cacheTime || 60, result);
179 } 189 }
@@ -207,6 +217,15 @@ const devRender = (route) => { @@ -207,6 +217,15 @@ const devRender = (route) => {
207 } 217 }
208 res.setHeader('X-YOHO-Cached', 'MISS'); 218 res.setHeader('X-YOHO-Cached', 'MISS');
209 } 219 }
  220 +
  221 + if (req.query && req.query.SRC_ID) {
  222 + res.cookie('SRC_ID', req.query.SRC_ID, {
  223 + domain: 'yohobuy.com',
  224 + path: '/',
  225 + maxAge: ThreeDays
  226 + });
  227 + }
  228 +
210 let context = getContext(req); 229 let context = getContext(req);
211 230
212 process.send({action: 'ssr_request', context}); 231 process.send({action: 'ssr_request', context});
@@ -48,11 +48,9 @@ @@ -48,11 +48,9 @@
48 "fastclick": "^1.0.6", 48 "fastclick": "^1.0.6",
49 "handlebars": "^4.1.1", 49 "handlebars": "^4.1.1",
50 "jest": "^24.8.0", 50 "jest": "^24.8.0",
51 - "knex": "^0.16.3",  
52 "lodash": "^4.17.11", 51 "lodash": "^4.17.11",
53 "lottie-web": "^5.4.2", 52 "lottie-web": "^5.4.2",
54 "moment": "^2.24.0", 53 "moment": "^2.24.0",
55 - "mysql": "^2.16.0",  
56 "nodemon": "^1.19.1", 54 "nodemon": "^1.19.1",
57 "passport": "^0.4.0", 55 "passport": "^0.4.0",
58 "passport-oauth": "^1.0.0", 56 "passport-oauth": "^1.0.0",
@@ -645,14 +645,6 @@ @@ -645,14 +645,6 @@
645 "@babel/helper-regex" "^7.0.0" 645 "@babel/helper-regex" "^7.0.0"
646 regexpu-core "^4.1.3" 646 regexpu-core "^4.1.3"
647 647
648 -"@babel/polyfill@^7.0.0":  
649 - version "7.2.5"  
650 - resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.2.5.tgz#6c54b964f71ad27edddc567d065e57e87ed7fa7d"  
651 - integrity sha1-bFS5ZPca0n7d3FZ9Bl5X6H7X+n0=  
652 - dependencies:  
653 - core-js "^2.5.7"  
654 - regenerator-runtime "^0.12.0"  
655 -  
656 "@babel/preset-env@^7.2.0": 648 "@babel/preset-env@^7.2.0":
657 version "7.2.3" 649 version "7.2.3"
658 resolved "http://npm.yohops.com/@babel%2fpreset-env/-/preset-env-7.2.3.tgz#948c8df4d4609c99c7e0130169f052ea6a7a8933" 650 resolved "http://npm.yohops.com/@babel%2fpreset-env/-/preset-env-7.2.3.tgz#948c8df4d4609c99c7e0130169f052ea6a7a8933"
@@ -1034,11 +1026,6 @@ @@ -1034,11 +1026,6 @@
1034 dependencies: 1026 dependencies:
1035 "@babel/types" "^7.3.0" 1027 "@babel/types" "^7.3.0"
1036 1028
1037 -"@types/bluebird@^3.5.25":  
1038 - version "3.5.26"  
1039 - resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.26.tgz#a38c438ae84fa02431d6892edf86e46edcbca291"  
1040 - integrity sha1-o4xDiuhPoCQx1oku34bkbty8opE=  
1041 -  
1042 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": 1029 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
1043 version "2.0.1" 1030 version "2.0.1"
1044 resolved "http://r.cnpmjs.org/@types/istanbul-lib-coverage/download/@types/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" 1031 resolved "http://r.cnpmjs.org/@types/istanbul-lib-coverage/download/@types/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -1487,11 +1474,6 @@ arr-union@^3.1.0: @@ -1487,11 +1474,6 @@ arr-union@^3.1.0:
1487 resolved "http://npm.yohops.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" 1474 resolved "http://npm.yohops.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
1488 integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= 1475 integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
1489 1476
1490 -array-each@^1.0.1:  
1491 - version "1.0.1"  
1492 - resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"  
1493 - integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=  
1494 -  
1495 array-equal@^1.0.0: 1477 array-equal@^1.0.0:
1496 version "1.0.0" 1478 version "1.0.0"
1497 resolved "http://r.cnpmjs.org/array-equal/download/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" 1479 resolved "http://r.cnpmjs.org/array-equal/download/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
@@ -1512,11 +1494,6 @@ array-flatten@^2.1.0: @@ -1512,11 +1494,6 @@ array-flatten@^2.1.0:
1512 resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" 1494 resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
1513 integrity sha1-JO+AoowaiTYX4hSbDG0NeIKTsJk= 1495 integrity sha1-JO+AoowaiTYX4hSbDG0NeIKTsJk=
1514 1496
1515 -array-slice@^1.0.0:  
1516 - version "1.1.0"  
1517 - resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"  
1518 - integrity sha1-42jqFfibxwaff/uJrsOmx9SsItQ=  
1519 -  
1520 array-union@^1.0.1: 1497 array-union@^1.0.1:
1521 version "1.0.2" 1498 version "1.0.2"
1522 resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" 1499 resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -1918,11 +1895,6 @@ big.js@^3.1.3: @@ -1918,11 +1895,6 @@ big.js@^3.1.3:
1918 resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" 1895 resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
1919 integrity sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4= 1896 integrity sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4=
1920 1897
1921 -bignumber.js@4.1.0:  
1922 - version "4.1.0"  
1923 - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1"  
1924 - integrity sha1-228UBnwUC9RmJIFaeRbJLZtsJLE=  
1925 -  
1926 bignumber.js@^7.0.0: 1898 bignumber.js@^7.0.0:
1927 version "7.2.1" 1899 version "7.2.1"
1928 resolved "http://npm.yohops.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f" 1900 resolved "http://npm.yohops.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f"
@@ -1945,7 +1917,7 @@ bluebird@^3.1.1: @@ -1945,7 +1917,7 @@ bluebird@^3.1.1:
1945 resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f" 1917 resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
1946 integrity sha1-qNCv1zJR7/u9X+OEp31zADwXpx8= 1918 integrity sha1-qNCv1zJR7/u9X+OEp31zADwXpx8=
1947 1919
1948 -bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3: 1920 +bluebird@^3.5.0, bluebird@^3.5.1:
1949 version "3.5.3" 1921 version "3.5.3"
1950 resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" 1922 resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
1951 integrity sha1-fQHG+WFsmlGrD4xUmnnf5uwz76c= 1923 integrity sha1-fQHG+WFsmlGrD4xUmnnf5uwz76c=
@@ -2385,15 +2357,6 @@ ccount@^1.0.0: @@ -2385,15 +2357,6 @@ ccount@^1.0.0:
2385 resolved "http://npm.yohops.com/ccount/-/ccount-1.0.3.tgz#f1cec43f332e2ea5a569fd46f9f5bde4e6102aff" 2357 resolved "http://npm.yohops.com/ccount/-/ccount-1.0.3.tgz#f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"
2386 integrity sha1-8c7EPzMuLqWlaf1G+fW95OYQKv8= 2358 integrity sha1-8c7EPzMuLqWlaf1G+fW95OYQKv8=
2387 2359
2388 -chalk@2.4.1, chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1:  
2389 - version "2.4.1"  
2390 - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"  
2391 - integrity sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=  
2392 - dependencies:  
2393 - ansi-styles "^3.2.1"  
2394 - escape-string-regexp "^1.0.5"  
2395 - supports-color "^5.3.0"  
2396 -  
2397 chalk@^1.1.1, chalk@^1.1.3: 2360 chalk@^1.1.1, chalk@^1.1.3:
2398 version "1.1.3" 2361 version "1.1.3"
2399 resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" 2362 resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -2405,6 +2368,15 @@ chalk@^1.1.1, chalk@^1.1.3: @@ -2405,6 +2368,15 @@ chalk@^1.1.1, chalk@^1.1.3:
2405 strip-ansi "^3.0.0" 2368 strip-ansi "^3.0.0"
2406 supports-color "^2.0.0" 2369 supports-color "^2.0.0"
2407 2370
  2371 +chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1:
  2372 + version "2.4.1"
  2373 + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
  2374 + integrity sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=
  2375 + dependencies:
  2376 + ansi-styles "^3.2.1"
  2377 + escape-string-regexp "^1.0.5"
  2378 + supports-color "^5.3.0"
  2379 +
2408 chalk@^2.0.1: 2380 chalk@^2.0.1:
2409 version "2.3.1" 2381 version "2.3.1"
2410 resolved "http://npm.yohops.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796" 2382 resolved "http://npm.yohops.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
@@ -2731,7 +2703,7 @@ commander@2.20.0: @@ -2731,7 +2703,7 @@ commander@2.20.0:
2731 resolved "http://npm.yohops.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" 2703 resolved "http://npm.yohops.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
2732 integrity sha1-1YuytcHuj4ew00ACfp6U4iLFpCI= 2704 integrity sha1-1YuytcHuj4ew00ACfp6U4iLFpCI=
2733 2705
2734 -commander@^2.18.0, commander@^2.19.0: 2706 +commander@^2.18.0:
2735 version "2.19.0" 2707 version "2.19.0"
2736 resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" 2708 resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
2737 integrity sha1-9hmKqE5bg8RgVLlN3tv+1e6f8So= 2709 integrity sha1-9hmKqE5bg8RgVLlN3tv+1e6f8So=
@@ -3193,7 +3165,7 @@ de-indent@^1.0.2: @@ -3193,7 +3165,7 @@ de-indent@^1.0.2:
3193 resolved "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" 3165 resolved "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
3194 integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= 3166 integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
3195 3167
3196 -debug@*, debug@4.1.0, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0: 3168 +debug@*, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0:
3197 version "4.1.0" 3169 version "4.1.0"
3198 resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87" 3170 resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
3199 integrity sha1-NzaHv/pnizixzZH4YbY4UANd3Ic= 3171 integrity sha1-NzaHv/pnizixzZH4YbY4UANd3Ic=
@@ -3364,11 +3336,6 @@ destroy@^1.0.4, destroy@~1.0.4: @@ -3364,11 +3336,6 @@ destroy@^1.0.4, destroy@~1.0.4:
3364 resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" 3336 resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
3365 integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= 3337 integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
3366 3338
3367 -detect-file@^1.0.0:  
3368 - version "1.0.0"  
3369 - resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"  
3370 - integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=  
3371 -  
3372 detect-libc@^1.0.2: 3339 detect-libc@^1.0.2:
3373 version "1.0.3" 3340 version "1.0.3"
3374 resolved "http://npm.yohops.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" 3341 resolved "http://npm.yohops.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
@@ -4301,32 +4268,6 @@ find-up@^4.0.0: @@ -4301,32 +4268,6 @@ find-up@^4.0.0:
4301 locate-path "^5.0.0" 4268 locate-path "^5.0.0"
4302 path-exists "^4.0.0" 4269 path-exists "^4.0.0"
4303 4270
4304 -findup-sync@^2.0.0:  
4305 - version "2.0.0"  
4306 - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"  
4307 - integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=  
4308 - dependencies:  
4309 - detect-file "^1.0.0"  
4310 - is-glob "^3.1.0"  
4311 - micromatch "^3.0.4"  
4312 - resolve-dir "^1.0.1"  
4313 -  
4314 -fined@^1.0.1:  
4315 - version "1.1.1"  
4316 - resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.1.tgz#95d88ff329123dd1a6950fdfcd321f746271e01f"  
4317 - integrity sha1-ldiP8ykSPdGmlQ/fzTIfdGJx4B8=  
4318 - dependencies:  
4319 - expand-tilde "^2.0.2"  
4320 - is-plain-object "^2.0.3"  
4321 - object.defaults "^1.1.0"  
4322 - object.pick "^1.2.0"  
4323 - parse-filepath "^1.0.1"  
4324 -  
4325 -flagged-respawn@^1.0.0:  
4326 - version "1.0.1"  
4327 - resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"  
4328 - integrity sha1-595vEnnd2cqarIpZcdYYYGs6q0E=  
4329 -  
4330 flat-cache@^1.2.1: 4271 flat-cache@^1.2.1:
4331 version "1.3.4" 4272 version "1.3.4"
4332 resolved "http://npm.yohops.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f" 4273 resolved "http://npm.yohops.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
@@ -5375,14 +5316,6 @@ ipaddr.js@^1.5.2: @@ -5375,14 +5316,6 @@ ipaddr.js@^1.5.2:
5375 resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427" 5316 resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
5376 integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc= 5317 integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
5377 5318
5378 -is-absolute@^1.0.0:  
5379 - version "1.0.0"  
5380 - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"  
5381 - integrity sha1-OV4a6EsR8mrReV5zwXN45IowFXY=  
5382 - dependencies:  
5383 - is-relative "^1.0.0"  
5384 - is-windows "^1.0.1"  
5385 -  
5386 is-accessor-descriptor@^0.1.6: 5319 is-accessor-descriptor@^0.1.6:
5387 version "0.1.6" 5320 version "0.1.6"
5388 resolved "http://npm.yohops.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" 5321 resolved "http://npm.yohops.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -5694,13 +5627,6 @@ is-regexp@^1.0.0: @@ -5694,13 +5627,6 @@ is-regexp@^1.0.0:
5694 resolved "http://npm.yohops.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" 5627 resolved "http://npm.yohops.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
5695 integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= 5628 integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
5696 5629
5697 -is-relative@^1.0.0:  
5698 - version "1.0.0"  
5699 - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"  
5700 - integrity sha1-obtpNc6MXboei5dUubLcwCDiJg0=  
5701 - dependencies:  
5702 - is-unc-path "^1.0.0"  
5703 -  
5704 is-retry-allowed@^1.0.0: 5630 is-retry-allowed@^1.0.0:
5705 version "1.1.0" 5631 version "1.1.0"
5706 resolved "http://npm.yohops.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" 5632 resolved "http://npm.yohops.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
@@ -5728,13 +5654,6 @@ is-typedarray@~1.0.0: @@ -5728,13 +5654,6 @@ is-typedarray@~1.0.0:
5728 resolved "http://npm.yohops.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" 5654 resolved "http://npm.yohops.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
5729 integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= 5655 integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
5730 5656
5731 -is-unc-path@^1.0.0:  
5732 - version "1.0.0"  
5733 - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"  
5734 - integrity sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=  
5735 - dependencies:  
5736 - unc-path-regex "^0.1.2"  
5737 -  
5738 is-utf8@^0.2.0: 5657 is-utf8@^0.2.0:
5739 version "0.2.1" 5658 version "0.2.1"
5740 resolved "http://npm.yohops.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" 5659 resolved "http://npm.yohops.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
@@ -6382,29 +6301,6 @@ kleur@^3.0.2: @@ -6382,29 +6301,6 @@ kleur@^3.0.2:
6382 resolved "http://r.cnpmjs.org/kleur/download/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" 6301 resolved "http://r.cnpmjs.org/kleur/download/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
6383 integrity sha1-p5yezIbuHOP6YgbRIWxQHxR/wH4= 6302 integrity sha1-p5yezIbuHOP6YgbRIWxQHxR/wH4=
6384 6303
6385 -knex@^0.16.3:  
6386 - version "0.16.3"  
6387 - resolved "https://registry.yarnpkg.com/knex/-/knex-0.16.3.tgz#ca9effd4973655f42b42132b9019b0bc6bd20644"  
6388 - integrity sha1-yp7/1Jc2VfQrQhMrkBmwvGvSBkQ=  
6389 - dependencies:  
6390 - "@babel/polyfill" "^7.0.0"  
6391 - "@types/bluebird" "^3.5.25"  
6392 - bluebird "^3.5.3"  
6393 - chalk "2.4.1"  
6394 - commander "^2.19.0"  
6395 - debug "4.1.0"  
6396 - inherits "~2.0.3"  
6397 - interpret "^1.1.0"  
6398 - liftoff "2.5.0"  
6399 - lodash "^4.17.11"  
6400 - minimist "1.2.0"  
6401 - mkdirp "^0.5.1"  
6402 - pg-connection-string "2.0.0"  
6403 - tarn "^1.1.4"  
6404 - tildify "1.2.0"  
6405 - uuid "^3.3.2"  
6406 - v8flags "^3.1.1"  
6407 -  
6408 known-css-properties@^0.10.0: 6304 known-css-properties@^0.10.0:
6409 version "0.10.0" 6305 version "0.10.0"
6410 resolved "http://npm.yohops.com/known-css-properties/-/known-css-properties-0.10.0.tgz#8378a8921e6c815ecc47095744a8900af63d577d" 6306 resolved "http://npm.yohops.com/known-css-properties/-/known-css-properties-0.10.0.tgz#8378a8921e6c815ecc47095744a8900af63d577d"
@@ -6463,20 +6359,6 @@ levn@^0.3.0, levn@~0.3.0: @@ -6463,20 +6359,6 @@ levn@^0.3.0, levn@~0.3.0:
6463 prelude-ls "~1.1.2" 6359 prelude-ls "~1.1.2"
6464 type-check "~0.3.2" 6360 type-check "~0.3.2"
6465 6361
6466 -liftoff@2.5.0:  
6467 - version "2.5.0"  
6468 - resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"  
6469 - integrity sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=  
6470 - dependencies:  
6471 - extend "^3.0.0"  
6472 - findup-sync "^2.0.0"  
6473 - fined "^1.0.1"  
6474 - flagged-respawn "^1.0.0"  
6475 - is-plain-object "^2.0.4"  
6476 - object.map "^1.0.0"  
6477 - rechoir "^0.6.2"  
6478 - resolve "^1.1.7"  
6479 -  
6480 load-json-file@^1.0.0: 6362 load-json-file@^1.0.0:
6481 version "1.1.0" 6363 version "1.1.0"
6482 resolved "http://npm.yohops.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" 6364 resolved "http://npm.yohops.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -6769,13 +6651,6 @@ make-dir@^3.0.0: @@ -6769,13 +6651,6 @@ make-dir@^3.0.0:
6769 dependencies: 6651 dependencies:
6770 semver "^6.0.0" 6652 semver "^6.0.0"
6771 6653
6772 -make-iterator@^1.0.0:  
6773 - version "1.0.1"  
6774 - resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"  
6775 - integrity sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=  
6776 - dependencies:  
6777 - kind-of "^6.0.2"  
6778 -  
6779 makeerror@1.0.x: 6654 makeerror@1.0.x:
6780 version "1.0.11" 6655 version "1.0.11"
6781 resolved "http://r.cnpmjs.org/makeerror/download/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" 6656 resolved "http://r.cnpmjs.org/makeerror/download/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -6795,7 +6670,7 @@ map-age-cleaner@^0.1.1: @@ -6795,7 +6670,7 @@ map-age-cleaner@^0.1.1:
6795 dependencies: 6670 dependencies:
6796 p-defer "^1.0.0" 6671 p-defer "^1.0.0"
6797 6672
6798 -map-cache@^0.2.0, map-cache@^0.2.2: 6673 +map-cache@^0.2.2:
6799 version "0.2.2" 6674 version "0.2.2"
6800 resolved "http://npm.yohops.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" 6675 resolved "http://npm.yohops.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
6801 integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= 6676 integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
@@ -6944,7 +6819,7 @@ methods@~1.1.2: @@ -6944,7 +6819,7 @@ methods@~1.1.2:
6944 resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" 6819 resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
6945 integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= 6820 integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
6946 6821
6947 -micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.8, micromatch@^3.1.9: 6822 +micromatch@^3.1.10, micromatch@^3.1.8, micromatch@^3.1.9:
6948 version "3.1.10" 6823 version "3.1.10"
6949 resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" 6824 resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
6950 integrity sha1-cIWbyVyYQJUvNZoGij/En57PrCM= 6825 integrity sha1-cIWbyVyYQJUvNZoGij/En57PrCM=
@@ -7078,7 +6953,7 @@ minimist@1.1.x: @@ -7078,7 +6953,7 @@ minimist@1.1.x:
7078 resolved "http://npm.yohops.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8" 6953 resolved "http://npm.yohops.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
7079 integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag= 6954 integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
7080 6955
7081 -minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: 6956 +minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
7082 version "1.2.0" 6957 version "1.2.0"
7083 resolved "http://npm.yohops.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" 6958 resolved "http://npm.yohops.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
7084 integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= 6959 integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -7264,16 +7139,6 @@ mux.js@5.2.1: @@ -7264,16 +7139,6 @@ mux.js@5.2.1:
7264 resolved "http://npm.yohops.com/mux.js/-/mux.js-5.2.1.tgz#6698761fc88da5acecea0758ac25f11d3a08bee8" 7139 resolved "http://npm.yohops.com/mux.js/-/mux.js-5.2.1.tgz#6698761fc88da5acecea0758ac25f11d3a08bee8"
7265 integrity sha1-Zph2H8iNpazs6gdYrCXxHToIvug= 7140 integrity sha1-Zph2H8iNpazs6gdYrCXxHToIvug=
7266 7141
7267 -mysql@^2.16.0:  
7268 - version "2.16.0"  
7269 - resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.16.0.tgz#b23b22ab5de44fc2d5d32bd4f5af6653fc45e2ba"  
7270 - integrity sha1-sjsiq13kT8LV0yvU9a9mU/xF4ro=  
7271 - dependencies:  
7272 - bignumber.js "4.1.0"  
7273 - readable-stream "2.3.6"  
7274 - safe-buffer "5.1.2"  
7275 - sqlstring "2.3.1"  
7276 -  
7277 nan@^2.10.0, nan@^2.9.2: 7142 nan@^2.10.0, nan@^2.9.2:
7278 version "2.11.1" 7143 version "2.11.1"
7279 resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766" 7144 resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
@@ -7658,16 +7523,6 @@ object-visit@^1.0.0: @@ -7658,16 +7523,6 @@ object-visit@^1.0.0:
7658 dependencies: 7523 dependencies:
7659 isobject "^3.0.0" 7524 isobject "^3.0.0"
7660 7525
7661 -object.defaults@^1.1.0:  
7662 - version "1.1.0"  
7663 - resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"  
7664 - integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=  
7665 - dependencies:  
7666 - array-each "^1.0.1"  
7667 - array-slice "^1.0.0"  
7668 - for-own "^1.0.0"  
7669 - isobject "^3.0.0"  
7670 -  
7671 object.entries@^1.1.0: 7526 object.entries@^1.1.0:
7672 version "1.1.0" 7527 version "1.1.0"
7673 resolved "http://npm.yohops.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519" 7528 resolved "http://npm.yohops.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"
@@ -7686,15 +7541,7 @@ object.getownpropertydescriptors@^2.0.3: @@ -7686,15 +7541,7 @@ object.getownpropertydescriptors@^2.0.3:
7686 define-properties "^1.1.2" 7541 define-properties "^1.1.2"
7687 es-abstract "^1.5.1" 7542 es-abstract "^1.5.1"
7688 7543
7689 -object.map@^1.0.0:  
7690 - version "1.0.1"  
7691 - resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"  
7692 - integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=  
7693 - dependencies:  
7694 - for-own "^1.0.0"  
7695 - make-iterator "^1.0.0"  
7696 -  
7697 -object.pick@^1.2.0, object.pick@^1.3.0: 7544 +object.pick@^1.3.0:
7698 version "1.3.0" 7545 version "1.3.0"
7699 resolved "http://npm.yohops.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" 7546 resolved "http://npm.yohops.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
7700 integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= 7547 integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
@@ -7975,15 +7822,6 @@ parse-entities@^1.0.2, parse-entities@^1.1.0: @@ -7975,15 +7822,6 @@ parse-entities@^1.0.2, parse-entities@^1.1.0:
7975 is-decimal "^1.0.0" 7822 is-decimal "^1.0.0"
7976 is-hexadecimal "^1.0.0" 7823 is-hexadecimal "^1.0.0"
7977 7824
7978 -parse-filepath@^1.0.1:  
7979 - version "1.0.2"  
7980 - resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"  
7981 - integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=  
7982 - dependencies:  
7983 - is-absolute "^1.0.0"  
7984 - map-cache "^0.2.0"  
7985 - path-root "^0.1.1"  
7986 -  
7987 parse-headers@^2.0.0: 7825 parse-headers@^2.0.0:
7988 version "2.0.2" 7826 version "2.0.2"
7989 resolved "http://npm.yohops.com/parse-headers/-/parse-headers-2.0.2.tgz#9545e8a4c1ae5eaea7d24992bca890281ed26e34" 7827 resolved "http://npm.yohops.com/parse-headers/-/parse-headers-2.0.2.tgz#9545e8a4c1ae5eaea7d24992bca890281ed26e34"
@@ -8120,18 +7958,6 @@ path-parse@^1.0.5, path-parse@^1.0.6: @@ -8120,18 +7958,6 @@ path-parse@^1.0.5, path-parse@^1.0.6:
8120 resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" 7958 resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
8121 integrity sha1-1i27VnlAXXLEc37FhgDp3c8G0kw= 7959 integrity sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=
8122 7960
8123 -path-root-regex@^0.1.0:  
8124 - version "0.1.2"  
8125 - resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"  
8126 - integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=  
8127 -  
8128 -path-root@^0.1.1:  
8129 - version "0.1.1"  
8130 - resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"  
8131 - integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=  
8132 - dependencies:  
8133 - path-root-regex "^0.1.0"  
8134 -  
8135 path-to-regexp@0.1.7: 7961 path-to-regexp@0.1.7:
8136 version "0.1.7" 7962 version "0.1.7"
8137 resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" 7963 resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -8186,11 +8012,6 @@ performance-now@^2.1.0: @@ -8186,11 +8012,6 @@ performance-now@^2.1.0:
8186 resolved "http://npm.yohops.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" 8012 resolved "http://npm.yohops.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
8187 integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= 8013 integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
8188 8014
8189 -pg-connection-string@2.0.0:  
8190 - version "2.0.0"  
8191 - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.0.0.tgz#3eefe5997e06d94821e4d502e42b6a1c73f8df82"  
8192 - integrity sha1-Pu/lmX4G2Ugh5NUC5CtqHHP434I=  
8193 -  
8194 pidusage@^1.1.6: 8015 pidusage@^1.1.6:
8195 version "1.2.0" 8016 version "1.2.0"
8196 resolved "http://npm.yohops.com/pidusage/-/pidusage-1.2.0.tgz#65ee96ace4e08a4cd3f9240996c85b367171ee92" 8017 resolved "http://npm.yohops.com/pidusage/-/pidusage-1.2.0.tgz#65ee96ace4e08a4cd3f9240996c85b367171ee92"
@@ -8800,7 +8621,7 @@ read-pkg@^4.0.1: @@ -8800,7 +8621,7 @@ read-pkg@^4.0.1:
8800 parse-json "^4.0.0" 8621 parse-json "^4.0.0"
8801 pify "^3.0.0" 8622 pify "^3.0.0"
8802 8623
8803 -"readable-stream@1 || 2", readable-stream@2.3.6, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: 8624 +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
8804 version "2.3.6" 8625 version "2.3.6"
8805 resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" 8626 resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
8806 integrity sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8= 8627 integrity sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=
@@ -9212,7 +9033,7 @@ resolve-cwd@^2.0.0: @@ -9212,7 +9033,7 @@ resolve-cwd@^2.0.0:
9212 dependencies: 9033 dependencies:
9213 resolve-from "^3.0.0" 9034 resolve-from "^3.0.0"
9214 9035
9215 -resolve-dir@^1.0.0, resolve-dir@^1.0.1: 9036 +resolve-dir@^1.0.0:
9216 version "1.0.1" 9037 version "1.0.1"
9217 resolved "http://npm.yohops.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" 9038 resolved "http://npm.yohops.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
9218 integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= 9039 integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
@@ -9264,13 +9085,6 @@ resolve@^1.1.6, resolve@^1.8.1: @@ -9264,13 +9085,6 @@ resolve@^1.1.6, resolve@^1.8.1:
9264 dependencies: 9085 dependencies:
9265 path-parse "^1.0.6" 9086 path-parse "^1.0.6"
9266 9087
9267 -resolve@^1.1.7:  
9268 - version "1.10.0"  
9269 - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"  
9270 - integrity sha1-O9qur0XMB/N1ZW39LlTtCBCxAbo=  
9271 - dependencies:  
9272 - path-parse "^1.0.6"  
9273 -  
9274 resolve@^1.2.0: 9088 resolve@^1.2.0:
9275 version "1.12.0" 9089 version "1.12.0"
9276 resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" 9090 resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
@@ -9931,11 +9745,6 @@ sprintf-js@~1.0.2: @@ -9931,11 +9745,6 @@ sprintf-js@~1.0.2:
9931 resolved "http://npm.yohops.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" 9745 resolved "http://npm.yohops.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
9932 integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= 9746 integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
9933 9747
9934 -sqlstring@2.3.1:  
9935 - version "2.3.1"  
9936 - resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz#475393ff9e91479aea62dcaf0ca3d14983a7fb40"  
9937 - integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=  
9938 -  
9939 sshpk@^1.7.0: 9748 sshpk@^1.7.0:
9940 version "1.15.2" 9749 version "1.15.2"
9941 resolved "http://npm.yohops.com/sshpk/-/sshpk-1.15.2.tgz#c946d6bd9b1a39d0e8635763f5242d6ed6dcb629" 9750 resolved "http://npm.yohops.com/sshpk/-/sshpk-1.15.2.tgz#c946d6bd9b1a39d0e8635763f5242d6ed6dcb629"
@@ -10404,11 +10213,6 @@ tar@^4: @@ -10404,11 +10213,6 @@ tar@^4:
10404 safe-buffer "^5.1.2" 10213 safe-buffer "^5.1.2"
10405 yallist "^3.0.2" 10214 yallist "^3.0.2"
10406 10215
10407 -tarn@^1.1.4:  
10408 - version "1.1.4"  
10409 - resolved "https://registry.yarnpkg.com/tarn/-/tarn-1.1.4.tgz#aeeb85964b1afa0bbf381359c1167df237c27b6a"  
10410 - integrity sha1-ruuFlksa+gu/OBNZwRZ98jfCe2o=  
10411 -  
10412 term-size@^1.2.0: 10216 term-size@^1.2.0:
10413 version "1.2.0" 10217 version "1.2.0"
10414 resolved "http://npm.yohops.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" 10218 resolved "http://npm.yohops.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -10482,13 +10286,6 @@ thunky@^1.0.2: @@ -10482,13 +10286,6 @@ thunky@^1.0.2:
10482 resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826" 10286 resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
10483 integrity sha1-9d9zJFNAewkZHa5z4qjMc/OBqCY= 10287 integrity sha1-9d9zJFNAewkZHa5z4qjMc/OBqCY=
10484 10288
10485 -tildify@1.2.0:  
10486 - version "1.2.0"  
10487 - resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"  
10488 - integrity sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=  
10489 - dependencies:  
10490 - os-homedir "^1.0.0"  
10491 -  
10492 timed-out@^4.0.0: 10289 timed-out@^4.0.0:
10493 version "4.0.1" 10290 version "4.0.1"
10494 resolved "http://npm.yohops.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" 10291 resolved "http://npm.yohops.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
@@ -10761,11 +10558,6 @@ uid2@0.0.x: @@ -10761,11 +10558,6 @@ uid2@0.0.x:
10761 resolved "http://npm.yohops.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82" 10558 resolved "http://npm.yohops.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
10762 integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I= 10559 integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I=
10763 10560
10764 -unc-path-regex@^0.1.2:  
10765 - version "0.1.2"  
10766 - resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"  
10767 - integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=  
10768 -  
10769 undefsafe@^2.0.2: 10561 undefsafe@^2.0.2:
10770 version "2.0.2" 10562 version "2.0.2"
10771 resolved "http://npm.yohops.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76" 10563 resolved "http://npm.yohops.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76"
@@ -11088,13 +10880,6 @@ v8-compile-cache@^2.0.2: @@ -11088,13 +10880,6 @@ v8-compile-cache@^2.0.2:
11088 resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c" 10880 resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
11089 integrity sha1-pCiyi7JnkHNMT8i8n6EG/M6/amw= 10881 integrity sha1-pCiyi7JnkHNMT8i8n6EG/M6/amw=
11090 10882
11091 -v8flags@^3.1.1:  
11092 - version "3.1.2"  
11093 - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.2.tgz#fc5cd0c227428181e6c29b2992e4f8f1da5e0c9f"  
11094 - integrity sha1-/FzQwidCgYHmwpspkuT48dpeDJ8=  
11095 - dependencies:  
11096 - homedir-polyfill "^1.0.1"  
11097 -  
11098 validate-npm-package-license@^3.0.1: 10883 validate-npm-package-license@^3.0.1:
11099 version "3.0.4" 10884 version "3.0.4"
11100 resolved "http://npm.yohops.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" 10885 resolved "http://npm.yohops.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"