Commit 5371491a authored by 黄奎's avatar 黄奎

页面修改

parent ae77d8ca
<style> <style>
@import url("../../../assets/css/tripIndexNew2.css"); @import url("../../../assets/css/tripIndexNew2.css");
.dayPage-box {
.dayPage-box {
margin-left: 20px; margin-left: 20px;
position: relative; position: relative;
background-color: #eee; background-color: #eee;
...@@ -22,16 +23,20 @@ ...@@ -22,16 +23,20 @@
left: -8px; left: -8px;
top: 17px; top: 17px;
} }
.TravelDayContentThree .el-textarea__inner{
.TravelDayContentThree .el-textarea__inner {
/* width: ; */ /* width: ; */
} }
.TravelDayContentThree .days-box .leftDayLine{
.TravelDayContentThree .days-box .leftDayLine {
flex-shrink: 0; flex-shrink: 0;
} }
.dayPage-form{
.dayPage-form {
width: 500px; width: 500px;
padding: 10px 0; padding: 10px 0;
} }
.TravelDaysTrip .el-form-item { .TravelDaysTrip .el-form-item {
display: inline-block; display: inline-block;
} }
...@@ -77,7 +82,8 @@ ...@@ -77,7 +82,8 @@
.TC-newTop { .TC-newTop {
margin-top: 40px !important; margin-top: 40px !important;
} }
.BlowUpTravelDays{
.BlowUpTravelDays {
position: absolute; position: absolute;
right: 10px; right: 10px;
top: -19px; top: -19px;
...@@ -91,10 +97,12 @@ ...@@ -91,10 +97,12 @@
cursor: pointer; cursor: pointer;
font-size: 15px; font-size: 15px;
} }
.BlowUpTravelDays:hover{
.BlowUpTravelDays:hover {
color: #fff; color: #fff;
} }
.BlowUpTravelDaysBox{
.BlowUpTravelDaysBox {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
...@@ -103,11 +111,12 @@ ...@@ -103,11 +111,12 @@
z-index: 10000; z-index: 10000;
padding: 0 10px; padding: 0 10px;
overflow-y: scroll; overflow-y: scroll;
background: rgba(23,23,23,0.5); background: rgba(23, 23, 23, 0.5);
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.BlowUpTravelDaysClose{
.BlowUpTravelDaysClose {
position: fixed; position: fixed;
width: 40px; width: 40px;
right: 50px; right: 50px;
...@@ -136,6 +145,7 @@ ...@@ -136,6 +145,7 @@
<span class="TDInputspan"> <span class="TDInputspan">
<el-form-item prop="DayNum"> <el-form-item prop="DayNum">
<el-input class="w100 LowNum" v-model="subConfig.DayNum" maxlength="2" <el-input class="w100 LowNum" v-model="subConfig.DayNum" maxlength="2"
:disabled="dataAll&&dataAll.OfferId&&dataAll.OfferId>0"
@keyup.native="checkInteger(subConfig,'DayNum');createLineTrip()"> @keyup.native="checkInteger(subConfig,'DayNum');createLineTrip()">
<template slot="append">{{$t('hotel.hotel_day')}}</template> <template slot="append">{{$t('hotel.hotel_day')}}</template>
</el-input> </el-input>
...@@ -180,13 +190,12 @@ ...@@ -180,13 +190,12 @@
</el-form-item> </el-form-item>
</span> --> </span> -->
<template v-if="true"> <template v-if="true">
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('objFill.v101.myOrdersAllType.banxing')}}</span> <span class="TDTextspan"
:class="{'showOther':TeamType==3}">{{$t('objFill.v101.myOrdersAllType.banxing')}}</span>
<span :class="{'showOther':TeamType==3}"> <span :class="{'showOther':TeamType==3}">
<el-form-item prop="FeaturePageType"> <el-form-item prop="FeaturePageType">
<el-select class="w90" :placeholder="$t('objFill.v101.myOrdersAllType.qingxuanzbx')" <el-select class="w90" :placeholder="$t('objFill.v101.myOrdersAllType.qingxuanzbx')"
:disabled="isTemplate" :disabled="isTemplate" v-model="dataAll.FeaturePageType" @change="PromptTemplate()">
v-model="dataAll.FeaturePageType"
@change="PromptTemplate()" @focus="">
<el-option :label="$t('objFill.v101.myOrdersAllType.hengban')" :value="1"></el-option> <el-option :label="$t('objFill.v101.myOrdersAllType.hengban')" :value="1"></el-option>
<el-option :label="$t('objFill.v101.myOrdersAllType.shuban')" :value="2"></el-option> <el-option :label="$t('objFill.v101.myOrdersAllType.shuban')" :value="2"></el-option>
</el-select> </el-select>
...@@ -205,9 +214,10 @@ ...@@ -205,9 +214,10 @@
<div class="dayPage-box row"> <div class="dayPage-box row">
<div class="dayPage-form relative" v-if="!item.isHide"> <div class="dayPage-form relative" v-if="!item.isHide">
<template v-if="isTemplate"> <template v-if="isTemplate">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.myOrdersAllType.fangdaxingc')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.myOrdersAllType.fangdaxingc')"
placement="top">
<span class="el-icon-full-screen absolute BlowUpTravelDays" <span class="el-icon-full-screen absolute BlowUpTravelDays"
@click="clickBlowUpTravelDays(item)"></span> @click="clickBlowUpTravelDays(item)"></span>
</el-tooltip> </el-tooltip>
<template v-if="!item.IsBlowUp"> <template v-if="!item.IsBlowUp">
<travelDaysHV v-if="dataAll.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item"> <travelDaysHV v-if="dataAll.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
...@@ -226,8 +236,7 @@ ...@@ -226,8 +236,7 @@
</template> </template>
<span v-else style="color: red;">{{$t('objFill.v101.myOrdersAllType.qingxuanzbx')}}</span> <span v-else style="color: red;">{{$t('objFill.v101.myOrdersAllType.qingxuanzbx')}}</span>
</div> </div>
<div class="newDayContent" <div class="newDayContent" :style="{'width':!item.isHide?'520px':'1020px'}">
:style="{'width':!item.isHide?'520px':'1020px'}">
<travelDaysTrip :dataAll="dataAll" v-bind:dayObj="item" v-bind:CurrentIndex="index" <travelDaysTrip :dataAll="dataAll" v-bind:dayObj="item" v-bind:CurrentIndex="index"
v-bind:TotalCount="subConfig.DayList.length" v-bind:isOpenGroup="isOpenGroup" v-bind:TotalCount="subConfig.DayList.length" v-bind:isOpenGroup="isOpenGroup"
v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity" v-bind:UseTypeArray="UseTypeArray" v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity" v-bind:UseTypeArray="UseTypeArray"
...@@ -278,50 +287,49 @@ ...@@ -278,50 +287,49 @@
travelDaysHV travelDaysHV
}, },
methods: { methods: {
PromptTemplate(){ PromptTemplate() {
let _this = this let _this = this
this.$confirm(this.$t('objFill.v101.myOrdersAllType.yidanxzbkgg'), this.$t('tips.tips'), { this.$confirm(this.$t('objFill.v101.myOrdersAllType.yidanxzbkgg'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
_this.isTemplate = true _this.isTemplate = true
_this.getFeaturePageType() _this.getFeaturePageType()
}) })
.catch(() => { .catch(() => {
_this.isTemplate = false _this.isTemplate = false
_this.dataAll.FeaturePageType = 0 _this.dataAll.FeaturePageType = 0
}); });
}, },
getFeaturePageType(){ getFeaturePageType() {
this.subConfig.DayList.forEach(x=>{ this.subConfig.DayList.forEach(x => {
x.IsBlowUp = false x.IsBlowUp = false
x.ScenicArray.forEach(y=>{ x.ScenicArray.forEach(y => {
y.ScenicJson = { y.ScenicJson = {
x: 0, x: 0,
y:0 y: 0
} }
}) })
if(this.dataAll.FeaturePageType==1){ if (this.dataAll.FeaturePageType == 1) {
x.zoom = 0.285 x.zoom = 0.285
} }
if(this.dataAll.FeaturePageType==2){ if (this.dataAll.FeaturePageType == 2) {
x.zoom = 0.40 x.zoom = 0.40
} }
}) })
this.$forceUpdate() this.$forceUpdate()
}, },
clickBlowUpTravelDays(item){ clickBlowUpTravelDays(item) {
item.IsBlowUp=!item.IsBlowUp item.IsBlowUp = !item.IsBlowUp
if(item.IsBlowUp) { if (item.IsBlowUp) {
if(this.dataAll.FeaturePageType==1) item.zoom = 0.68 if (this.dataAll.FeaturePageType == 1) item.zoom = 0.68
if(this.dataAll.FeaturePageType==2) item.zoom = 1 if (this.dataAll.FeaturePageType == 2) item.zoom = 1
} } else {
else{ if (this.dataAll.FeaturePageType == 1) item.zoom = 0.285
if(this.dataAll.FeaturePageType==1) item.zoom = 0.285 if (this.dataAll.FeaturePageType == 2) item.zoom = 0.40
if(this.dataAll.FeaturePageType==2) item.zoom = 0.40
} }
this.$forceUpdate() this.$forceUpdate()
}, },
...@@ -368,10 +376,10 @@ ...@@ -368,10 +376,10 @@
dayItem.isRead = false; dayItem.isRead = false;
dayItem.IsBlowUp = false dayItem.IsBlowUp = false
dayItem.zoom = 1 dayItem.zoom = 1
if(this.dataAll.FeaturePageType==1){ if (this.dataAll.FeaturePageType == 1) {
dayItem.zoom = 0.285 dayItem.zoom = 0.285
} }
if(this.dataAll.FeaturePageType==2){ if (this.dataAll.FeaturePageType == 2) {
dayItem.zoom = 0.40 dayItem.zoom = 0.40
} }
var hotelObj = this.$tripUtils.hotelObj(); var hotelObj = this.$tripUtils.hotelObj();
...@@ -499,7 +507,7 @@ ...@@ -499,7 +507,7 @@
TrafficList: TrafficList, TrafficList: TrafficList,
WarmTipList: WarmTipList, WarmTipList: WarmTipList,
TitleList: TitleList, TitleList: TitleList,
IsUpdateTrip:this.subConfig.IsUpdateTrip, IsUpdateTrip: this.subConfig.IsUpdateTrip,
FeaturePageType: this.dataAll.FeaturePageType FeaturePageType: this.dataAll.FeaturePageType
}; };
this.HotelList = HotelList; this.HotelList = HotelList;
...@@ -528,9 +536,9 @@ ...@@ -528,9 +536,9 @@
deep: true, deep: true,
immediate: true, immediate: true,
handler: function (newVal, oldVal) { handler: function (newVal, oldVal) {
if(!this.dataAll.FeaturePageType){ if (!this.dataAll.FeaturePageType) {
this.isTemplate = false this.isTemplate = false
}else this.isTemplate = true } else this.isTemplate = true
} }
}, },
'subConfig.DayList': { 'subConfig.DayList': {
...@@ -544,8 +552,7 @@ ...@@ -544,8 +552,7 @@
this.createLineTrip(); this.createLineTrip();
}, },
//监听直采和非直采的编号 //监听直采和非直采的编号
getLineId(newValue, oldValue) { getLineId(newValue, oldValue) {},
},
subConfig: { subConfig: {
handler: function (newValue, oldValue) { handler: function (newValue, oldValue) {
this.emitData(); this.emitData();
......
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