Skip to content

S
SuperMan
Commit fa56048f authored by zhengke's avatar zhengke
Browse files
Options

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

parents ed94b25b 620b0194
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 15668 additions and 13251 deletions
src/App.vue
View file @ fa56048f
<template>
<div id="app">
<div id="app" :class="{'red-theme':isRed}">
<keep-alive>
<router-view v-if="$route.meta.keepAlive"/>
</keep-alive>
......@@ -66,7 +66,8 @@ export default {
timer:null,
useTime:0,
showCareer:false,
careerId:0
careerId:0,
isRed:false
// sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true
}
},
......@@ -130,6 +131,7 @@ export default {
this.timekeeper()
this.listeneruser()
}
this.haveOpenMode=!localStorage.openMode
this.MsgBus.$on('imgpreviewoverflow',content=>{
this.show(content)
......@@ -169,11 +171,15 @@ export default {
this.careerId=0
this.showCareer=false
})
this.MsgBus.$on("changeTheme",t=>{
console.log('theme type:'+t)
this.isRed=t==1;
})
}
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_erhq7cu6ne6.css";
@import "//at.alicdn.com/t/font_635492_corysyogb8g.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......@@ -195,5 +201,8 @@ export default {
justify-content: center;
z-index: 999999999999999;
}
.red-theme{
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji, MicrosoftJhengHeiBoldFix, "\5FAE\8EDF\6B63\9ED1\9AD4", Microsoft JhengHei;
}
</style>
src/assets/css/Details.css
View file @ fa56048f
......@@ -11,9 +11,73 @@
transition: all linear .3s;
}
.red-theme .secondMenu {
z-index: 9;
}
.secondMenu .extender {
display: none;
height: 50px;
justify-content: center;
align-items: center;
position: absolute;
left: 0;
bottom: 0;
right: 0;
cursor: pointer;
background: #f7f7f7;
}
.red-theme .el-menu-item i {
margin-right: 12px;
}
.secondMenu.big {
width: 230px;
}
.secondMenu .extender img {
width: 18px;
height: 15px;
transform: rotateY(0deg);
transition: transform 0.3s linear;
}
.secondMenu .extender img.close-extend {
transform: rotateY(180deg);
transition: transform 0.3s linear;
}
.secondMenu .extender:hover img {
transform: rotateY(180deg);
transition: transform 0.3s linear;
}
.secondMenu .extender:hover img.close-extend {
transform: rotateY(0deg);
transition: transform 0.3s linear;
}
.secondMenu .extender:hover {
background: #F4F4F4;
}
.red-theme .secondMenu .extender {
display: flex;
}
.red-theme .secondMenu {
background: #FBFBFB;
border-right: 1px solid #dcdcdc;
}
.secondMenu .el-submenu__title i {
color: #a3ace0;
font-size: 18px;
margin-left: 16px;
margin-right: 16px;
min-width: 18px;
display: inline-block;
}
.el-menu--vertical .thridMenu {
......@@ -27,11 +91,22 @@
margin-right: 10px;
}
.el-menu--vertical .thridMenu.red-theme i {
color: #787A7D !important;
font-size: 0;
}
.el-menu--vertical .thridMenu:hover,
.el-menu--vertical .thridMenu:hover i {
color: #f1f1f1 !important;
}
.el-menu--vertical .thridMenu.red-theme:hover,
.el-menu--vertical .thridMenu.red-theme:hover i {
color: #B1B4B8 !important;
background: #F4F4F4 !important;
}
.secondMenu .el-submenu__title:hover i {
color: #f1f1f1;
}
......@@ -41,10 +116,46 @@
text-align: center;
}
.menuItem .el-menu--collapse {
.red-theme .menuItem .el-submenu__title {
text-align: left;
}
.red-theme .secondMenu .menuItem ul,
.red-theme .secondMenu .menuItem ul .el-submenu__title {
background: #FBFBFB !important;
border-right: none;
}
.red-theme .secondMenu .menuItem ul .el-submenu__title i {
color: #787A7D !important;
}
.red-theme .secondMenu .menuItem ul .el-submenu__title:hover {
background: #F4F4F4 !important;
}
.red-theme .secondMenu .menuItem ul .el-submenu__title:i {
color: #B1B4B8 !important;
}
.red-theme .secondMenu .menuItem ul li {
width: 230px;
text-align: left;
}
.red-theme .secondMenu .menuItem ul li .menuItem .el-menu--collapse {
width: 51px;
}
.red-theme .secondMenu .menuItem ul .el-submenu__title i {
margin-left: 16px;
margin-right: 16px;
}
.red-theme .menuItem .el-menu--collapse {
width: 100%;
}
/* .secondMenu:hover{
width: 200px;
......@@ -174,6 +285,13 @@
color: #333333;
}
.red-theme .resource-ttop {
background: #FFF;
margin-left: -19px;
padding-left: 19px;
width: calc(100% + 38px);
}
.resource-ttop i {
font-size: 12px;
color: #999;
......@@ -184,6 +302,10 @@
width: 200px;
}
.red-theme .secondMenu_l {
width: 100%;
}
.menuItem .el-menu-item-group__title {
padding: 0;
}
......@@ -192,6 +314,10 @@
background: #f2f2f2;
}
.ren-theme .flexParent {
background: '#F0F2FA';
}
.my_maxheight {
max-height: 600px;
overflow: auto;
......@@ -201,12 +327,20 @@
border-bottom: 1px solid #0f1522;
}
.my_maxheight.red .el-menu-item-group__title {
border-bottom: 1px solid #ccc;
}
.my_maxheight .el-menu-item-group__title span {
font-size: 14px;
color: #ffffff;
font-family: "PingFangSC-fine";
}
.my_maxheight.red .el-menu-item-group__title span {
color: #787A7D;
}
.my_maxheight::-webkit-scrollbar {
/*滚动条整体样式*/
width: 4px;
......@@ -249,6 +383,10 @@
position: relative;
}
.red-theme .nav-tabs-box {
background: #FFF;
}
.nav-tabs-box .is-active {
background: #f2f2f2;
}
......@@ -257,6 +395,11 @@
background: #f0f0f0;
}
.red-theme .nav-tabs-box .el-tabs {
background: #FFF;
margin-left: 100px !important;
}
.browner-opera-box {
position: absolute;
width: 100px;
......@@ -265,6 +408,7 @@
top: 0;
display: flex;
padding: 5px;
margin-top: 1px;
}
.browner-opera-box i {
......
src/assets/css/cssReset.css
View file @ fa56048f
This diff is collapsed.
src/assets/css/global/config.css
View file @ fa56048f
.secondMenu{
.secondMenu {
margin: 0px 0px 0 0 !important;
}
.el-pagination{
.el-pagination {
border: none !important;
border-top: 1px solid #dcdfe6 !important;
}
.el-pagination {
text-align: center;
white-space: nowrap;
......@@ -15,9 +17,23 @@
font-size: 14px;
margin-top: 15px;
}
.el-pagination__total{
.el-pagination__total {
vertical-align: middle !important;
}
th{
font-family:PingFangSC-Semibold !important;
th {
font-family: PingFangSC-Semibold !important;
}
.red-theme th {
font-family: unset !important;
font-weight: normal !important;
color: #303133 !important;
}
.red-theme .el-button--danger {
color: #fff;
background-color: #f45c43 !important;
border-color: #f45c43 !important;
}
\ No newline at end of file
src/assets/utils/travelFeature2.js
View file @ fa56048f
......@@ -72,7 +72,7 @@ let travelFeatureTwo = {
let obj = {
name: '',
MD5Sign: '',
description: '',
description: '餐厅描述',
images: [],
type:"Dinner"
};
......@@ -87,7 +87,10 @@ let travelFeatureTwo = {
obj.images.push(obj2)
}
}
obj.description = item.Description;
if(item.description)
{
obj.description = item.Description;
}
obj.name = item.DinnerName ? item.DinnerName : '';
obj.Ename = '';
obj.MD5Sign = item.MD5Sign ? item.MD5Sign : '';
......
src/assets/utils/tripUtils.js
View file @ fa56048f
......@@ -619,7 +619,15 @@ var tripUtils = {
if (dayIndex == currentDayIndex) {
if (dayItem.TrafficObj != null && dayItem.TrafficObj.SubTraffic != null && dayItem.TrafficObj.SubTraffic.length > 0) {
dayItem.TrafficObj.SubTraffic.forEach(subItem => {
cityIdStr += subItem.StartCityId + "," + subItem.ArrivalCityId + ","
if(subItem.StartCityId&&subItem.StartCityId!="0")
{
cityIdStr += subItem.StartCityId + ","
}
if(subItem.ArrivalCityId&&subItem.ArrivalCityId!="0")
{
cityIdStr += subItem.ArrivalCityId + ","
}
});
}
}
......@@ -796,6 +804,19 @@ var tripUtils = {
);
}
},
//跳转到B2B页面
GotoB2BPage2(B2BDomain, ConfigId, tcid) {
if (B2BDomain) {
var url = "http://" + B2BDomain;
window.open(
url + "/#/details/" +
encodeURIComponent(ConfigId) +
"/" +
tcid ,
"_blank"
);
}
},
//获取B2B连接
GetB2BUrl(B2BDomain, ConfigId, tcid) {
var url = "";
......
src/components/Details.vue
View file @ fa56048f
This diff is collapsed.
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ fa56048f
......@@ -1570,15 +1570,24 @@ export default {
},err=>{})
},
goassets(ID,OtherType){
// var assetsDomain = 'http://www.test.com:8082/#/';//本地地址
var assetsDomain = 'http://zcyx.oytour.com/#/';//线上地址
if(OtherType==15){
window.open(assetsDomain+ 'procurementDetails' +"?ID="+ID, "_blank"); //采购详情
}else if(OtherType==16){
window.open(assetsDomain+ 'chukudan' +"?ID="+ID+'&type=2', "_blank"); //出库详情
}
this.$router.replace({
name: "InAndOutDdetails",
query: {
ID: ID,
OtherType: OtherType,
blank:'y'
},
})
// var assetsDomain = 'http://www.test.com:8081/#/';//本地地址
// // var assetsDomain = 'http://zcyx.oytour.com/#/';//线上地址
// if(OtherType==15){
// window.open(assetsDomain+ 'procurementDetails' +"?ID="+ID+'&token='+token, "_blank"); //采购详情
// }else if(OtherType==16){
// window.open(assetsDomain+ 'outboundD' +"?ID="+ID+'&type=2', "_blank"); //出库详情
// // window.open(assetsDomain+ 'chukudan' +"?ID="+ID+'&type=2', "_blank"); //出库详情
// }
}
},mounted(){
......
src/components/FinancialModule/InAndOutDdetails.vue 0 → 100644
View file @ fa56048f
<style scoped>
.outboundD .xiangq{
padding: 15px 0;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.outboundD .topkuang{
padding: 5px 10px;
border:1px solid #e2e2e2;
background: #e2e2e2;
border-radius: 15px;
margin-right: 25px;
}
.outboundD .el-table th.is-leaf{
text-align: left !important;
}
</style>
<template>
<div class="outboundD">
<div v-if="OtherType==15" class="xiangq">
<div>
<el-tag style="margin-right: 10px;">仓库名称：{{dataList2.WareHouseName}}</el-tag>
<el-tag style="margin-right: 10px;">备注：{{dataList2.Remark}}</el-tag>
<!-- <span class="topkuang">仓库名称：{{dataList2.WareHouseName}}</span>
<span class="topkuang">备注：{{dataList2.Remark}}</span> -->
</div>
</div>
<div v-if="OtherType==16" class="xiangq">
<div>
<el-tag style="margin-right: 10px;">出库状态：{{dataList.StockOutStateStr}}</el-tag>
<el-tag style="margin-right: 10px;">出库单编码：{{dataList.StockOutNum}}</el-tag>
<el-tag style="margin-right: 10px;">出库时间：{{dataList.UpdateDate}}</el-tag>
<el-tag style="margin-right: 10px;">仓库名称：{{dataList.WareHouseName}}</el-tag>
<el-tag style="margin-right: 10px;">领取人：{{dataList.EmName}}</el-tag>
<el-tag style="margin-right: 10px;">操作人/时间：{{dataList.UpdateBy}}/{{dataList.StockOutDate}}</el-tag>
</div>
</div>
<el-table v-if="OtherType==15"
:data="dataList2.DetailList"
border
header-align='left'
style="width: 100%">
<el-table-column
prop="Id"
label="ID"
width="80">
</el-table-column>
<el-table-column
prop="ImageList"
label="封面图"
width="90">
<template slot-scope="scope">
<img :src=" scope.row.MaterialModel.ImageList[0]" alt="" style="width: 60px; height: 60px;">
</template>
</el-table-column>
<el-table-column
prop="Name"
label="商品名称"
>
<template slot-scope="scope">
<span>{{scope.row.MaterialModel.Name}}</span>
</template>
</el-table-column>
<el-table-column
prop="Name"
label="规格"
width="300"
>
<template slot-scope="scope">
<span v-for="(x,y) in scope.row.MaterialModel.GoodsSpecificationList" :key="y">{{x}} <span v-if="scope.row.MaterialModel.GoodsSpecificationList.length !== y+1"> , </span></span>
</template>
</el-table-column>
<el-table-column
prop="Number"
label="采购数量"
width="150">
</el-table-column>
<el-table-column
prop="Id"
label="已入数量"
width="150">
<template slot-scope="scope">
<span>{{scope.row.StockInNum!=null?scope.row.StockInNum:0}}</span>
</template>
</el-table-column>
</el-table>
<el-table v-if="OtherType==16"
:data="dataList.DetailList"
header-align="left"
border
style="width: 100%">
<el-table-column
prop="SuppliesName"
label="耗材名称 "
width="700"
>
</el-table-column>
<el-table-column
prop="SuppliesNum"
label="耗材编码 "
>
</el-table-column>
<el-table-column
prop="CategoryName"
label="分类名称 "
>
</el-table-column>
<el-table-column
prop="WareHouseName"
label="品牌名称 "
>
<template slot-scope="scope">
<span v-for="(x,y) in scope.row.GoodsCategoryList" :key="y">{{x}} <span v-if="scope.row.GoodsCategoryList.length !== y+1"> , </span></span>
</template>
</el-table-column>
<el-table-column
prop="InventoryNum"
label="库存 "
>
</el-table-column>
<el-table-column
prop="Number"
label="数量 "
>
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
data(){
return{
msg:{
pageIndex:1,
pageSize:10,
StockOutNum:'',
SuppliesNum:'',
SuppliesName:'',
SupplierName:'',
StartTime:'',
EndTime:'',
WarehouseId:'',
EmployeeId:'',
Id:0,
RB_Group_id:''
},
msg2:{
ProcurementId:0,
RB_Group_id:''
},
dataList:{},//出库
dataList2:{},//采购
OtherType:0,
}
},
created(){
this.OtherType = this.$route.query.OtherType
let RB_Group_id = this.getLocalStorage().RB_Group_id;
if(this.OtherType ==15){//采购单
this.msg2.ProcurementId = this.$route.query.ID;
this.msg2.RB_Group_id = RB_Group_id;
this.getList2()
}else if(this.OtherType == 16){//出库单
this.msg.Id = this.$route.query.ID;
this.msg.RB_Group_id = RB_Group_id;
this.getList()
}
},
methods:{
getList(){
this.apiJavaPostZc("/api/Warehouse/GetStockOutPageList",this.msg,
res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData[0]
} else {
this.Error(res.data.message);
}
},
null
);
},
getList2(){
this.apiJavaPostZc("/api/Warehouse/GetProcurementInfo",this.msg2,
res => {
if (res.data.resultCode === 1) {
this.dataList2 = res.data.data
} else {
this.Error(res.data.message);
}
},
null
);
}
},mounted(){
}
}
</script>
src/components/Login2019.vue
View file @ fa56048f
This diff is collapsed.
src/components/SalesModule/addPassenger.vue
View file @ fa56048f
This diff is collapsed.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ fa56048f
......@@ -477,8 +477,8 @@
{{subItem.aName}} {{subItem.Departure_time}}
-
{{subItem.dName}} {{subItem.Arrival_time}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span>
</div>
</template>
......@@ -1893,7 +1893,11 @@
goB2B(ConfigId, tcid, type) {
var B2BDomain = this.CurrentUserInfo.B2BDomain;
if (type == 1) {
this.$tripUtils.GotoB2BPage(B2BDomain, ConfigId, tcid);
if (this.CurrentUserInfo.RB_Group_id == 81) {
this.$tripUtils.GotoB2BPage2(B2BDomain, ConfigId, tcid);
} else {
this.$tripUtils.GotoB2BPage(B2BDomain, ConfigId, tcid);
}
} else {
this.$tripUtils.GotoB2CPage(B2BDomain, ConfigId, tcid);
}
......
src/components/TravelManager/TravelNewQuotation/QuotationPrice_SWT.vue
View file @ fa56048f
......@@ -1770,6 +1770,30 @@
},
//保存数据
SaveData(type) {
if (!this.postData.DayNum) {
this.postData.DayNum = 0;
}
if (!this.postData.GuestNum) {
this.postData.GuestNum = 0;
}
if (!this.postData.FocNum) {
this.postData.FocNum = 0;
}
if (!this.postData.SalePrice) {
this.postData.SalePrice = 0;
}
if (!this.postData.SingleRoomPrice) {
this.postData.SingleRoomPrice = 0;
}
if (!this.postData.HotelDisNum) {
this.postData.HotelDisNum = 0;
}
if (!this.postData.DinnerDisNum) {
this.postData.DinnerDisNum = 0;
}
if (!this.postData.TicketDisNum) {
this.postData.TicketDisNum = 0;
}
//酒店默认值赋值
if (this.postData.SWTHotelList && this.postData.SWTHotelList.length > 0) {
this.postData.SWTHotelList.forEach(item => {
......@@ -1835,6 +1859,24 @@
})
})
}
if (this.postData.SWTBusOtherList && this.postData.SWTBusOtherList.length > 0) {
this.postData.SWTBusOtherList.forEach(rootItem => {
rootItem.SubBusList.forEach(item => {
if (!item.Kilometre) {
item.Kilometre = 0;
}
if (!item.VNDPrice) {
item.VNDPrice = 0;
}
if (!item.Times) {
item.Times = 0;
}
if (!item.Price) {
item.Price = 0;
}
})
})
}
//船票默认值赋值
if (this.postData.SWTShipList && this.postData.SWTShipList.length > 0) {
this.postData.SWTShipList.forEach(item => {
......
src/components/WebSet/WebSiteAbout.vue
View file @ fa56048f
<style>
.WebSiteAbout .WebSiteTopdiv {
margin: 10px 0;
width: 1080px;
display: flex;
align-items: center;
justify-content: space-between;
}
.WebSiteAbout {
height: calc(100% - 15px);
}
.WebSiteAbout .WebSiteTopdiv {
/* text-align: right; */
margin: 10px auto;
max-width: 1080px;
min-width: 800px;
height: calc(100% - 20px);
}
.WebSiteAbout .WebSiteTopdiv .title {
display: flex;
align-items: center;
justify-content: space-between;
width: calc(100% - 270px);
padding: 10px 5px;
margin: 15px 0 0 0;
border: 1px solid #d1d1d1;
border-bottom: 1px solid #eee;
background: #fff;
}
</style>
<template>
<!--关于我们-->
<div class="WebSiteAbout">
<div class="WebSiteTopdiv">
<div>关于我们版面設定</div>
<div>
<el-button type="primary" size="small" @click="saveData()">保存</el-button>
<el-button type="primary" size="small" @click="goAbout()">瀏覽頁面</el-button>
<div class="title">
<div>关于我们版面設定</div>
<div>
<el-button type="primary" size="small" @click="saveData()">保存</el-button>
<el-button type="primary" size="small" @click="goAbout()">瀏覽頁面</el-button>
</div>
</div>
</div>
<div>
<WebSiteEdit ref="WebSiteEdit" :templateData="postMsg.HomeDataList"
v-on:getNewTemplateData="getNewTemplateData">
</WebSiteEdit>
<WebSiteEdit
ref="WebSiteEdit"
:templateData="postMsg.HomeDataList"
v-on:getNewTemplateData="getNewTemplateData"
></WebSiteEdit>
</div>
</div>
</template>
<script>
import WebSiteEdit from "../WebSet/WebSiteEdit.vue"
export default {
data() {
return {
postMsg: {
Id: 0,
AboutDataList: [],
//当前登录用户信息
CurrentUserInfo: {},
}
};
import WebSiteEdit from "../WebSet/WebSiteEdit.vue";
export default {
data() {
return {
postMsg: {
Id: 0,
AboutDataList: [],
//当前登录用户信息
CurrentUserInfo: {}
}
};
},
mounted() {
this.getData();
let userInfo = this.getLocalStorage();
this.CurrentUserInfo = userInfo;
},
components: {
WebSiteEdit
},
methods: {
//获取配置
getData() {
this.apipost(
"ws_get_GetHomeAboutTrip",
{},
res => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
if (tempData) {
if (tempData.Id) {
this.postMsg.Id = tempData.Id;
}
if (tempData.AboutDataList && tempData.AboutDataList.length > 0) {
this.postMsg.AboutDataList = tempData.AboutDataList;
}
}
this.$refs.WebSiteEdit.initData(this.postMsg.AboutDataList);
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
mounted() {
this.getData();
let userInfo = this.getLocalStorage();
this.CurrentUserInfo = userInfo;
//保存数据
saveData() {
this.apipost(
"ws_post_SetAboutData",
this.postMsg,
res => {
if (res.data.resultCode == 1) {
this.getData();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
components: {
WebSiteEdit
//获取模板数据
getNewTemplateData(templateDataList) {
this.postMsg.AboutDataList = templateDataList;
},
methods: {
//获取配置
getData() {
this.apipost(
"ws_get_GetHomeAboutTrip", {},
res => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
if (tempData) {
if (tempData.Id) {
this.postMsg.Id = tempData.Id;
}
if (tempData.AboutDataList && tempData.AboutDataList.length > 0) {
this.postMsg.AboutDataList = tempData.AboutDataList;
}
}
this.$refs.WebSiteEdit.initData(this.postMsg.AboutDataList);
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//保存数据
saveData() {
this.apipost(
"ws_post_SetAboutData", this.postMsg,
res => {
if (res.data.resultCode == 1) {
this.getData();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//获取模板数据
getNewTemplateData(templateDataList) {
this.postMsg.AboutDataList = templateDataList;
},
//跳转至预览
goAbout(){
var B2BDomain = this.CurrentUserInfo.B2BDomain;
this.$tripUtils.GotoB2CAbout(B2BDomain);
}
//跳转至预览
goAbout() {
var B2BDomain = this.CurrentUserInfo.B2BDomain;
this.$tripUtils.GotoB2CAbout(B2BDomain);
}
}
};
</script>
src/components/WebSet/WebSiteCustomer.vue
View file @ fa56048f
This diff is collapsed.
src/components/WebSet/WebSiteEdit.vue
View file @ fa56048f
This diff is collapsed.
src/components/WebSet/WebSiteIndex.vue
View file @ fa56048f
This diff is collapsed.
src/components/WebSet/WebSiteSearch.vue
View file @ fa56048f
This diff is collapsed.
src/components/WebSet/WebSiteService.vue
View file @ fa56048f
This diff is collapsed.
src/components/WebSet/WebSiteUpdate.vue
View file @ fa56048f
This diff is collapsed.
src/components/index.vue
View file @ fa56048f
This diff is collapsed.
src/components/personalCenter.vue
View file @ fa56048f
This diff is collapsed.
src/components/platformModule/groupManagement.vue
View file @ fa56048f
......@@ -242,6 +242,12 @@
<el-form-item class='w400' label='航班' prop="Status">
<el-radio v-model="addMsg.UseFlightType" :label="0">系统</el-radio>
<el-radio v-model="addMsg.UseFlightType" :label="1">自定义</el-radio>
</el-form-item>
<el-form-item class='w400' label='主题'>
<el-select v-model="addMsg.ThemeType" placeholder="请选项">
<el-option label='黑色' value='0'></el-option>
<el-option label='红色' value='1'></el-option>
</el-select>
</el-form-item>
<el-form-item class='w400' label='备注' prop="Remarks">
<el-input type="textarea" v-model="addMsg.Remarks"></el-input>
......@@ -406,6 +412,7 @@
IsOpenTripFeature: 0, //是否有行程特色(0-没有，1-有)
TripFeatureImg: "", //行程特色背景图片
UseFlightType: 0, //使用航班类型(0-系统默认航班,1-自定义航班信息)
ThemeType:'0' //主题颜色
},
verSionMsg: {
Status: 0
......
src/components/temp/websiteManager.vue 0 → 100644
View file @ fa56048f
This diff is collapsed.
src/components/work/mywork.vue
View file @ fa56048f
This diff is collapsed.
src/components/work/workDetails.vue
View file @ fa56048f
This diff is collapsed.
src/plug/index.js
View file @ fa56048f
This diff is collapsed.
src/router/config.js
View file @ fa56048f
This diff is collapsed.
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