Skip to content

S
SuperMan
Commit 98bb0a6e authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents ca255145 cce71956
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 448 additions and 766 deletions
src/assets/css/UpgradedVersion.css
View file @ 98bb0a6e
......@@ -250,6 +250,7 @@ img {
}
.featureHome-left-two .edit_div {
max-height: 625px;
height: 540px;
overflow: hidden;
font-size: 45px;
......@@ -530,7 +531,8 @@ img {
}
.UpgradedVersionDetails-formBox1 {
top: 12px;
top: 139px;
left: -31px;
}
.UpgradedVersionDetails-imgbox {}
......@@ -915,7 +917,7 @@ img {
.subIdeImgForm2Box3 {
left: 0px;
top: 0;
top: 1px;
}
.UpgradedVersion-intTitle {
......
src/assets/css/tripIndexNew.css
View file @ 98bb0a6e
......@@ -12,6 +12,30 @@
.LeaveGroupDownload-form td, .LeaveGroupDownload-form iframe {
font-family: Microsoft JhengHei, sans-serif !important;
}
.LeaveGroupDownload-form .expense .right .expense-table {
width: 100%;
table-layout: fixed;
border: 1px solid #eee;
border-top: none;
border-bottom: none;
margin-top: 30px;
}
.LeaveGroupDownload-form .expense .right .expense-table th {
background: #bbb;
height: 28px;
vertical-align: middle;
text-align: center;
font-size: 14px;
/* font-family: 'PingFangR'; */
width: 150px;
color: #333;
}
.LeaveGroupDownload-form .expense .right .expense-table tr td {
text-align: center;
padding: 5px 0 !important;
border-bottom: 1px solid #eee;
color: #666 !important;
}
.bjE6{
background: #e6e6e6;
}
......@@ -184,9 +208,11 @@
background: url('https://imgfile.oytour.com/Static/NewTripFeature/Shape.png')no-repeat center;
background-size: 100% 100%;
}
.travelDaysTitlle-left-text span{
font-family: FZCuSong-B09S !important;
}
.travelDaysTitlle-left-textOne{
font-size: 79px;
font-family: FZCuSong-B09S !important;
font-weight: 400;
color: #2A2A2A;
line-height: 55px;
......@@ -194,12 +220,14 @@
}
.travelDaysTitlle-left-textTwo{
font-size: 47px;
font-family: PingFang SC !important;
font-weight: 800;
color: #2A2A2A;
line-height: 55px;
margin-top: 10px;
}
.travelDaysTitlle-left-textTwo span{
font-family: PingFang SC !important;
}
.travelDaysTitlle-right{
flex-grow: 1;
margin-left: 21px;
......@@ -215,8 +243,9 @@
-o-border-radius: 100px 0px 0px 100px;
}
.travelDaysMasterMap{
height: 632px;
margin-top: 14px;
margin-bottom: 41px;
height: 632px;
overflow: hidden;
}
.travelDaysMasterMap img{
......@@ -231,6 +260,8 @@
}
.travelDaysMasterMap-oneImg{
width: 100%;
height: 0;
padding-top: 100%;
}
.travelDaysMasterMap-text{
left: 15px;
......@@ -249,8 +280,8 @@
right: 50px;
}
.travelDaysMasterMap-twoImg{
width: 335px;
height: 189px;
max-width: 335px;
max-height: 189px;
overflow: hidden;
border: 2px solid #FFFFFF;
border-radius: 18px;
......@@ -262,11 +293,10 @@
line-height: 34px;
}
.travelDaysContent{
max-height: 468px;
/* min-height: 360px; */
line-height: 38px;
padding: 0 44px 0 44px;
margin: 41px 0 47px 0;
overflow: hidden;
padding: 0 44px 265px 44px;
/* margin: 41px 0 47px 0; */
}
.travelDaysContent-text{
font-size: 21px;
......@@ -279,7 +309,10 @@
font-weight: bold;
}
.travelDaysdetails{
padding: 0 36px 115px 36px;
left: 0;
right: 0;
bottom: 115px;
padding: 47px 36px 0 36px;
}
.travelDaysdetailsBJ{
border-radius: 100px;
......@@ -307,8 +340,10 @@
color: #2A2A2A;
line-height: 34px;
white-space: wrap;
display: inline-block;
padding: 0;
margin: 0;
margin-right: 10px;
}
.LeaveGroupDownload-form .travelControlTrip .module-title {
text-align: center;
......@@ -331,6 +366,52 @@
margin: 0 !important;
line-height: 160%;
}
.UpgradedVersion-header {
top: 0;
left: 0;
right: 0;
}
.UpgradedVersion-header-left {
width: 341px;
height: 65px;
border-radius: 0px 0px 18px 0px;
position: relative;
}
.header-leftImg {
width: 292px;
height: auto;
display: block;
margin-left: 19px;
}
.header-leftBj {
left: 314px;
top: 0;
width: 27px;
height: 100%;
background-size: 100% 100%;
}
.UpgradedVersion-header-title {
padding: 12px 19px 10px 19px;
margin-right: 53px;
margin-top: 20px;
border: 2px dashed #000;
border-radius: 14px;
-webkit-border-radius: 14px;
-moz-border-radius: 14px;
-ms-border-radius: 14px;
-o-border-radius: 14px;
}
.UpgradedVersion-header .edit_div {
font-size: 38px;
font-weight: 400;
font-family: FZCuSong-B09S;
color: #2A2A2A;
}
.UpgradedVersion-box{
width: 1123px;
height: 1588px;
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 98bb0a6e
......@@ -1223,7 +1223,8 @@ export default {
EmployeeId: this.userId,
Year: this.year,
sharelist: [],
BranchId: this.msg.BranchId,
// BranchId: this.msg.BranchId,
...this.msg
}
this.monthList.forEach(x=>{
let obj = {
......
src/components/LeaveGroupDownload/ItineraryFeatures.vue
View file @ 98bb0a6e
......@@ -42,8 +42,3 @@
</script>
<style>
@import url("../../assets/css/UpgradedVersion.css");
</style>
src/components/LeaveGroupDownload/TourFareDescription.vue
View file @ 98bb0a6e
......@@ -28,7 +28,7 @@
</div>
</div>
<div class="right">
<table class="expense-table" cellspacing=0 cellpadding=0>
<table class="expense-table" cellspacing=0 cellpadding=0 style="text-align:left">
<thead>
<th>城市</th>
<th>活动</th>
......@@ -62,9 +62,9 @@
</div>
</template>
<div class="expense" v-if="dataList.shopList && dataList.shopList.length>0&&vshowF">
<div class="left">购物安排</div>
<div class="left" style="font-size:28px;margin-bottom:20px;">购物安排</div>
<div class="right">
<table class="expense-table autowidth" cellspacing=0 cellpadding=0>
<table class="expense-table" cellspacing=0 cellpadding=0 style="text-align:left">
<thead>
<th>城市</th>
<th>购物店名称</th>
......@@ -72,7 +72,7 @@
</thead>
<tbody>
<tr v-for="(item,i) in dataList.shopList" :key="i">
<td>{{item.cityName}}</td>
<td>{{item.cityName?item.cityName:''}}</td>
<td>{{item.shopName}}</td>
<td>{{item.visitTime}}</td>
</tr>
......
src/components/LeaveGroupDownload/components/header.vue
View file @ 98bb0a6e
<template>
<div class="UpgradedVersion-header absolute row-sb z-index1">
<div class="UpgradedVersion-header row-sb">
<div class="UpgradedVersion-header-left relative row-aic" :style="{'background':TripColor}">
<img class="header-leftBj absolute z-index2" :src="backgroundImgBj2" />
<img class="header-leftImg" src="https://imgfile.oytour.com/Static/NewTripFeature/headerLogoTwo.png" />
......@@ -57,51 +57,6 @@
</script>
<style>
.UpgradedVersion-header {
top: 0;
left: 0;
right: 0;
}
.UpgradedVersion-header-left {
width: 341px;
height: 65px;
border-radius: 0px 0px 18px 0px;
position: relative;
}
.header-leftImg {
width: 292px;
height: auto;
display: block;
margin-left: 19px;
}
.header-leftBj {
left: 314px;
top: 0;
width: 27px;
height: 100%;
background-size: 100% 100%;
}
.UpgradedVersion-header-title {
padding: 12px 19px 10px 19px;
margin-right: 53px;
margin-top: 20px;
border: 2px dashed #000;
border-radius: 14px;
-webkit-border-radius: 14px;
-moz-border-radius: 14px;
-ms-border-radius: 14px;
-o-border-radius: 14px;
}
.UpgradedVersion-header .edit_div {
font-size: 38px;
font-weight: 400;
font-family: FZCuSong-B09S;
color: #2A2A2A;
}
</style>
src/components/LeaveGroupDownload/travelDays.vue
View file @ 98bb0a6e
......@@ -11,37 +11,37 @@
</div> -->
<div class="UpgradedVersion-box UpgradedVersion-homebj relative"
v-for="(item,index) in tripList">
<div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;">
<Header :TripColor="dataAll.tripColor" :orderMsg="orderMsg"></Header>
<div class="travelDays-form absolute column z-index1">
<div class="travelDaysTitlle row-aic">
<div class="travelDaysTitlle-left">
<div class="travelDaysTitlle-left-text column-ajc">
<div class="travelDaysTitlle-left-textOne">
<span>{{item.dayNum>9?item.dayNum:'0'+item.dayNum}}</span>
</div>
<div class="travelDaysTitlle-left-textTwo">
<span>{{day}}</span>
</div>
<div class="travelDaysTitlle row-aic">
<div class="travelDaysTitlle-left">
<div class="travelDaysTitlle-left-text column-ajc">
<div class="travelDaysTitlle-left-textOne">
<span>{{item.dayNum>9?item.dayNum:'0'+item.dayNum}}</span>
</div>
</div>
<div class="travelDaysTitlle-right">
<div class="travelDaysTitlle-right-text row-aic"
:style="{'background': dataAll.tripColor,'font-size': getFontSize(item.title),'color':textColor}">
{{item.title}}
<div class="travelDaysTitlle-left-textTwo">
<span>{{day}}</span>
</div>
</div>
</div>
<div class="travelDaysMasterMap relative">
<div class="travelDaysMasterMap-one" :style="{'color':getImgColor(item.details[0].img,'travelDaysImg_one'+index)}">
<div class="travelDaysMasterMap-oneImg bjF6" :id="'travelDaysImg_one'+index">
<img class="absolute" :src="item.details[0].img">
<div class="travelDaysTitlle-right">
<div class="travelDaysTitlle-right-text row-aic"
:style="{'background': dataAll.tripColor,'font-size': getFontSize(item.title),'color':textColor}">
{{item.title}}
</div>
</div>
</div>
<div :id="'travelDaysMasterMap_'+index" class="travelDaysMasterMap relative">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg absolute bjF6" :id="'travelDaysImg_one'+index">
<img class="relative" :src="item.details[0].img">
</div>
<div class="travelDaysMasterMap-text absolute z-index2">{{item.details[0].title}}</div>
</div>
<div class="travelDaysMasterMap-two absolute z-index2">
<template v-if="item.imgMapId=='travelDaysMasterMap_'+index&&item.showImgOne">
<div class="travelDaysMasterMap-twoImg relative bjF6"
:style="{'color':getImgColor(item.details[0].img,'travelDaysImg_two'+index)}"
:style="{'color':'#fff'}"
:id="'travelDaysImg_two'+index"
v-if="(item.details&&item.details.length>1&&item.details[1].img)||(item.jiu2&&item.jiu2.length>0&&item.jiu2[0].url)">
<template v-if="item.details.length>1&&item.details[1].img">
......@@ -49,7 +49,6 @@
<div class="travelDaysMasterMap-text textTwo absolute z-index2">
【{{item.details[1].title}}】</div>
</template>
<template v-else>
<template v-for="(jiudian,j) in item.jiu2">
<template v-if="jiudian.url&&j==0">
......@@ -60,8 +59,10 @@
</template>
</template>
</div>
</template>
<template v-if="item.imgMapId=='travelDaysMasterMap_'+index&&item.showImgTwo">
<div class="travelDaysMasterMap-twoImg relative bjF6" style="margin-top: 47px;"
:style="{'color':getImgColor(item.details[0].img,'travelDaysImg_three'+index)}"
:style="{'color':'#fff'}"
:id="'travelDaysImg_three'+index"
v-if="(item.details&&item.details.length>2&&item.details[2].img)||(item.jiu2&&item.jiu2.length>1&&item.jiu2[0].url)">
<template v-if="item.details.length>2&&item.details[2].img">
......@@ -80,54 +81,59 @@
</template>
</template>
</div>
</template>
</div>
</div>
</div>
<div class="travelDaysContent">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.details">
<span>【{{jindian.title}}】</span>
{{jindian.content}}
</div>
<div class="travelDaysContent column">
<template v-for="i in 2">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.details">
<span>【{{jindian.title}}】</span>
{{jindian.content}}
</div>
</template>
</div>
<div class="travelDaysdetails">
<div class="travelDaysdetailsBJ row"
:style="{'background':backgroundColor}">
<div class="travelDaysdetails-text row">
<span>早餐：</span>
<div><p>{{item.can.breakfirst}}</p></div>
</div>
<div class="travelDaysdetails-text row">
<span>午餐：</span>
<div><p>{{item.can.lanuch}}</p></div>
</div>
<div class="travelDaysdetails-text row">
<span>晚餐：</span>
<div><p>{{item.can.dinner}}</p></div>
</div>
<div class="travelDaysdetails-text row">
<span>住宿：</span>
<div><p>{{item.jiu2[0].name}}</p></div>
<div class="travelDaysdetails absolute">
<div class="travelDaysdetailsBJ row"
:style="{'background':backgroundColor}">
<div class="travelDaysdetails-text row">
<span>早餐：</span>
<div><p>{{item.can.breakfirst}}</p></div>
</div>
<div class="travelDaysdetails-text row">
<span>午餐：</span>
<div><p>{{item.can.lanuch}}</p></div>
</div>
<div class="travelDaysdetails-text row">
<span>晚餐：</span>
<div><p>{{item.can.dinner}}</p></div>
</div>
<div class="travelDaysdetails-text row">
<span>住宿：</span>
<div>
<p v-for="(j,i) in item.jiu2">{{j.name}}</p>
</div>
</div>
</div>
<!-- otherJourney-footer -->
<div>
<div class="otherJourney-introduceFooter absolute z-index1 row-aic"
:style="{'background':''}">
<div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.tripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.tripColor}">&nbsp;</div>
<div class="introduceFooter-text row-aic">
<img src="http://imgfile.oytour.com/Static/NewTripFeature/footerLogo.png" />
<div class="edit_div">{{dataAll.lineShortName}}</div>
</div>
<div class="introduceFooterBJ introduceFootertThree" :style="{'background':dataAll.tripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertFour" :style="{'background':dataAll.tripColor}">&nbsp;</div>
</div>
</div>
<!-- otherJourney-footer -->
<div>
<div class="otherJourney-introduceFooter absolute z-index1 row-aic"
:style="{'background':''}">
<div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.tripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.tripColor}">&nbsp;</div>
<div class="introduceFooter-text row-aic">
<img src="http://imgfile.oytour.com/Static/NewTripFeature/footerLogo.png" />
<div class="edit_div">{{dataAll.lineShortName}}</div>
</div>
<div class="introduceFooterBJ introduceFootertThree" :style="{'background':dataAll.tripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertFour" :style="{'background':dataAll.tripColor}">&nbsp;</div>
</div>
</div>
</div>
</div>
</div>
</template>
......@@ -150,6 +156,31 @@
},
methods: {
getShow(Id,HeightNum,item){
item.imgMapId = Id
if(HeightNum>=243){
item.showImgOne = true
}else{
item.showImgOne = false
}
if(HeightNum>=478){
item.showImgTwo = true
}else{
item.showImgTwo = false
}
this.$forceUpdate()
},
getHeigthNum(Id,item){
let that = this
setTimeout(()=>{
var Height = document.getElementById(Id);
if(Height){
let HeightNum = Height.offsetHeight
that.getShow(Id,HeightNum,item)
}
},300)
},
getFontSize(title){
if(title.length>60){
return 929/60 +'px'
......@@ -256,7 +287,9 @@
},
tripList: {
handler(val, oldVal) {
this.tripList.forEach((x,index)=>{
this.getHeigthNum(`'travelDaysMasterMap_'+${this.index}`)
})
},
deep: true,
immediate: true
......
src/components/SalesModule/addPassenger.vue
View file @ 98bb0a6e
......@@ -314,7 +314,7 @@
<el-input v-model="addMsg.Remarks" type="text" size=mini class="w230" maxlength="1000"></el-input>
</el-form-item>
</li>
<li>
<!-- <li>
<el-form-item label="出游类型" prop="TravelType">
<el-select v-model="addMsg.TravelType" filterable size=mini class="w230">
<el-option v-for="item in TravelTypeList" :key="item.Code" :label="item.Content" :value="item.Code">
......@@ -337,7 +337,7 @@
</el-option>
</el-select>
</el-form-item>
</li>
</li> -->
<li>
<el-form-item label="高校学生">
<el-checkbox v-model="addMsg.IsHightSchool" :true-label='1' :false-label='2'></el-checkbox>
......
src/components/commonPage/TripDownLoadCommon.vue
View file @ 98bb0a6e
......@@ -205,8 +205,21 @@
})
window.open(routeData.href, '_blank');
this.$emit("headCallBack");
},
getFeatureType() {
var postMsg = {
TCID: this.tripObj
}
this.apipost('travel_get_GetTravelFeatureType', postMsg, res => {
if (res.data.resultCode == 1) {
console.log("travel_get_GetTravelFeatureType",res);
}
}, err => {})
}
},
mounted() {
this.getFeatureType();
},
created() {
this.TripLayer.vshowA = true;
this.TripLayer.vshowB = true;
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 98bb0a6e
......@@ -12,7 +12,7 @@
<div class="TFslide"
:class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
@click="clickFeature(item)" :key="item.subCode"
v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)&&item.TypeState!=8">
v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)">
<img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelNotice.vue
View file @ 98bb0a6e
......@@ -36,11 +36,12 @@
<tbody>
<tr v-for="(selfItem,selfIndex) in SelfpayingAllList">
<td>
<span v-if="selfItem.IsShow==0">{{getSelfCityName(selfItem.CityId)}}</span>
<span v-if="selfItem.IsShow==0">{{selfItem.CityName}}</span>
<el-select class='w120' :placeholder="$t('pub.pleaseSel')" filterable v-model="selfItem.CityId"
v-else-if="selfItem.IsShow==1">
v-else-if="selfItem.IsShow==1" remote :remote-method="(query) => getCityList(query, selfItem)"
@change="changeCity(selfItem)">
<el-option :label="$t('pub.unlimitedSel')" :value='DefaultSelectValue'></el-option>
<el-option v-for="item in AllCityList" :label='item.Name' :value='item.ID' :key='item.ID'>
<el-option v-for="item in selfItem.CityList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</td>
......@@ -59,7 +60,7 @@
<td>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start"
v-if="(selfItem.IsShow==0)">
<el-button type="primary" icon="el-icon-edit" circle @click="SelfpayingShow(selfItem)"></el-button>
<el-button type="primary" icon="el-icon-edit" circle @click="getCityList('',selfItem),SelfpayingShow(selfItem)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="selfItem.IsShow==1">
......@@ -143,7 +144,8 @@
<td>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start"
v-if="(shopItem.IsShow==0)">
<el-button type="primary" icon="el-icon-edit" circle @click="ShopShow(shopItem),getShopItemList()"></el-button>
<el-button type="primary" icon="el-icon-edit" circle @click="ShopShow(shopItem),getShopItemList()">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="shopItem.IsShow==1">
......@@ -208,7 +210,7 @@
"subArray",
"NoticeData",
"PostConfig",
"AllCityList",
"CountryID" //国家编号
],
data() {
......@@ -246,7 +248,7 @@
narrative: true //叙述,
},
//折叠展开
isFold: ""
isFold: "",
};
},
components: {
......@@ -387,7 +389,6 @@
this.SelfpayingAllList.splice(selfIndex, 1);
}
},
//新增购物店
AddShop() {
var obj = {
......@@ -433,6 +434,8 @@
Id: 0,
ConfigId: this.subArray.ConfigId,
CityId: 0,
CityName: '', //城市名称
CityList: [],
ItemName: "",
EstimatedCost: "",
Explain: "",
......@@ -449,14 +452,34 @@
this.SelfpayingAllList.splice(shopIndex, 1);
},
//获取自费城市名
getSelfCityName(cityId) {
let cityName = "";
this.AllCityList.forEach(x => {
if (x.ID === cityId) {
cityName = x.Name;
changeCity(selfItem) {
if (selfItem.CityList && selfItem.CityList.length > 0) {
selfItem.CityList.forEach(x => {
if (x.ID === selfItem.CityId) {
selfItem.CityName = x.Name;
}
});
}
},
//获取城市列表
getCityList(query, selfItem) {
var postMsg = {
CodeLevel: 3,
Name: '',
};
if(selfItem.CityName!='')
{
postMsg.Name = selfItem.CityName;
}
if (query != '') {
postMsg.Name = query;
}
this.apipost("dict_get_Destination_GetCityExtList", postMsg, res => {
if (res.data.resultCode == 1) {
selfItem.CityList = res.data.data;
}
});
return cityName;
})
}
},
mounted() {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @ 98bb0a6e
......@@ -3,7 +3,7 @@
<div class="UpgradedVersionDetails-form absolute row-sb z-index1" :style="{'background':backgroundColor}">
<div class="UpgradedVersionDetails-form-Box absolute UpgradedVersion-Hover">
<div class="UpgradedVersionDetails-formBox1 absolute">
<FeatureControls :index="index" :FeatureData="FeatureData" :ControlsType="'row'"
<FeatureControls :index="index" :FeatureData="FeatureData" :ControlsType="'column'"
:isDeletePage="FeatureData.isDeletePage" :pagesType="3" @toAddPages="toAddPages"
@toDeletePages="toDeletePages">
</FeatureControls>
......@@ -14,7 +14,7 @@
<div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover">
<div class="UpgradedVersionDetails-img relative">
<div class="UpgradedVersionDetails1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'column'" isImg="1" :isUploadImg="true"
:isSelectImg="true" @toUploadImg="UploadImg(i)" @toSelectImg="SelectImg(i)" @toAddImg="AddImg"
@toDeleteImg="DeleteImg(i)" />
</div>
......@@ -63,7 +63,6 @@
<script>
import MasterMapList from "./components/MasterMapList";
import subheading from "./components/subheading";
import vEditDiv from "../TravelTemp/VEditDiv";
import FeatureControls from "./components/featureControls";
import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue";
......@@ -71,7 +70,6 @@
components: {
DMCchooseImg,
MasterMapList,
subheading,
vEditDiv,
FeatureControls,
},
......@@ -113,6 +111,7 @@
},
uploadpic(e) {
let that = this;
that.$message.info('上传中...')
if (e.target.files.length > 0 && e.target.files[0].size > 0) {
// 压缩图片需要的一些元素和对象
var reader = new FileReader();
......@@ -126,6 +125,7 @@
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
that.FeatureData.dataObj.SubList[that.MasterMapIndex].ImgList[0].url = allPath
that.$message.success('上传成功');
});
};
reader.readAsDataURL(e.target.files[0]);
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @ 98bb0a6e
<template>
<div class="featureControls">
<div class="row-aic featureControls-bottom featureControls-bottomOne" v-if="ControlsType=='row'">
<el-tooltip class="item" effect="dark" content="上传图" placement="top">
<div @click="toUploadImg" v-if="isUploadImg">
<i class="el-icon-upload2"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="选图" placement="top">
<div @click="toSelectImg" v-if="isSelectImg">
<i class="el-icon-search"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加图" placement="top">
<div @click="toAddImg" v-if="isAddImg">
<i class="el-icon-plus"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除图" placement="top">
<div @click="toDeleteImg" v-if="isDeleteImg">
<i class="el-icon-delete"></i>
</div>
</el-tooltip>
</div>
<div class="column featureControls-bottom featureControls-bottomTwo" v-else>
<template v-if="!isImg&&!isTemplate">
<el-tooltip class="item" effect="dark" content="添加页面" placement="top">
<div @click="toAddPages">
<i class="el-icon-plus"></i>
......@@ -11,8 +35,19 @@
<i class="el-icon-delete"></i>
</div>
</el-tooltip>
</div>
<div class="column featureControls-bottom featureControls-bottomTwo" v-else>
</template>
<template v-else>
<el-tooltip class="item" effect="dark" content="上传图" placement="top">
<div @click="toUploadImg" v-if="isUploadImg">
<i class="el-icon-upload2"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="选图" placement="top">
<div @click="toSelectImg" v-if="isSelectImg">
<i class="el-icon-search"></i>
</div>
</el-tooltip>
</template>
<div v-if="isTemplate">
<el-tooltip class="item" effect="dark" content="选模版" placement="top">
<el-popover trigger="hover" placement="right">
......@@ -28,26 +63,6 @@
</el-popover>
</el-tooltip>
</div>
<el-tooltip class="item" effect="dark" content="上传图" placement="top">
<div @click="toUploadImg" v-if="isUploadImg">
<i class="el-icon-upload2"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="选图" placement="top">
<div @click="toSelectImg" v-if="isSelectImg">
<i class="el-icon-search"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加图" placement="top">
<div @click="toAddImg" v-if="isAddImg">
<i class="el-icon-plus"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除图" placement="top">
<div @click="toDeleteImg" v-if="isDeleteImg">
<i class="el-icon-delete"></i>
</div>
</el-tooltip>
</div>
</div>
</template>
......@@ -57,7 +72,7 @@
components: {
},
props: ['index', 'FeatureData', 'ControlsType', 'pagesType', 'isDeletePage',
props: ['index', 'FeatureData', 'ControlsType','isImg', 'pagesType', 'isDeletePage',
'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template'
],
data() {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @ 98bb0a6e
......@@ -61,7 +61,7 @@
<div class="subIdeImg1 bjE6 UpgradedVersion-Hover">
<div class="subIdeImg1relative relative UpgradedVersion-Hover">
<div class="subIdeImgForm1Box absolute">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
......@@ -77,7 +77,7 @@
<div class="subIdeImg1 bjE6 UpgradedVersion-Hover">
<div class="subIdeImg1relative relative">
<div class="subIdeImgForm1Box absolute">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
</div>
......@@ -113,11 +113,11 @@
'Template',
'index',
'TripColor',
'FeatureData'
'FeatureData',
'canEdit'
],
data() {
return {
canEdit: true,
};
},
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @ 98bb0a6e
......@@ -15,16 +15,17 @@
</div>
<div class="featureHome-left UpgradedVersion-Hover">
<div class="featureHome-vToolBar-one absolute z-index3">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'"
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg"
@toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls>
<input type="file" style="display:none" :id="'homefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
</div>
<div class="featureHome-vToolBar-two absolute z-index3">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'column'"
:isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
@toDeletePages="toDeletePages">
</FeatureControls>
<input type="file" style="display:none" :id="'homefile_'+(FeatureItem * 2 + 1) + '_0'" @change="uploadpic">
</div>
<div class="featureHome-vToolBar-two absolute z-index3">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'column'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg"
@toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls>
</div>
<div class="featureHome-left-one bjF6 absolute z-index2">
<template v-if="FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0">
......@@ -107,10 +108,11 @@
},
methods: {
UploadImg() {
document.querySelector(`#homefile_${(this.FeatureItem * 2 + 1)}_0`).click();
document.querySelector(`#homefile_${(this.FeatureItem * 2 + 1)}_${this.index}`).click();
},
uploadpic(e) {
let that = this;
that.$message.info('上传中...')
if (e.target.files.length > 0 && e.target.files[0].size > 0) {
// 压缩图片需要的一些元素和对象
var reader = new FileReader();
......@@ -124,6 +126,7 @@
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
that.FeatureItem.dataObj.ImgList[0].url = allPath
that.$message.success('上传成功');
});
};
reader.readAsDataURL(e.target.files[0]);
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue
View file @ 98bb0a6e
......@@ -6,27 +6,28 @@
:class="[FeatureItem.pageType==2?'':'UpgradedVersion-Hover']">
<div class="MasterMapList-box-one absolute">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'"
:isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
@toDeletePages="toDeletePages">
</FeatureControls>
<input type="file" style="display:none" :id="'introducefile_'+(index * 2 + 1) + '_0'" @change="uploadpic">
</div>
<div class="MasterMapList-box-two absolute z-index3">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'column'"
:isUploadImg="FeatureItem.pageType==2?true:false" :isSelectImg="FeatureItem.pageType==2?true:false" :isAddImg="FeatureItem.pageType==2?false:
FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList
&&FeatureItem.dataObj.ImgList.length!=9?true:false" :isDeleteImg="false" @toUploadImg="UploadImg"
@toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls>
<input type="file" style="display:none" :id="'introducefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
</div>
<div class="MasterMapList-box-two absolute z-index3">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'column'"
:isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
@toDeletePages="toDeletePages">
</FeatureControls>
</div>
</div>
<!-- 上传主图文件 -->
<input type="file" style="display:none" :id="'MasterMapfile_'+(index * 2 + 1)" @change="uploadpic">
<input type="file" style="display:none" :id="'MasterMapfile_'+(FeatureItem * 2 + 1)+'_'+index" @change="uploadpic">
<MasterMapList :index="index" :FeatureData="FeatureItem.dataObj" :pageType="FeatureItem.pageType"
@toUploadImg="UploadImg" @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></MasterMapList>
<!-- 副标题 -->
<subheading :Template="FeatureItem.pageTemplate" :index="index" :FeatureData="FeatureItem" :TripColor="TripColor"
@toUploadImg="UploadImg" @toSelectImg="SelectImg" @setTemplate="setTemplate"></subheading>
@toUploadImg="UploadImg" @toSelectImg="SelectImg" @setTemplate="setTemplate" :canEdit='canEdit'></subheading>
<!-- otherJourney-otherDetails 宿、食 景详情 -->
<div
......@@ -72,24 +73,65 @@
queryName: '',
queryId: 0,
},
msg:{
pageSize: 50,
pageIndex: 1,
currentPage: 1,
total: 0,
Type: 1, //1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店
Name: "", //资源图片名称
SourceId: 0 //资源编号
},
MasterMapIndex: null, //主图下标
StencilDrawing: false, //是否是模版图
imglistArry:[],
homeBg3: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg",
dinner2: "http://imgfile.oytour.com/Static/NewTripFeature/dinner2.jpg",
homeBg1: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg",
};
},
methods: {
getList() {
//初始化弹窗图片列表
let obj = {
url: 'http://192.168.10.214:8120/image/index?filePath=/Upload/DMC/20180722/636678151855193385.jpg&process=resize,m_filt,w_160,h_'
}
this.imglistArry = [];
this.apipost(
"hotel_post_GetPicList",
this.msg,
res => {
if (res.data.resultCode == 1) {
this.imglistArry = res.data.data.pageData;
this.imglistArry.forEach(x => {
x.isShowImgDiv = true;
})
this.msg.total = res.data.data.count;
if(this.imglistArry&&this.imglistArry.length>0){
obj.url = this.imglistArry[0].Path
}
this.FeatureItem.dataObj.ImgList.push(obj)
}else{
this.FeatureItem.dataObj.ImgList.push(obj)
}
},
null
);
},
UploadImg(index, type) {
this.MasterMapIndex = index ? index : 0
if (type) this.StencilDrawing = true
else this.StencilDrawing = false
if (this.FeatureItem.pageType == 2) {
document.querySelector(`#introducefile_${(this.index * 2 + 1)}_0`).click();
document.querySelector(`#introducefile_${(this.FeatureItem * 2 + 1)}_${this.index}`).click();
} else {
document.querySelector(`#MasterMapfile_${(this.index * 2 + 1)}`).click();
document.querySelector(`#MasterMapfile_${(this.FeatureItem * 2 + 1)}_${this.index}`).click();
}
},
uploadpic(e) {
let that = this;
that.$message.info('上传中...')
if (e.target.files.length > 0 && e.target.files[0].size > 0) {
var reader = new FileReader();
reader.onload = function (event) {
......@@ -106,6 +148,7 @@
} else {
that.FeatureItem.dataObj.ImgList[that.MasterMapIndex].url = allPath
}
that.$message.success('上传成功');
});
};
reader.readAsDataURL(e.target.files[0]);
......@@ -124,9 +167,22 @@
},
AddImg() {
let obj = {
url: ''
url: this.FeatureItem.pageType==4?this.homeBg3:this.FeatureItem.pageType==5?this.dinner2:this.homeBg1
}
this.FeatureItem.dataObj.ImgList.push(obj)
return
if(this.FeatureItem.pageType==4||this.FeatureItem.pageType==5||this.FeatureItem.pageType==6){
if(this.FeatureItem.pageType==4){
this.choseType = 1
}else if(this.FeatureItem.pageType==5){
this.choseType = 2
}else if(this.FeatureItem.pageType==6){
this.choseType = 3
}else{
this.choseType = 0
}
this.getList()
}
},
DeleteImg(index, type) {
if (type) this.StencilDrawing = true
......
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