Authored by OF1706

merge

Showing 42 changed files with 470 additions and 192 deletions
... ... @@ -155,7 +155,7 @@ export default {
disabled={!params.row.operator[i].value}
placeholder="请输入..."
style={{width: '100%'}}
/>
/>
</div>
{(size.validate && !size.name) ? (
<div class={{'size-code-tip': true}}>
... ...
... ... @@ -112,8 +112,8 @@ export default {
balanceId: params.row.balanceId,
brandId: params.row.brandId,
status: {
'未结算': 1,
'已结算': 2
未结算: 1,
已结算: 2
}[params.row.statusDesc]
}
});
... ...
... ... @@ -39,6 +39,7 @@
</template>
<script>
import _ from 'lodash';
import detail from './store/detail';
import FinanceService from 'services/finance/finance-service';
... ... @@ -50,10 +51,6 @@ export default {
this.FinanceService = new FinanceService();
this.search();
},
mounted() {
},
computed: {
},
methods: {
filterValues() {
let params = {
... ... @@ -69,10 +66,26 @@ export default {
return _.pickBy(params, val => val);
},
search() {
let sumParams = {
balanceId: +this.filters.balanceId.model,
brandId: +this.filters.brandId.model,
orderCode: +this.filters.orderCode.model,
status: +this.filters.status.model,
productSku: +this.filters.sku.model
};
this.FinanceService.balanceDetail(this.filterValues()).then(ret => {
this.tableData = _.get(ret, 'data.records', []);
this.pageData.total = _.get(ret, 'data.totalCount', 0);
this.pageData.pageNo = _.get(ret, 'data.pageNo', 1);
this.FinanceService.balanceDetailSum(_.pickBy(sumParams, val => val)).then(result => {
this.tableData.push({
sellTypeDesc: '总计',
salesNums: result.data.sumNums,
clearingPrice: result.data.sumAmount
});
});
});
},
reset() {
... ...
... ... @@ -19,4 +19,4 @@ export default [{
meta: {
pageName: '对账单库存'
}
}];
\ No newline at end of file
}];
... ...
let date = new Date();
let agoMonthFirstDay = new Date(date.getFullYear(),date.getMonth()-1,1);
let agoMonthLastDay = new Date(date.getFullYear(),date.getMonth(),1);
let agoMonthFirstDay = new Date(date.getFullYear(), date.getMonth() - 1, 1);
let agoMonthLastDay = new Date(date.getFullYear(), date.getMonth(), 1);
export default {
filters: {
... ... @@ -43,4 +43,4 @@ export default {
]
}
}
}
\ No newline at end of file
};
... ...
... ... @@ -30,7 +30,7 @@ export default function() {
);
} else {
return '';
}
}
}
},
{
... ...
... ... @@ -93,7 +93,7 @@ export default function() {
labelSpan: 6,
model: [
new Date(+this.$route.query.begin * 1000),
new Date(moment(this.$route.query.begin * 1000).endOf('month').format("YYYY-MM-DD") + " 00:00:00")
new Date(moment(this.$route.query.begin * 1000).endOf('month').format('YYYY-MM-DD') + ' 00:00:00')
],
holder: '',
fieldSpan: 18
... ...
... ... @@ -54,10 +54,24 @@ export default {
return _.pickBy(params, val => val);
},
search() {
let sumParams = {
balanceId: +this.filters.balanceId.model,
brandId: +this.filters.brandId.model,
productSku: +this.filters.sku.model
};
this.FinanceService.settlementList(this.filterValues()).then(ret => {
this.tableData = _.get(ret, 'data.records', []);
this.pageData.total = _.get(ret, 'data.totalCount', 0);
this.pageData.pageNo = _.get(ret, 'data.pageNo', 1);
this.FinanceService.settlementListSum(_.pickBy(sumParams, val => val)).then(result => {
this.tableData.push({
agencyTypeDesc: '总计',
salesNums: result.data.sumNums,
salesAmount: result.data.sumAmount
});
});
});
},
reset() {
... ...
... ... @@ -102,7 +102,7 @@ export default {
balanceId: params.row.balanceId,
brandId: params.row.brandId,
supplierName: params.row.supplierName,
createTime: params.row.createTimeString
createTime: params.row.createTimeString
}
});
},
... ...
let date = new Date();
let agoMonthFirstDay = new Date(date.getFullYear(),date.getMonth()-1,1);
let agoMonthLastDay = new Date(date.getFullYear(),date.getMonth(),1);
let agoMonthFirstDay = new Date(date.getFullYear(), date.getMonth() - 1, 1);
let agoMonthLastDay = new Date(date.getFullYear(), date.getMonth(), 1);
export default {
filters: {
... ... @@ -26,4 +26,4 @@ export default {
fieldSpan: 18
}
}
}
\ No newline at end of file
};
... ...
... ... @@ -92,7 +92,7 @@ export default function() {
labelSpan: 6,
model: [
new Date(+this.$route.query.begin * 1000),
new Date(moment(this.$route.query.begin * 1000).endOf('month').format("YYYY-MM-DD") + " 00:00:00")
new Date(moment(this.$route.query.begin * 1000).endOf('month').format('YYYY-MM-DD') + ' 00:00:00')
],
holder: '',
fieldSpan: 18
... ...
... ... @@ -61,7 +61,7 @@
},
computed: {
date() {
return moment(this.$route.query.begin * 1000).format("YYYY-MM-DD 00:00:00") + '至' + moment(this.$route.query.begin * 1000).endOf('month').format("YYYY-MM-DD 00:00:00");
return moment(this.$route.query.begin * 1000).format('YYYY-MM-DD 00:00:00') + '至' + moment(this.$route.query.begin * 1000).endOf('month').format('YYYY-MM-DD 00:00:00');
},
supplierName() {
return this.$route.query.supplierName;
... ... @@ -96,7 +96,7 @@
supplier71Sell: _.sum(_.map(list, 'supplier71Sell')),
supplier100Sell: _.sum(_.map(list, 'supplier100Sell'))
});
});
});
}
}
};
... ... @@ -108,6 +108,7 @@ h2 {
border-bottom: 1px solid #f2f2f2;
margin-bottom: 10px;
}
.print-detail {
margin-bottom: 20px;
color: #333;
... ...
... ... @@ -86,7 +86,7 @@
},
computed: {
date() {
return moment(this.$route.query.createTime).startOf('month').format("YYYY-MM-DD");
return moment(this.$route.query.createTime).startOf('month').format('YYYY-MM-DD');
},
supplierName() {
return this.$route.query.supplierName;
... ... @@ -117,7 +117,7 @@
list1.push(item);
}
if(type2.indexOf(item.agencyTypeDesc) > -1) {
if (type2.indexOf(item.agencyTypeDesc) > -1) {
list2.push(item);
}
});
... ... @@ -161,10 +161,12 @@ h4 {
text-align: center;
font-weight: bold;
}
.print-detail {
margin-bottom: 20px;
color: #333;
}
p {
line-height: 20px;
}
... ...
... ... @@ -61,7 +61,7 @@
},
computed: {
date() {
return moment(this.$route.query.begin * 1000).format("YYYY-MM-DD 00:00:00") + '至' + moment(this.$route.query.begin * 1000).endOf('month').format("YYYY-MM-DD 00:00:00");
return moment(this.$route.query.begin * 1000).format('YYYY-MM-DD 00:00:00') + '至' + moment(this.$route.query.begin * 1000).endOf('month').format('YYYY-MM-DD 00:00:00');
},
supplierName() {
return this.$route.query.supplierName;
... ... @@ -96,7 +96,7 @@
supplier71Sell: _.sum(_.map(list, 'supplier71Sell')),
supplier100Sell: _.sum(_.map(list, 'supplier100Sell'))
});
});
});
}
}
};
... ... @@ -108,6 +108,7 @@ h2 {
border-bottom: 1px solid #f2f2f2;
margin-bottom: 10px;
}
.print-detail {
margin-bottom: 20px;
color: #333;
... ...
... ... @@ -91,7 +91,7 @@ export default {
this.search();
},
print() {
const href = `/finance/print/stock/printDetail.html`;
const href = '/finance/print/stock/printDetail.html';
window.open(href, '_blank');
}
... ...
... ... @@ -15,4 +15,4 @@ export default {
fieldSpan: 18
}
}
}
\ No newline at end of file
};
... ...
... ... @@ -3,8 +3,6 @@
* @author: wsl <shuiling.wang@yoho.cn>
* @date: 2017/07/13
*/
import moment from 'moment';
export default function() {
return {
tableCols: [
... ... @@ -87,6 +85,6 @@ export default function() {
pageNo: 1,
pageSize: 20
},
curDay: Math.round(new Date().getTime()/1000)
curDay: Math.round(new Date().getTime() / 1000)
};
}
... ...
... ... @@ -136,6 +136,7 @@ body {
background: #fff;
border-radius: 4px;
flex: auto;
position: relative;
}
.layout-copy {
... ...
... ... @@ -130,7 +130,7 @@
</Col>
</Row>
<Row v-for="attr in render.productStandardRelationStr" :key="attr">
<Row v-for="attr in model.productStandardRelationStr" :key="attr">
<Col span="8" v-if="attr.inputType === 'select'">
<Form-item :label="attr.attributeName">
<Select v-model="attr.model" :placeholder="'请选择' + attr.attributeName" :label-in-value="true">
... ... @@ -150,7 +150,7 @@
</Col>
</Row>
<Row v-for="attr in render.attributeProValuesOne" :key="attr">
<Row v-for="attr in model.attributeProValuesOne" :key="attr">
<Col span="8" v-if="attr.inputType === 'select'">
<Form-item :label="attr.attributeName">
<Select v-model="attr.model" :placeholder="'请选择' + attr.attributeName">
... ... @@ -170,7 +170,7 @@
</Col>
</Row>
<Row v-for="attr in render.attributeProValuesTwo" :key="attr">
<Row v-for="attr in model.attributeProValuesTwo" :key="attr">
<Col span="8" v-if="attr.inputType === 'select'">
<Form-item :label="attr.attributeName">
<Select v-model="attr.model" :placeholder="'请选择' + attr.attributeName">
... ... @@ -190,11 +190,11 @@
</Col>
</Row>
<Row v-if="render.productMaterial">
<Row v-if="model.productMaterial">
<Col>
<Form-item :label="render.productMaterial.attributeName">
<Checkbox-group v-model="render.productMaterial.model">
<Checkbox v-for="name in render.productMaterial.idNameList" :label="name.id" :key="name">
<Form-item :label="model.productMaterial.attributeName">
<Checkbox-group v-model="model.productMaterial.model">
<Checkbox v-for="name in model.productMaterial.idNameList" :label="name.id" :key="name">
<span>{{name.text}}</span>
</Checkbox>
</Checkbox-group>
... ... @@ -257,10 +257,10 @@ export default {
},
getAllAttr: function(smallSortId, maxSortId) {
return this.productCreateService.getAllAttr(smallSortId, maxSortId).then((result) => {
this.render.productStandardRelationStr = this.productCreateService.addNoneItem(result[0]);
this.render.attributeProValuesOne = this.productCreateService.addNoneItem(result[1]);
this.render.attributeProValuesTwo = this.productCreateService.addNoneItem(result[2]);
this.render.productMaterial = result[3];
this.model.productStandardRelationStr = this.productCreateService.addNoneItem(result[0]);
this.model.attributeProValuesOne = this.productCreateService.addNoneItem(result[1]);
this.model.attributeProValuesTwo = this.productCreateService.addNoneItem(result[2]);
this.model.productMaterial = result[3];
});
},
submit: function() {
... ... @@ -283,16 +283,16 @@ export default {
return result;
},
handleRelation: function() {
return this.productCreateService.handleRelation(this.render.productStandardRelationStr);
return this.productCreateService.handleRelation(this.model.productStandardRelationStr);
},
handleOne: function() {
return this.productCreateService.handleValue(this.product.productSkn, this.render.attributeProValuesOne);
return this.productCreateService.handleValue(this.product.productSkn, this.model.attributeProValuesOne);
},
handleTwo: function() {
return this.productCreateService.handleValue(this.product.productSkn, this.render.attributeProValuesTwo);
return this.productCreateService.handleValue(this.product.productSkn, this.model.attributeProValuesTwo);
},
handleMaterial: function() {
return this.render.productMaterial.model.join(',');
return this.model.productMaterial.model.join(',');
},
handleImage: function() {
return this.productCreateService.handleColorImage(this.product);
... ...
... ... @@ -5,7 +5,7 @@
export default function() {
return {
desc: '',
render: {
model: {
goodsImagesReqStr: [],
productStandardRelationStr: [],
attributeProValuesOne: [],
... ...
... ... @@ -87,7 +87,7 @@
<div class="create-item-title">商品属性
<span class="create-group-sub-title">(请认真选择所列的属性项,所填内容会对商品搜索、智能推荐等功能产生影响,从而影响商品曝光展示)</span>
</div>
<template v-for="(attrs, index) in [render.productStandardRelationStr, render.attributeProValuesOne, render.attributeProValuesTwo]">
<template v-for="(attrs, index) in [model.productStandardRelationStr, model.attributeProValuesOne, model.attributeProValuesTwo]">
<Form-item :label="attr.attributeName"
v-for="attr in attrs"
:key="attr">
... ... @@ -107,8 +107,8 @@
</template>
</Form-item>
</template>
<Form-item v-if="render.productMaterial" :label="render.productMaterial.attributeName">
<checkbox-material v-model="product.materialList" :idNameList="render.productMaterial.idNameList">
<Form-item v-if="model.productMaterial" :label="model.productMaterial.attributeName">
<checkbox-material v-model="product.materialList" :idNameList="model.productMaterial.idNameList">
</checkbox-material>
</Form-item>
<Form-item>
... ... @@ -225,7 +225,7 @@ export default {
let index = this.table.defaultSelectedSizes.findIndex((s) => s.id === size[0].id);
let tableIndex = (this.table.data[0] ? this.table.data[0].sizeId : [])
.findIndex((s) => s.id === size[0].id);
.findIndex((s) => s.id === size[0].id);
if (index !== -1 && tableIndex !== -1) {
this.table.defaultSelectedSizes.splice(index, 1);
... ... @@ -278,17 +278,17 @@ export default {
},
getAllAttr(smallSortId, maxSortId) {
return this.productCreateService.getAllAttr(smallSortId, maxSortId).then((result) => {
this.render.productStandardRelationStr = this.productCreateService.addNoneItem(result[0] || []);
this.render.attributeProValuesOne = this.productCreateService.addNoneItem(result[1]);
this.render.attributeProValuesTwo = this.productCreateService.addNoneItem(result[2]);
this.render.productMaterial = result[3];
this.model.productStandardRelationStr = this.productCreateService.addNoneItem(result[0] || []);
this.model.attributeProValuesOne = this.productCreateService.addNoneItem(result[1]);
this.model.attributeProValuesTwo = this.productCreateService.addNoneItem(result[2]);
this.model.productMaterial = result[3];
}).then(() => {
let relation = this.product.productStandardRelationBoList || [];
let one = this.product.attributeProValuesBosOne || [];
let two = this.product.attributeProValuesBosTwo || [];
relation.forEach((s) => {
let i = _.find(this.render.productStandardRelationStr, { attributeId: s.standardId });
let i = _.find(this.model.productStandardRelationStr, { attributeId: s.standardId });
if (i) {
i.model = [`${s.parameterMakeId}`];
... ... @@ -296,7 +296,7 @@ export default {
});
one.forEach((s) => {
let i = _.find(this.render.attributeProValuesOne, { attributeId: s.attributeId });
let i = _.find(this.model.attributeProValuesOne, { attributeId: s.attributeId });
if (i) {
i.model = s.attributeValueIds.map(id => `${id}`);
... ... @@ -304,7 +304,7 @@ export default {
});
two.forEach((s) => {
let i = _.find(this.render.attributeProValuesTwo, { attributeId: s.attributeId });
let i = _.find(this.model.attributeProValuesTwo, { attributeId: s.attributeId });
if (i) {
i.model = s.attributeValueIds.map(id => `${id}`);
... ... @@ -490,11 +490,11 @@ export default {
JSON.stringify(this.productCreateService.handleEditColorImage(this.product));
newProduct.productStandardRelationStr =
JSON.stringify(this.productCreateService.handleRelation(this.render.productStandardRelationStr));
JSON.stringify(this.productCreateService.handleRelation(this.model.productStandardRelationStr));
newProduct.attributeProValuesOne =
JSON.stringify(this.productCreateService.handleValue(this.product.productSkn, this.render.attributeProValuesOne));
JSON.stringify(this.productCreateService.handleValue(this.product.productSkn, this.model.attributeProValuesOne));
newProduct.attributeProValuesTwo =
JSON.stringify(this.productCreateService.handleValue(this.product.productSkn, this.render.attributeProValuesTwo));
JSON.stringify(this.productCreateService.handleValue(this.product.productSkn, this.model.attributeProValuesTwo));
newProduct.productMaterial = this.product.materialList.map(s => s.id).join(',');
newProduct.productIntro = this.product.productIntro;
... ...
... ... @@ -11,7 +11,7 @@ export default function() {
defaultSelectedColors: [],
},
desc: '',
render: {
model: {
goodsImagesReqStr: [],
productStandardRelationStr: [],
attributeProValuesOne: [],
... ...
... ... @@ -93,7 +93,7 @@
middleSortId: fts.sort.second.model,
smallSortId: fts.sort.third.model,
isPublished: fts.publishStatus.model === '' || fts.publishStatus.model === null ?
null : fts.publishStatus.model,
null : fts.publishStatus.model,
brandId: fts.brand.model ? fts.brand.model : null,
auditStatus: fts.verifyStatus.model ? fts.verifyStatus.model : null,
stock: fts.stockStatus.model === '' || fts.stockStatus.model === null ?
... ...
... ... @@ -132,19 +132,19 @@ export default function() {
<div>
<div class="cell-action-row">
<i-button type="primary" size="small"
onClick={() => this.editSize(row.productSkn)}>
onClick={() => this.editSize(row.productSkn)}>
尺码维护
</i-button>
</div>
<div class="cell-action-row">
<i-button type="primary" size="small"
onClick={() => this.editProduct(row.productSkn)}>
onClick={() => this.editProduct(row.productSkn)}>
内容编辑
</i-button>
</div>
<div class="cell-action-row">
<i-button type="error" size="small" disabled={disabled}
onClick={() => this.setOffSale(row.productSkn)}>
onClick={() => this.setOffSale(row.productSkn)}>
商品下架
</i-button>
</div>
... ...
... ... @@ -7,8 +7,8 @@ import CellInfo from 'components/cell/cell-info';
const vipDiscount = {
platinumCard: 0.88, // 白金:88折
goldCard: 0.9, // 金卡:9折
silverCard: 0.95 // 银卡:95折
goldCard: 0.9, // 金卡:9折
silverCard: 0.95 // 银卡:95折
};
export default function() {
... ...
<template>
<layout-body>
<iFrame :src="`${$config.shopsFeDomain}/storehouse/workorder/index`"></iFrame>
</layout-body>
</template>
... ...
... ... @@ -124,7 +124,7 @@ export default function() {
<div>
<div>
<i-progress percent={ percent }
hide-info={true}></i-progress>
hide-info={true}></i-progress>
</div>
<div>{ params.row.inStoreNum || 0} / {params.row.buyingNums || 0}</div>
</div>
... ...
... ... @@ -98,7 +98,7 @@ export default function() {
<div>
<div>
<i-progress percent={ percent }
hide-info={true}></i-progress>
hide-info={true}></i-progress>
</div>
<div>{ params.row.inStoreNum || 0} / {params.row.totalNum || 0}</div>
</div>
... ...
... ... @@ -93,10 +93,10 @@ let cols = function() {
}
} else {
let edit = (
<div>
<i-button type="error" size="small" onClick={() => this.update(params)}></i-button>
<i-input value={params.row.buyingNums} onInput={val => (params.row.buyingNums = val)} style="width:50px;"></i-input>
</div>
<div>
<i-button type="error" size="small" onClick={() => this.update(params)}></i-button>
<i-input value={params.row.buyingNums} onInput={val => (params.row.buyingNums = val)} style="width:50px;"></i-input>
</div>
);
let info = (
... ... @@ -223,7 +223,7 @@ let infoCols = function() {
return (
<div>
<div><i-progress percent={ percent }
hide-info={true}></i-progress></div>
hide-info={true}></i-progress></div>
<div>{ params.row.inStoreNum || 0} / {params.row.buyingNums || 0}</div>
</div>
);
... ...
... ... @@ -10,4 +10,3 @@ export default {
pageName: '销退入库'
}
};
... ...
<template>
<layout-body>
<iFrame :src="`${$config.shopsFeDomain}/report/importExportStock`"></iFrame>
</layout-body>
</template>
... ...
<template>
<layout-body>
<iFrame :src="`${$config.shopsFeDomain}/report/businessOverview`"></iFrame>
</layout-body>
</template>
... ...
<template>
<layout-body>
<iFrame :src="`${$config.shopsFeDomain}/report/businessSale`"></iFrame>
</layout-body>
</template>
... ...
<template>
<layout-body>
<iFrame :src="`${$config.shopsFeDomain}/report/stock`"></iFrame>
</layout-body>
</template>
... ...
... ... @@ -75,7 +75,7 @@ export default function() {
render: (h, params) => {
return (
<i-button type="primary"
onClick={() => this.goExpDetail(params.row.expressNumber)}>
onClick={() => this.goExpDetail(params.row.expressNumber)}>
查看明细
</i-button>
);
... ...
... ... @@ -5,7 +5,9 @@ let apiUrl = {
balanceDetail: '/erp/balanceDetail',
settlementList: '/erp/settlementList',
inventoryLedgerList: '/erp/inventoryLedgerList',
exportBalanceList: '/erp/exportBalanceList'
exportBalanceList: '/erp/exportBalanceList',
balanceDetailSum: '/erp/balanceDetailSum',
settlementListSum: '/erp/settlementListSum'
};
class FinanceService extends Service {
... ... @@ -29,5 +31,11 @@ class FinanceService extends Service {
inventoryLedgerList(params) {
return this.post(apiUrl.inventoryLedgerList, params);
}
balanceDetailSum(params) {
return this.post(apiUrl.balanceDetailSum, params);
}
settlementListSum(params) {
return this.post(apiUrl.settlementListSum, params);
}
}
export default FinanceService;
... ...
{
"name": "yoho-shop-manage",
"version": "1.0.20",
"version": "1.0.21",
"description": "",
"main": "app.js",
"scripts": {
... ... @@ -99,15 +99,15 @@
"clean-webpack-plugin": "^0.1.16",
"css-loader": "^0.26.1",
"escodegen": "^1.8.1",
"eslint": "^3.19.0",
"eslint-config-standard": "^6.2.1",
"eslint": "^4.3.0",
"eslint-config-standard": "^10.2.1",
"eslint-config-yoho": "^1.0.8",
"eslint-friendly-formatter": "^2.0.7",
"eslint-loader": "^1.6.1",
"eslint-plugin-html": "^2.0.1",
"eslint-plugin-promise": "^3.4.0",
"eslint-plugin-standard": "^2.0.1",
"eslint-plugin-vue": "^2.0.1",
"eslint-loader": "^1.9.0",
"eslint-plugin-html": "^3.1.1",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-standard": "^3.0.1",
"eslint-plugin-vue": "^2.1.0",
"eventsource-polyfill": "^0.9.6",
"extract-text-webpack-plugin": "^2.0.0",
"file-loader": "^0.10.0",
... ... @@ -124,11 +124,11 @@
"rimraf": "^2.6.1",
"sass-loader": "^6.0.3",
"style-loader": "^0.16.1",
"stylelint": "^7.10.1",
"stylelint-config-yoho": "^1.2.8",
"stylelint": "^8.0.0",
"stylelint-config-yoho": "^1.2.10",
"stylelint-formatter-table": "^1.0.3",
"stylelint-processor-html": "^1.0.0",
"stylelint-webpack-plugin": "^0.7.0",
"stylelint-webpack-plugin": "^0.9.0",
"url-loader": "^0.5.7",
"vue-style-loader": "^2.0.5",
"webpack": "^2.6.1",
... ...
... ... @@ -48,6 +48,8 @@ let domainApis = {
exportBalanceList: '/erp-shop-web/export/exportBalanceList',
exportSettlementDetail: '/erp-shop-web/export/exportSettlementDetail',
exportBalanceDetail: '/erp-shop-web/export/exportBalanceDetail',
balanceDetailSum: '/erp-shop-web/financeBill/balanceDetailSum',
settlementListSum: '/erp-shop-web/financeBill/settlementListSum',
defectGoodsList: '/erp-shop-web/defectGoods/list',
defectGoodsImg: '/erp-shop-web/defectGoods/detail'
},
... ...
... ... @@ -56,7 +56,8 @@ class Api extends Context {
}
_request(options) {
options = Object.assign(options, {
resolveWithFullResponse: true
resolveWithFullResponse: true,
timeout: 3000
});
return rp[options.method || 'get'](options).then(response => {
let jsonBody = JSON.parse(response.body);
... ...
... ... @@ -17,7 +17,8 @@ class UserController extends Context {
login(req, res, next) {
Promise.all([
this.userService.login(req.body.username, req.body.password),
this.userService.shopLogin(req.body.username, req.body.password)]).then(allResult => {
this.userService.shopLogin(req.body.username, req.body.password)])
.then(allResult => {
let user = allResult[0];
let sess = allResult[1];
... ...
... ... @@ -50,7 +50,7 @@ class UserService extends Context {
_.each(rawHeaders, header => {
let sessIdMatched = header.match(new RegExp(regSession.replace('${0}', 'PHPSESSID')));
let sidMatched = header.match(new RegExp(regSession.replace('${0}', 'connect\.sid')));
let sidMatched = header.match(new RegExp(regSession.replace('${0}', 'connect.sid')));
if (sessIdMatched) {
sessId = sessIdMatched[1];
... ...
... ... @@ -82,7 +82,7 @@ ajv@^4.7.0, ajv@^4.9.1:
co "^4.6.0"
json-stable-stringify "^1.0.1"
ajv@^5.0.0:
ajv@^5.0.0, ajv@^5.2.0:
version "5.2.0"
resolved "http://npm.yoho.cn/ajv/-/ajv-5.2.0.tgz#c1735024c5da2ef75cc190713073d44f098bf486"
dependencies:
... ... @@ -111,6 +111,10 @@ ansi-escapes@^1.1.0:
version "1.4.0"
resolved "http://npm.yoho.cn/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
ansi-escapes@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
ansi-html@0.0.7:
version "0.0.7"
resolved "http://npm.yoho.cn/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
... ... @@ -119,10 +123,20 @@ ansi-regex@^2.0.0:
version "2.1.1"
resolved "http://npm.yoho.cn/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
ansi-regex@^3.0.0:
version "3.0.0"
resolved "http://npm.yoho.cn/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
ansi-styles@^2.2.1:
version "2.2.1"
resolved "http://npm.yoho.cn/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
ansi-styles@^3.1.0:
version "3.2.0"
resolved "http://npm.yoho.cn/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
dependencies:
color-convert "^1.9.0"
anymatch@^1.3.0:
version "1.3.0"
resolved "http://npm.yoho.cn/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
... ... @@ -287,6 +301,17 @@ autoprefixer@^6.0.0, autoprefixer@^6.0.2, autoprefixer@^6.3.1, autoprefixer@^6.7
postcss "^5.2.16"
postcss-value-parser "^3.2.3"
autoprefixer@^7.1.2:
version "7.1.2"
resolved "http://npm.yoho.cn/autoprefixer/-/autoprefixer-7.1.2.tgz#fbeaf07d48fd878e0682bf7cbeeade728adb2b18"
dependencies:
browserslist "^2.1.5"
caniuse-lite "^1.0.30000697"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^6.0.6"
postcss-value-parser "^3.2.3"
aws-sign2@~0.6.0:
version "0.6.0"
resolved "http://npm.yoho.cn/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
... ... @@ -1082,7 +1107,7 @@ browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.3.6, browserslist@^1.5
caniuse-db "^1.0.30000639"
electron-to-chromium "^1.2.7"
browserslist@^2.1.2:
browserslist@^2.1.2, browserslist@^2.1.5:
version "2.1.5"
resolved "http://npm.yoho.cn/browserslist/-/browserslist-2.1.5.tgz#e882550df3d1cd6d481c1a3e0038f2baf13a4711"
dependencies:
... ... @@ -1149,7 +1174,7 @@ camelcase@^1.0.2, camelcase@^1.2.1:
version "1.2.1"
resolved "http://npm.yoho.cn/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
camelcase@^2.0.0, camelcase@^2.0.1:
camelcase@^2.0.0:
version "2.1.1"
resolved "http://npm.yoho.cn/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
... ... @@ -1178,6 +1203,10 @@ caniuse-lite@^1.0.30000684:
version "1.0.30000693"
resolved "http://npm.yoho.cn/caniuse-lite/-/caniuse-lite-1.0.30000693.tgz#c9c6298697c71fdf6cb13eefe8aa93926f2f8613"
caniuse-lite@^1.0.30000697:
version "1.0.30000708"
resolved "http://npm.yoho.cn/caniuse-lite/-/caniuse-lite-1.0.30000708.tgz#71dbf388c57f379b1bb66c89a890edc04c2509b6"
caseless@~0.12.0:
version "0.12.0"
resolved "http://npm.yoho.cn/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
... ... @@ -1205,6 +1234,14 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
chalk@^2.0.0, chalk@^2.0.1:
version "2.0.1"
resolved "http://npm.yoho.cn/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
dependencies:
ansi-styles "^3.1.0"
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"
charenc@~0.0.1:
version "0.0.2"
resolved "http://npm.yoho.cn/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
... ... @@ -1284,7 +1321,7 @@ cliui@^2.1.0:
right-align "^0.1.1"
wordwrap "0.0.2"
cliui@^3.0.3, cliui@^3.2.0:
cliui@^3.2.0:
version "3.2.0"
resolved "http://npm.yoho.cn/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
dependencies:
... ... @@ -1341,7 +1378,7 @@ collections@^3.0.0:
dependencies:
weak-map "~1.0.x"
color-convert@^1.3.0:
color-convert@^1.3.0, color-convert@^1.9.0:
version "1.9.0"
resolved "http://npm.yoho.cn/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
dependencies:
... ... @@ -1441,7 +1478,7 @@ concat-map@0.0.1:
version "0.0.1"
resolved "http://npm.yoho.cn/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
concat-stream@, concat-stream@^1.5.2:
concat-stream@, concat-stream@^1.5.2, concat-stream@^1.6.0:
version "1.6.0"
resolved "http://npm.yoho.cn/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
dependencies:
... ... @@ -1561,7 +1598,7 @@ core-util-is@~1.0.0:
version "1.0.2"
resolved "http://npm.yoho.cn/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
cosmiconfig@^2.1.0, cosmiconfig@^2.1.1, cosmiconfig@^2.1.3:
version "2.1.3"
resolved "http://npm.yoho.cn/cosmiconfig/-/cosmiconfig-2.1.3.tgz#952771eb0dddc1cb3fa2f6fbe51a522e93b3ee0a"
dependencies:
... ... @@ -1618,6 +1655,14 @@ cross-spawn@^3.0.0:
lru-cache "^4.0.1"
which "^1.2.9"
cross-spawn@^5.1.0:
version "5.1.0"
resolved "http://npm.yoho.cn/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
dependencies:
lru-cache "^4.0.1"
shebang-command "^1.2.0"
which "^1.2.9"
crypt@~0.0.1:
version "0.0.2"
resolved "http://npm.yoho.cn/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
... ... @@ -2187,9 +2232,9 @@ escope@^3.6.0:
esrecurse "^4.1.0"
estraverse "^4.1.1"
eslint-config-standard@^6.2.1:
version "6.2.1"
resolved "http://npm.yoho.cn/eslint-config-standard/-/eslint-config-standard-6.2.1.tgz#d3a68aafc7191639e7ee441e7348739026354292"
eslint-config-standard@^10.2.1:
version "10.2.1"
resolved "http://npm.yoho.cn/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591"
eslint-config-yoho@^1.0.8:
version "1.0.8"
... ... @@ -2204,9 +2249,9 @@ eslint-friendly-formatter@^2.0.7:
minimist "^1.2.0"
text-table "^0.2.0"
eslint-loader@^1.6.1:
version "1.8.0"
resolved "http://npm.yoho.cn/eslint-loader/-/eslint-loader-1.8.0.tgz#8261f08cca4bd2ea263b77733e93cf0f21e20aa9"
eslint-loader@^1.9.0:
version "1.9.0"
resolved "http://npm.yoho.cn/eslint-loader/-/eslint-loader-1.9.0.tgz#7e1be9feddca328d3dcfaef1ad49d5beffe83a13"
dependencies:
loader-fs-cache "^1.0.0"
loader-utils "^1.0.2"
... ... @@ -2214,19 +2259,13 @@ eslint-loader@^1.6.1:
object-hash "^1.1.4"
rimraf "^2.6.1"
eslint-plugin-html@^2.0.1:
version "2.0.3"
resolved "http://npm.yoho.cn/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz#7c89883ab0c85fa5d28b666a14a4e906aa90b897"
dependencies:
htmlparser2 "^3.8.2"
eslint-plugin-html@^3.0.0:
version "3.0.0"
resolved "http://npm.yoho.cn/eslint-plugin-html/-/eslint-plugin-html-3.0.0.tgz#2c982a71b9d965654f0f3a52358735821a1a4239"
eslint-plugin-html@^3.0.0, eslint-plugin-html@^3.1.1:
version "3.1.1"
resolved "http://npm.yoho.cn/eslint-plugin-html/-/eslint-plugin-html-3.1.1.tgz#d6c03796e89ac6b735da6fef9ca9162b423daee3"
dependencies:
htmlparser2 "^3.8.2"
eslint-plugin-promise@^3.4.0:
eslint-plugin-promise@^3.5.0:
version "3.5.0"
resolved "http://npm.yoho.cn/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"
... ... @@ -2238,17 +2277,24 @@ eslint-plugin-react@^7.0.0:
has "^1.0.1"
jsx-ast-utils "^1.4.1"
eslint-plugin-standard@^2.0.1:
version "2.3.1"
resolved "http://npm.yoho.cn/eslint-plugin-standard/-/eslint-plugin-standard-2.3.1.tgz#6765bd2a6d9ecdc7bdf1b145ae4bb30e2b7b86f8"
eslint-plugin-standard@^3.0.1:
version "3.0.1"
resolved "http://npm.yoho.cn/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2"
eslint-plugin-vue@^2.0.1:
eslint-plugin-vue@^2.1.0:
version "2.1.0"
resolved "http://npm.yoho.cn/eslint-plugin-vue/-/eslint-plugin-vue-2.1.0.tgz#50ed0b7e9a2389d90e689743a3cc26b502441b69"
dependencies:
eslint-plugin-html "^3.0.0"
eslint-plugin-react "^7.0.0"
eslint-scope@^3.7.1:
version "3.7.1"
resolved "http://npm.yoho.cn/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
dependencies:
esrecurse "^4.1.0"
estraverse "^4.1.1"
eslint@^3.19.0:
version "3.19.0"
resolved "http://npm.yoho.cn/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
... ... @@ -2289,7 +2335,48 @@ eslint@^3.19.0:
text-table "~0.2.0"
user-home "^2.0.0"
espree@^3.4.0:
eslint@^4.3.0:
version "4.3.0"
resolved "http://npm.yoho.cn/eslint/-/eslint-4.3.0.tgz#fcd7c96376bbf34c85ee67ed0012a299642b108f"
dependencies:
ajv "^5.2.0"
babel-code-frame "^6.22.0"
chalk "^1.1.3"
concat-stream "^1.6.0"
cross-spawn "^5.1.0"
debug "^2.6.8"
doctrine "^2.0.0"
eslint-scope "^3.7.1"
espree "^3.4.3"
esquery "^1.0.0"
estraverse "^4.2.0"
esutils "^2.0.2"
file-entry-cache "^2.0.0"
functional-red-black-tree "^1.0.1"
glob "^7.1.2"
globals "^9.17.0"
ignore "^3.3.3"
imurmurhash "^0.1.4"
inquirer "^3.0.6"
is-resolvable "^1.0.0"
js-yaml "^3.8.4"
json-stable-stringify "^1.0.1"
levn "^0.3.0"
lodash "^4.17.4"
minimatch "^3.0.2"
mkdirp "^0.5.1"
natural-compare "^1.4.0"
optionator "^0.8.2"
path-is-inside "^1.0.2"
pluralize "^4.0.0"
progress "^2.0.0"
require-uncached "^1.0.3"
semver "^5.3.0"
strip-json-comments "~2.0.1"
table "^4.0.1"
text-table "~0.2.0"
espree@^3.4.0, espree@^3.4.3:
version "3.4.3"
resolved "http://npm.yoho.cn/espree/-/espree-3.4.3.tgz#2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"
dependencies:
... ... @@ -2460,6 +2547,14 @@ extend@^3.0.0, extend@~3.0.0:
version "3.0.1"
resolved "http://npm.yoho.cn/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
external-editor@^2.0.4:
version "2.0.4"
resolved "http://npm.yoho.cn/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"
dependencies:
iconv-lite "^0.4.17"
jschardet "^1.4.2"
tmp "^0.0.31"
extglob@^0.3.1:
version "0.3.2"
resolved "http://npm.yoho.cn/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
... ... @@ -2520,6 +2615,12 @@ figures@^1.3.5:
escape-string-regexp "^1.0.5"
object-assign "^4.1.0"
figures@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
dependencies:
escape-string-regexp "^1.0.5"
file-entry-cache@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
... ... @@ -2693,6 +2794,10 @@ function-bind@^1.0.2:
version "1.1.0"
resolved "http://npm.yoho.cn/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
functional-red-black-tree@^1.0.1:
version "1.0.1"
resolved "http://npm.yoho.cn/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
gather-stream@^1.0.0:
version "1.0.0"
resolved "http://npm.yoho.cn/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b"
... ... @@ -2734,7 +2839,7 @@ get-stdin@^4.0.1:
version "4.0.1"
resolved "http://npm.yoho.cn/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
get-stdin@^5.0.0:
get-stdin@^5.0.0, get-stdin@^5.0.1:
version "5.0.1"
resolved "http://npm.yoho.cn/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
... ... @@ -2757,7 +2862,7 @@ glob-parent@^2.0.0:
dependencies:
is-glob "^2.0.0"
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@~7.1.1:
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.1:
version "7.1.2"
resolved "http://npm.yoho.cn/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
dependencies:
... ... @@ -2768,7 +2873,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@~7.1.1:
once "^1.3.0"
path-is-absolute "^1.0.0"
globals@^9.0.0, globals@^9.14.0:
globals@^9.0.0, globals@^9.14.0, globals@^9.17.0:
version "9.18.0"
resolved "http://npm.yoho.cn/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
... ... @@ -2873,6 +2978,10 @@ has-flag@^1.0.0:
version "1.0.0"
resolved "http://npm.yoho.cn/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
has-flag@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
has-unicode@^2.0.0:
version "2.0.1"
resolved "http://npm.yoho.cn/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
... ... @@ -2977,6 +3086,10 @@ html-tags@^1.1.1:
version "1.2.0"
resolved "http://npm.yoho.cn/html-tags/-/html-tags-1.2.0.tgz#c78de65b5663aa597989dd2b7ab49200d7e4db98"
html-tags@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
html-webpack-plugin@^2.28.0:
version "2.28.0"
resolved "http://npm.yoho.cn/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz#2e7863b57e5fd48fe263303e2ffc934c3064d009"
... ... @@ -3062,6 +3175,10 @@ iconv-lite@0.4.15:
version "0.4.15"
resolved "http://npm.yoho.cn/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
iconv-lite@^0.4.17:
version "0.4.18"
resolved "http://npm.yoho.cn/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
icss-replace-symbols@^1.1.0:
version "1.1.0"
resolved "http://npm.yoho.cn/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
... ... @@ -3080,7 +3197,7 @@ ignore-file-loader@^1.0.0:
dependencies:
loader-utils "~0.2.5"
ignore@^3.2.0:
ignore@^3.2.0, ignore@^3.3.3:
version "3.3.3"
resolved "http://npm.yoho.cn/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
... ... @@ -3147,6 +3264,25 @@ inquirer@^0.12.0:
strip-ansi "^3.0.0"
through "^2.3.6"
inquirer@^3.0.6:
version "3.2.1"
resolved "http://npm.yoho.cn/inquirer/-/inquirer-3.2.1.tgz#06ceb0f540f45ca548c17d6840959878265fa175"
dependencies:
ansi-escapes "^2.0.0"
chalk "^2.0.0"
cli-cursor "^2.1.0"
cli-width "^2.0.0"
external-editor "^2.0.4"
figures "^2.0.0"
lodash "^4.3.0"
mute-stream "0.0.7"
run-async "^2.2.0"
rx-lite "^4.0.8"
rx-lite-aggregates "^4.0.8"
string-width "^2.1.0"
strip-ansi "^4.0.0"
through "^2.3.6"
internal-ip@^1.2.0:
version "1.2.0"
resolved "http://npm.yoho.cn/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
... ... @@ -3322,7 +3458,7 @@ is-primitive@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
is-promise@^2.1:
is-promise@^2.1, is-promise@^2.1.0:
version "2.1.0"
resolved "http://npm.yoho.cn/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
... ... @@ -3440,7 +3576,7 @@ js-tokens@^3.0.0:
version "3.0.1"
resolved "http://npm.yoho.cn/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
js-yaml@^3.4.3, js-yaml@^3.5.1:
js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.8.4:
version "3.8.4"
resolved "http://npm.yoho.cn/js-yaml/-/js-yaml-3.8.4.tgz#520b4564f86573ba96662af85a8cafa7b4b5a6f6"
dependencies:
... ... @@ -3458,6 +3594,10 @@ jsbn@~0.1.0:
version "0.1.1"
resolved "http://npm.yoho.cn/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
jschardet@^1.4.2:
version "1.5.0"
resolved "http://npm.yoho.cn/jschardet/-/jschardet-1.5.0.tgz#a61f310306a5a71188e1b1acd08add3cfbb08b1e"
jsesc@^1.3.0:
version "1.3.0"
resolved "http://npm.yoho.cn/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
... ... @@ -3869,9 +4009,9 @@ math-expression-evaluator@^1.2.14:
version "1.2.17"
resolved "http://npm.yoho.cn/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
mathml-tag-names@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/mathml-tag-names/-/mathml-tag-names-2.0.0.tgz#eee615112a2b127e70f558d69c9ebe14076503d7"
mathml-tag-names@^2.0.0, mathml-tag-names@^2.0.1:
version "2.0.1"
resolved "http://npm.yoho.cn/mathml-tag-names/-/mathml-tag-names-2.0.1.tgz#8d41268168bf86d1102b98109e28e531e7a34578"
md5@^2.1.0:
version "2.2.1"
... ... @@ -4067,6 +4207,10 @@ mute-stream@0.0.5:
version "0.0.5"
resolved "http://npm.yoho.cn/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
mute-stream@0.0.7:
version "0.0.7"
resolved "http://npm.yoho.cn/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
nan@^2.3.0, nan@^2.3.2:
version "2.6.2"
resolved "http://npm.yoho.cn/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
... ... @@ -4416,7 +4560,7 @@ os-locale@^1.4.0:
dependencies:
lcid "^1.0.0"
os-tmpdir@^1.0.0, os-tmpdir@^1.0.1:
os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
version "1.0.2"
resolved "http://npm.yoho.cn/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
... ... @@ -4491,7 +4635,7 @@ path-is-absolute@^1.0.0:
version "1.0.1"
resolved "http://npm.yoho.cn/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
path-is-inside@^1.0.1:
path-is-inside@^1.0.1, path-is-inside@^1.0.2:
version "1.0.2"
resolved "http://npm.yoho.cn/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
... ... @@ -4659,6 +4803,12 @@ postcss-less@^0.14.0:
dependencies:
postcss "^5.0.21"
postcss-less@^1.1.0:
version "1.1.0"
resolved "http://npm.yoho.cn/postcss-less/-/postcss-less-1.1.0.tgz#bdcc76be64c4324d873fbc5cd9fa2e799e4305fa"
dependencies:
postcss "^5.2.16"
postcss-load-config@^1.1.0:
version "1.2.0"
resolved "http://npm.yoho.cn/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
... ... @@ -4682,7 +4832,7 @@ postcss-load-plugins@^2.3.0:
cosmiconfig "^2.1.1"
object-assign "^4.1.0"
postcss-media-query-parser@^0.2.0:
postcss-media-query-parser@^0.2.0, postcss-media-query-parser@^0.2.3:
version "0.2.3"
resolved "http://npm.yoho.cn/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
... ... @@ -4835,6 +4985,14 @@ postcss-reporter@^3.0.0:
log-symbols "^1.0.2"
postcss "^5.0.0"
postcss-reporter@^4.0.0:
version "4.0.0"
resolved "http://npm.yoho.cn/postcss-reporter/-/postcss-reporter-4.0.0.tgz#13356c365c36783adde88e28e09dbba6ec6c6501"
dependencies:
chalk "^1.0.0"
lodash "^4.1.0"
log-symbols "^1.0.2"
postcss-resolve-nested-selector@^0.1.1:
version "0.1.1"
resolved "http://npm.yoho.cn/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
... ... @@ -4851,7 +5009,13 @@ postcss-scss@^0.4.0:
dependencies:
postcss "^5.2.13"
postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1, postcss-selector-parser@^2.2.2:
postcss-scss@^1.0.2:
version "1.0.2"
resolved "http://npm.yoho.cn/postcss-scss/-/postcss-scss-1.0.2.tgz#ff45cf3354b879ee89a4eb68680f46ac9bb14f94"
dependencies:
postcss "^6.0.3"
postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1, postcss-selector-parser@^2.2.2, postcss-selector-parser@^2.2.3:
version "2.2.3"
resolved "http://npm.yoho.cn/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
dependencies:
... ... @@ -4897,13 +5061,13 @@ postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.
source-map "^0.5.6"
supports-color "^3.2.3"
postcss@^6.0.1:
version "6.0.2"
resolved "http://npm.yoho.cn/postcss/-/postcss-6.0.2.tgz#5c4fea589f0ac3b00caa75b1cbc3a284195b7e5d"
postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.3, postcss@^6.0.6:
version "6.0.8"
resolved "http://npm.yoho.cn/postcss/-/postcss-6.0.8.tgz#89067a9ce8b11f8a84cbc5117efc30419a0857b3"
dependencies:
chalk "^1.1.3"
chalk "^2.0.1"
source-map "^0.5.6"
supports-color "^3.2.3"
supports-color "^4.2.0"
prelude-ls@~1.1.2:
version "1.1.2"
... ... @@ -4944,6 +5108,10 @@ progress@^1.1.8:
version "1.1.8"
resolved "http://npm.yoho.cn/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
progress@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
promise-polyfill@^6.0.2:
version "6.0.2"
resolved "http://npm.yoho.cn/promise-polyfill/-/promise-polyfill-6.0.2.tgz#d9c86d3dc4dc2df9016e88946defd69b49b41162"
... ... @@ -5329,7 +5497,7 @@ require-main-filename@^1.0.1:
version "1.0.1"
resolved "http://npm.yoho.cn/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
require-uncached@^1.0.2:
require-uncached@^1.0.2, require-uncached@^1.0.3:
version "1.0.3"
resolved "http://npm.yoho.cn/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
dependencies:
... ... @@ -5432,6 +5600,22 @@ run-async@^0.1.0:
dependencies:
once "^1.3.0"
run-async@^2.2.0:
version "2.3.0"
resolved "http://npm.yoho.cn/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
dependencies:
is-promise "^2.1.0"
rx-lite-aggregates@^4.0.8:
version "4.0.8"
resolved "http://npm.yoho.cn/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
dependencies:
rx-lite "*"
rx-lite@*, rx-lite@^4.0.8:
version "4.0.8"
resolved "http://npm.yoho.cn/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
rx-lite@^3.1.2:
version "3.1.2"
resolved "http://npm.yoho.cn/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
... ... @@ -5584,6 +5768,16 @@ shallow-clone@^0.1.2:
lazy-cache "^0.2.3"
mixin-object "^2.0.1"
shebang-command@^1.2.0:
version "1.2.0"
resolved "http://npm.yoho.cn/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
dependencies:
shebang-regex "^1.0.0"
shebang-regex@^1.0.0:
version "1.0.0"
resolved "http://npm.yoho.cn/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
shelljs@^0.7.5, shelljs@^0.7.7:
version "0.7.8"
resolved "http://npm.yoho.cn/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
... ... @@ -5736,9 +5930,9 @@ spdy@^3.4.1:
select-hose "^2.0.0"
spdy-transport "^2.0.18"
specificity@^0.3.0:
version "0.3.0"
resolved "http://npm.yoho.cn/specificity/-/specificity-0.3.0.tgz#332472d4e5eb5af20821171933998a6bc3b1ce6f"
specificity@^0.3.0, specificity@^0.3.1:
version "0.3.1"
resolved "http://npm.yoho.cn/specificity/-/specificity-0.3.1.tgz#f1b068424ce317ae07478d95de3c21cf85e8d567"
split2@^0.2.1:
version "0.2.1"
... ... @@ -5852,12 +6046,12 @@ string-width@^1.0.1, string-width@^1.0.2:
is-fullwidth-code-point "^1.0.0"
strip-ansi "^3.0.0"
string-width@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
string-width@^2.0.0, string-width@^2.1.0:
version "2.1.1"
resolved "http://npm.yoho.cn/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
dependencies:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^3.0.0"
strip-ansi "^4.0.0"
string_decoder@^0.10.25, string_decoder@~0.10.x:
version "0.10.31"
... ... @@ -5879,6 +6073,12 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
dependencies:
ansi-regex "^2.0.0"
strip-ansi@^4.0.0:
version "4.0.0"
resolved "http://npm.yoho.cn/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
dependencies:
ansi-regex "^3.0.0"
strip-bom@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
... ... @@ -5925,16 +6125,22 @@ stylehacks@^2.3.2:
text-table "^0.2.0"
write-file-stdout "0.0.2"
stylelint-config-standard@^16.0.0:
version "16.0.0"
resolved "http://npm.yoho.cn/stylelint-config-standard/-/stylelint-config-standard-16.0.0.tgz#bb7387bff1d7dd7186a52b3ebf885b2405d691bf"
stylelint-config-recommended@^1.0.0:
version "1.0.0"
resolved "http://npm.yoho.cn/stylelint-config-recommended/-/stylelint-config-recommended-1.0.0.tgz#752c17fc68fa64cd5e7589e24f6e46e77e14a735"
stylelint-config-standard@^17.0.0:
version "17.0.0"
resolved "http://npm.yoho.cn/stylelint-config-standard/-/stylelint-config-standard-17.0.0.tgz#42103a090054ee2a3dde9ecaed55e5d4d9d059fc"
dependencies:
stylelint-config-recommended "^1.0.0"
stylelint-config-yoho@^1.2.8:
version "1.2.8"
resolved "http://npm.yoho.cn/stylelint-config-yoho/-/stylelint-config-yoho-1.2.8.tgz#64b0e52887e03f6f7922df9940f5a097ba89273b"
stylelint-config-yoho@^1.2.10:
version "1.2.10"
resolved "http://npm.yoho.cn/stylelint-config-yoho/-/stylelint-config-yoho-1.2.10.tgz#e2d648755f82af713e0dfcb11e3c8bf62d9fb088"
dependencies:
stylelint "^7.9.0"
stylelint-config-standard "^16.0.0"
stylelint "^8.0.0"
stylelint-config-standard "^17.0.0"
stylelint-formatter-table@^1.0.3:
version "1.0.3"
... ... @@ -5950,18 +6156,16 @@ stylelint-processor-html@^1.0.0:
dependencies:
htmlparser2 "^3.9.1"
stylelint-webpack-plugin@^0.7.0:
version "0.7.1"
resolved "http://npm.yoho.cn/stylelint-webpack-plugin/-/stylelint-webpack-plugin-0.7.1.tgz#e21624097aa4d4774158d2dd8a5067880f841831"
stylelint-webpack-plugin@^0.9.0:
version "0.9.0"
resolved "http://npm.yoho.cn/stylelint-webpack-plugin/-/stylelint-webpack-plugin-0.9.0.tgz#acc27351751dfa0113ad0eb8919946dcfc0922e2"
dependencies:
arrify "^1.0.1"
chalk "^1.1.3"
minimatch "^3.0.3"
object-assign "^4.1.0"
ramda "^0.24.1"
stylelint "^7.7.0"
stylelint@^7.10.1, stylelint@^7.7.0, stylelint@^7.9.0:
stylelint@^7.10.1:
version "7.11.1"
resolved "http://npm.yoho.cn/stylelint/-/stylelint-7.11.1.tgz#c816c658baf7d9e5d167d82273fead37c97ae49d"
dependencies:
... ... @@ -6005,12 +6209,59 @@ stylelint@^7.10.1, stylelint@^7.7.0, stylelint@^7.9.0:
svg-tags "^1.0.0"
table "^4.0.1"
stylelint@^8.0.0:
version "8.0.0"
resolved "http://npm.yoho.cn/stylelint/-/stylelint-8.0.0.tgz#87611211776cb315c93fcf6c58bc261d3c92612e"
dependencies:
autoprefixer "^7.1.2"
balanced-match "^1.0.0"
chalk "^2.0.1"
cosmiconfig "^2.1.3"
debug "^2.6.8"
execall "^1.0.0"
file-entry-cache "^2.0.0"
get-stdin "^5.0.1"
globby "^6.1.0"
globjoin "^0.1.4"
html-tags "^2.0.0"
ignore "^3.3.3"
imurmurhash "^0.1.4"
known-css-properties "^0.2.0"
lodash "^4.17.4"
log-symbols "^1.0.2"
mathml-tag-names "^2.0.1"
meow "^3.7.0"
micromatch "^2.3.11"
normalize-selector "^0.2.0"
pify "^3.0.0"
postcss "^6.0.6"
postcss-less "^1.1.0"
postcss-media-query-parser "^0.2.3"
postcss-reporter "^4.0.0"
postcss-resolve-nested-selector "^0.1.1"
postcss-scss "^1.0.2"
postcss-selector-parser "^2.2.3"
postcss-value-parser "^3.3.0"
resolve-from "^3.0.0"
specificity "^0.3.1"
string-width "^2.1.0"
style-search "^0.1.0"
sugarss "^1.0.0"
svg-tags "^1.0.0"
table "^4.0.1"
sugarss@^0.2.0:
version "0.2.0"
resolved "http://npm.yoho.cn/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e"
dependencies:
postcss "^5.2.4"
sugarss@^1.0.0:
version "1.0.0"
resolved "http://npm.yoho.cn/sugarss/-/sugarss-1.0.0.tgz#65e51b3958432fb70d5451a68bb33e32d0cf1ef7"
dependencies:
postcss "^6.0.0"
supports-color@^2.0.0:
version "2.0.0"
resolved "http://npm.yoho.cn/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
... ... @@ -6021,6 +6272,12 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
dependencies:
has-flag "^1.0.0"
supports-color@^4.0.0, supports-color@^4.2.0:
version "4.2.1"
resolved "http://npm.yoho.cn/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
dependencies:
has-flag "^2.0.0"
svg-tags@^1.0.0:
version "1.0.0"
resolved "http://npm.yoho.cn/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
... ... @@ -6140,6 +6397,12 @@ tiny-cookie@^1.0:
version "1.0.1"
resolved "http://npm.yoho.cn/tiny-cookie/-/tiny-cookie-1.0.1.tgz#753786079c642a3c3d0b2accad600f8de119ac2a"
tmp@^0.0.31:
version "0.0.31"
resolved "http://npm.yoho.cn/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
dependencies:
os-tmpdir "~1.0.1"
to-arraybuffer@^1.0.0:
version "1.0.1"
resolved "http://npm.yoho.cn/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
... ... @@ -6611,10 +6874,6 @@ window-size@0.1.0:
version "0.1.0"
resolved "http://npm.yoho.cn/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
window-size@^0.1.4:
version "0.1.4"
resolved "http://npm.yoho.cn/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
winston-daily-rotate-file@^1.1.1:
version "1.4.6"
resolved "http://npm.yoho.cn/winston-daily-rotate-file/-/winston-daily-rotate-file-1.4.6.tgz#f204b6ada19a5386fdf52fe997d8e10e43ff7788"
... ... @@ -6709,7 +6968,7 @@ xss-filters@^1.2.6:
version "4.0.1"
resolved "http://npm.yoho.cn/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
y18n@^3.2.0, y18n@^3.2.1:
y18n@^3.2.1:
version "3.2.1"
resolved "http://npm.yoho.cn/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
... ... @@ -6733,17 +6992,14 @@ yargs@^1.2.6:
version "1.3.3"
resolved "http://npm.yoho.cn/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a"
yargs@^3.5.4:
version "3.32.0"
resolved "http://npm.yoho.cn/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
yargs@^3.5.4, yargs@~3.10.0:
version "3.10.0"
resolved "http://npm.yoho.cn/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
dependencies:
camelcase "^2.0.1"
cliui "^3.0.3"
decamelize "^1.1.1"
os-locale "^1.4.0"
string-width "^1.0.1"
window-size "^0.1.4"
y18n "^3.2.0"
camelcase "^1.0.2"
cliui "^2.1.0"
decamelize "^1.0.0"
window-size "0.1.0"
yargs@^6.0.0:
version "6.6.0"
... ... @@ -6781,15 +7037,6 @@ yargs@^7.0.0:
y18n "^3.2.1"
yargs-parser "^5.0.0"
yargs@~3.10.0:
version "3.10.0"
resolved "http://npm.yoho.cn/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
dependencies:
camelcase "^1.0.2"
cliui "^2.1.0"
decamelize "^1.0.0"
window-size "0.1.0"
yoho-cookie@^1.2.0:
version "1.2.0"
resolved "http://npm.yoho.cn/yoho-cookie/-/yoho-cookie-1.2.0.tgz#e8600ff0fcf316e8a9f88d32cd263396dc7e5f22"
... ...