Skip to content

S
SuperMan
Commit cbe73b0b authored by 吴春's avatar 吴春
Browse files
Options

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

parents f02ef1f4 331201a8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3127 additions and 3338 deletions
src/assets/css/UpgradedVersion.css
View file @ cbe73b0b
......@@ -300,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;
......@@ -323,9 +323,16 @@ img {
.featureHome-right-three {
width: 143px;
max-height: 747px;
height: 747px;
top: 240px;
right: 42px;
}
.featureHome-right-three.active {
height: inherit;
max-height: 747px;
left: 938px;
right: inherit;
margin-bottom: 34px;
}
.featureHomeBjH1 {
......@@ -349,37 +356,69 @@ img {
}
.featureHomeBj2 {
left: 7px;
top: -18px;
}
.featureHomeBj2.active {
left: 7px;
top: 0px;
}
.featureHomeBj3 {
left: 134px;
top: -25px;
}
.featureHomeBj3.active {
left: 136px;
top: 0px;
}
.featureHomeBj4 {
left: 109px;
top: -43px;
}
.featureHomeBj4.active {
left: 111px;
top: 0px;
}
.featureHomeBj5 {
left: 0;
top: 668px;
}
.featureHomeBj5.active {
left: 0;
top: inherit;
bottom: 0;
}
.featureHomeBj6 {
left: 7px;
top: 661px;
}
.featureHomeBj6.active {
left: 7px;
top: inherit;
bottom: 0;
}
.featureHomeBj7 {
left: 134px;
top: 634px;
}
.featureHomeBj7.active {
left: 136px;
top: inherit;
bottom: 0;
}
.featureHomeBj8 {
left: 109px;
top: 627px;
}
.featureHomeBj8.active {
left: 111px;
top: inherit;
bottom: 0;
}
......@@ -393,18 +432,32 @@ img {
}
.featureHome-three-textOne {
max-height: 600px;
height: 600px;
overflow: hidden;
top: 93px;
left: 24px;
}
.featureHome-three-textOne.active {
height: auto;
max-height: 600px;
margin-top: 93px;
margin-left: 24px;
margin-bottom: 34px;
}
.featureHome-three-textTwo {
max-height: 650px;
height: 650px;
overflow: hidden;
top: 22px;
right: 31px;
}
.featureHome-three-textTwo.active {
height: auto;
max-height: 650px;
margin-top: 20px;
margin-left: 25px;
}
.MasterMapList-form {
left: 33px;
top: 268px;
......
src/components/Details.vue
View file @ cbe73b0b
......@@ -878,7 +878,6 @@
},
getTitleByRouter(name) {
let obj = {title:""};
// console.log("routerConfig.routes[11]",routerConfig.routes[12]);
if (routerConfig.routes[12] && routerConfig.routes[12].children && routerConfig.routes[12].children.length>0) {
routerConfig.routes[12].children[0].children.forEach(x => {
if (x.name == name) {
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ cbe73b0b
......@@ -2065,15 +2065,12 @@
}
},
checkDialog(value) {
console.log("value",value);
console.log("this.$tripUtils.TeamStatesList.salsPlat",this.$tripUtils.TeamStatesList.salsPlat);
let checkedCount = value.length;
this.queryCommonData.checkDialogAll =
checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length;
},
//点击上架
setUpPlat(item) {
console.log("item",item);
this.queryCommonData.outerVisible = false;
this.queryCommonData.setPlatDialog = true;
this.queryCommonData.singleTCID = item.TCID;
......
src/components/activity/CouponList.vue
View file @ cbe73b0b
This diff is collapsed.
src/components/myOrdersAllType/components/OrderListExaminePrice.vue
View file @ cbe73b0b
......@@ -777,7 +777,6 @@
res => {
if (res.data.resultCode == 1) {
this.list = res.data.data.pageData;
console.log("this.list",this.list);
} else {
this.$message.error(res.data.message);
}
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ cbe73b0b
......@@ -39,10 +39,12 @@
:subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend"
@change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
<TravelFeature :TripColor="PostConfig.TripColor" :class="{'showOther':(TeamType==3)}" ref="TravelFeature"
id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo">
</TravelFeature>
<TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
:subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
......@@ -164,7 +166,10 @@
WCountryId: 0, //国家编号
WLocationId: 0, //位置编号
WCityId: 0, //城市编号
TripColor:"",//行程特色主色
TripColor: "", //行程特色主色
TripCountryList: [], //行程国家
TripCitwlist: [], //行程城市
TripMapList: [],
},
//行程
FeatureData: {
......@@ -390,7 +395,7 @@
basicData.ReturnArriveCityId = this.PostDaysTrip.ReturnArriveCityId;
}
}
basicData.TripColor=this.PostConfig.TripColor;
basicData.TripColor = this.PostConfig.TripColor;
basicData.SelfpayingList = this.PostConfig.SelfpayingList;
basicData.ShopList = this.PostConfig.ShopList;
basicData.DinnerList = this.PostDaysTrip.DinnerList;
......@@ -813,12 +818,14 @@
}
//如果当前config配置主色就使用当前config配置的主色，没有配置，就取线路配置的主色
if (tempData.TripColor && tempData.TripColor != '') {
this.PostConfig.TripColor=tempData.TripColor;
this.PostConfig.TripColor = tempData.TripColor;
this.FeatureData.TripColor = tempData.TripColor;
} else if (tempData.LineTripColor && tempData.LineTripColor != '') {
this.PostConfig.TripColor=tempData.LineTripColor;
this.PostConfig.TripColor = tempData.LineTripColor;
this.FeatureData.TripColor = tempData.LineTripColor;
}
console.log(" this.PostConfig", this.PostConfig)
console.log(" this.FeatureData", this.FeatureData)
this.FeatureData.LtName = tempData.LtName;
this.FeatureData.DayList = tempData.DayList;
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ cbe73b0b
......@@ -33,7 +33,7 @@
<div class="TravelLine" v-if="TeamType!=3"></div>
<div class="TravelNavList" v-if="(TeamType!=3)" :class="{'TravelCked':ckedNav==6}"
@click.prevent="custormAnchor('thirdMap',6)">
地图 {{PostConfig.TeamType}}
地图
</div>
<div class="TravelLine" v-if="TeamType!=3"></div>
<div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==4}"
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ cbe73b0b
......@@ -2042,7 +2042,6 @@
priceList: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
console.log("travel_price2");
this.returnPriceList = JSON.parse(JSON.stringify(this.priceList));
//当团期修改
if (this.modifyTcid > 0) {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @ cbe73b0b
......@@ -24,10 +24,10 @@
<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">
<el-tooltip class="item" effect="dark" content="设置字体大小(默认60px)" placement="top" v-if="isFontSize">
<p class="row-aic">
<span class="fz14" style="flex-shrink: 0;margin-right: 3px;">字体大小</span>
<el-input class="ShadowFontSize" size="mini" v-model="FeatureData.dataObj.ShadowFontSize" style="width: 80px;height: 34px;"></el-input>
<el-input class="ShadowFontSize" type="number" size="mini" v-model="FeatureData.dataObj.ShadowFontSize" style="width: 80px;height: 34px;"></el-input>
<span class="cursorInitial fz14" style="flex-shrink: 0;margin-left: 5px;">
<span class="relative" style="top: -3px;">px</span>
</span>
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @ cbe73b0b
......@@ -57,26 +57,39 @@
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.ShadowName" :fontSize="FeatureItem.dataObj.ShadowFontSize"></vEditDiv>
</div>
</div>
<div class="featureHome-right-three relative z-index1">
<div class="featureHome-right-three z-index1"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active relative':'absolute']">
<div>
<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 class="featureHomeBjH1 featureHomeBj1"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW1 featureHomeBj2"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjH1 featureHomeBj3 relative"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW1 featureHomeBj4 relative"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
</div>
<div class="row" style="padding: 20px 0 34px 0;">
<div class="featureHome-three-text featureHome-three-textOne" style="margin-left: 24px;margin-top: 93px;">
<div
:class="[FeatureItem.dataObj.ShadowFontSize>0?'row':'']">
<div class="featureHome-three-text featureHome-three-textOne"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active':'absolute']">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainName"></vEditDiv>
</div>
<div class="featureHome-three-text featureHome-three-textTwo" style="margin-left: 26px;">
<div class="featureHome-three-text featureHome-three-textTwo"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active':'absolute']">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubName"></vEditDiv>
</div>
</div>
<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 class="featureHomeBjH2 featureHomeBj5"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW2 featureHomeBj6"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjH2 featureHomeBj7"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW2 featureHomeBj8"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
</div>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ cbe73b0b
......@@ -195,9 +195,12 @@
return detailsObj;
},
initFeature(isReload) {
this.FeatureData.FeatureHtmlJson.forEach(x=>{
x.dataObj.ShadowFontSize = x.dataObj.ShadowFontSize?x.dataObj.ShadowFontSize:60
})
if (this.FeatureData && this.FeatureData.FeatureHtmlJson && typeof (this.FeatureData.FeatureHtmlJson) ==
Array) {
this.FeatureData.FeatureHtmlJson.forEach(x => {
x.dataObj.ShadowFontSize = x.dataObj.ShadowFontSize ? Number(x.dataObj.ShadowFontSize) : 0;
})
}
var oldJson = this.FeatureData.FeatureHtmlJson ?
JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) :
"";
......@@ -262,7 +265,7 @@
}
newObj.ShadowName = "遇见最美好的自己";
newObj.SubShadowName = "在古老的日本樱花街道";
newObj.ShadowFontSize = tripObj.ShadowFontSize?tripObj.ShadowFontSize:60;
newObj.ShadowFontSize = tripObj.ShadowFontSize ? Number(tripObj.ShadowFontSize) : 0;
if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
newObj.DetailsName = tripObj.scenicArray[0].MainName;
var tempImgUrl = this.homeBg2;
......@@ -287,15 +290,22 @@
},
//介绍页数据
getIntroduceData(tripObj, newObj) {
newObj.MainName = "日本旅行专家";
newObj.SubName = "『印象日本』日本豪华游代名词";
newObj.ImgList = [{
url: this.homeBg1,
x: 0,
y: 0,
}];
newObj.MainDesc =
"坚持以高端旅游服务广大客户群体！我们坚信旅游是美好的体验！带您体验日本的四季之美，赏花.赏枫.赏雪并且享受怀石料理，泡露天温泉，遨游日本的秀丽山海美景！印象日本不断思索旅游本质，坚持旅游质量，对于旅游的专业与服务有着深刻体认！我们的用心，您一定会看的见！选择印象日本，会是你前往日本最好的选择，您一定会认同并期待您的参与，这也是我们由衷的期盼！“旅遊”不是舟車勞頓的代名詞~提供高档旅游产品，印象之旅有其独到的见解与坚持，这就是各位选择旅游的真正定义!来吧~如果你还在犹豫不知道该选择什么样的日本产品，相信印象之旅对是你最棒的选择！最后并祝各位有个愉快的旅游假期!";
if (this.FeatureData && this.FeatureData.LineShortName && this.FeatureData.LineShortName.indexOf('欧洲') > -1) {
newObj.MainName = "欧洲旅行家";
newObj.SubName = '‹印象欧洲› 欧洲旅行家';
newObj.MainDesc =
"坚持以高端旅游服务广大客户群体！我们坚信旅游是美好的体验！带您体验欧洲的四季之美，印象欧洲不断思索旅游本质，坚持旅游质量，对于旅游的专业与服务有着深刻认知！我们的用心，您一定会看的见！选择印象欧洲，会是你前往欧洲最好的选择，您一定会认同并期待您的参与，这也是我们由衷的期盼！“旅游”不是舟车劳顿的代名词~提供高档旅游产品，印象之旅有其独到的见解与坚持，这就是各位选择旅游的真正定义!来吧~如果你还在犹豫不知道该选择什么样的欧洲产品，相信印象之旅是你最棒的选择！最后并祝各位有个愉快的旅游假期!"
} else {
newObj.MainName = "日本旅行专家";
newObj.SubName = "『印象日本』日本豪华游代名词";
newObj.MainDesc =
"坚持以高端旅游服务广大客户群体！我们坚信旅游是美好的体验！带您体验日本的四季之美，赏花.赏枫.赏雪并且享受怀石料理，泡露天温泉，遨游日本的秀丽山海美景！印象日本不断思索旅游本质，坚持旅游质量，对于旅游的专业与服务有着深刻体认！我们的用心，您一定会看的见！选择印象日本，会是你前往日本最好的选择，您一定会认同并期待您的参与，这也是我们由衷的期盼！“旅遊”不是舟車勞頓的代名詞~提供高档旅游产品，印象之旅有其独到的见解与坚持，这就是各位选择旅游的真正定义!来吧~如果你还在犹豫不知道该选择什么样的日本产品，相信印象之旅对是你最棒的选择！最后并祝各位有个愉快的旅游假期!";
}
},
//详情页数据
getDetailsData(tripObj, newObj) {
......
src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue
View file @ cbe73b0b
......@@ -36,8 +36,9 @@
:subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend"
@change="handlerChangeData" :TeamType="TeamType"></TravelDaysTripDirect>
<TravelFeature ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData"
:TeamType="TeamType" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
<TravelFeature :TripColor="PostConfig.TripColor" ref="TravelFeature" id="thirdAnchor"
@featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" :isNewConfig="isNewConfig"
@unlockFormCommit="unlockFormCommit"></TravelFeature>
<TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
:NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList"
v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
......@@ -48,12 +49,14 @@
<div class="toTop" @click="backTop">
<i class="iconfont icon-huidaodingbu"></i>
</div>
<div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(1)">{{$t('pub.saveBtn')}}</div>
<div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(2)">{{$t('fnc.tijiao')}}</div>
<div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(1)">
{{$t('pub.saveBtn')}}</div>
<div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(2)">
{{$t('fnc.tijiao')}}</div>
<div v-if="modifyType==2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(3)"
:title="$t('sm.lcwxmb')">{{$t('pub.saveBtn')}}
</div>
<!--
<!--
<div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">{{$t('sm.yulan')}}</div>
<div class="DTSaveBtn" v-if="ConfigId>0" @click="getMapList()">{{$t('sm.ditu')}}</div> -->
</div>
......@@ -134,6 +137,7 @@
OpenTeamDescribe: '', //开团备注
customId: 0,
allotId: 0,
TripColor: "", //行程特色主色
},
//行程
FeatureData: {
......@@ -150,9 +154,12 @@
Title: '',
Subtitle: '',
LineName: '',
LineShortName: "",
DayList: [],
TemplateId: 1,
IsSave: false //是否保存
IsSave: false, //是否保存
TripColor: "", //行程特色主色
LtName: "", //系列名称
},
//线路行程
journeyList: {
......@@ -248,7 +255,7 @@
}
},
/*获取组件报价信息*/
getPrice(priceObj,OutGroupType) {
getPrice(priceObj, OutGroupType) {
priceObj.forEach(objItem => {
var SaleBranchId = ''
if (objItem.SaleBranchIdArray.length > 0) {
......@@ -641,8 +648,20 @@
this.PriceList = tempData.PriceList
}
this.FeatureData.Subtitle = tempData.LtName
this.FeatureData.LineName = tempData.LineName
if (tempData.LineShortName && tempData.LineShortName != '') {
this.FeatureData.LineShortName = tempData.LineShortName;
} else {
this.FeatureData.LineShortName = tempData.LineName;
}
//如果当前config配置主色就使用当前config配置的主色，没有配置，就取线路配置的主色
if (tempData.TripColor && tempData.TripColor != '') {
this.PostConfig.TripColor = tempData.TripColor;
this.FeatureData.TripColor = tempData.TripColor;
} else if (tempData.LineTripColor && tempData.LineTripColor != '') {
this.PostConfig.TripColor = tempData.LineTripColor;
this.FeatureData.TripColor = tempData.LineTripColor;
}
this.FeatureData.LtName = tempData.LtName;
this.FeatureData.DayList = tempData.DayList2
this.ConfigId = tempData.ID
......@@ -695,7 +714,7 @@
this.journeyList.DayList = tempData.DayList;
this.PostDaysTrip.TrafficList = [];
if (tempData.DayList&& tempData.DayList.length>0) {
if (tempData.DayList && tempData.DayList.length > 0) {
tempData.DayList.forEach(item => {
this.PostDaysTrip.TrafficList.push(item.TrafficObj);
})
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ cbe73b0b
......@@ -416,7 +416,6 @@
this.QScenicList = res.data.data;
}
},
err => {}
);
},
getItemLabel(item) {
......@@ -592,6 +591,7 @@
//选中的景点
'ChooseScenicArray': {
handler: function (val, oldVal) {
console.log("this.ChooseScenicArray",this.ChooseScenicArray)
//新增
this.ChooseScenicArray.forEach(x => {
let isExist = false;
......@@ -604,6 +604,7 @@
let scenic = this.$tripUtils.scenicObj();
this.QScenicList.forEach(s => {
if (s.ID === x) {
console.log("scenic22",s);
scenic.Description = s.Feature;
scenic.CouponsId = x;
scenic.CouponsName = s.Name;
......@@ -620,7 +621,11 @@
};
if (s.PicPath != "") {
let picPath = s.PicPath.split(",")[0];
scenicImg.Url = this.domainManager().ViittoFileUrl + picPath;
if (picPath.indexOf('http://') != -1 || picPath.indexOf('https://') != -1) {
scenicImg.Url = picPath;
} else {
scenicImg.Url = this.domainManager().ViittoFileUrl + picPath;
}
scenicImg.fileName = picPath;
}
scenic.NewImaArray.push(scenicImg);
......@@ -668,7 +673,6 @@
});
this.WarmTripDescribe.ScenicDescribeArr = scenicDescribeArr;
this.dayObj.ChooseScenicArray = JSON.parse(JSON.stringify(this.ChooseScenicArray));
}
},
WarmTripDescribe: {
......
src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
View file @ cbe73b0b
......@@ -247,8 +247,7 @@
<div class="TC-warmTips TC-Comtitlediv TC-warmText" v-if="dayObj.isRead" :class="{'showOther':TeamType==3}">
<div class="TC-SpecialInstruction clearfix column" style="margin: 0;">
<div class="TC-leftTitle">温馨提示</div>
<div class="TC-rightContent" style="width: 99%;"
v-html="dayObj.WarmTipObj.Description"></div>
<div class="TC-rightContent" style="width: 99%;" v-html="dayObj.WarmTipObj.Description"></div>
</div>
</div>
<hotelTrip :dayObj="dayObj" :CurrentIndex="CurrentIndex" :DayList="DayList" :WarmTripDescribe="WarmTripDescribe"
......@@ -650,7 +649,11 @@
};
if (s.PicPath != "") {
let picPath = s.PicPath.split(",")[0];
scenicImg.Url = this.domainManager().ViittoFileUrl + picPath;
if (picPath.indexOf('http://') != -1 || picPath.indexOf('https://') != -1) {
scenicImg.Url = picPath;
} else {
scenicImg.Url = this.domainManager().ViittoFileUrl + picPath;
}
scenicImg.fileName = picPath;
}
scenic.NewImaArray.push(scenicImg);
......
src/components/orderCommon/order-form2.vue
View file @ cbe73b0b
......@@ -2312,8 +2312,6 @@
productObj: {
handler(oldValue, newVal) {
this.clearMsg();
//this.getTravelPirceInfo();
console.log(oldValue,'----------')
this.addMsg.DepartureCityId = oldValue.StartCityID;
this.addMsg.ReturnArriveCityId = oldValue.ReturnArriveCityId;
this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime;
......
src/components/scenicSpot/scenicSpotList.vue
View file @ cbe73b0b
......@@ -270,7 +270,6 @@
<span>
<em>{{$t('ground.menpiaozhongl')}}</em>
<el-select v-model="msg.IsFree" class='multiple_input w210' :placeholder="$t('pub.pleaseSel')">
<!-- <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option> -->
<el-option v-for="item in IsFreeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
......@@ -298,7 +297,7 @@
<div class="resourceList" v-for="item in tableData" :key="item.subCode">
<div class="reTopInfo" :class="{'comCursorUrl':item.Url}" @click="OpenNewUrl(item.Url)">
<img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
<img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
<img v-else :src='item.PicPath' :onerror="defaultImg">
<div class="resTypeList">
<span v-for="(items,index) in item.OpenPlatformList"
:class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}"
......
src/components/temp/operation.vue
View file @ cbe73b0b
......@@ -712,9 +712,9 @@
clickActive(item) {
this.Month = item.Id
if (item.Id == 1) {
this.msg.Month = this.Year + '-' + (this.MonthTime > 10 ? this.MonthTime : '0' + this.MonthTime)
this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime)
} else {
this.msg.Month = this.Year + '-' + (this.LastMonthTime > 10 ? this.LastMonthTime : '0' + this.LastMonthTime)
this.msg.Month = this.Year + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime)
}
this.getList()
},
......
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