Skip to content

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

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

parents 223e3ead 644806ce
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 191 deletions
src/assets/css/UpgradedVersion.css
View file @ ea742e05
......@@ -227,6 +227,10 @@ img {
top: 425px;
left: -30px;
}
.featureHome-vToolBar-three {
top: 535px;
right: 186px;
}
.featureHome-left-one {
width: 697px;
......@@ -296,7 +300,7 @@ img {
.featureHome-right-text .edit_div {
width: 60px;
font-size: 60px;
/* font-size: 60px; */
font-family: Microsoft YaHei;
font-weight: bold;
color: #2A2A2A;
......@@ -319,9 +323,9 @@ img {
.featureHome-right-three {
width: 143px;
height: 747px;
max-height: 747px;
top: 240px;
right: 42px;
left: 938px;
}
.featureHomeBjH1 {
......@@ -346,37 +350,37 @@ img {
.featureHomeBj2 {
left: 7px;
top: -18px;
top: 0px;
}
.featureHomeBj3 {
left: 134px;
top: -25px;
left: 136px;
top: 0px;
}
.featureHomeBj4 {
left: 109px;
top: -43px;
left: 111px;
top: 0px;
}
.featureHomeBj5 {
left: 0;
top: 668px;
bottom: 0;
}
.featureHomeBj6 {
left: 7px;
top: 661px;
bottom: 0;
}
.featureHomeBj7 {
left: 134px;
top: 634px;
left: 136px;
bottom: 0;
}
.featureHomeBj8 {
left: 109px;
top: 627px;
left: 111px;
bottom: 0;
}
.featureHome-three-text .edit_div {
......@@ -389,14 +393,14 @@ img {
}
.featureHome-three-textOne {
height: 600px;
max-height: 600px;
overflow: hidden;
top: 93px;
left: 24px;
}
.featureHome-three-textTwo {
height: 650px;
max-height: 650px;
overflow: hidden;
top: 22px;
right: 31px;
......
src/components/SalesModule/Common/productOrderList.vue
View file @ ea742e05
......@@ -535,7 +535,7 @@
<div class="people-item">
<span class="people-item-title">签证人数:</span>
<!-- {{ isVisa ? ((item.VisaNum == -1 || item.NeedVisaNum < item.VisaNum) ? item.NeedVisaNum : item.VisaNum) : item.NeedVisaNum }} -->
{{item.VisaNum}}
{{item.VisaNum==-1?item.NeedVisaNum:item.VisaNum}}
</div>
</div>
<div class="d5" style="width:25%">
......@@ -799,7 +799,7 @@ export default {
);
},
editItem(item) {
let ArtDesigningIds = item.ArtDesigningIdList.map(x=> {return Number(x.Id)})
let ArtDesigningIds = item.ArtDesigningIdList&&item.ArtDesigningIdList.map(x=> {return Number(x.Id)})
this.TCIDs = item.TCID;
this.editObj = item;
this.queryData = {
......@@ -814,8 +814,8 @@ export default {
[] :
item.VisaAssistantId.split(",").map((item) => Number(item)),
VisaNum: item.VisaNum,//(item.VisaNum == -1 || item.NeedVisaNum < item.VisaNum) ? item.NeedVisaNum : item.VisaNum
ArtDesigningId: ArtDesigningIds.length>0?ArtDesigningIds.join(','):'',
ArtDesigningIds: ArtDesigningIds.length>0?ArtDesigningIds:0
ArtDesigningId: ArtDesigningIds&&ArtDesigningIds.length>0?ArtDesigningIds.join(','):'',
ArtDesigningIds: ArtDesigningIds&&ArtDesigningIds.length>0?ArtDesigningIds:0
};
this.editNum = true;
this.showDialog = true;
......
src/components/SalesModule/MyCustomer.vue
View file @ ea742e05
......@@ -708,7 +708,7 @@
</div>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="6">
<el-form-item label="平台用户名">
<div style="display: flex;flex-wrap: nowrap;justify-content: space-between;">
<div style="display: flex; flex-wrap: wrap;align-items: center;">
......@@ -736,15 +736,38 @@
<el-button v-else class="button-new-tag" size="small" @click="showInput(1)">+ 添加</el-button>
</div>
</div>
<div style="flex-shrink: 0;">
<span class="q-pl-lg text-grey-8" style="cursor: pointer;margin-left: 10px;color: gray;"
@click="isShow=!isShow">{{isShow?'收起':'展开'}}</span>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="签约月结客户" prop="SigningType">
<div style="display: flex;flex-wrap: nowrap;">
<div>
<el-checkbox v-model='addMsg.SigningType'>
</el-checkbox>
</div>
<div v-if="addMsg.SigningType">
<el-upload v-if="!saveMsg || !saveMsg.length" class="upload-demo" :disabled="!addMsg.SigningType"
style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
:show-file-list="false" action="">
<el-button size="small" type="primary">上传签约资料</el-button>
</el-upload>
<div v-if="addMsg.SigningType && saveMsg&& saveMsg.length>0">
<template v-for="(subItem,subIndex) in saveMsg">
<a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
@click="downloadFile(subItem.URL,subItem.FileName)">{{subItem.FileName}}</a>
<a :key="subIndex+1000" style="margin-left:20px;color:blue;cursor:pointer;"
@click="DeleteFile(subIndex)">删除</a>
</template>
</div>
</div>
</div>
</el-form-item>
</el-col>
<template v-if="isShow">
<el-col :span="6">
<el-form-item :label="$t('salesModule.CustomerSource')" prop="CustomerSourceType">
......@@ -779,36 +802,10 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="签约月结客户" prop="SigningType">
<div style="display: flex;flex-wrap: nowrap;">
<div>
<el-checkbox v-model='addMsg.SigningType'>
</el-checkbox>
</div>
<div v-if="addMsg.SigningType">
<el-upload v-if="!saveMsg || !saveMsg.length" class="upload-demo" :disabled="!addMsg.SigningType"
style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
:show-file-list="false" action="">
<el-button size="small" type="primary">上传签约资料</el-button>
</el-upload>
<div v-if="addMsg.SigningType && saveMsg&& saveMsg.length>0">
<template v-for="(subItem,subIndex) in saveMsg">
<a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
@click="downloadFile(subItem.URL,subItem.FileName)">{{subItem.FileName}}</a>
<a :key="subIndex+1000" style="margin-left:20px;color:blue;cursor:pointer;"
@click="DeleteFile(subIndex)">删除</a>
</template>
</div>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('hotel.hotel_remark')" prop="remark">
<el-input v-model="addMsg.remark" type="textarea" maxlength="500"></el-input>
<el-input v-model="addMsg.remark" autosize type="textarea" maxlength="500"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -835,8 +832,6 @@
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
</el-col>
</template>
</el-row>
</el-form>
......@@ -865,7 +860,7 @@
<input type="button" class="normalBtn" value="保存" @click="saveUpdate()" />
</el-col>
</el-row>
<el-form label-width="80px">
<el-form label-width="80px" >
<el-row :gutter="20">
<el-col :span="4">
......@@ -1304,6 +1299,7 @@
this.getList()
},
clickAdd(){
this.cancelData()
this.inputValue = ''
this.inputVisible = false
this.addShow=true;
......@@ -1962,6 +1958,10 @@
},
cancelEdit() { // 取消新增
this.addShow = false
this.cancelData()
this.resetForm('addMsg')
},
cancelData(){
this.addMsg = {
CustomerId: 0,
customerName: '',
......@@ -1991,7 +1991,6 @@
this.HousePhotos = '',
this.Images = '',
this.addMsgS.customerVisit.expectVisitDateTime = ''
this.resetForm('addMsg')
},
resetForm(formName) { // 重置表单
this.$refs[formName].resetFields();
......
src/components/administrative/model/unbundlingMessage.vue
View file @ ea742e05
<template>
<el-dialog custom-class='w800 PingFangSC' title="机票未绑团提醒" :visible.sync="outerVisibleNot" center
:before-close="closeChangeMachie">
<el-dialog custom-class='PingFangSC' title="机票未绑团提醒" :visible.sync="outerVisibleNot" center
:before-close="closeChangeMachie" width="1100px">
<div v-if="UnboundDate.Type==1&&UnboundDate.TravelList&&UnboundDate.TravelList.length>0">
<p style="font-size: 18px;font-weight: bold;background: #d1d1d1;padding: 5px 10px;">团队未绑机票列表</p>
<el-table :data="UnboundDate.TravelList" tooltip-effect="dark" style="width: 100%">
......@@ -36,7 +36,11 @@
<el-table-column prop="TicketCreateByName" label="开票人"></el-table-column>
</el-table>
</div>
<div v-if="(UnboundDate.TravelList&&UnboundDate.TravelList.length==0
&&UnboundDate.AirList&&UnboundDate.AirList.length==0)||
(UnboundDate.Type==1&&UnboundDate.AirList&&UnboundDate.AirList.length==0)" style="padding: 40px 0;text-align: center;">
暂无数据
</div>
</el-dialog>
</template>
......
src/components/busManagement/BookAcar/CharterPreview.vue
View file @ ea742e05
......@@ -420,7 +420,7 @@
</div>
</div>
<div class="flexOne-infor-box">
<b><template v-if="msg.OrderType==1">接机</template><template v-if="msg.OrderType==2">送机</template><template v-if="msg.OrderType==3">包机</template>信息</b>
<b><template v-if="msg.OrderType==1">接机</template><template v-if="msg.OrderType==2">送机</template><template v-if="msg.OrderType==3">包车</template>信息</b>
<div class="infor-list">
<div class="list-centent active">
<li v-if="msg.OrderType!=1">
......
src/components/index.vue
View file @ ea742e05
......@@ -214,7 +214,10 @@
CRM系统
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true">
<el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true"
v-if="userInfo&&userInfo.DepartName&&userInfo.DepartName.indexOf('操作部')!=-1 ||(userInfo.RB_Branch_id == 1245
&& userInfo.DepartName.indexOf('引流')==-1
&& userInfo.DepartName.indexOf('市场')==-1)">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
机票未绑团查看
<i class="iconfont icon-right1"></i>
......@@ -1843,8 +1846,16 @@
this.GetTravelAirNotBind()
}else{
if(localStorage.getItem("UnboundDate")){
this.UnboundDate = JSON.parse(localStorage.getItem("UnboundDate"))
// this.unbundlingVisible = true
if(this.userInfo.DepartName.indexOf("操作部")!=-1 ||
(this.userInfo.RB_Branch_id == 1245
&& this.userInfo.DepartName.indexOf("引流")==-1
&& this.userInfo.DepartName.indexOf("市场")==-1)){
this.UnboundDate = JSON.parse(localStorage.getItem("UnboundDate"))
}else{
localStorage.removeItem("UnboundDate");
localStorage.removeItem("UnboundDateTime");
}
}
}
......@@ -1904,7 +1915,6 @@
}
);
}
},
testApi() {
var postMsg = {
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/VEditDiv.vue
View file @ ea742e05
<template>
<div :data-name="isLocked" class="edit_div" :contenteditable="canEdit" v-html="innerText" @focus="isLocked = true"
@blur="isLocked = false" @input="changeText">
@blur="isLocked = false" @input="changeText"
:style="{'font-size':fontSize?fontSize+'px':''}">
</div>
</template>
<script>
export default {
props: ["value", "canEdit", "textLength"],
props: ["value", "canEdit", "textLength","fontSize"],
data() {
return {
innerText: this.value,
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @ ea742e05
......@@ -24,6 +24,15 @@
<el-tooltip class="item" effect="dark" :content="'尺寸'+x+'*'+y" placement="top" v-if="x&&y">
<div class="cursorInitial fz14">{{x}} * {{y}}</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="设置字体大小" placement="top" v-if="isFontSize">
<p class="row-aic">
<span class="fz14" style="flex-shrink: 0;margin-right: 3px;">字体大小</span>
<el-input size="mini" v-model="FeatureData.dataObj.ShadowFontSize" style="width: 80px;height: 28px;"></el-input>
<span class="cursorInitial fz14" style="flex-shrink: 0;margin-left: 5px;">
<span class="relative" style="top: -3px;">px</span>
</span>
</p>
</el-tooltip>
</div>
<div class="column featureControls-bottom featureControls-bottomTwo" v-else>
<template v-if="!isImg&&!isTemplate">
......@@ -76,7 +85,7 @@
},
props: ['index', 'FeatureData', 'ControlsType','isImg', 'pagesType', 'isDeletePage',
'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template','x','y'
'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template','x','y','isFontSize'
],
data() {
return {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @ ea742e05
......@@ -45,30 +45,38 @@
</div>
</div>
<div class="featureHome-right">
<div class="featureHome-right-text featureHome-right-one absolute z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubShadowName"></vEditDiv>
</div>
<div class="featureHome-right-text featureHome-right-two absolute z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.ShadowName"></vEditDiv>
<div class="UpgradedVersion-Hover">
<div class="featureHome-vToolBar-three absolute z-index3" v-if="FeatureItem.dataObj.SubShadowName||FeatureItem.dataObj.ShadowName">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
:isFontSize="true"></FeatureControls>
</div>
<div class="featureHome-right-text featureHome-right-one absolute z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubShadowName" :fontSize="FeatureItem.dataObj.ShadowFontSize"></vEditDiv>
</div>
<div class="featureHome-right-text featureHome-right-two absolute z-index1">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.ShadowName" :fontSize="FeatureItem.dataObj.ShadowFontSize"></vEditDiv>
</div>
</div>
<div class="featureHome-right-three absolute z-index1">
<div class="featureHome-right-three relative z-index1">
<div>
<div class="featureHomeBjH1 featureHomeBj1" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW1 featureHomeBj2 relative" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjH1 featureHomeBj3 relative" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW1 featureHomeBj4 relative" :style="{'background':TripColor}">&nbsp;</div>
</div>
<div class="featureHome-three-text featureHome-three-textOne absolute">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainName"></vEditDiv>
<div class="featureHomeBjH1 featureHomeBj1 absolute" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW1 featureHomeBj2 absolute" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjH1 featureHomeBj3 absolute" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW1 featureHomeBj4 absolute" :style="{'background':TripColor}">&nbsp;</div>
</div>
<div class="featureHome-three-text featureHome-three-textTwo absolute">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubName"></vEditDiv>
<div class="row" style="padding: 20px 0 34px 0;">
<div class="featureHome-three-text featureHome-three-textOne" style="margin-left: 24px;margin-top: 93px;">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainName"></vEditDiv>
</div>
<div class="featureHome-three-text featureHome-three-textTwo" style="margin-left: 26px;">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubName"></vEditDiv>
</div>
</div>
<div>
<div class="featureHomeBjH2 featureHomeBj5 relative" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW2 featureHomeBj6 relative" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjH2 featureHomeBj7 relative" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW2 featureHomeBj8 relative" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjH2 featureHomeBj5 absolute" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW2 featureHomeBj6 absolute" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjH2 featureHomeBj7 absolute" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW2 featureHomeBj8 absolute" :style="{'background':TripColor}">&nbsp;</div>
</div>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ ea742e05
......@@ -195,6 +195,9 @@
return detailsObj;
},
initFeature(isReload) {
this.FeatureData.FeatureHtmlJson.forEach(x=>{
x.dataObj.ShadowFontSize = x.dataObj.ShadowFontSize?x.dataObj.ShadowFontSize:60
})
var oldJson = this.FeatureData.FeatureHtmlJson ?
JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) :
"";
......@@ -208,6 +211,7 @@
});
this.pageList = oldJson;
this.RenderingOk = true;
} else {
var tripObj = this.getTripData();
this.pageList.forEach(pItem => {
......@@ -258,6 +262,7 @@
}
newObj.ShadowName = "遇见最美好的自己";
newObj.SubShadowName = "在古老的日本樱花街道";
newObj.ShadowFontSize = tripObj.ShadowFontSize?tripObj.ShadowFontSize:60;
if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
newObj.DetailsName = tripObj.scenicArray[0].MainName;
var tempImgUrl = this.homeBg2;
......
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ ea742e05
<template>
<div style="height: 100%;overflow: hidden;" v-if="RenderingOk">
<!-- -->
<div class="UpgradedVersion-box2 UpgradedVersion-homebj relative" style="zoom: 0.44;"
:id="'LineOfTravel'+(item*4)+'_0'+index">
>
<div class=" z-index1" style="left: 0;right: 0; top: 0;bottom: 0;">
<Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header>
<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 :id="'LineOfTravel'+(item*4)+'_0'+index">
<Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header>
<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>
</div>
</div>
<div class="travelDaysTitlle-right">
<div class="travelDaysTitlle-right-text row-aic"
:style="{'background': dataAll.TripColor,'font-size': getFontSize(item.TitleObj.Title),'color':textColor}">
{{item.TitleObj.Title}}
<div class="travelDaysTitlle-right">
<div class="travelDaysTitlle-right-text row-aic"
:style="{'background': dataAll.TripColor,'font-size': getFontSize(item.TitleObj.Title),'color':textColor}">
{{item.TitleObj.Title}}
</div>
</div>
</div>
</div>
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)" @toSelectImg="SelectImg(0)"
:x="1123" :y="632"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div>
<VueDraggableResizable v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="1123" :h="632" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(0)"
:x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop">
<template v-if="ScenicArrayList&&ScenicArrayList.length>0">
<img v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
class="absolute" :src="ScenicArrayList[0].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_0'+index">
</template>
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)" @toSelectImg="SelectImg(0)"
:x="1123" :y="632"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div>
<VueDraggableResizable v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="1123" :h="632" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(0)"
:x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop">
<template v-if="ScenicArrayList&&ScenicArrayList.length>0">
<img v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
class="absolute" :src="ScenicArrayList[0].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_0'+index">
</template>
<img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0" class="absolute"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage" :id="'viewSpotImg_'+(item*4)+'_0'+index">
</VueDraggableResizable>
<img
v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute" :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
<img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0" class="absolute"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage" :id="'viewSpotImg_'+(item*4)+'_0'+index">
</VueDraggableResizable>
<img
v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute" :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
</div>
</div>
</div>
</div>
<div class="travelDaysContent">
<template v-if="item.ScenicArray.length>0">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.ScenicArray" :key="j">
<div class="travelDaysContent">
<template v-if="item.ScenicArray.length>0">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.ScenicArray" :key="j">
<span class="textBold">
【{{jindian.CouponsName}}】
</span>
<vEditSpan :canEdit='canEdit' v-model="jindian.Description"></vEditSpan>
</div>
</template>
<div v-if="item.ScenicArray.length==0&&item.TrafficObj.trafficIntroduce.IntroduceTitle"
class="travelDaysContent-text">
<span class="textBold">
【{{jindian.CouponsName}}】
<vEditDiv class="dayCouponsName" :canEdit='canEdit'
v-model="'【'+item.TrafficObj.trafficIntroduce.IntroduceTitle+'】'"></vEditDiv>
</span>
<vEditSpan :canEdit='canEdit' v-model="jindian.Description"></vEditSpan>
<vEditSpan :canEdit='canEdit' v-model="item.TrafficObj.trafficIntroduce.IntroduceDetail"></vEditSpan>
</div>
<div v-if="item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceTitle"
class="travelDaysContent-text">
{{item.TitleObj.Title}}
</div>
</template>
<div v-if="item.ScenicArray.length==0&&item.TrafficObj.trafficIntroduce.IntroduceTitle"
class="travelDaysContent-text">
<span class="textBold">
<vEditDiv class="dayCouponsName" :canEdit='canEdit'
v-model="'【'+item.TrafficObj.trafficIntroduce.IntroduceTitle+'】'"></vEditDiv>
</span>
<vEditSpan :canEdit='canEdit' v-model="item.TrafficObj.trafficIntroduce.IntroduceDetail"></vEditSpan>
</div>
<div v-if="item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceTitle"
class="travelDaysContent-text">
{{item.TitleObj.Title}}
</div>
</div>
<div class="travelDaysdetails-tsTextBox"
v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
<div class="travelDaysdetails-tsText" :style="{'background':backgroundColor2}">
<span class="travelDaysdetails-text0" style="float:left;">温馨提示：</span>
<span v-html="item.WarmTipObj.Description"></span>
<div class="travelDaysdetails-tsTextBox"
v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
<div class="travelDaysdetails-tsText" :style="{'background':backgroundColor2}">
<span class="travelDaysdetails-text0" style="float:left;">温馨提示：</span>
<span v-html="item.WarmTipObj.Description"></span>
</div>
</div>
</div>
<div class="travelDaysdetails">
<div class="travelDaysdetailsBJ column" :style="{'background':backgroundColor}">
<div class="travelDaysdetails-textBox row">
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">早餐：</span>
<div>
<template v-if="item&&item.DinnerArray&&item.DinnerArray.length>0">
{{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}
</template>
<div class="travelDaysdetails">
<div class="travelDaysdetailsBJ column" :style="{'background':backgroundColor}">
<div class="travelDaysdetails-textBox row">
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">早餐：</span>
<div>
<template v-if="item&&item.DinnerArray&&item.DinnerArray.length>0">
{{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}
</template>
</div>
</div>
</div>
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">午餐：</span>
<div>
<template v-if="item&&item.DinnerArray&&item.DinnerArray.length>1">
{{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}
</template>
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">午餐：</span>
<div>
<template v-if="item&&item.DinnerArray&&item.DinnerArray.length>1">
{{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}
</template>
</div>
</div>
</div>
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">晚餐：</span>
<div> <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>2">
{{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}
</template>
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">晚餐：</span>
<div> <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>2">
{{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}
</template>
</div>
</div>
</div>
</div>
<div class="travelDaysdetails-textBox">
<div class="travelDaysdetails-text right0 row">
<span class="travelDaysdetails-text0">住宿：</span>
<template v-if="item.HotelArray">
<template v-if="item.HotelArray.length==1">
{{item.HotelArray[0].HotelName!='温馨的家'?item.HotelArray[0].HotelName+"/或同级":"温馨的家"}}
</template>
<template v-else>
<template v-for="(j) in item.HotelArray">{{j.HotelName}}、</template> /或同级
<div class="travelDaysdetails-textBox">
<div class="travelDaysdetails-text right0 row">
<span class="travelDaysdetails-text0">住宿：</span>
<template v-if="item.HotelArray">
<template v-if="item.HotelArray.length==1">
{{item.HotelArray[0].HotelName!='温馨的家'?item.HotelArray[0].HotelName+"/或同级":"温馨的家"}}
</template>
<template v-else>
<template v-for="(j) in item.HotelArray">{{j.HotelName}}、</template> /或同级
</template>
</template>
</template>
</div>
</div>
</div>
</div>
</div>
<!-- otherJourney-footer -->
<div class="footer">
<div class="otherJourney-introduceFooter absolute z-index1 row-aic" :style="{'background':''}">
......@@ -139,11 +141,10 @@
</div>
</div>
<div class="UpgradedVersion2Line absolute z-index3 row-ajc">
<span>底线</span>
<span>{{pageHeight>1464?'超出内容分割到下一页':'底线'}}</span>
</div>
<!-- v-if="pageHeight>1839" -->
<!-- :style="{'top': pageHeight>2878?'2878px':pageHeight-10+'px'}" -->
<div class="UpgradedVersion2Line absolute z-index3 row-ajc" style="top: 2878px">
<div class="UpgradedVersion2Line absolute z-index3 row-ajc"
:style="{'top': pageHeight>1464&&pageHeight<2878?pageHeight+'px':'2878px'}">
<span>底线</span>
</div>
</div>
......
src/components/temp/operation.vue
View file @ ea742e05
......@@ -722,6 +722,7 @@
getList() {
this.loading = true
this.apipost("opcommission_GetOPExpectCommission", this.msg, res => {
this.loading=false;
if (res.data.resultCode == 1) {
this.OrderNum = 0
this.groupNum = 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