Commit ef0763e8 authored by zhengke's avatar zhengke

修改

parent 6fbc7937
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
:label="subItem.Label==''?'默认':subItem.Label"> :label="subItem.Label==''?'默认':subItem.Label">
<div class="InnerHotelDiv"> <div class="InnerHotelDiv">
<div class="InnerHoImgDiv" v-for="(sItem,sIndex) in subItem.ImgList" :key="sIndex"> <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>
</div> </div>
</el-tab-pane> </el-tab-pane>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
<button class="cancel-Btn" @click="goUrl('GnHotelManagement')">{{$t('pub.cancelBtn')}}</button> <button class="cancel-Btn" @click="goUrl('GnHotelManagement')">{{$t('pub.cancelBtn')}}</button>
</div> </div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer"> <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> </viewer>
</div> </div>
</template> </template>
...@@ -478,13 +478,30 @@ ...@@ -478,13 +478,30 @@
inited(viewer) { inited(viewer) {
this.$viewer = viewer this.$viewer = viewer
}, },
showImg(obj,index){ showImg(src){
this.images=[]; src = src.indexOf('http') != -1 ? src : this.domainManager().ViittoFileUrl + src;
if(obj.ImgList && obj.ImgList.length>0){ let isExsit=false
this.images=obj.ImgList; 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.$viewer.show()
this.$viewer.view(index) // 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() { saveResource() {
......
...@@ -716,41 +716,10 @@ ...@@ -716,41 +716,10 @@
<el-form-item :label="$t('scen.sc_resName')" prop="Name"> <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-input type="text" v-model="addMsg.Name" maxlength="100" class="w300"></el-input>
</el-form-item> </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-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>
<!-- <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-form-item label="省">
<el-select placeholder="请选择省" filterable class='multiple_input w300' v-model="addMsg.Province" <el-select placeholder="请选择省" filterable class='multiple_input w300' v-model="addMsg.Province"
@change="GetSubAreaList(addMsg.Province,2),addMsg.City=0,addMsg.District=0"> @change="GetSubAreaList(addMsg.Province,2),addMsg.City=0,addMsg.District=0">
...@@ -1013,7 +982,7 @@ ...@@ -1013,7 +982,7 @@
</div> </div>
</div> --> </div> -->
<div class="toolOne"> <div class="toolOne" style="display:none;">
<span class="fdTag">{{$t('scen.sc_fdTag')}}</span> <span class="fdTag">{{$t('scen.sc_fdTag')}}</span>
<div class="footabs"> <div class="footabs">
<el-tag :key="tag" v-for="tag in tipsList" closable :disable-transitions="false" <el-tag :key="tag" v-for="tag in tipsList" closable :disable-transitions="false"
...@@ -1221,7 +1190,7 @@ ...@@ -1221,7 +1190,7 @@
QCountry: "", QCountry: "",
QProvince: "", QProvince: "",
QCity: "", QCity: "",
District: 0, District: 5572,
Address: "", Address: "",
Lng: "", Lng: "",
Lat: "", Lat: "",
...@@ -1230,9 +1199,9 @@ ...@@ -1230,9 +1199,9 @@
RebateRatio: "", RebateRatio: "",
Url: "", Url: "",
IsSelfBook: "", IsSelfBook: "",
Country: 0, Country: 2,
Province: 0, Province: 261,
City: 0, City: 5571,
TicketCouponsImageList: [], //现在的图片 TicketCouponsImageList: [], //现在的图片
DeleteImageList: [], //要删除的图片 DeleteImageList: [], //要删除的图片
//是否预约 //是否预约
...@@ -1796,7 +1765,13 @@ ...@@ -1796,7 +1765,13 @@
} }
this.getweekenum(); this.getweekenum();
this.getScenicList(); 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);
}
} }
}; };
......
...@@ -304,8 +304,8 @@ ...@@ -304,8 +304,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="OpenPlatformList" label="是否上架"> <el-table-column prop="OpenPlatformList" label="是否上架">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.IsShelves===0"></div> <div v-if="scope.row.IsShelves===0">上架</div>
<div v-if="scope.row.IsShelves===1"></div> <div v-if="scope.row.IsShelves===1">下架</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="地址"> <el-table-column label="地址">
......
...@@ -1584,14 +1584,6 @@ export default { ...@@ -1584,14 +1584,6 @@ export default {
title: '国内景区列表' title: '国内景区列表'
}, },
}, },
{
path: '/domesticScenicSpotList', //国内景区列表
name: 'domesticScenicSpotList',
component: resolve => require(['@/components/scenicSpot/domesticScenicSpotList'], resolve),
meta: {
title: '国内景区列表'
},
},
{ {
path: '/domesticScenicSpotInfoManage', //新增修改国内景区 path: '/domesticScenicSpotInfoManage', //新增修改国内景区
name: 'domesticScenicSpotInfoManage', name: 'domesticScenicSpotInfoManage',
......
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