Skip to content

S
SuperMan
Commit cf9856e5 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 919856e1 d9f20ed3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 925 additions and 133 deletions
src/components/Hotel/GnHotelInfo.vue
View file @ cf9856e5
......@@ -147,7 +147,7 @@
:label="subItem.Label==''?'默认':subItem.Label">
<div class="InnerHotelDiv">
<div class="InnerHoImgDiv" v-for="(sItem,sIndex) in subItem.ImgList" :key="sIndex">
<img :src="getIconLink(sItem.Path)" @click="showImg(subItem,sIndex)" />
<img :src="getIconLink(sItem.Path)" @click="showImg(sItem.Path)" />
</div>
</div>
</el-tab-pane>
......@@ -253,7 +253,7 @@
<button class="cancel-Btn" @click="goUrl('GnHotelManagement')">{{$t('pub.cancelBtn')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="(src,index) in images" :src="src.Path" :key="index">
<img v-for="(src,index) in images" :src="src" :key="index">
</viewer>
</div>
</template>
......@@ -478,13 +478,30 @@
inited(viewer) {
this.$viewer = viewer
},
showImg(obj,index){
this.images=[];
if(obj.ImgList && obj.ImgList.length>0){
this.images=obj.ImgList;
}
this.$viewer.show()
this.$viewer.view(index)
showImg(src){
src = src.indexOf('http') != -1 ? src : this.domainManager().ViittoFileUrl + src;
let isExsit=false
this.images.forEach(x=>{
if(x==src)
isExsit=true
})
if(!isExsit) {
this.images.push(src)
} else {
this.$viewer.view(this.images.indexOf(src))
}
// this.$viewer.show()
// this.images=[];
// let newArr = [];
// if(obj.ImgList && obj.ImgList.length>0){
// obj.ImgList.forEach(x=>{
// newArr.push(this.getIconLink(x.Path));
// })
// this.images= newArr;
// }
// console.log(this.images,'this.images');
// this.$viewer.show()
// this.$viewer.view(index)
},
//保存酒店信息
saveResource() {
......
src/components/TravelManager/customizedcar/adddzline.vue 0 → 100644
View file @ cf9856e5
This diff is collapsed.
src/components/TravelManager/customizedcar/dzscenicspotList.vue
View file @ cf9856e5
......@@ -8,7 +8,7 @@
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" @click="outerVisible = true,dialogTitle='新增景点'" class="normalBtn" :value="$t('pub.addBtn')" />
<input type="button" @click="addjd(),dialogTitle='新增景点'" class="normalBtn" :value="$t('pub.addBtn')" />
</li>
</ul>
</div>
......@@ -58,6 +58,10 @@
<el-form-item label="景点名称" prop="Name">
<el-input class='w600' type="text" v-model="addMsg.Name" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="景点拼音">
<el-input class='w600' type="text" v-model="addMsg.PinYin" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="景点地址">
<el-select v-model="addMsg.ProvinceId" class="w150" filterable @change="getProvinceList(addMsg.ProvinceId,2)" :placeholder="$t('hotel.hotel_province')">
......@@ -122,7 +126,8 @@
Name:'',
DistrictId:'',
CityId:'',
ProvinceId:''
ProvinceId:'',
PinYin:'',
},
rules:{
......@@ -155,6 +160,17 @@
this.getProvinceList(2,1)
},
methods: {
addjd(){
this.outerVisible=true;
this.addMsg={
Id:'-1',
Name:'',
DistrictId:'',
CityId:'',
ProvinceId:'',
PinYin:'',
}
},
getProvinceList(ID,type) {
//根据省份获取城市
let msg = { Id: ID };
......@@ -200,13 +216,17 @@
}, err => {})
},
Edit(row){
this.outerVisible=true;
this.dialogTitle='修改景点'
this.addMsg.Name = row.Name;
this.addMsg.Id = row.Id;
this.addMsg.ProvinceId = row.ProvinceId;
this.getProvinceList(this.addMsg.ProvinceId,2)
this.addMsg.CityId = row.CityId;
this.getProvinceList(this.addMsg.CityId,3)
this.addMsg.DistrictId = row.DistrictId;
this.outerVisible=true;
},
addNotice(_status){
......
src/components/scenicSpot/domesticScenicSpotInfoManage.vue
View file @ cf9856e5
......@@ -721,41 +721,10 @@
<el-form-item :label="$t('scen.sc_resName')" prop="Name">
<el-input type="text" v-model="addMsg.Name" maxlength="100" class="w300"></el-input>
</el-form-item>
<!-- <el-form-item label="景区类型" prop="FoodType">
<el-cascader
placeholder="请选择景区类型"
:options="scenicList"
:props="{
checkStrictly:true,
emitPath:false,
label:'Name',
value:'ID',
children:'ChildrenList',
}"
filterable
:show-all-levels="false"
clearable
v-model="type"
@change="handleChange"
>
</el-cascader>
</el-form-item> -->
<el-form-item label="是否上架" prop="IsShelves">
<el-radio v-model="addMsg.IsShelves" :label="1">是</el-radio>
<el-radio v-model="addMsg.IsShelves" :label="0">否</el-radio>
<el-radio v-model="addMsg.IsShelves" :label="0">上架</el-radio>
<el-radio v-model="addMsg.IsShelves" :label="1">下架</el-radio>
</el-form-item>
<!-- <el-form-item label="网址">
<el-input type="text" v-model="addMsg.Url" maxlength="100" class="w300"></el-input>
</el-form-item> -->
<!-- <el-form-item label="国家">
<el-select placeholder="请选择国家" filterable v-model="addMsg.Country" class='multiple_input w300'
@change="GetSubAreaList(addMsg.Country,1),addMsg.Province=0,addMsg.City=0,addMsg.District=0">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in CountryList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option>
</el-select> -->
<!-- </el-form-item> -->
<el-form-item label="省">
<el-select placeholder="请选择省" filterable class='multiple_input w300' v-model="addMsg.Province"
@change="GetSubAreaList(addMsg.Province,2),addMsg.City=0,addMsg.District=0">
......@@ -1018,7 +987,7 @@
</div>
</div> -->
<div class="toolOne">
<div class="toolOne" style="display:none;">
<span class="fdTag">{{$t('scen.sc_fdTag')}}</span>
<div class="footabs">
<el-tag :key="tag" v-for="tag in tipsList" closable :disable-transitions="false"
......@@ -1227,7 +1196,7 @@
QCountry: "",
QProvince: "",
QCity: "",
District: 0,
District: 5572,
Address: "",
Lng: "",
Lat: "",
......@@ -1236,9 +1205,9 @@
RebateRatio: "",
Url: "",
IsSelfBook: "",
Country: 0,
Province: 0,
City: 0,
Country: 2,
Province: 261,
City: 5571,
TicketCouponsImageList: [], //现在的图片
DeleteImageList: [], //要删除的图片
//是否预约
......@@ -1802,7 +1771,13 @@
}
this.getweekenum();
this.getScenicList();
this.GetSubAreaList(2,1)
this.GetSubAreaList(2,1);
if(this.addMsg.Province>0){
this.GetSubAreaList(this.addMsg.Province, 2, 1);
}
if(this.addMsg.City>0){
this.GetSubAreaList(this.addMsg.City, 3, 1);
}
}
};
......
src/components/scenicSpot/domesticScenicSpotList.vue
View file @ cf9856e5
......@@ -304,8 +304,8 @@
</el-table-column>
<el-table-column prop="OpenPlatformList" label="是否上架">
<template slot-scope="scope">
<div v-if="scope.row.IsShelves===0">否</div>
<div v-if="scope.row.IsShelves===1">是</div>
<div v-if="scope.row.IsShelves===0">上架</div>
<div v-if="scope.row.IsShelves===1">下架</div>
</template>
</el-table-column>
<el-table-column label="地址">
......
src/router/config.js
View file @ cf9856e5
......@@ -1584,14 +1584,6 @@ export default {
title: '国内景区列表'
},
},
{
path: '/domesticScenicSpotList', //国内景区列表
name: 'domesticScenicSpotList',
component: resolve => require(['@/components/scenicSpot/domesticScenicSpotList'], resolve),
meta: {
title: '国内景区列表'
},
},
{
path: '/domesticScenicSpotInfoManage', //新增修改国内景区
name: 'domesticScenicSpotInfoManage',
......@@ -2667,6 +2659,14 @@ export default {
title: '线路管理'
},
},
{
path: '/adddzline', //定制包车=>线路新增修改
name: 'adddzline',
component: resolve => require(['@/components/TravelManager/customizedcar/adddzline'], resolve),
meta: {
title: '线路管理'
},
},
......
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