Skip to content

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

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

parents 5ab3cf05 b6cf7d68
Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 97 deletions
src/assets/utils/tripUtils.js
View file @ d714ce5d
......@@ -362,7 +362,8 @@ var tripUtils = {
TrafficType: 2, //交通类型,默认为专车
TrafficContent: "", //交通详情
TrafficImage: "", //交通图片
x: 0,
y: 0,
}
};
},
......@@ -634,7 +635,7 @@ var tripUtils = {
{
cityIdStr += subItem.ArrivalCityId + ","
}
});
}
}
......
src/components/Details.vue
View file @ d714ce5d
......@@ -190,8 +190,13 @@
},
changeMenuShowType() {
this.isCollapse = !this.isCollapse;
localStorage.navsot = this.isCollapse ? 'a' : 'b'
if(this.$route.path=='/TravelManager'){
this.isCollapse = true;
localStorage.navsot = 'a'
}else{
this.isCollapse = !this.isCollapse;
localStorage.navsot = this.isCollapse ? 'a' : 'b'
}
},
referPage() {
this.currentTabName = this.tabs[this.currentRightIndex].name + '_' + this.currentRightIndex
......
src/components/LeaveGroupDownload/travelDays.vue
View file @ d714ce5d
......@@ -83,7 +83,19 @@
<div class="travelDaysContent column">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.details" v-if="item.details.length>0">
<span>{{jindian.title?'【'+jindian.title+'】':''}}</span>
<span>
<template v-if="!jindian.playTimeHour&&!jindian.playTimeMinutes&&jindian.title">
{{'【'+jindian.title+'】'}}
</template>
<template v-else>
<template v-if="jindian.playTimeHour!=null&&jindian.playTimeHour&&jindian.playTimeMinutes">
{{'【'+jindian.title+'(约'+jindian.playTimeHour+'小时'+jindian.playTimeMinutes+'分钟'+')】'}}
</template>
<template v-if="(!jindian.playTimeHour||jindian.playTimeHour==null)&&jindian.playTimeMinutes">
{{'【'+jindian.title+'(约'+jindian.playTimeMinutes+'分钟'+')】'}}
</template>
</template>
</span>
{{jindian.content}}
</div>
<div class="travelDaysContent-text" v-else>
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ d714ce5d
......@@ -2535,10 +2535,10 @@
message: '请输入联系人电话',
trigger: 'blur'
},
{
pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
message: '请输入正确的手机'
}
// {
// pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
// message: '请输入正确的手机'
// }
],
GatherAddress: [{
required: true,
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ d714ce5d
......@@ -2091,10 +2091,10 @@
message: '请输入联系人电话',
trigger: 'blur'
},
{
pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
message: '请输入正确的手机'
}
// {
// pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
// message: '请输入正确的手机'
// }
],
GatherAddress: [{
required: true,
......
src/components/TravelManager/TravelList/OpTripList.vue
View file @ d714ce5d
......@@ -128,7 +128,7 @@
<el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">
{{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button @click="goUrlR('confirmationOrderDownLoadNew',item)" type="primary">
<el-button @click="goUrlR(item)" type="primary">
{{$t('Operation.Op_tripDownLoad')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">
......@@ -405,13 +405,13 @@
);
},
goUrlR(path, item) {
goUrlR(item) {
var cityId = item.StartCityID
if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
cityId = item.UnionCityId
}
let routeData = this.$router.resolve({
name: path,
name: 'confirmationOrderDownLoadNew',
query: {
configId: item.ID,
cityId: cityId,
......
src/components/TravelManager/TravelList/SaleTripList.vue
View file @ d714ce5d
......@@ -101,12 +101,9 @@
<div class="el-col">
<div class="d7">
<el-button v-if="item.CreateBy==CurrentUserId && item.ShareTeamType<0" @click="goToOpenTravel('TravelManager3',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
<!-- <el-button v-if="item.CreateBy==CurrentUserId" @click="goToOpenTravel('TravelManager5',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button> -->
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
<!-- <el-button @click="goUrlR('SalesconfirmationOrder',item)" type="primary">行程下载</el-button> -->
<el-button @click="goUrlR('confirmationOrderDownLoadNew',item)" type="primary">
<el-button @click="goUrlR(item)" type="primary">
{{$t('Operation.Op_tripDownLoad')}}</el-button>
</div>
</div>
......@@ -332,9 +329,9 @@
);
},
//跳转至下载
goUrlR(path,item){
goUrlR(item){
let routeData = this.$router.resolve({
name: path,
name: 'confirmationOrderDownLoadNew',
query: {
configId:item.ID,
cityId: 0,
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ d714ce5d
......@@ -1086,7 +1086,7 @@
@click.native="goTeamBalance(item.TCID,item.OutBranchId)">
{{$t('Operation.Op_shouzhiDetail')}}
</el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoadNew',item)">
<el-dropdown-item @click.native="goUrlR(item)">
{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
</el-dropdown-item>
......@@ -2174,16 +2174,14 @@
}
});
},
goUrlR(path, item) {
goUrlR(item) {
var cityId = item.StartCityID;
if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
cityId = item.UnionCityId;
}
if (item.FeatureType == 8) {
//path = 'confirmationOrderDownLoadNew'
}
let routeData = this.$router.resolve({
name: path,
name: 'confirmationOrderDownLoadNew',
query: {
configId: item.ID,
cityId: cityId,
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ d714ce5d
......@@ -783,7 +783,7 @@
<el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
{{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item>
<el-dropdown-item
@click.native="goUrlR('confirmationOrderDownLoadNew',item)">
@click.native="goUrlR(item)">
{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
</el-dropdown-item>
......@@ -1558,16 +1558,13 @@
}
});
},
goUrlR(path, item) {
goUrlR(item) {
var cityId = item.StartCityID;
if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
cityId = item.UnionCityId;
}
if (item.FeatureType == 8) {
//path = 'confirmationOrderDownLoadNew'
}
let routeData = this.$router.resolve({
name: path,
let routeData = this.$router.resolve({
name: 'confirmationOrderDownLoadNew',
query: {
configId: item.ID,
cityId: cityId,
......
src/components/commonPage/TripDownLoadCommon.vue
View file @ d714ce5d
......@@ -214,7 +214,7 @@
this.apipost('travel_get_GetTravelFeatureType', postMsg, res => {
if (res.data.resultCode == 1) {
if (res.data.data == 8) {
// this.TripPath = "confirmationOrderDownLoadNew";
}
}
}, err => {})
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ d714ce5d
......@@ -199,6 +199,9 @@
JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) :
"";
if (oldJson && oldJson.length > 0) {
oldJson.forEach(item => {
item.isDeletePage = true;
});
this.pageList = oldJson;
this.RenderingOk = true;
} else {
......@@ -282,7 +285,8 @@
x: 0,
y: 0,
}];
newObj.MainDesc = "描述信息";
newObj.MainDesc =
"坚持以高端旅游服务广大客户群体！我们坚信旅游是美好的体验！带您体验日本的四季之美，赏花.赏枫.赏雪并且享受怀石料理，泡露天温泉，遨游日本的秀丽山海美景！印象日本不断思索旅游本质，坚持旅游质量，对于旅游的专业与服务有着深刻体认！我们的用心，您一定会看的见！选择印象日本，会是你前往日本最好的选择，您一定会认同并期待您的参与，这也是我们由衷的期盼！“旅遊”不是舟車勞頓的代名詞~提供高档旅游产品，印象之旅有其独到的见解与坚持，这就是各位选择旅游的真正定义!来吧~如果你还在犹豫不知道该选择什么样的日本产品，相信印象之旅对是你最棒的选择！最后并祝各位有个愉快的旅游假期!";
},
//详情页数据
getDetailsData(tripObj, newObj) {
......
src/components/newTravelmanager/TravelTripPreview/noScenic.vue
View file @ d714ce5d
......@@ -95,8 +95,6 @@ export default {
this.UploadSelfFileT(path, newArr, x => {
this.trafficObj.trafficIntroduce.IntroduceImage =
this.domainManager().ViittoFileUrl + x.data.FilePath;
this.trafficObj.trafficIntroduce.x = 0
this.trafficObj.trafficIntroduce.y = 0
});
},
//关闭添加弹窗
......@@ -109,8 +107,6 @@ export default {
imgArr.forEach(imgItem => {
this.trafficObj.trafficIntroduce.IntroduceImage =
imgItem.Path ;
this.trafficObj.trafficIntroduce.x = 0
this.trafficObj.trafficIntroduce.y = 0
});
}
},
......@@ -120,8 +116,6 @@ export default {
watch: {
"trafficObj.trafficIntroduce":{
handler: function(newValue, oldValue) {
this.trafficObj.trafficIntroduce.x = 0
this.trafficObj.trafficIntroduce.y = 0
this.trafficObj.Introduce = JSON.stringify(this.trafficObj.trafficIntroduce);
},
......
src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue
View file @ d714ce5d
......@@ -121,9 +121,9 @@
</tr>
</template>
<tr>
<!-- <tr>
<td colspan="6" height="15"></td>
</tr>
</tr> -->
<tr class="marginT10">
<td width="70" valign="top">
<img crossorigin="Anonymous" src="../../../assets/img/daily_hotel-1.png">
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @ d714ce5d
......@@ -147,7 +147,7 @@
</div>
<div class="dayPage-box row">
<div class="dayPage-form">
<template v-show="!item.isHide">
<template v-if="!item.isHide">
<travelDays :index="index" :dataAll="dataAll" :item="item"></travelDays>
</template>
</div>
......
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ d714ce5d
<template>
<div style="height: 100%;">
<div style="height: 100%;" v-if="RenderingOk">
<div class="UpgradedVersion-box2 UpgradedVersion-homebj relative" style="zoom: 0.44;">
<div class=" z-index1" style="left: 0;right: 0; top: 0;bottom: 0;">
<Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header>
......@@ -41,7 +41,8 @@
: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"
<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 v-if="ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].FileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="ScenicArrayList[0].NewImaArray[0].VideoPath" controls="controls"
......@@ -58,7 +59,8 @@
</div>
<div class="travelDaysMasterMap-text absolute z-index2">
<vEditDiv v-if="ScenicArrayList.length==0" :canEdit='canEdit' v-model="item.TrafficObj.trafficIntroduce.IntroduceTitle"></vEditDiv>
<vEditDiv v-if="ScenicArrayList.length>0" :canEdit='canEdit' v-model="ScenicArrayList[0].CouponsName"></vEditDiv>
<template v-if="ScenicArrayList.length>0">{{ScenicArrayList[0].CouponsName}}</template>
<!-- <vEditDiv v-if="ScenicArrayList.length>0" :canEdit='canEdit' v-model="ScenicArrayList[0].CouponsName"></vEditDiv> -->
</div>
</div>
<div class="travelDaysMasterMap-two absolute z-index2" v-if="ScenicArrayList.length>1||ScenicArrayList.length>2"
......@@ -67,7 +69,7 @@
:style="{'color':'#fff'}"
:id="'viewSpotBox_'+(item*4)+'_1'+index"
v-if="ScenicArrayList.length>1">
<div class="featureDay-vToolBar absolute z-index3">
<div class="featureDay-vToolBar absolute z-index3" style="display: none;">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true"
@toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)"
......@@ -93,7 +95,7 @@
:style="{'color':'#fff'}"
:id="'viewSpotBox_'+(item*4)+'_2'+index"
v-if="ScenicArrayList.length>2">
<div class="featureDay-vToolBar absolute z-index3">
<div class="featureDay-vToolBar absolute z-index3" style="display: none;">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true"
@toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)"
......@@ -130,7 +132,10 @@
<div class="travelDaysContent">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.ScenicArray"
v-if="item.ScenicArray.length>0">
<span class="textBold"><vEditDiv class="dayCouponsName" :canEdit='canEdit' v-model="'【'+jindian.CouponsName+'】'"></vEditDiv></span>
<span class="textBold">
【{{jindian.CouponsName}}】
<!-- <vEditDiv class="dayCouponsName" :canEdit='canEdit' v-model="'【'+jindian.CouponsName+'】'"></vEditDiv> -->
</span>
<span><vEditDiv :canEdit='canEdit' v-model="jindian.Description"></vEditDiv></span>
</div>
<div v-if="item.ScenicArray.length==0" class="travelDaysContent-text">
......@@ -143,7 +148,7 @@
</div>
</div>
<div class="travelDaysdetails-tsTextBox">
<div class="travelDaysdetails-tsText row"
<div class="travelDaysdetails-tsText"
:style="{'background':backgroundColor2}">
<span class="travelDaysdetails-text0">温馨提示：</span>
<template v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
......@@ -223,6 +228,7 @@
props: ['dataAll','item','index','tripList','orderMsg','orderTripdiff'],
data() {
return {
RenderingOk: false,
canEdit: true,
title: '北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）',
day: 'DAY',
......@@ -295,8 +301,17 @@
}
if(this.ScenicArrayList&&this.ScenicArrayList.length>0){
this.ScenicArrayList[this.imgIndex].ScenicJson.y = y
this.item.ScenicArray.forEach(x=>{
this.ScenicArrayList.forEach(y=>{
if(x.CouponsId==y.CouponsId){
x.ScenicJson.y = y.ScenicJson.y
}
})
})
}else{
this.item.TrafficObj.trafficIntroduce.x = 0
this.item.TrafficObj.trafficIntroduce.y = y
this.item.TrafficObj.Introduce = JSON.stringify(this.item.TrafficObj.trafficIntroduce);
}
this.$refs[
"viewSpotVds_" + (this.item * 4)+ "_"+this.imgIndex + this.index
......@@ -333,6 +348,7 @@
that.item.TrafficObj.trafficIntroduce.IntroduceImage = allPath
that.item.TrafficObj.trafficIntroduce.x = 0
that.item.TrafficObj.trafficIntroduce.y = 0
that.item.TrafficObj.Introduce = JSON.stringify(this.item.TrafficObj.trafficIntroduce);
}
that.$message.success('上传成功');
that.item.ScenicArray = JSON.parse(JSON.stringify(that.ScenicArrayList))
......@@ -346,13 +362,33 @@
},
getDMCimg(selectImgArr) {
if(this.ScenicArrayList.length>0){
this.ScenicArrayList[this.imgIndex].NewImaArray[0].Url = selectImgArr[0].Path
this.ScenicArrayList[this.imgIndex].NewImaArray[0].x = 0
this.ScenicArrayList[this.imgIndex].NewImaArray[0].y = 0
var that = this;
selectImgArr.forEach(imgItem => {
var obj = {
Name: imgItem.Name,
Url: imgItem.Path,
fileName: imgItem.Name
};
if (imgItem.VideoPath) {
obj.VideoPath = imgItem.VideoPath;
}
if (imgItem.FileType) {
obj.FileType = imgItem.FileType;
}
that.ScenicArrayList[that.imgIndex].NewImaArray = [];
that.ScenicArrayList[that.imgIndex].NewImaArray.push(obj);
that.ScenicArrayList[that.imgIndex].ScenicJson.x = 0
that.ScenicArrayList[that.imgIndex].ScenicJson.y = 0
that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[0].NewImaArray);
});
// this.ScenicArrayList[this.imgIndex].NewImaArray[0].Url = selectImgArr[0].Path
// this.ScenicArrayList[this.imgIndex].NewImaArray[0].x = 0
// this.ScenicArrayList[this.imgIndex].NewImaArray[0].y = 0
}else{
this.item.TrafficObj.trafficIntroduce.IntroduceImage = selectImgArr[0].Path
this.item.TrafficObj.trafficIntroduce.x = 0
this.item.TrafficObj.trafficIntroduce.y = 0
this.item.TrafficObj.Introduce = JSON.stringify(this.item.TrafficObj.trafficIntroduce);
}
this.isShowScenicImg = false;
this.item.ScenicArray = JSON.parse(JSON.stringify(this.ScenicArrayList))
......@@ -370,14 +406,15 @@
}
});
if(this.ScenicArrayList&&this.ScenicArrayList.length>0) this.ScenicArrayList.sort((a, b)=>{return a.Rank - b.Rank})
console.log(val.ScenicArray,'-----------')
if(!this.RenderingOk){
this.RenderingOk = true;
}
},
deep: true,
immediate: true
},
dataAll: {
handler(val, oldVal) {
// console.log(val,'-----')
if(val&&val.TripColor){
this.backgroundColor = this.hexToRgb(val.TripColor, 0.2)
this.backgroundColor2 = this.hexToRgb(val.TripColor, 0.1)
......
src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
View file @ d714ce5d
......@@ -6,6 +6,7 @@
}
.TC-itemContent {
position: relative;
/* max-height: 700px; */
}
.TD_OperaContent {
......@@ -207,7 +208,8 @@
<div>
<span v-if="ishasScenic">默认展示图</span>
<el-select v-if="ishasScenic&&NoticeParameters.IsDirect==1" class="w220 Ht_hotelSelect" size="mini"
:placeholder="$t('pub.pleaseSel')" :multiple-limit="1" v-model="ScenicArray" multiple filterable
:placeholder="$t('pub.pleaseSel')" v-model="ScenicArraySingle"
filterable
@change="getScenicArray">
<el-option v-for="(item,index) in dayObj.ScenicArray" :label="item.CouponsName" :value="item.CouponsId" :key="index">
<span style="float: left">{{ item.CouponsName }}</span>
......@@ -320,6 +322,7 @@
],
data() {
return {
ScenicArraySingle: this.dayObj.ScenicArrayImg?this.dayObj.ScenicArrayImg:'',//单选默认图
ScenicArray: this.dayObj.ScenicArrayImg?this.dayObj.ScenicArrayImg:[],//默认展示图
DefaultSelectValue: 0,
QScenicList: [],
......@@ -340,28 +343,36 @@
};
},
methods: {
// 默认需要展示的图
getScenicArray(){
let i = 1
let list = []
this.ScenicArray.forEach(y=>{
this.dayObj.ScenicArray.forEach(x=>{
x.Rank = 0
if(x.CouponsId==y){
list.push(x)
}
})
})
list.forEach((x,index)=>{
x.Rank = index+1
})
// this.ScenicArray.forEach(y=>{
// this.dayObj.ScenicArray.forEach(x=>{
// x.Rank = 0
// if(x.CouponsId==y){
// list.push(x)
// }
// })
// })
// this.dayObj.ScenicArrayImg = JSON.parse(JSON.stringify(this.ScenicArray));
// list.forEach((x,index)=>{
// x.Rank = index+1
// })
// this.dayObj.ScenicArray.forEach(x=>{
// list.forEach(y=>{
// if(x.CouponsId==y.CouponsId){
// x.Rank = y.Rank
// }
// })
// })
this.dayObj.ScenicArray.forEach(x=>{
list.forEach(y=>{
if(x.CouponsId==y.CouponsId){
x.Rank = y.Rank
}
})
x.Rank = 0
if(x.CouponsId===this.ScenicArraySingle){
x.Rank = 1
}
})
if(this.ScenicArray&&this.ScenicArray.length>0) this.dayObj.ScenicArrayImg = JSON.parse(JSON.stringify(this.ScenicArray));
this.dayObj.ScenicArrayImg = this.ScenicArraySingle;
this.dayObj.ScenicArray = this.dayObj.ScenicArray.sort((a, b)=>{return b.Rank - a.Rank});
},
//非直采切换
......@@ -602,23 +613,30 @@
this.dayObj.TitleObj.DayNum = this.dayObj.DayNum;
this.dayObj.ChooseScenicArray = [];
this.ChooseScenicArray = [];
let status = false
this.dayObj.ScenicArray.forEach(x => {
this.dayObj.ChooseScenicArray.push(x.CouponsId);
if(x.Rank>0){
// this.ScenicArray.push(x.CouponsId)
this.ScenicArray = [x.CouponsId]
if(!status&&x.Rank>0&&!this.ScenicArraySingle){
// this.ScenicArray = [x.CouponsId]
this.ScenicArraySingle = x.CouponsId
status = true
}
});
if(!status&&this.dayObj.ScenicArray.length>0&&!this.ScenicArraySingle){
status = true
this.ScenicArraySingle = this.dayObj.ScenicArray[0].CouponsId
}
if(this.ScenicArray&&this.ScenicArray.length>0) {
this.ScenicArray.sort((a, b)=>{return a.Rank - b.Rank})
this.dayObj.ScenicArrayImg = JSON.parse(JSON.stringify(this.ScenicArray));
}
if(this.ScenicArraySingle){
this.dayObj.ScenicArrayImg = this.ScenicArraySingle;
}
if (this.dayObj.ChooseScenicArray.length > 0) {
this.ChooseScenicArray = JSON.parse(JSON.stringify(this.dayObj.ChooseScenicArray));
}
if (this.dayObj.ScenicArray != null && this.dayObj.ScenicArray.length > 0) {
this.ishasScenic = true;
this.QScenicList = [];
......@@ -655,10 +673,13 @@
//选中的景点
'ChooseScenicArray': {
handler: function (val, oldVal) {
if(val.length==0) this.ScenicArray = []
if(val.length==0) {
this.ScenicArray = [];
this.ScenicArraySingle = '';
}
let list = []
//新增
this.ChooseScenicArray.forEach(x => {
val.forEach(x => {
let isExist = false;
this.dayObj.ScenicArray.forEach(y => {
if (x === y.CouponsId) {
......@@ -695,13 +716,12 @@
scenicDescribeObj.Id = x;
scenicDescribeObj.Describe = s.About;
//this.WarmTripDescribe.ScenicDescribeArr.push(scenicDescribeObj);
if (scenicDescribeObj.Describe != null && scenicDescribeObj.Describe != "") {
this.dayObj.WarmTipObj.Description += "<p>" + scenicDescribeObj.Describe + "</p>";
}
// if (scenicDescribeObj.Describe != null && scenicDescribeObj.Describe != "") {
// this.dayObj.WarmTipObj.Description += "<p>" + scenicDescribeObj.Describe + "</p>";
// }
}
});
list.push(scenic)
this.dayObj.ScenicArray = list.sort((a, b)=>{return b.Rank - a.Rank});
this.dayObj.ScenicArray.push(scenic)
}
});
//移除
......@@ -719,7 +739,7 @@
}
});
this.dayObj.ScenicArray = newScenicObj.sort((a, b)=>{return b.Rank - a.Rank});
if(this.dayObj.ScenicArray&&this.dayObj.ScenicArray.length>0) this.dayObj.ScenicArray.sort((a, b)=>{return a.Rank - b.Rank})
//清除数据
let scenicDescribeArr = [];
this.WarmTripDescribe.ScenicDescribeArr.forEach(x => {
......@@ -733,9 +753,35 @@
scenicDescribeArr.push(x);
}
});
this.WarmTripDescribe.ScenicDescribeArr = scenicDescribeArr;
this.dayObj.ChooseScenicArray = JSON.parse(JSON.stringify(this.ChooseScenicArray));
// 默认第一个为默认图
// if(this.ScenicArray,length==0&&this.ChooseScenicArray&&this.ChooseScenicArray.length>0){
// this.ScenicArray = [this.ChooseScenicArray[0]]
// this.getScenicArray()
// }
if(!this.ScenicArraySingle&&this.ChooseScenicArray&&this.ChooseScenicArray.length>0){
this.ScenicArraySingle = this.ChooseScenicArray[0]
this.getScenicArray()
}else{
let status = false
this.dayObj.ScenicArray.forEach(x=>{
x.Rank = 0
if(x.CouponsId===this.ScenicArraySingle){
status = true
x.Rank = 1
}
})
if(!status) {
this.ScenicArraySingle = this.ChooseScenicArray[0]
this.getScenicArray()
this.dayObj.ScenicArrayImg = this.ScenicArraySingle;
}
}
if(this.dayObj.ScenicArray&&this.dayObj.ScenicArray.length>0) this.dayObj.ScenicArray.sort((a, b)=>{return a.Rank - b.Rank})
}
},
WarmTripDescribe: {
......
src/components/orderCommon/order-form2.vue
View file @ d714ce5d
......@@ -793,10 +793,10 @@
message: "请输入联系人电话",
trigger: "blur",
},
{
pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
message: "请输入正确的手机",
},
// {
// pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
// message: "请输入正确的手机",
// },
],
SurName: [{
required: true,
......@@ -833,10 +833,10 @@
message: "请输入联系人电话",
trigger: "blur",
},
{
pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
message: "请输入正确的手机",
},
// {
// pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
// message: "请输入正确的手机",
// },
],
GatherAddress: [{
required: 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