Skip to content

S
SuperMan
Commit e1042558 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents ac3de38d 1bbdfa71
Hide whitespace changes
Inline Side-by-side
Showing with 2191 additions and 263 deletions
package.json
View file @ e1042558
......@@ -80,7 +80,7 @@
"less": "^3.9.0",
"less-loader": "^4.1.0",
"node-notifier": "^5.1.2",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0",
"portfinder": "^1.0.13",
"postcss-import": "^11.0.0",
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ e1042558
......@@ -2,6 +2,7 @@
<div class="mb30" v-loading='loading'>
<table class="leaderReimbursementTableNav" border="0" cellspacing="1" cellpadding="0">
<tr>
<th width="8%">出团公司</th>
<th width="8%">出发地</th>
<th width="30%">行程名称</th>
<th width="150">团号</th>
......@@ -14,6 +15,9 @@
<th>酒店</th>
</tr>
<tr v-for='item in nav'>
<td>
{{item.OutBranchName}}
</td>
<td>{{item.StartCityNames}}
</td>
<td>
......
src/components/SalesModule/VisitRecord.vue
View file @ e1042558
......@@ -3,7 +3,7 @@
.page_VisitRecord ._scrollbar::-webkit-scrollbar-thumb{border-radius: 4px;-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);background: #c9c9c9;}
.page_VisitRecord ._scrollbar::-webkit-scrollbar-track{-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;}
.page_VisitRecord>div>ul{height: 650px;margin: 20px 20px;background-color: #FFFFFF;border: 1px solid #F1F2F5;padding: 20px;border-radius: 4px;padding-right: 16px;margin-bottom: 5px}
.page_VisitRecord ._vr_left{width: 510px;}
.page_VisitRecord ._vr_left{width: 630px;}
.page_VisitRecord ._vr_right{width: 1110px;}
.page_VisitRecord ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 14px;color: #000000;margin: 20px 0 0 20px;}
.page_VisitRecord .icon-ditu{color: #E95252;cursor: pointer;}
......@@ -59,6 +59,7 @@
<div class="_info">
<div><i class="iconfont icon-xinzengkehu-copy"></i>&nbsp;新增客户&nbsp;&nbsp;&nbsp;{{item.addNewCustomerCount}}</div>
<div><i class="iconfont el-icon-view"></i>&nbsp;拜访客户&nbsp;&nbsp;&nbsp;{{item.visitOldCustomerCount}}</div>
<div style="margin-left:10px;"><i class="iconfont icon-qianming"></i>&nbsp;签到&nbsp;&nbsp;&nbsp;{{item.signInCount}}</div>
</div>
</div>
</li>
......@@ -163,7 +164,6 @@ export default {
// console.log(end_time)
let url='?ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX&service_id=203768&entity_name='+this.account+'&start_time='+start_time+'&end_time='+end_time+'&is_processed=1&process_option=need_denoise=1,need_vacuate=1,need_mapmatch=1';
this.$http.get('https://bird.ioliu.cn/v1?url=http://yingyan.baidu.com/api/v3/track/gettrack'+url).then(res=>{
console.log(res.data.points)
let xy=res.data.points
this.Point=[]
xy.forEach(x=>{
......@@ -179,10 +179,12 @@ export default {
this.apipost('app_get_visit_line_list',{},res=>{
if(res.data.resultCode==1){
this.VisitLineList = res.data.data.pageData
this.getTodayVisitList(this.VisitLineList[0].date)
this.thisDay = this.VisitLineList[0].dateStr
if(this.VisitLineList.length>0){
this.getTodayVisitList(this.VisitLineList[0].date)
this.thisDay = this.VisitLineList[0].dateStr
}
}else{
this.$message.error(res.data.message)
this.Error(res.data.message)
}
},err=>{})
},
......@@ -192,7 +194,7 @@ export default {
if(res.data.resultCode==1){
this.TodayVisitList = res.data.data;
}else{
this.$message.error(res.data.message)
this.Error(res.data.message)
}
},err=>{})
},
......@@ -208,7 +210,6 @@ export default {
this.Point.forEach(x=>{
x.xy = x.point.split(',')
})
console.log(this.Point)
this.creatMap()
}else{
let div = document.createElement("div")
......
src/components/administrative/CommissionDetail.vue
View file @ e1042558
......@@ -43,7 +43,8 @@ export default {
pageSize: 20,
ParentId: 0,
OrderStr: "RB_Branch_Id asc",
BName:-1
BName:-1,
RB_Branch_Id:-1
},
total: 0,
currentPage: 1,
......@@ -56,7 +57,8 @@ export default {
loading: true,
CompanyList:[],
dataListTwo: [],
stringPerons:''
stringPerons:'',
userInfo: {}
};
},
methods: {
......@@ -133,7 +135,17 @@ export default {
data.forEach(x => {
x.disabled = false;
});
this.CompanyList = data;
if(this.userInfo.RB_Branch_id!=0){
this.CompanyList = data.filter(x=>{
if(x.BName==this.userInfo.BranchName){
return x
}else
return false
})
}else{
this.CompanyList = data;
}
this.initColums();
} else {
}
......@@ -347,6 +359,10 @@ export default {
},
getList() {
this.loading = true;
if(this.userInfo.RB_Branch_id!=0){
this.msg.RB_Branch_Id=this.userInfo.RB_Branch_id
}
this.apipost(
"sellcommission_GetDetailsList",
this.msg,
......@@ -406,7 +422,7 @@ export default {
this.msg.ParentId = this.$route.query.ParentId;
let dt=new Date()
this.stringPerons=(dt.getMonth()==0?(dt.getFullYear()-1):dt.getFullYear())+''+(dt.getMonth().toString().length<2?'0':'')+(dt.getMonth()==0?12:dt.getMonth());
console.log(this.stringPerons)
this.userInfo = this.getLocalStorage();
this.getList();
this.getCompanyList();
},
......
src/components/administrative/CommissionManagement.vue
View file @ e1042558
<style>
.CM_look{
padding:4px!important;
position: relative;
top:1px;
}
.CM_look {
padding: 4px !important;
position: relative;
top: 1px;
}
.TCommission-finance {
font-size: 12px;
text-decoration: underline;
cursor: pointer;
margin-right: 5px;
}
</style>
<template>
<div class="flexOne">
......@@ -13,106 +19,175 @@
<input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/>
</li>
</ul>
</div> -->
</div>-->
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>期数</th>
<th>提成总金额</th>
<th v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49">提成总金额</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<th>所属公司提成</th>
<th>财务单据</th>
<th>日期</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.periods}}</td>
<td>{{item.sumPrice}}</td>
<td
v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49"
>{{item.sumPrice.toFixed(2)}}</td>
<td>{{item.createByStr}}</td>
<td>{{item.branchMoney.toFixed(2)}}</td>
<td>
<span
class="TCommission-finance"
v-for="(fno, i) in item.financialsArray"
:key="i"
@click="goUrl2(fno)"
>{{fno}}</span>
</td>
<td>{{item.createStr}}</td>
<td>
<!-- <el-tooltip class="item" effect="dark" content="取消" placement="top">
<el-button type="danger" icon="el-icon-delete" circle></el-button>
</el-tooltip> -->
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('CommissionDetail',item.id)" icon="iconfont icon-chakan" circle></el-button>
<el-button
type="primary"
class="CM_look"
@click="goUrl('CommissionDetail',item.id)"
icon="iconfont icon-chakan"
title="查看"
circle
></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="制单" placement="top">
<el-button
type="primary"
class="CM_look"
@click="generalFinancacls"
icon="el-icon-plus"
title="制单"
circle
></el-button>
</el-tooltip>
</td>
</tr>
</table>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
</el-pagination>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.PageSize"
:total="total"
></el-pagination>
</div>
</template>
<script>
export default {
data() {
return {
msg: {
PageIndex: 1,
PageSize: 20
},
loading:false,
//数据源
dataList:[],
total:0,
currentPage: 1,
}
},
mounted() {
export default {
data() {
return {
msg: {
PageIndex: 1,
PageSize: 20
},
loading: false,
//数据源
dataList: [],
total: 0,
currentPage: 1,
userInfo: {}
};
},
mounted() {
this.getList();
this.userInfo = this.getLocalStorage();
},
methods: {
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
methods: {
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
goUrl(path,id) {
this.$router.push({
path: path,
query: {
ParentId:id,
blank: 'y',
tab: '报价详情'
}
});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
"sellcommission_GetPageList",
this.msg,
res => {
this.loading = false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},
null
);
},
//生成提成报表
generateTable(){
let msg = {
UserId: 0
goUrl(path, id) {
this.$router.push({
path: path,
query: {
ParentId: id,
blank: "y",
tab: "报价详情"
}
this.apipost(
"sellcommission_SetGenerateCommission",msg,
res => {
if(res.data.resultCode==1){
this.getList();
this.Success('报表生成成功')
}else{
this.Error(res.data.message);
});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
"sellcommission_GetPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
this.dataList.forEach(x => {
if (x.financials && x.financials.length > 0) {
x.financialsArray = x.financials.split(",");
}
},
null
);
});
} else {
this.Error(res.data.message);
}
},
null
);
},
goUrl2(id) {
this.$router.push({
path: "/FinancialDocumentsDetail",
query: {
id,
blank: "y",
tab: id + "单据详情"
}
});
},
//生成提成报表
generateTable() {
let msg = {
UserId: 0
};
this.apipost(
"sellcommission_SetGenerateCommission",
msg,
res => {
if (res.data.resultCode == 1) {
this.getList();
this.Success("报表生成成功");
} else {
this.Error(res.data.message);
}
},
null
);
},
generalFinancacls(){
let query = {
blank: "y",
tab: "新增付款单据",
Type:2,
IsUploadPic:1
}
if(this.userInfo.RB_Branch_id==0) {
query.id=28
query.Name="总部销售提成单"
}else{
query.id=30
query.Name="分公司销售提成单"
}
this.$router.push({
path: "/addFinancialDocuments",
query
});
}
}
};
</script>
src/components/administrative/myDocuments.vue
View file @ e1042558
......@@ -94,6 +94,10 @@
<el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center>
<div class="documentDialogNav">
<div @click="shareGroup">
<i class="iconfont icon-user11"></i>集团
<div v-if='shareMsg.shareType==4' class="checkIcon"></div>
</div>
<div @click="shareDeparment">
<i class="iconfont icon-user11"></i>{{$t('admin.admin_Department')}}
<div v-if='shareMsg.shareType==1' class="checkIcon"></div>
......@@ -108,6 +112,11 @@
<div v-if='shareMsg.shareType==3' class="checkIcon"></div>
</div>
</div>
<div v-if="shareMsg.shareType==4" class="myDocumentShareDiv">
<div style="height:400px;padding:20px;font-size:15px;">
分享到整个集团
</div>
</div>
<div v-if='shareMsg.shareType==1' class="myDocumentShareDiv">
<div class="myDocumentShareTree">
<el-tree
......@@ -754,6 +763,7 @@
}
this.outerVisible3 = true
this.dialogTitle3 = '分享文件/文件夹'
this.shareMsg.shareType=1;
this.getDepartment()
this.getRole()
this.getMenber()
......@@ -761,10 +771,15 @@
openShareDialog() {
this.outerVisible3 = true
this.dialogTitle3 = '分享文件/文件夹'
this.shareMsg.shareType=1;
this.getDepartment()
this.getRole()
this.getMenber()
},
//按照集团分享
shareGroup(){
this.shareMsg.shareType=4;
},
shareDeparment(){
this.shareMsg.shareType=1
this.ckdRoleList=[]
......@@ -876,6 +891,10 @@
}else{
this.shareMsg.targetIds=this.ckdMenberListId.join(',')
}
if(this.shareMsg.shareType==4){
let userInfo = this.getLocalStorage();
this.shareMsg.targetIds = userInfo.RB_Group_id;
}
this.shareMsg.fileIds=this.notFileList
this.shareMsg.folderIds=this.fileList
this.apipost('user_cloud_file_share',this.shareMsg,res=>{
......
src/components/administrative/myShareDocuments.vue
View file @ e1042558
......@@ -150,6 +150,10 @@
<el-dialog custom-class='w800 shareDocumentDialog' :title="dialogTitle3" :visible.sync="outerVisible3" center>
<div class="documentDialogNav">
<div @click="shareGroup">
<i class="iconfont icon-user11"></i>集团
<div v-if='shareMsg.shareType==4' class="checkIcon"></div>
</div>
<div @click="shareDeparment">
<i class="iconfont icon-user11"></i>{{$t('admin.admin_Department')}}
<div v-if='shareMsg.shareType==1' class="checkIcon"></div>
......@@ -230,6 +234,11 @@
</ul>
</div>
</div>
<div v-if="shareMsg.shareType==4" class="myDocumentShareDiv">
<div style="height:400px;padding:20px;font-size:15px;">
分享到整个集团
</div>
</div>
<div slot="footer" class="dialog-footer">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="outerVisible3=false" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="saveShareDocument" />
......@@ -858,6 +867,10 @@
this.getRole()
this.getMenber()
},
//按照集团分享
shareGroup(){
this.shareMsg.shareType=4;
},
shareDeparment(){
this.shareMsg.shareType=1
this.ckdRoleList=[]
......@@ -987,6 +1000,11 @@
targetIds=this.ckdMenberListId
}
this.shareMsg.targetIds = targetIds.join(",")
if(this.shareMsg.shareType==4){
let userInfo = this.getLocalStorage();
this.shareMsg.targetIds = userInfo.RB_Group_id;
}
//this.shareMsg.fileIds=this.notFileList
//this.shareMsg.folderIds=this.fileList
this.apipost('user_cloud_update_file_share_target',this.shareMsg,res=>{
......
src/components/busManagement/busUsePrice2.vue 0 → 100644
View file @ e1042558
<style>
.busUsePrice2 .busList {
width: 230px;
height: 270px;
float: left;
margin: 0 10px 10px 0;
background-color: #fff;
border-radius: 4px;
font-size: 12px;
overflow: hidden;
}
.busUsePrice2 .busListTable {
width: 98%;
margin: 0px 2px 0px 2px;
}
.busUsePrice2 .busListTable tr td {
height: 20px;
line-height: 20px;
}
.busUsePrice2 .busListTop {
width: 100%;
position: relative;
text-align: center;
}
.busUsePrice2 .usePricediv {
margin: 7px 0 0 20px;
}
.busUsePrice2 .btmAddStore {
border-top: 1px solid #d1d1d1;
width: 100%;
display: none;
overflow-x: auto;
overflow-y: auto;
position: fixed;
background: #f9f9f9;
bottom: 0;
}
.busUsePrice2 .changeMsg {
width: 80%;
}
.busUsePrice2 .changeMsg li {
float: left;
}
.busUsePrice2 .changeMsg li:first-child {
margin-left: 20px;
}
.busUsePrice2 .btmTitle {
padding: 0 10px;
margin: 20px 0 20px 25px;
border-left: 3px solid #e95252;
font-size: 14px;
color: #000000;
}
.busUsePrice2 .busUsePeople .el-input__inner {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.busUsePrice2 .busType {
margin: 10px 0 0 31px;
font-size: 14px;
display: inline-block;
}
.busUsePrice2 .cityBtnList {
margin: 10px 0 20px 20px;
}
.busUsePrice2 .busUserBtnList {
width: 100%;
text-align: center;
margin-top: 10px;
}
.busUsePrice2 .busListTop img {
width: 100%;
}
.busUsePrice2 .BusTypeStr {
position: absolute;
top: 15px;
color: #fff;
font-size: 25px;
left: 63px;
}
.busUsePrice2 .UPBtn {
width: 70px;
height: 23px;
}
.busUsePrice2 .topNotice {
width: 100%;
height: 20px;
font-size: 12px;
text-align: left;
margin: 20px 0;
}
.busUsePrice2 .delScien {
position: absolute;
right: 10px;
top: 10px;
display: none;
}
.busUsePrice2 .delScien:hover {
color: #f76f6f;
cursor: pointer;
}
.busUsePrice2 .busList:hover .delScien {
display: block;
}
.busUsePrice2 .busDiv {
margin-top: 20px;
}
.busUsePrice2 .busList:hover {
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
transition: all linear 0.5s;
}
.Bus_BtnList {
text-align: right;
margin-bottom: 10px;
}
.Bus_Spacing {
margin-left: 24px;
}
.busUsePrice2 .combottomDiv .el-select {
width: 100%;
}
.busUsePrice2 .linkStrle {
cursor: pointer;
text-decoration: underline;
color:blue;
}
</style>
<template>
<div class="flexOne busUsePrice2">
<div class="query-box">
<ul>
<li>
注：以下报价是提供给开团人员产生成本报价的参考依据，不作为最终的用车价格
</li>
<li>
<input type="button" class="normalBtn" @click="addPanel" value="新增" />
</li>
</ul>
</div>
<div class="busDiv clearfix" v-loading="loading">
<table>
<thead>
<tr>
<th>
图片
</th>
<th>
地区/车辆类型
</th>
<th>
使用人数
</th>
<th>
接送价格
</th>
<th>
全天价格
</th>
<th>
半天价格
</th>
<th>
全天高速
</th>
<th>
接送高速
</th>
<th>
全天茶代
</th>
<th>
接送茶代
</th>
<th>
操作
</th>
</tr>
</thead>
<tbody v-for="item in dataList" :key="item.subCode">
<tr>
<td>
<img v-if="item.ShowBusImage" :src="item.ShowBusImage" style="width:230px;height:60px;" />
<img v-else src="../../assets/img/suplier.jpg" style="width:230px;height:60px;" />
</td>
<td>
{{getArea(item.AreaType)}}-{{item.BusTypeStr}}
</td>
<td>
{{item.UseNum}}
</td>
<td>
{{item.ReceivePrice}}
</td>
<td>
{{item.AllDayPrice}}
</td>
<td>
{{item.HalfDayPrice}}
</td>
<td>
{{item.AllDayHighSpeedFee}}
</td>
<td>
{{item.PickUpHighSpeedFee}}
</td>
<td>{{item.AllDayChaDaiFee}}</td>
<td>{{item.PickUpChaDaiFee}}</td>
<td rowspan="2">
<input type="button" class="normalBtn" @click="managePrice(item.Id)" value="管理报价" />&nbsp;
<a class="linkStrle" @click="goUrl('busUsePriceDetails',item.Id,'报价详情')">详情</a>&nbsp;
<a class="linkStrle" @click="isdelete(item.Id)">删除</a>
</td>
</tr>
<tr>
<td colspan="8">
备注: {{item.Remark}}
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="9">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
</el-pagination>
</td>
</tr>
</tfoot>
</table>
</div>
<div class="combottomDiv" v-if="isShow">
<el-row>
<el-col :span="18">
<div class="combottomTitle">报价管理</div>
</el-col>
<el-col :span="4" class="Bus_BtnList">
<input type="button" class="hollowFixedBtn" @click="cancelPanel" value="取消" />
<input type="button" class="normalBtn" @click="submitForm('addMsg')" value="保存" />
</el-col>
</el-row>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-row>
<el-col :span="5">
<el-form-item label="地区" prop="AreaType">
<el-select filterable placeholder="请选择" v-model="addMsg.AreaType">
<el-option label='不限' :value="selectDefauleValue"></el-option>
<el-option v-for="item in AreaList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车辆类型" prop="BusType">
<el-select filterable placeholder="请选择" v-model="addMsg.BusType">
<el-option v-for="item in BusTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="座位数" prop="UseNum">
<el-input placeholder="座位数" v-model="addMsg.UseNum" @keyup.native="checkInteger(addMsg,'UseNum')"
class="busUsePeople">
<template slot="append">座</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="接送报价" prop="ReceivePrice">
<el-input v-model="addMsg.ReceivePrice" @keyup.native="checkPrice(addMsg,'ReceivePrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="送机报价" prop="SendPrice" style="display:none;">
<el-input v-model="addMsg.SendPrice" @keyup.native="checkPrice(addMsg,'SendPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="全天报价" prop="AllDayPrice">
<el-input v-model="addMsg.AllDayPrice" @keyup.native="checkPrice(addMsg,'AllDayPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="半天报价" prop="HalfDayPrice">
<el-input v-model="addMsg.HalfDayPrice" @keyup.native="checkPrice(addMsg,'HalfDayPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5" style="display:none;">
<el-form-item label="小时报价" prop="HourPrice">
<el-input v-model="addMsg.HourPrice" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="全天高速" prop="AllDayHighSpeedFee">
<el-input v-model="addMsg.AllDayHighSpeedFee" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="接送高速" prop="PickUpHighSpeedFee">
<el-input v-model="addMsg.PickUpHighSpeedFee" @keyup.native="checkPrice(addMsg,'PickUpHighSpeedFee')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="全天茶代" prop="AllDayChaDaiFee">
<el-input v-model="addMsg.AllDayChaDaiFee" @keyup.native="checkPrice(addMsg,'AllDayChaDaiFee')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="接送茶代" prop="PickUpChaDaiFee">
<el-input v-model="addMsg.PickUpChaDaiFee" @keyup.native="checkPrice(addMsg,'PickUpChaDaiFee')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="币种" prop="CurrencyId">
<el-select filterable v-model='addMsg.CurrencyId' @change="getRate(addMsg.CurrencyId)">
<el-option label='不限' :value="selectDefauleValue"></el-option>
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="汇率" prop="CurrentRate">
<el-input v-model="addMsg.CurrentRate" @keyup.native="checkRate(addMsg,'CurrentRate')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车辆图片">
<el-upload class="avatar-uploader" :http-request="UploadImage" :multiple="false"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="addMsg.ShowBusImage&&addMsg.ShowBusImage!=''" :src="addMsg.ShowBusImage"
style="width:200px;height:100px">
<i class="el-icon-upload2 avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="说明" prop="Remark">
<el-input type="textarea" autosize placeholder="请输入内容" v-model="addMsg.Remark">
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
export default {
data() {
var DealAreaValidate = (rule, value, callback) => {
if (value === 0) {
callback(new Error("请选择地区"));
} else {
callback();
}
};
var validateCurrency = (rule, value, callback) => {
if (value === 0) {
callback(new Error("请选择币种"));
} else {
callback();
}
};
return {
total: 0,
currentPage: 1,
dataList: "",
loading: false,
isShow: false,
BusTypeList: "",
selectDefauleValue: 0,
AreaList: [],
currencyTypeList: [],
msg: {
pageIndex: 1,
pageSize: 18
},
//表单json
addMsg: {
ID: 0,
UseNum: "",
BusType: "",
ReceivePrice: "",
SendPrice: "",
AllDayPrice: "",
HalfDayPrice: "",
HourPrice: "",
Remark: "",
AreaType: 0,
CurrencyId: 0,
CurrentRate: 0,
AllDayHighSpeedFee: 0, //全天高速费
PickUpHighSpeedFee: 0, //接送高速费
AllDayChaDaiFee: 0, //全天茶代费
PickUpChaDaiFee: 0, //接送茶代费
BusImage: '', //车辆图片
ShowBusImage: "",
},
//表单验证
rules: {
AreaType: [{
validator: DealAreaValidate,
trigger: "change",
required: true
}],
CurrencyId: [{
validator: validateCurrency,
trigger: "change",
required: true
}],
BusType: [{
required: true,
message: "请选择车辆类型",
trigger: "change"
}],
UseNum: [{
required: true,
message: "请输入人数",
trigger: "change"
}],
ReceivePrice: [{
required: true,
message: "请输入接机价格",
trigger: "change"
}],
SendPrice: [{
required: true,
message: "请输入送机价格",
trigger: "change"
}],
AllDayPrice: [{
required: true,
message: "请输入全天价格",
trigger: "change"
}],
HalfDayPrice: [{
required: true,
message: "请输入全天价格",
trigger: "change"
}],
HourPrice: [{
required: true,
message: "请输入小时价格",
trigger: "change"
}],
AllDayHighSpeedFee: [{
required: true,
message: "请输入全天高速价格",
trigger: "change"
}],
PickUpHighSpeedFee: [{
required: true,
message: "请输入接送高速价格",
trigger: "change"
}],
AllDayChaDaiFee: [{
required: true,
message: "请输入全天茶代价格",
trigger: "change"
}],
PickUpChaDaiFee: [{
required: true,
message: "请输入接送茶代价格",
trigger: "change"
}]
}
};
},
methods: {
goUrl(path, id, name) {
this.$router.push({
name: path,
query: {
id: id,
blank: 'y',
tab: name
}
})
},
//上传图片
UploadImage(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
var obj = this.$DMCUtils.DMCImageObj();
var str = x.name;
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.addMsg.BusImage = x.data.FilePath;
this.addMsg.ShowBusImage = imgUrl;
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.initData();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
initData() {
this.loading = true;
this.apipost(
"busprice_get_GetBusPricePageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}
},
null
);
},
saveInfo() {
this.apipost(
"busprice_post_SetBusPrice",
this.addMsg,
res => {
if (res.data.resultCode == 1) {
this.initData();
this.Success("保存成功");
this.isShow = false;
this.resetForm("addMsg");
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取地区下拉
getAreaList() {
this.apipost(
"busprice_get_GetBusAreaType", {},
res => {
if (res.data.resultCode == 1) {
this.AreaList = res.data.data;
}
},
null
);
},
//根据ID获取地区
getArea(AreaType) {
var AreaName = '';
this.AreaList.forEach(item => {
if (item.Id == AreaType) {
AreaName = item.Name
}
})
return AreaName;
},
getCurrencyType() { // 币种类型
this.apipost('financeinfo_post_GetList', {
Name: ''
}, res => {
if (res.data.resultCode == 1) {
this.currencyTypeList = res.data.data;
}
}, err => {})
},
//修改管理报价
managePrice(ID) {
this.addMsg.ID = ID;
this.isShow = true;
let msg = {
ID: ID
};
this.apipost(
"busprice_get_GetBusPrice",
msg,
res => {
this.addMsg = res.data.data;
},
null
);
},
/*获取车辆类型列表*/
getBusTypeList() {
this.apipost(
"bus_get_GetBusTypeList",
null,
res => {
if (res.data.resultCode == 1) {
this.BusTypeList = res.data.data;
}
},
null
);
},
//币种下拉获取汇率
getRate(ID) {
this.currencyTypeList.forEach(x => {
if (x.ID == ID) {
this.addMsg.CurrentRate = x.Rate;
}
});
},
//取消
cancelPanel() {
this.isShow = false;
this.resetForm("addMsg");
},
//添加
addPanel() {
this.isShow = true;
this.addMsg.ID = 0;
this.clearInfo();
},
clearInfo() {
this.addMsg = {
ID: 0,
UseNum: "",
BusType: "",
ReceivePrice: "",
SendPrice: "",
AllDayPrice: "",
HalfDayPrice: "",
HourPrice: "",
Remark: "",
AreaType: 0,
CurrencyId: 0,
CurrentRate: 0,
AllDayHighSpeedFee: 0,
PickUpHighSpeedFee: 0,
AllDayChaDaiFee: 0,
PickUpChaDaiFee: 0,
BusImage: ''
};
},
submitForm(addMsg) {
//提交创建、修改表单
let that = this;
that.$refs[addMsg].validate(valid => {
if (valid) {
that.saveInfo();
} else {
return false;
}
});
},
resetForm(formName) {
this.$refs[formName].resetFields();
},
//删除
isdelete(ID) {
var that = this;
this.Confirm("是否删除?", function () {
var msg = {
ID: ID
};
that.apipost(
"busprice_post_RemoveBusPrice",
msg,
res => {
if (res.data.resultCode == 1) {
that.initData();
}
},
null
);
});
}
},
mounted() {
this.initData();
this.getAreaList();
this.getCurrencyType();
this.getBusTypeList();
}
};
</script>
src/components/busManagement/busUsePriceDetails.vue 0 → 100644
View file @ e1042558
<style>
.busUsePrice .busList {
width: 230px;
height: 270px;
float: left;
margin: 0 10px 10px 0;
background-color: #fff;
border-radius: 4px;
font-size: 12px;
overflow: hidden;
}
.busUsePrice .busListTable {
width: 98%;
margin: 0px 2px 0px 2px;
}
.busUsePrice .busListTable tr td {
height: 20px;
line-height: 20px;
}
.busUsePrice .busListTop {
width: 100%;
position: relative;
text-align: center;
}
.busUsePrice .usePricediv {
margin: 7px 0 0 20px;
}
.busUsePrice .btmAddStore {
border-top: 1px solid #d1d1d1;
width: 100%;
display: none;
overflow-x: auto;
overflow-y: auto;
position: fixed;
background: #f9f9f9;
bottom: 0;
}
.busUsePrice .changeMsg {
width: 80%;
}
.busUsePrice .changeMsg li {
float: left;
}
.busUsePrice .changeMsg li:first-child {
margin-left: 20px;
}
.busUsePrice .btmTitle {
padding: 0 10px;
margin: 20px 0 20px 25px;
border-left: 3px solid #e95252;
font-size: 14px;
color: #000000;
}
.busUsePrice .busUsePeople .el-input__inner {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.busUsePrice .busType {
margin: 10px 0 0 31px;
font-size: 14px;
display: inline-block;
}
.busUsePrice .cityBtnList {
margin: 10px 0 20px 20px;
}
.busUsePrice .busUserBtnList {
width: 100%;
text-align: center;
margin-top: 10px;
}
.busUsePrice .busListTop img {
width: 100%;
}
.busUsePrice .BusTypeStr {
position: absolute;
top: 15px;
color: #fff;
font-size: 25px;
left: 63px;
}
.busUsePrice .UPBtn {
width: 70px;
height: 23px;
}
.busUsePrice .topNotice {
width: 100%;
height: 20px;
font-size: 12px;
text-align: left;
margin: 20px 0;
}
.busUsePrice .delScien {
position: absolute;
right: 10px;
top: 10px;
display: none;
}
.busUsePrice .delScien:hover {
color: #f76f6f;
cursor: pointer;
}
.busUsePrice .busList:hover .delScien {
display: block;
}
.busUsePrice .busDiv {
margin-top: 20px;
}
.busUsePrice .busList:hover {
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
transition: all linear 0.5s;
}
.Bus_BtnList {
text-align: right;
margin-bottom: 10px;
}
.Bus_Spacing {
margin-left: 24px;
}
.busUsePrice .combottomDiv .el-select {
width: 100%;
}
</style>
<template>
<div class="flexOne busUsePrice">
<div class="query-box">
<ul>
<li>
注：以下报价是提供给开团人员产生成本报价的参考依据，不作为最终的用车价格
</li>
<li>
<input type="button" class="normalBtn" @click="addPanel" value="新增" />
</li>
</ul>
</div>
<div class="busDiv clearfix" v-loading="loading">
<table>
<thead>
<tr>
<th>
图片
</th>
<th>
地区/车辆类型
</th>
<th>
使用人数
</th>
<th>
接送价格
</th>
<th>
全天价格
</th>
<th>
半天价格
</th>
<th>
全天高速
</th>
<th>
接送高速
</th>
<th>
全天茶代
</th>
<th>
接送茶代
</th>
<th>
操作
</th>
</tr>
</thead>
<tbody v-for="item in dataList" :key="item.subCode">
<tr>
<td>
<img v-if="item.ShowBusImage" :src="item.ShowBusImage" style="width:230px;height:60px;" />
<img v-else src="../../assets/img/suplier.jpg" style="width:230px;height:60px;" />
</td>
<td>
{{getArea(item.AreaType)}}-{{item.BusTypeStr}}
</td>
<td>
{{item.UseNum}}
</td>
<td>
{{item.ReceivePrice}}
</td>
<td>
{{item.AllDayPrice}}
</td>
<td>
{{item.HalfDayPrice}}
</td>
<td>
{{item.AllDayHighSpeedFee}}
</td>
<td>
{{item.PickUpHighSpeedFee}}
</td>
<td>{{item.AllDayChaDaiFee}}</td>
<td>{{item.PickUpChaDaiFee}}</td>
<td rowspan="2">
<input type="button" class="normalBtn" @click="managePrice(item.Id)" value="管理报价">
<a >详情</a>
<a @click="isdelete(item.Id)">删除</a>
</td>
</tr>
<tr>
<td colspan="8">
备注: {{item.Remark}}
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="9">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
</el-pagination>
</td>
</tr>
</tfoot>
</table>
</div>
<div class="combottomDiv" v-if="isShow">
<el-row>
<el-col :span="18">
<div class="combottomTitle">报价管理</div>
</el-col>
<el-col :span="4" class="Bus_BtnList">
<input type="button" class="hollowFixedBtn" @click="cancelPanel" value="取消" />
<input type="button" class="normalBtn" @click="submitForm('addMsg')" value="保存" />
</el-col>
</el-row>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-row>
<el-col :span="5">
<el-form-item label="地区" prop="AreaType">
<el-select filterable placeholder="请选择" v-model="addMsg.AreaType">
<el-option label='不限' :value="selectDefauleValue"></el-option>
<el-option v-for="item in AreaList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车辆类型" prop="BusType">
<el-select filterable placeholder="请选择" v-model="addMsg.BusType">
<el-option v-for="item in BusTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="座位数" prop="UseNum">
<el-input placeholder="座位数" v-model="addMsg.UseNum" @keyup.native="checkInteger(addMsg,'UseNum')"
class="busUsePeople">
<template slot="append">座</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="接送报价" prop="ReceivePrice">
<el-input v-model="addMsg.ReceivePrice" @keyup.native="checkPrice(addMsg,'ReceivePrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="送机报价" prop="SendPrice" style="display:none;">
<el-input v-model="addMsg.SendPrice" @keyup.native="checkPrice(addMsg,'SendPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="全天报价" prop="AllDayPrice">
<el-input v-model="addMsg.AllDayPrice" @keyup.native="checkPrice(addMsg,'AllDayPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="半天报价" prop="HalfDayPrice">
<el-input v-model="addMsg.HalfDayPrice" @keyup.native="checkPrice(addMsg,'HalfDayPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5" style="display:none;">
<el-form-item label="小时报价" prop="HourPrice">
<el-input v-model="addMsg.HourPrice" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="全天高速" prop="AllDayHighSpeedFee">
<el-input v-model="addMsg.AllDayHighSpeedFee" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="接送高速" prop="PickUpHighSpeedFee">
<el-input v-model="addMsg.PickUpHighSpeedFee" @keyup.native="checkPrice(addMsg,'PickUpHighSpeedFee')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="全天茶代" prop="AllDayChaDaiFee">
<el-input v-model="addMsg.AllDayChaDaiFee" @keyup.native="checkPrice(addMsg,'AllDayChaDaiFee')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="接送茶代" prop="PickUpChaDaiFee">
<el-input v-model="addMsg.PickUpChaDaiFee" @keyup.native="checkPrice(addMsg,'PickUpChaDaiFee')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="币种" prop="CurrencyId">
<el-select filterable v-model='addMsg.CurrencyId' @change="getRate(addMsg.CurrencyId)">
<el-option label='不限' :value="selectDefauleValue"></el-option>
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="汇率" prop="CurrentRate">
<el-input v-model="addMsg.CurrentRate" @keyup.native="checkRate(addMsg,'CurrentRate')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车辆图片">
<el-upload class="avatar-uploader" :http-request="UploadImage" :multiple="false"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="addMsg.ShowBusImage&&addMsg.ShowBusImage!=''" :src="addMsg.ShowBusImage"
style="width:200px;height:100px">
<i class="el-icon-upload2 avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="说明" prop="Remark">
<el-input type="textarea" autosize placeholder="请输入内容" v-model="addMsg.Remark">
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
export default {
data() {
var DealAreaValidate = (rule, value, callback) => {
if (value === 0) {
callback(new Error("请选择地区"));
} else {
callback();
}
};
var validateCurrency = (rule, value, callback) => {
if (value === 0) {
callback(new Error("请选择币种"));
} else {
callback();
}
};
return {
total: 0,
currentPage: 1,
dataList: "",
loading: false,
isShow: false,
BusTypeList: "",
selectDefauleValue: 0,
AreaList: [],
currencyTypeList: [],
msg: {
pageIndex: 1,
pageSize: 18
},
//表单json
addMsg: {
ID: 0,
UseNum: "",
BusType: "",
ReceivePrice: "",
SendPrice: "",
AllDayPrice: "",
HalfDayPrice: "",
HourPrice: "",
Remark: "",
AreaType: 0,
CurrencyId: 0,
CurrentRate: 0,
AllDayHighSpeedFee: 0, //全天高速费
PickUpHighSpeedFee: 0, //接送高速费
AllDayChaDaiFee: 0, //全天茶代费
PickUpChaDaiFee: 0, //接送茶代费
BusImage: '', //车辆图片
ShowBusImage: "",
DetailsList:[],//报价详情列表
},
//表单验证
rules: {
AreaType: [{
validator: DealAreaValidate,
trigger: "change",
required: true
}],
CurrencyId: [{
validator: validateCurrency,
trigger: "change",
required: true
}],
BusType: [{
required: true,
message: "请选择车辆类型",
trigger: "change"
}],
UseNum: [{
required: true,
message: "请输入人数",
trigger: "change"
}],
ReceivePrice: [{
required: true,
message: "请输入接机价格",
trigger: "change"
}],
SendPrice: [{
required: true,
message: "请输入送机价格",
trigger: "change"
}],
AllDayPrice: [{
required: true,
message: "请输入全天价格",
trigger: "change"
}],
HalfDayPrice: [{
required: true,
message: "请输入全天价格",
trigger: "change"
}],
HourPrice: [{
required: true,
message: "请输入小时价格",
trigger: "change"
}],
AllDayHighSpeedFee: [{
required: true,
message: "请输入全天高速价格",
trigger: "change"
}],
PickUpHighSpeedFee: [{
required: true,
message: "请输入接送高速价格",
trigger: "change"
}],
AllDayChaDaiFee: [{
required: true,
message: "请输入全天茶代价格",
trigger: "change"
}],
PickUpChaDaiFee: [{
required: true,
message: "请输入接送茶代价格",
trigger: "change"
}]
}
};
},
methods: {
//上传图片
UploadImage(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
var obj = this.$DMCUtils.DMCImageObj();
var str = x.name;
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.addMsg.BusImage = x.data.FilePath;
this.addMsg.ShowBusImage = imgUrl;
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.initData();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
initData() {
this.loading = true;
this.apipost(
"busprice_get_GetBusPricePageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}
},
null
);
},
saveInfo() {
this.apipost(
"busprice_post_SetBusPrice",
this.addMsg,
res => {
if (res.data.resultCode == 1) {
this.initData();
this.Success("保存成功");
this.isShow = false;
this.resetForm("addMsg");
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取地区下拉
getAreaList() {
this.apipost(
"busprice_get_GetBusAreaType", {},
res => {
if (res.data.resultCode == 1) {
this.AreaList = res.data.data;
}
},
null
);
},
//根据ID获取地区
getArea(AreaType) {
var AreaName = '';
this.AreaList.forEach(item => {
if (item.Id == AreaType) {
AreaName = item.Name
}
})
return AreaName;
},
getCurrencyType() { // 币种类型
this.apipost('financeinfo_post_GetList', {
Name: ''
}, res => {
if (res.data.resultCode == 1) {
this.currencyTypeList = res.data.data;
}
}, err => {})
},
//修改管理报价
managePrice(ID) {
this.addMsg.ID = ID;
this.isShow = true;
let msg = {
ID: ID
};
this.apipost(
"busprice_get_GetBusPrice",
msg,
res => {
this.addMsg = res.data.data;
},
null
);
},
/*获取车辆类型列表*/
getBusTypeList() {
this.apipost(
"bus_get_GetBusTypeList",
null,
res => {
if (res.data.resultCode == 1) {
this.BusTypeList = res.data.data;
}
},
null
);
},
//币种下拉获取汇率
getRate(ID) {
this.currencyTypeList.forEach(x => {
if (x.ID == ID) {
this.addMsg.CurrentRate = x.Rate;
}
});
},
//取消
cancelPanel() {
this.isShow = false;
this.resetForm("addMsg");
},
//添加
addPanel() {
this.isShow = true;
this.addMsg.ID = 0;
this.clearInfo();
},
clearInfo() {
this.addMsg = {
ID: 0,
UseNum: "",
BusType: "",
ReceivePrice: "",
SendPrice: "",
AllDayPrice: "",
HalfDayPrice: "",
HourPrice: "",
Remark: "",
AreaType: 0,
CurrencyId: 0,
CurrentRate: 0,
AllDayHighSpeedFee: 0,
PickUpHighSpeedFee: 0,
AllDayChaDaiFee: 0,
PickUpChaDaiFee: 0,
BusImage: ''
};
},
submitForm(addMsg) {
//提交创建、修改表单
let that = this;
that.$refs[addMsg].validate(valid => {
if (valid) {
that.saveInfo();
} else {
return false;
}
});
},
resetForm(formName) {
this.$refs[formName].resetFields();
},
//删除
isdelete(ID) {
var that = this;
this.Confirm("是否删除?", function () {
var msg = {
ID: ID
};
that.apipost(
"busprice_post_RemoveBusPrice",
msg,
res => {
if (res.data.resultCode == 1) {
that.initData();
}
},
null
);
});
}
},
mounted() {
this.initData();
this.getAreaList();
this.getCurrencyType();
this.getBusTypeList();
}
};
</script>
src/components/index.vue
View file @ e1042558
......@@ -44,6 +44,14 @@
.myIndexStyle .addTichengDialog .el-dialog__body{
padding:0;
}
.TiChengScore{
position: absolute;
left:2rem;
top:1.5rem;
}
.TiChengScore img {
width:30px;
}
</style>
......@@ -516,6 +524,14 @@
{{getResetTime(item.createTime)}}
</p>
<div class="tichengContent" @click="getTichengInfo(item)">
<div class="TiChengScore">
<img v-if="item.SellGeneralContent.totalCommission>=2000&&item.SellGeneralContent.totalCommission<4000" src="../assets/img/imbg/A.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission>=1000&&item.SellGeneralContent.totalCommission<2000" src="../assets/img/imbg/B.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission<1000" src="../assets/img/imbg/C.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission>=4000&&item.SellGeneralContent.totalCommission<8000" src="../assets/img/imbg/S.png" alt=""/>
<img style="width:40px;" v-if="item.SellGeneralContent.totalCommission>=8000&&item.SellGeneralContent.totalCommission<15000" src="../assets/img/imbg/SS.png" alt=""/>
<img style="width:65px;" v-if="item.SellGeneralContent.totalCommission>=15000" src="../assets/img/imbg/SSR.png" alt=""/>
</div>
<div class="Ticheng_Date">
<span>{{item.SellGeneralContent.Month}}月</span><span class="Ticheng_Money"><span>¥</span>{{item.SellGeneralContent.totalCommission}}</span>
</div>
......@@ -641,6 +657,14 @@
{{getResetTime(item.createTime)}}
</p>
<div class="tichengContent" @click="getTichengInfo(item)">
<div class="TiChengScore">
<img v-if="item.SellGeneralContent.totalCommission>=2000&&item.SellGeneralContent.totalCommission<4000" src="../assets/img/imbg/A.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission>=1000&&item.SellGeneralContent.totalCommission<2000" src="../assets/img/imbg/B.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission<1000" src="../assets/img/imbg/C.png" alt=""/>
<img v-if="item.SellGeneralContent.totalCommission>=4000&&item.SellGeneralContent.totalCommission<8000" src="../assets/img/imbg/S.png" alt=""/>
<img style="width:40px;" v-if="item.SellGeneralContent.totalCommission>=8000&&item.SellGeneralContent.totalCommission<15000" src="../assets/img/imbg/SS.png" alt=""/>
<img style="width:65px;" v-if="item.SellGeneralContent.totalCommission>=15000" src="../assets/img/imbg/SSR.png" alt=""/>
</div>
<div class="Ticheng_Date">
<span>{{item.SellGeneralContent.Month}}月</span><span class="Ticheng_Money"><span>¥</span>{{item.SellGeneralContent.totalCommission}}</span>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ e1042558
......@@ -287,6 +287,16 @@
});
},
getHtml: function (postData, SaveType, TeamType) {
//HK 2019-10-14 新增开始
if (this.$refs.newFeature2 != undefined) {
//检查是否有更新
var IsRefresh = this.$refs.newFeature2.getIsRefresh();
if (IsRefresh) {
//有更新重新初始化行程特色内容
this.$refs.newFeature2.UpDateInfo();
}
}
//HK 2019-10-14 新增结束
var FeatureData = {
B2BRemark: postData.B2BRemark,
ConfigId: postData.ConfigId,
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ e1042558
......@@ -1636,6 +1636,11 @@
blockList.splice(index1, 1);
this.pageCount(name)
},
//判断是否切换
getIsRefresh()
{
return this.Refresh;
},
// 返回数据对象
getFeatureData: function () {
this.canEditChange(false);
......
src/components/newTravelmanager/TravelGroupControl/travelFeature/featureBody.vue
View file @ e1042558
......@@ -35,35 +35,6 @@
</div>
</div>
</div>
<!-- <div class="meal-first-box" v-if='i==0 && x.type==1'>
<div class="img-box" :id='"box_"+index+"_"+i'>
<div class="img-parent">
<VueDraggableResizable :ref='"vds_"+index+"_"+i' tabindex="0" :resizable='false' :active="false" :parent="false" axis='y' @activated="onActivated(i)" :w="860" :h="1960" :x="x.x" :y="x.y" :z="2" @dragstop="onDragstop">
<img :src='x.img' :id='"body_"+index+"_"+i' />
</VueDraggableResizable>
</div>
<div class="type">
<span>酒店</span>
</div>
</div>
<div class="remark">优选酒店</div>
<div class="hotelInfo">
<div class="name-box">
<div class="name">
<div class="right-bg"></div>
<input v-if='!r' v-model='x.name' :style='{width:x.name.length*28+"px"}' type="text" maxlength="10" />
</div>
<div class="cityName">
<div class="left-bg"></div>
<input v-if='!r' v-model='x.cityName' type="text" maxlength="5" />
</div>
</div>
<div class="star-box"></div>
<div class="txt-content">
<textarea v-if='!r' v-model="x.description" spellcheck="false"></textarea>
</div>
</div>
</div> -->
<div class="hotel-second-box" v-if='i==1 && x.type==1'>
<div class="hotelInfo">
<div class="txt-content">
......
src/components/newTravelmanager/TravelGroupControl/travelFeature/index.vue
View file @ e1042558
......@@ -347,7 +347,6 @@
this.h.subTitle = this.data.Subtitle ? this.data.Subtitle : "";
this.h.title = this.data.Title ? (this.data.Title.length > 20 ? this.data.Title.substring(0, 20) : this.data.Title) :
"";
console.log("this.h",this.data,this.h);
//初始化A4腰
if (this.data.LineName) {
this.f.line = this.data.LineName.replace(/出境/ig, "");
......@@ -432,13 +431,6 @@
this.t.push(i)
}
} else if (active == 'change') {
// if (chooseType == 1 || chooseType == 2) {
// } else {
// let tempObj = this.d[i]
// tempObj.img = path
// this.$set(this.d, i, tempObj)
// }
let tempObj = this.d[i];
tempObj.img.list[tempObj.img.index] = path
this.$set(this.d, i, tempObj)
......@@ -457,5 +449,4 @@
}
}
}
</script>
</script>
\ No newline at end of file
src/router/config.js
View file @ e1042558
......@@ -1732,7 +1732,24 @@ export default {
meta: {
title: '车辆报价'
},
}, {
},
{
path: '/busUsePrice2', //车辆报价2
name: 'busUsePrice2',
component: resolve => require(['@/components/busManagement/busUsePrice2'], resolve),
meta: {
title: '车辆报价'
},
},
{
path: '/busUsePriceDetails', //车辆报价详情
name: 'busUsePriceDetails',
component: resolve => require(['@/components/busManagement/busUsePriceDetails'], resolve),
meta: {
title: '车辆报价'
},
},
{
path: '/BusApportionManagement',
name: 'BusApportionManagement',
component: resolve => require(['@/components/busManagement/BusApportionManagement'], resolve),
......
yarn.lock
View file @ e1042558
......@@ -126,6 +126,14 @@ accepts@~1.3.4, accepts@~1.3.5:
mime-types "~2.1.18"
negotiator "0.6.1"
accepts@~1.3.7:
version "1.3.7"
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
dependencies:
mime-types "~2.1.24"
negotiator "0.6.2"
acorn-dynamic-import@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
......@@ -144,6 +152,11 @@ acorn-jsx@^3.0.0:
dependencies:
acorn "^3.0.4"
acorn-walk@^6.1.1:
version "6.2.0"
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
acorn@^2.1.0, acorn@^2.4.0:
version "2.7.0"
resolved "http://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
......@@ -156,10 +169,15 @@ acorn@^4.0.3:
version "4.0.13"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
acorn@^5.0.0, acorn@^5.3.0, acorn@^5.5.0:
acorn@^5.0.0, acorn@^5.5.0:
version "5.7.3"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
acorn@^6.0.7:
version "6.3.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e"
integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==
address@>=0.0.1, address@^1.0.0:
version "1.0.3"
resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
......@@ -187,6 +205,11 @@ agentkeepalive@^3.4.1:
dependencies:
humanize-ms "^1.2.1"
ajv-errors@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
ajv-keywords@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
......@@ -195,6 +218,11 @@ ajv-keywords@^3.1.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
ajv-keywords@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
ajv@^5.0.0, ajv@^5.2.3, ajv@^5.3.0:
version "5.5.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
......@@ -213,6 +241,16 @@ ajv@^6.1.0:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
ajv@^6.10.2:
version "6.10.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
dependencies:
fast-deep-equal "^2.0.1"
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
ali-oss@^5.3.1:
version "5.3.2"
resolved "https://registry.yarnpkg.com/ali-oss/-/ali-oss-5.3.2.tgz#11259062c838102149bd626cac0e82b513abbdc1"
......@@ -484,12 +522,13 @@ aws4@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
axios@^0.18.0:
version "0.18.0"
resolved "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
axios@^0.19.0:
version "0.19.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
dependencies:
follow-redirects "^1.3.0"
is-buffer "^1.1.5"
follow-redirects "1.5.10"
is-buffer "^2.0.2"
babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
version "6.26.0"
......@@ -1134,18 +1173,25 @@ better-assert@~1.0.0:
dependencies:
callsite "1.0.0"
bfj-node4@^5.2.0:
version "5.3.1"
resolved "https://registry.yarnpkg.com/bfj-node4/-/bfj-node4-5.3.1.tgz#e23d8b27057f1d0214fc561142ad9db998f26830"
bfj@^6.1.1:
version "6.1.2"
resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz#325c861a822bcb358a41c78a33b8e6e2086dde7f"
integrity sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==
dependencies:
bluebird "^3.5.1"
check-types "^7.3.0"
tryer "^1.0.0"
bluebird "^3.5.5"
check-types "^8.0.3"
hoopy "^0.1.4"
tryer "^1.0.1"
big.js@^3.1.3:
version "3.2.0"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
big.js@^5.2.2:
version "5.2.2"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
binary-extensions@^1.0.0:
version "1.12.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
......@@ -1164,6 +1210,11 @@ bluebird@^3.1.1, bluebird@^3.4.7, bluebird@^3.5.1:
version "3.5.2"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
bluebird@^3.5.5:
version "3.5.5"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
version "4.11.8"
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
......@@ -1183,6 +1234,22 @@ body-parser@1.18.2:
raw-body "2.3.2"
type-is "~1.6.15"
body-parser@1.19.0:
version "1.19.0"
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
dependencies:
bytes "3.1.0"
content-type "~1.0.4"
debug "2.6.9"
depd "~1.1.2"
http-errors "1.7.2"
iconv-lite "0.4.24"
on-finished "~2.3.0"
qs "6.7.0"
raw-body "2.4.0"
type-is "~1.6.17"
bonjour@^3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
......@@ -1348,6 +1415,11 @@ bytes@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
bytes@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
cacache@^10.0.4:
version "10.0.4"
resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
......@@ -1424,6 +1496,11 @@ camelcase@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
camelcase@^5.2.0:
version "5.3.1"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
can-promise@^0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/can-promise/-/can-promise-0.0.1.tgz#7a7597ad801fb14c8b22341dfec314b6bd6ad8d3"
......@@ -1494,7 +1571,7 @@ chalk@^1.0.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, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1:
chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
dependencies:
......@@ -1502,13 +1579,23 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
chalk@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
dependencies:
ansi-styles "^3.2.1"
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
chardet@^0.4.0:
version "0.4.2"
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
check-types@^7.3.0:
version "7.4.0"
resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4"
check-types@^8.0.3:
version "8.0.3"
resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552"
integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==
child_process@^1.0.2:
version "1.0.2"
......@@ -1725,9 +1812,10 @@ commander@2.17.x, commander@~2.17.1:
version "2.17.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
commander@^2.13.0:
version "2.18.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
commander@^2.18.0:
version "2.20.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
commander@~1.1.1:
version "1.1.1"
......@@ -1851,6 +1939,13 @@ content-disposition@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
content-disposition@0.5.3:
version "0.5.3"
resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
dependencies:
safe-buffer "5.1.2"
content-type@^1.0.2, content-type@~1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
......@@ -1869,6 +1964,11 @@ cookie@0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
cookie@0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
copy-concurrently@^1.0.0:
version "1.0.5"
resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
......@@ -2012,24 +2112,22 @@ css-line-break@1.0.1:
dependencies:
base64-arraybuffer "^0.1.5"
css-loader@^0.28.11:
version "0.28.11"
resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7"
dependencies:
babel-code-frame "^6.26.0"
css-selector-tokenizer "^0.7.0"
cssnano "^3.10.0"
icss-utils "^2.1.0"
loader-utils "^1.0.2"
lodash.camelcase "^4.3.0"
object-assign "^4.1.1"
postcss "^5.0.6"
postcss-modules-extract-imports "^1.2.0"
postcss-modules-local-by-default "^1.2.0"
postcss-modules-scope "^1.1.0"
postcss-modules-values "^1.3.0"
css-loader@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz#d8254f72e412bb2238bb44dd674ffbef497333ea"
integrity sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==
dependencies:
camelcase "^5.2.0"
icss-utils "^4.1.0"
loader-utils "^1.2.3"
normalize-path "^3.0.0"
postcss "^7.0.14"
postcss-modules-extract-imports "^2.0.0"
postcss-modules-local-by-default "^2.0.6"
postcss-modules-scope "^2.1.0"
postcss-modules-values "^2.0.0"
postcss-value-parser "^3.3.0"
source-list-map "^2.0.0"
schema-utils "^1.0.0"
css-select@^1.1.0:
version "1.2.0"
......@@ -2040,23 +2138,16 @@ css-select@^1.1.0:
domutils "1.5.1"
nth-check "~1.0.1"
css-selector-tokenizer@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
dependencies:
cssesc "^0.1.0"
fastparse "^1.1.1"
regexpu-core "^1.0.0"
css-what@2.1:
version "2.1.0"
resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
cssesc@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
cssesc@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
cssnano@^3.10.0, cssnano@^3.4.0:
cssnano@^3.4.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
dependencies:
......@@ -2461,9 +2552,10 @@ ee-first@1.1.1, ee-first@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
ejs@^2.5.7:
version "2.6.1"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
ejs@^2.6.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.1.tgz#5b5ab57f718b79d4aca9254457afecd36fa80228"
integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==
electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47:
version "1.3.70"
......@@ -2971,6 +3063,42 @@ express@^4.16.2:
utils-merge "1.0.1"
vary "~1.1.2"
express@^4.16.3:
version "4.17.1"
resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
dependencies:
accepts "~1.3.7"
array-flatten "1.1.1"
body-parser "1.19.0"
content-disposition "0.5.3"
content-type "~1.0.4"
cookie "0.4.0"
cookie-signature "1.0.6"
debug "2.6.9"
depd "~1.1.2"
encodeurl "~1.0.2"
escape-html "~1.0.3"
etag "~1.8.1"
finalhandler "~1.1.2"
fresh "0.5.2"
merge-descriptors "1.0.1"
methods "~1.1.2"
on-finished "~2.3.0"
parseurl "~1.3.3"
path-to-regexp "0.1.7"
proxy-addr "~2.0.5"
qs "6.7.0"
range-parser "~1.2.1"
safe-buffer "5.1.2"
send "0.17.1"
serve-static "1.14.1"
setprototypeof "1.1.1"
statuses "~1.5.0"
type-is "~1.6.18"
utils-merge "1.0.1"
vary "~1.1.2"
extend-shallow@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
......@@ -3052,10 +3180,6 @@ fast-levenshtein@~2.0.4:
version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
fastparse@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
faye-websocket@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
......@@ -3104,9 +3228,10 @@ filename-regex@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
filesize@^3.5.11:
filesize@^3.6.1:
version "3.6.1"
resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
fill-range@^2.1.0:
version "2.2.4"
......@@ -3139,6 +3264,19 @@ finalhandler@1.1.1:
statuses "~1.4.0"
unpipe "~1.0.0"
finalhandler@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
dependencies:
debug "2.6.9"
encodeurl "~1.0.2"
escape-html "~1.0.3"
on-finished "~2.3.0"
parseurl "~1.3.3"
statuses "~1.5.0"
unpipe "~1.0.0"
find-cache-dir@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
......@@ -3188,7 +3326,14 @@ flush-write-stream@^1.0.0:
inherits "^2.0.1"
readable-stream "^2.0.4"
follow-redirects@^1.0.0, follow-redirects@^1.3.0:
follow-redirects@1.5.10:
version "1.5.10"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
dependencies:
debug "=3.1.0"
follow-redirects@^1.0.0:
version "1.5.8"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.8.tgz#1dbfe13e45ad969f813e86c00e5296f525c885a1"
dependencies:
......@@ -3497,12 +3642,13 @@ gulp-rename@^1.2.2:
version "1.4.0"
resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.4.0.tgz#de1c718e7c4095ae861f7296ef4f3248648240bd"
gzip-size@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-4.1.0.tgz#8ae096257eabe7d69c45be2b67c448124ffb517c"
gzip-size@^5.0.0:
version "5.1.1"
resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==
dependencies:
duplexer "^0.1.1"
pify "^3.0.0"
pify "^4.0.1"
handle-thing@^1.2.5:
version "1.2.5"
......@@ -3627,6 +3773,11 @@ home-or-tmp@^2.0.0:
os-homedir "^1.0.0"
os-tmpdir "^1.0.1"
hoopy@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==
hosted-git-info@^2.1.4:
version "2.7.1"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
......@@ -3708,6 +3859,28 @@ http-errors@1.6.3, http-errors@~1.6.2:
setprototypeof "1.1.0"
statuses ">= 1.4.0 < 2"
http-errors@1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
dependencies:
depd "~1.1.2"
inherits "2.0.3"
setprototypeof "1.1.1"
statuses ">= 1.5.0 < 2"
toidentifier "1.0.0"
http-errors@~1.7.2:
version "1.7.3"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
dependencies:
depd "~1.1.2"
inherits "2.0.4"
setprototypeof "1.1.1"
statuses ">= 1.5.0 < 2"
toidentifier "1.0.0"
http-parser-js@>=0.4.0:
version "0.4.13"
resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
......@@ -3771,7 +3944,7 @@ iconv-lite@0.4.23:
dependencies:
safer-buffer ">= 2.1.2 < 3"
iconv-lite@^0.4.13, iconv-lite@^0.4.15, iconv-lite@^0.4.17, iconv-lite@^0.4.4:
iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.15, iconv-lite@^0.4.17, iconv-lite@^0.4.4:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
dependencies:
......@@ -3781,11 +3954,12 @@ icss-replace-symbols@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
icss-utils@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
icss-utils@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==
dependencies:
postcss "^6.0.1"
postcss "^7.0.14"
ieee754@^1.1.4:
version "1.1.12"
......@@ -3865,6 +4039,11 @@ inherits@2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
inherits@2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
ini@^1.3.4, ini@~1.3.0:
version "1.3.5"
resolved "http://registry.npm.taobao.org/ini/download/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
......@@ -3916,6 +4095,11 @@ ipaddr.js@1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
ipaddr.js@1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
is-absolute-url@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
......@@ -3946,6 +4130,11 @@ is-buffer@^1.1.5:
version "1.1.6"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
is-buffer@^2.0.2:
version "2.0.3"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
is-builtin-module@^1.0.0:
version "1.0.0"
resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
......@@ -4319,6 +4508,13 @@ json5@^0.5.0, json5@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
json5@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
dependencies:
minimist "^1.2.0"
jspdf@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-1.4.1.tgz#8dbd437986346d65efe20ede5361927666b8e4ca"
......@@ -4476,6 +4672,15 @@ loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.1.0:
emojis-list "^2.0.0"
json5 "^0.5.0"
loader-utils@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
dependencies:
big.js "^5.2.2"
emojis-list "^2.0.0"
json5 "^1.0.1"
locate-path@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
......@@ -4487,10 +4692,6 @@ lodash.assign@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
lodash.camelcase@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
lodash.clonedeep@^4.3.2:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
......@@ -4507,14 +4708,24 @@ lodash.mergewith@^4.6.0:
version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
lodash.throttle@latest:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@latest, lodash@~4.17.10:
lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10:
version "4.17.11"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
lodash@^4.17.15:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
log-symbols@^2.1.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
......@@ -4693,6 +4904,11 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
mime-db@1.40.0:
version "1.40.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
"mime-db@>= 1.36.0 < 2", mime-db@~1.36.0:
version "1.36.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
......@@ -4703,18 +4919,26 @@ mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
dependencies:
mime-db "~1.36.0"
mime@1.3.x:
version "1.3.6"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
mime-types@~2.1.24:
version "2.1.24"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
dependencies:
mime-db "1.40.0"
mime@1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
mime@^1.3.4, mime@^1.4.1, mime@^1.5.0:
mime@1.6.0, mime@^1.3.4, mime@^1.4.1, mime@^1.5.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
mime@^2.4.4:
version "2.4.4"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
mimic-fn@^1.0.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
......@@ -4782,6 +5006,11 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
dependencies:
minimist "0.0.8"
moment@^2.24.0:
version "2.24.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
move-concurrently@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
......@@ -4801,7 +5030,7 @@ ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
ms@^2.0.0, ms@^2.1.1:
ms@2.1.1, ms@^2.0.0, ms@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
......@@ -4878,6 +5107,11 @@ negotiator@0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
negotiator@0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
neo-async@^2.5.0:
version "2.5.2"
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
......@@ -5031,6 +5265,11 @@ normalize-path@^2.0.1, normalize-path@^2.1.1:
dependencies:
remove-trailing-separator "^1.0.1"
normalize-path@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
normalize-range@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
......@@ -5173,9 +5412,10 @@ onetime@^2.0.0:
dependencies:
mimic-fn "^1.0.0"
opener@^1.4.3:
opener@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
opn@^5.1.0:
version "5.3.0"
......@@ -5397,6 +5637,16 @@ parseurl@~1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
parseurl@~1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
particleground-light@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/particleground-light/-/particleground-light-1.0.6.tgz#0e81548bcf91ff950bbafc2bfe93d024a3d76fd8"
integrity sha1-DoFUi8+R/5ULuvwr/pPQJKPXb9g=
pascalcase@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
......@@ -5488,6 +5738,11 @@ pify@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
pify@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
pinkie-promise@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
......@@ -5712,32 +5967,37 @@ postcss-minify-selectors@^2.0.4:
postcss "^5.0.14"
postcss-selector-parser "^2.0.0"
postcss-modules-extract-imports@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
postcss-modules-extract-imports@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
dependencies:
postcss "^6.0.1"
postcss "^7.0.5"
postcss-modules-local-by-default@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
postcss-modules-local-by-default@^2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz#dd9953f6dd476b5fd1ef2d8830c8929760b56e63"
integrity sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==
dependencies:
css-selector-tokenizer "^0.7.0"
postcss "^6.0.1"
postcss "^7.0.6"
postcss-selector-parser "^6.0.0"
postcss-value-parser "^3.3.1"
postcss-modules-scope@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
postcss-modules-scope@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz#ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"
integrity sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==
dependencies:
css-selector-tokenizer "^0.7.0"
postcss "^6.0.1"
postcss "^7.0.6"
postcss-selector-parser "^6.0.0"
postcss-modules-values@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
postcss-modules-values@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz#479b46dc0c5ca3dc7fa5270851836b9ec7152f64"
integrity sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==
dependencies:
icss-replace-symbols "^1.1.0"
postcss "^6.0.1"
postcss "^7.0.6"
postcss-normalize-charset@^1.1.0:
version "1.1.1"
......@@ -5790,6 +6050,15 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
indexes-of "^1.0.1"
uniq "^1.0.1"
postcss-selector-parser@^6.0.0:
version "6.0.2"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
dependencies:
cssesc "^3.0.0"
indexes-of "^1.0.1"
uniq "^1.0.1"
postcss-svgo@^2.1.1:
version "2.1.6"
resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
......@@ -5821,6 +6090,11 @@ postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^
version "3.3.0"
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
postcss-value-parser@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
postcss-zindex@^2.0.1:
version "2.2.0"
resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
......@@ -5829,7 +6103,7 @@ postcss-zindex@^2.0.1:
postcss "^5.0.4"
uniqs "^2.0.0"
postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.8, postcss@^5.2.16:
version "5.2.18"
resolved "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
dependencies:
......@@ -5846,6 +6120,15 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.17, postcss@^6.0.8:
source-map "^0.6.1"
supports-color "^5.4.0"
postcss@^7.0.14, postcss@^7.0.5, postcss@^7.0.6:
version "7.0.18"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
dependencies:
chalk "^2.4.2"
source-map "^0.6.1"
supports-color "^6.1.0"
prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
......@@ -5910,6 +6193,14 @@ proxy-addr@~2.0.3:
forwarded "~0.1.2"
ipaddr.js "1.8.0"
proxy-addr@~2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
dependencies:
forwarded "~0.1.2"
ipaddr.js "1.9.0"
proxy-agent@^2.1.0:
version "2.3.1"
resolved "http://registry.npmjs.org/proxy-agent/-/proxy-agent-2.3.1.tgz#3d49d863d46cf5f37ca8394848346ea02373eac6"
......@@ -6001,6 +6292,11 @@ qs@6.5.1:
version "6.5.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
qs@6.7.0:
version "6.7.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
qs@^6.4.0, qs@~6.5.2:
version "6.5.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
......@@ -6068,6 +6364,11 @@ range-parser@^1.0.3, range-parser@~1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
range-parser@~1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
raw-body@2.3.2:
version "2.3.2"
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
......@@ -6077,6 +6378,16 @@ raw-body@2.3.2:
iconv-lite "0.4.19"
unpipe "1.0.0"
raw-body@2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
dependencies:
bytes "3.1.0"
http-errors "1.7.2"
iconv-lite "0.4.24"
unpipe "1.0.0"
raw-body@^2.2.0:
version "2.3.3"
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
......@@ -6233,14 +6544,6 @@ regexpp@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
regexpu-core@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
dependencies:
regenerate "^1.2.1"
regjsgen "^0.2.0"
regjsparser "^0.1.4"
regexpu-core@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
......@@ -6475,6 +6778,23 @@ schema-utils@^0.4.0, schema-utils@^0.4.5:
ajv "^6.1.0"
ajv-keywords "^3.1.0"
schema-utils@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
dependencies:
ajv "^6.1.0"
ajv-errors "^1.0.0"
ajv-keywords "^3.1.0"
schema-utils@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.2.0.tgz#48a065ce219e0cacf4631473159037b2c1ae82da"
integrity sha512-5EwsCNhfFTZvUreQhx/4vVQpJ/lnCAkgoIHLhSpp4ZirE+4hzFvdJi0FMub6hxbFVBJYSpeVVmon+2e7uEGRrA==
dependencies:
ajv "^6.10.2"
ajv-keywords "^3.4.1"
scss-tokenizer@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
......@@ -6528,6 +6848,25 @@ send@0.16.2:
range-parser "~1.2.0"
statuses "~1.4.0"
send@0.17.1:
version "0.17.1"
resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
dependencies:
debug "2.6.9"
depd "~1.1.2"
destroy "~1.0.4"
encodeurl "~1.0.2"
escape-html "~1.0.3"
etag "~1.8.1"
fresh "0.5.2"
http-errors "~1.7.2"
mime "1.6.0"
ms "2.1.1"
on-finished "~2.3.0"
range-parser "~1.2.1"
statuses "~1.5.0"
serialize-javascript@^1.4.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
......@@ -6553,6 +6892,16 @@ serve-static@1.13.2:
parseurl "~1.3.2"
send "0.16.2"
serve-static@1.14.1:
version "1.14.1"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
dependencies:
encodeurl "~1.0.2"
escape-html "~1.0.3"
parseurl "~1.3.3"
send "0.17.1"
set-blocking@^2.0.0, set-blocking@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
......@@ -6587,6 +6936,11 @@ setprototypeof@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
setprototypeof@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
sha.js@^2.4.0, sha.js@^2.4.8:
version "2.4.11"
resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
......@@ -6883,7 +7237,7 @@ static-extend@^0.1.1:
define-property "^0.2.5"
object-copy "^0.1.0"
"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2", statuses@^1.3.1:
"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@^1.3.1, statuses@~1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
......@@ -7039,6 +7393,13 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
dependencies:
has-flag "^3.0.0"
supports-color@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
dependencies:
has-flag "^3.0.0"
svgo@^0.7.0:
version "0.7.2"
resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
......@@ -7191,6 +7552,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
regex-not "^1.0.2"
safe-regex "^1.1.0"
toidentifier@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
toposort@^1.0.0:
version "1.0.7"
resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
......@@ -7220,9 +7586,10 @@ trim-right@^1.0.1:
dependencies:
glob "^7.1.2"
tryer@^1.0.0:
tryer@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
tty-browserify@0.0.0:
version "0.0.0"
......@@ -7251,6 +7618,14 @@ type-is@~1.6.15, type-is@~1.6.16:
media-typer "0.3.0"
mime-types "~2.1.18"
type-is@~1.6.17, type-is@~1.6.18:
version "1.6.18"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
dependencies:
media-typer "0.3.0"
mime-types "~2.1.24"
typedarray@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
......@@ -7381,12 +7756,14 @@ urix@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
url-loader@^0.5.9:
version "0.5.9"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295"
url-loader@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz#bcc1ecabbd197e913eca23f5e0378e24b4412961"
integrity sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A==
dependencies:
loader-utils "^1.0.2"
mime "1.3.x"
loader-utils "^1.2.3"
mime "^2.4.4"
schema-utils "^2.0.0"
url-parse-lax@^1.0.0:
version "1.0.0"
......@@ -7551,12 +7928,13 @@ vue-easytable@^1.7.2:
webpack-chunk-hash "^0.4.0"
webpack-dev-server "^2.5.0"
vue-echarts-v3@^1.0.19:
version "1.0.19"
resolved "https://registry.yarnpkg.com/vue-echarts-v3/-/vue-echarts-v3-1.0.19.tgz#6814e7e426aafed80edfa5df321db51c00789802"
vue-echarts-v3@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/vue-echarts-v3/-/vue-echarts-v3-2.0.1.tgz#35c97040aed968ebc508c9450e95caf913beaafa"
integrity sha512-y8pYNUyX2i/0J76kCNC83KtMYeBlgkCcTS54ETCVsxKqxwtxpH2xnyfSPHktzucbCBR+JSMZGRpjFjBC9B79eg==
dependencies:
element-resize-detector latest
lodash latest
lodash.throttle latest
vue-eslint-parser@^2.0.3:
version "2.0.3"
......@@ -7694,22 +8072,24 @@ webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
webpack-bundle-analyzer@^2.9.0:
version "2.13.1"
resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz#07d2176c6e86c3cdce4c23e56fae2a7b6b4ad526"
webpack-bundle-analyzer@^3.3.2:
version "3.5.0"
resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.0.tgz#c82130a490a05f9267aa5956871aef574dff5074"
integrity sha512-NzueflueLSJxWGzDlMq5oUV+P8Qoq6yiaQlXGCbDYUpHEKlmzWdPLBJ4k/B6HTdAP/vHM8ply1Fx08mDnY+S8Q==
dependencies:
acorn "^5.3.0"
bfj-node4 "^5.2.0"
chalk "^2.3.0"
commander "^2.13.0"
ejs "^2.5.7"
express "^4.16.2"
filesize "^3.5.11"
gzip-size "^4.1.0"
lodash "^4.17.4"
acorn "^6.0.7"
acorn-walk "^6.1.1"
bfj "^6.1.1"
chalk "^2.4.1"
commander "^2.18.0"
ejs "^2.6.1"
express "^4.16.3"
filesize "^3.6.1"
gzip-size "^5.0.0"
lodash "^4.17.15"
mkdirp "^0.5.1"
opener "^1.4.3"
ws "^4.0.0"
opener "^1.5.1"
ws "^6.0.0"
webpack-chunk-hash@^0.4.0:
version "0.4.0"
......@@ -7906,12 +8286,12 @@ ws@1.1.1:
options ">=0.0.5"
ultron "1.0.x"
ws@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
ws@^6.0.0:
version "6.2.1"
resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
dependencies:
async-limiter "~1.0.0"
safe-buffer "~5.1.0"
wtf-8@1.0.0:
version "1.0.0"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment