Skip to content

S
SuperMan
Commit 0805450c authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

解决冲突

parents 99643a58 8d4c274b
Hide whitespace changes
Inline Side-by-side
Showing with 1043 additions and 881 deletions
index.html
View file @ 0805450c
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
<!-- <script type="text/javascript" src="http://api.map.baidu.com/library/MarkerClusterer/1.2/src/MarkerClusterer_min.js"></script> --> <!-- <script type="text/javascript" src="http://api.map.baidu.com/library/MarkerClusterer/1.2/src/MarkerClusterer_min.js"></script> -->
<script type="text/javascript" src="static/MarkerClusterer.js"></script> <script type="text/javascript" src="static/MarkerClusterer.js"></script>
<script type="text/javascript" src="static/CurveLine.min.js"></script> <script type="text/javascript" src="static/CurveLine.min.js"></script>
<script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script> <script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyBx6JAiyAFPwBN1nM-g_hpQ7lvdPY3n2oU&language=zh-CN"></script>
<title>四川和平国际旅行社</title> <title>四川和平国际旅行社</title>
</head> </head>
<body> <body>
......
src/assets/utils/googleMap.js
View file @ 0805450c
/** /**
* Created by Administrator on 2018/7/17. * Created by Administrator on 2018/7/17.
*/ */
var googleMap = { var googleMap = {
search_id: null, search_id: null,
map_id: null, map_id: null,
listData: [], listData: [],
map: {}, map: {},
marker: null, marker: null,
markerList: [], markerList: [],
infoWindow: null, infoWindow: null,
geocoder: null, geocoder: null,
callback: null, callback: null,
defaultAddress: "", defaultAddress: "",
imageDomain: "", imageDomain: "",
init: function (callback, queryAddress, imageUrl) { init: function (callback, queryAddress, imageUrl) {
googleMap.search_id = document.getElementById("address_all"); googleMap.search_id = document.getElementById("address_all");
googleMap.map_id = document.getElementById("MapContent"); googleMap.map_id = document.getElementById("MapContent");
googleMap.listData = []; googleMap.listData = [];
googleMap.markerList = []; googleMap.markerList = [];
googleMap.defaultAddress = queryAddress; googleMap.defaultAddress = queryAddress;
googleMap.imageDomain = imageUrl; googleMap.imageDomain = imageUrl;
googleMap.deleteLink(); googleMap.deleteLink();
var items = []; var items = [];
var item = {}; var item = {};
item['lat'] = parseFloat("30.6574389"); item['lat'] = parseFloat("30.6574389");
item['lng'] = parseFloat("104.06592380000006"); item['lng'] = parseFloat("104.06592380000006");
items[0] = item; items[0] = item;
googleMap.listData = items; googleMap.listData = items;
googleMap.listData = items; googleMap.listData = items;
googleMap.initMap(); googleMap.initMap();
if (googleMap.defaultAddress == "") { if (googleMap.defaultAddress == "") {
googleMap.initMapFirst(); googleMap.initMapFirst();
} } else {
else { googleMap.searchAddress();
googleMap.searchAddress(); }
} googleMap.callback = callback;
googleMap.callback = callback; },
}, deleteLink: function () {
deleteLink: function () { //删除google的字体
//删除google的字体 var e = document;
var e = document; var t = e.getElementsByTagName("head")[0],
var t = e.getElementsByTagName("head")[0], a = t.insertBefore;
a = t.insertBefore; t.insertBefore = function (e, i) {
t.insertBefore = function (e, i) { e.href && e.href.indexOf("fonts.googleapis.com") > -1 || a.call(t, e, i)
e.href && e.href.indexOf("fonts.googleapis.com") > -1 || a.call(t, e, i) }
} },
}, initMap: function () {
initMap: function () { var data = [];
var data = []; if (('undefined' != googleMap.listData) && googleMap.listData.length > 0) {
if (('undefined' != googleMap.listData) && googleMap.listData.length > 0) { data[0] = googleMap.listData[0];
data[0] = googleMap.listData[0]; var LatLng = new google.maps.LatLng(data[0].lat, data[0].lng);
var LatLng = new google.maps.LatLng(data[0].lat, data[0].lng); if (data.length > 0) {
if (data.length > 0) { googleMap.map = new google.maps.Map(googleMap.map_id, {
googleMap.map = new google.maps.Map(googleMap.map_id, { zoom: 14,
zoom: 14, center: LatLng center: LatLng
});
}
}
googleMap.geocoder = new google.maps.Geocoder();
//添加监听点击地图事件
google.maps.event.addListener(googleMap.map, 'click', function (event) {
googleMap.placeMarker(event.latLng);
}); });
}
}
googleMap.geocoder = new google.maps.Geocoder();
//添加监听点击地图事件
google.maps.event.addListener(googleMap.map, 'click', function (event) {
googleMap.placeMarker(event.latLng);
});
//搜索文本框的回车事件 //搜索文本框的回车事件
googleMap.search_id.onkeydown = function () { googleMap.search_id.onkeydown = function () {
if (event.keyCode == 13) { if (event.keyCode == 13) {
googleMap.searchAddress(); googleMap.searchAddress();
} }
} }
}, },
initMapFirst: function () { initMapFirst: function () {
if (('undefined' != googleMap.listData) && (googleMap.listData.length > 0)) { if (('undefined' != googleMap.listData) && (googleMap.listData.length > 0)) {
googleMap.GetAddress(googleMap.listData[0].lat, googleMap.listData[0].lng); googleMap.GetAddress(googleMap.listData[0].lat, googleMap.listData[0].lng);
} }
}, },
addInfowindow: function (lat, lng, address, newArray, isCallBack) { addInfowindow: function (lat, lng, address, newArray, isCallBack) {
var message = "<div style='text-align:left;'>"; var message = "<div style='text-align:left;'>";
message += "<br />"; message += "<br />";
message += "纬度:<span style='color:#06c;'>" + lat + "</span>&nbsp;&nbsp;经度:<span style='color: #FD7917;'>" + lng + "</span>"; message += "纬度:<span style='color:#06c;'>" + lat + "</span>&nbsp;&nbsp;经度:<span style='color: #FD7917;'>" + lng + "</span>";
message += "<br />"; message += "<br />";
message += "地址:" + address; message += "地址:" + address;
message += "</div>"; message += "</div>";
if (googleMap.marker) { if (googleMap.marker) {
googleMap.marker.setMap(null); googleMap.marker.setMap(null);
} }
var imageUrl = googleMap.imageDomain + "/static/img/position_red.png"; var imageUrl = {};
if (isCallBack == 1) { if (isCallBack == 1) {
imageUrl = googleMap.imageDomain + "/static/img/position_blue.png"; imageUrl = {
} url: googleMap.imageDomain + "/static/location_01.png", // image is 512 x 512
googleMap.marker = new google.maps.Marker({ scaledSize: new google.maps.Size(30, 40),
title: address, }
map: googleMap.map, } else {
position: new google.maps.LatLng(lat, lng), imageUrl = {
icon: imageUrl url: googleMap.imageDomain + "/static/location_01.png", // image is 512 x 512
}); scaledSize: new google.maps.Size(30, 40),
}
}
googleMap.marker = new google.maps.Marker({
title: address,
map: googleMap.map,
position: new google.maps.LatLng(lat, lng),
icon: imageUrl
});
if (googleMap.infowindow) { if (googleMap.infowindow) {
googleMap.infowindow.close(); googleMap.infowindow.close();
} }
googleMap.infowindow = new google.maps.InfoWindow({ googleMap.infowindow = new google.maps.InfoWindow({
content: message, content: message,
size: new google.maps.Size(50, 50) size: new google.maps.Size(50, 50)
}); });
googleMap.infowindow.open(googleMap.map, googleMap.marker); googleMap.infowindow.open(googleMap.map, googleMap.marker);
//设置居中 //设置居中
googleMap.map.setCenter(new google.maps.LatLng(lat, lng)); googleMap.map.setCenter(new google.maps.LatLng(lat, lng));
if (googleMap.callback != null && isCallBack == 1) { if (googleMap.callback != null && isCallBack == 1) {
googleMap.callback({ googleMap.callback({
"lat": lat, "lat": lat,
"lng": lng, "lng": lng,
"address": address, "address": address,
"areaArray": newArray, "areaArray": newArray,
}) })
} }
}, },
GetAddress: function (lat, lng) { GetAddress: function (lat, lng) {
var address = "四川成都天府广场"; var address = "四川成都天府广场";
googleMap.addInfowindow(lat, lng, address); googleMap.addInfowindow(lat, lng, address);
return address; return address;
}, },
searchAddress: function () { searchAddress: function () {
var address = googleMap.search_id.value; var address = googleMap.search_id.value;
googleMap.geocoder.geocode({ 'address': address }, function (results, status) { googleMap.geocoder.geocode({
if (status == google.maps.GeocoderStatus.OK) { 'address': address
googleMap.getAddress(results,1); }, function (results, status) {
} if (status == google.maps.GeocoderStatus.OK) {
}); googleMap.getAddress(results, 1);
}, }
placeMarker: function (location) { });
//地图的点击事件，根据点击的点获取经度，纬度和地址信息 },
if (googleMap.geocoder) { placeMarker: function (location) {
googleMap.geocoder.geocode({ 'location': location }, function (results, status) { //地图的点击事件，根据点击的点获取经度，纬度和地址信息
if (status == google.maps.GeocoderStatus.OK) { if (googleMap.geocoder) {
googleMap.getAddress(results, 1); googleMap.geocoder.geocode({
} 'location': location
}); }, function (results, status) {
} if (status == google.maps.GeocoderStatus.OK) {
}, googleMap.getAddress(results, 1);
getAddress: function (results, isCallBack) {
var re = /^[\u4E00-\u9FA5]+$/;
if (results[0]) {
var Address = results[0].formatted_address;
var newArray = [];
results.forEach(item => {
if (re.test(item.formatted_address)) {
item.address_components.forEach(arrItem => {
var name = arrItem.long_name.replace('省', '').replace('市', '');
if (!googleMap.isExists(newArray, name)) {
newArray.push(name);
}
})
}
});
googleMap.addInfowindow(results[0].geometry.location.lat(), results[0].geometry.location.lng(), Address, newArray, isCallBack);
} }
}, });
//判断数组是否存在 值 }
isExists: function (arr, item) { },
var flag = false; getAddress: function (results, isCallBack) {
for (var i = 0; i < arr.length; i++) { var re = /^[\u4E00-\u9FA5]+$/;
if (arr[i] == item) { if (results[0]) {
flag = true; var Address = results[0].formatted_address;
break; var newArray = [];
results.forEach(item => {
if (re.test(item.formatted_address)) {
item.address_components.forEach(arrItem => {
var name = arrItem.long_name.replace('省', '').replace('市', '');
if (!googleMap.isExists(newArray, name)) {
newArray.push(name);
} }
})
} }
return flag;
},
initLine: function (dataList, _this) {
let _dataList = JSON.parse(JSON.stringify(dataList));
let lat = parseFloat(_dataList[0].lat);
let lng = parseFloat(_dataList[0].lng);
let center = {lng: lng, lat: lat}
//创建地图实例，zoom是缩放比例
_this.map = new google.maps.Map(document.getElementById('map_canvas'), {
zoom: 7,
center: center,
mapTypeId: google.maps.MapTypeId.ROADMAP
}); });
_this.directionsDisplay.setMap(_this.map); googleMap.addInfowindow(results[0].geometry.location.lat(), results[0].geometry.location.lng(), Address, newArray, isCallBack);
googleMap.calcRoute(_dataList, _this) }
}, },
calcRoute: function(_dataList, _this) { // 创建路径规划 //判断数组是否存在 值
// 分解数据 获得起 止 以及中间数据 isExists: function (arr, item) {
let lat = parseFloat(_dataList[0].lat); var flag = false;
let lng = parseFloat(_dataList[0].lng); for (var i = 0; i < arr.length; i++) {
let elat = parseFloat(_dataList[_dataList.length-1].lat); if (arr[i] == item) {
let elng = parseFloat(_dataList[_dataList.length-1].lng); flag = true;
let start = lat + ',' + lng; break;
let end = elat + ',' + elng;
let waypoints = [];
if (_dataList.length > 2) {
_dataList.forEach((x, index) => {
if (index >= 1 && index !== (_dataList.length-1)) {
let obj = {
location: x.lat + ',' + x.lng
};
waypoints.push(obj)
}
});
}
let request = { // 组装连线数据
origin:start, // 起
destination:end, // 止
travelMode: google.maps.TravelMode.DRIVING,
// waypoints: [{location:"30.5226477,104.05806469999993"},{location:"30.67416759999999,104.04721970000003"}] // 中间点数据
};
if (waypoints.length > 0) {
request.waypoints = waypoints
} }
}
_this.directionsService.route(request, function(result, status) { return flag;
if (status == google.maps.DirectionsStatus.OK) { },
_this.directionsDisplay.setDirections(result); initLine: function (dataList, _this) {
let _dataList = JSON.parse(JSON.stringify(dataList));
let lat = parseFloat(_dataList[0].lat);
let lng = parseFloat(_dataList[0].lng);
let center = {
lng: lng,
lat: lat
}
//创建地图实例，zoom是缩放比例
_this.map = new google.maps.Map(document.getElementById('map_canvas'), {
zoom: 7,
center: center,
mapTypeId: google.maps.MapTypeId.ROADMAP
});
_this.directionsDisplay.setMap(_this.map);
googleMap.calcRoute(_dataList, _this)
},
calcRoute: function (_dataList, _this) { // 创建路径规划
// 分解数据 获得起 止 以及中间数据
let lat = parseFloat(_dataList[0].lat);
let lng = parseFloat(_dataList[0].lng);
let elat = parseFloat(_dataList[_dataList.length - 1].lat);
let elng = parseFloat(_dataList[_dataList.length - 1].lng);
let start = lat + ',' + lng;
let end = elat + ',' + elng;
let waypoints = [];
if (_dataList.length > 2) {
_dataList.forEach((x, index) => {
if (index >= 1 && index !== (_dataList.length - 1)) {
let obj = {
location: x.lat + ',' + x.lng
};
waypoints.push(obj)
} }
}); });
}, }
let request = { // 组装连线数据
origin: start, // 起
destination: end, // 止
travelMode: google.maps.TravelMode.DRIVING,
// waypoints: [{location:"30.5226477,104.05806469999993"},{location:"30.67416759999999,104.04721970000003"}] // 中间点数据
};
if (waypoints.length > 0) {
request.waypoints = waypoints
}
_this.directionsService.route(request, function (result, status) {
if (status == google.maps.DirectionsStatus.OK) {
_this.directionsDisplay.setDirections(result);
}
});
},
}; };
export default googleMap; export default googleMap;
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 0805450c
...@@ -273,7 +273,6 @@ ...@@ -273,7 +273,6 @@
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1; this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj; this.orderObj = this.$route.query.orderObj;
this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg; this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
console.log("this.Handmsg",this.Handmsg)
this.Financial_post_GetList(); this.Financial_post_GetList();
},components: { },components: {
"my-FlowChartModule": myFlowChartModule "my-FlowChartModule": myFlowChartModule
......
src/components/FinancialModule/accountingWork.vue
View file @ 0805450c
...@@ -316,7 +316,6 @@ export default { ...@@ -316,7 +316,6 @@ export default {
},methods:{ },methods:{
getSingleList(){ // 获取费用类型 getSingleList(){ // 获取费用类型
this.apipost('FinancialFlowTemplate_post_GetSingleList',{},res=>{ this.apipost('FinancialFlowTemplate_post_GetSingleList',{},res=>{
console.log("1231",res);
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.SingleList=res.data.data; this.SingleList=res.data.data;
}else{} }else{}
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 0805450c
...@@ -1099,7 +1099,6 @@ export default { ...@@ -1099,7 +1099,6 @@ export default {
this.msg.OrderTradeWay=this.tradeWay; this.msg.OrderTradeWay=this.tradeWay;
this.msg.PlatformAccountId=this.platformAccount; this.msg.PlatformAccountId=this.platformAccount;
this.loading = true; this.loading = true;
console.log("this.msg",this.msg)
this.apipost('Financial_post_Set',this.msg,res=>{ this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), { this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
......
src/components/Hotel/HotelInfo.vue
View file @ 0805450c
...@@ -73,24 +73,28 @@ ...@@ -73,24 +73,28 @@
</el-select> </el-select>
</span> </span>
</div> </div>
<span class="resource-lititle sheshi">{{$t('ground.jiudianyouhui')}} <el-button icon="el-icon-plus" circle @click="addAir"></el-button> <span class="resource-lititle sheshi">{{$t('ground.jiudianyouhui')}} <el-button icon="el-icon-plus" circle
@click="addAir"></el-button>
</span> </span>
<div class="jiudianyouhuiDiv"> <div class="jiudianyouhuiDiv">
<el-row v-for="(list,index) in addMsg.DiscountList" :key="index"> <el-row v-for="(list,index) in addMsg.DiscountList" :key="index">
<el-col :span="6" :gutter="35"> <el-col :span="6" :gutter="35">
<el-form-item :label="$t('ground.kaishishuliang')"> <el-form-item :label="$t('ground.kaishishuliang')">
<el-input class='w80' type="text" v-model="list.StartNum" @keyup.native="checkInteger(list,'StartNum')" maxlength="2"></el-input> <el-input class='w80' type="text" v-model="list.StartNum"
@keyup.native="checkInteger(list,'StartNum')" maxlength="2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" :gutter="35"> <el-col :span="6" :gutter="35">
<el-form-item :label="$t('ground.jieshushuliang')"> <el-form-item :label="$t('ground.jieshushuliang')">
<el-input class='w80' type="text" v-model="list.EndNum" @keyup.native="checkInteger(list,'EndNum')" maxlength="2"></el-input> <el-input class='w80' type="text" v-model="list.EndNum" @keyup.native="checkInteger(list,'EndNum')"
maxlength="2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" :gutter="35"> <el-col :span="6" :gutter="35">
<el-form-item :label="$t('ground.fanhuanshuliang')"> <el-form-item :label="$t('ground.fanhuanshuliang')">
<el-input class='w80' type="text" v-model="list.DisCountNum" @keyup.native="checkInteger(list,'DisCountNum')" maxlength="2"></el-input> <el-input class='w80' type="text" v-model="list.DisCountNum"
@keyup.native="checkInteger(list,'DisCountNum')" maxlength="2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" :gutter="35" v-if="index==0"> <el-col :span="6" :gutter="35" v-if="index==0">
...@@ -125,8 +129,8 @@ ...@@ -125,8 +129,8 @@
class="w300"></el-input> class="w300"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.table_country')"> <el-form-item :label="$t('system.table_country')">
<el-select :placeholder="$t('visaT.qxzguojia')" filterable v-model="addMsg.Country" class='multiple_input w300' <el-select :placeholder="$t('visaT.qxzguojia')" filterable v-model="addMsg.Country"
@change="GetSubAreaList(addMsg.Country,1)"> class='multiple_input w300' @change="GetSubAreaList(addMsg.Country,1)">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in CountryList" :key="childItem.ID" :label="childItem.Name" <el-option v-for="childItem in CountryList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID"> :value="childItem.ID">
...@@ -134,8 +138,8 @@ ...@@ -134,8 +138,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('hotel.hotel_province')"> <el-form-item :label="$t('hotel.hotel_province')">
<el-select :placeholder="$t('ground.qingxuanzesheng')" filterable class='multiple_input w300' v-model="addMsg.Province" <el-select :placeholder="$t('ground.qingxuanzesheng')" filterable class='multiple_input w300'
@change="GetSubAreaList(addMsg.Province,2)"> v-model="addMsg.Province" @change="GetSubAreaList(addMsg.Province,2)">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in ProvinceList" :key="childItem.ID" :label="childItem.Name" <el-option v-for="childItem in ProvinceList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID"> :value="childItem.ID">
...@@ -143,7 +147,8 @@ ...@@ -143,7 +147,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('hotel.hotel_city')"> <el-form-item :label="$t('hotel.hotel_city')">
<el-select :placeholder="$t('ground.qingxuanzeshi')" filterable class='multiple_input w300' v-model="addMsg.City"> <el-select :placeholder="$t('ground.qingxuanzeshi')" filterable class='multiple_input w300'
v-model="addMsg.City">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in CityList" :key="childItem.ID" :label="childItem.Name" <el-option v-for="childItem in CityList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID"> :value="childItem.ID">
...@@ -155,6 +160,19 @@ ...@@ -155,6 +160,19 @@
<el-button slot="append" @click="selectAddress = true" icon="iconfont icon-img_dw"></el-button> <el-button slot="append" @click="selectAddress = true" icon="iconfont icon-img_dw"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<div class="toolOne">
<span class="fanbili">地理位置</span>
<div class="RabateDiv clearfix">
<div class="RebateCount reOne">
<div class="leftPnum">经度</div>
<input type="text" class="toolInput inpuOne" v-model="addMsg.Lng" maxlength="20">
</div>
<div class="RebateCount reTwo">
<div class="fanNum">纬度</div>
<input type="text" class="toolInput inpuTwo" v-model="addMsg.Lat" maxlength="20">
</div>
</div>
</div>
<el-form-item :label="$t('hotel.hotel_fax')"> <el-form-item :label="$t('hotel.hotel_fax')">
<el-input type="text" v-model="addMsg.Fax" maxlength="20" class="w300"></el-input> <el-input type="text" v-model="addMsg.Fax" maxlength="20" class="w300"></el-input>
</el-form-item> </el-form-item>
...@@ -169,8 +187,8 @@ ...@@ -169,8 +187,8 @@
<el-input type="textarea" v-model="addMsg.WarmTip" class="w300"></el-input> <el-input type="textarea" v-model="addMsg.WarmTip" class="w300"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-switch v-model="isBook" active-color="#13ce66" inactive-color="#ff4949" :active-text="$t('hotel.hotel_Supplier')" <el-switch v-model="isBook" active-color="#13ce66" inactive-color="#ff4949"
:inactive-text="$t('ground.ziding')"></el-switch> :active-text="$t('hotel.hotel_Supplier')" :inactive-text="$t('ground.ziding')"></el-switch>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-switch v-model="isDinner" active-color="#13ce66" @change="getDinnerList" inactive-color="#ff4949" <el-switch v-model="isDinner" active-color="#13ce66" @change="getDinnerList" inactive-color="#ff4949"
...@@ -187,13 +205,16 @@ ...@@ -187,13 +205,16 @@
<el-switch v-model="addMsg.IsHavearking" :active-value="1" :inactive-value="0"></el-switch> <el-switch v-model="addMsg.IsHavearking" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item> </el-form-item>
<el-form-item :label="$t('ground.tingchefei')" v-if="addMsg.IsHavearking==1"> <el-form-item :label="$t('ground.tingchefei')" v-if="addMsg.IsHavearking==1">
<el-input type="text" v-model="addMsg.ParkFee" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'ParkFee')"></el-input> <el-input type="text" v-model="addMsg.ParkFee" class="w300" maxlength="10"
@keyup.native="checkPrice(addMsg,'ParkFee')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('ground.rutangshui')"> <el-form-item :label="$t('ground.rutangshui')">
<el-input type="text" v-model="addMsg.InTangTax" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'InTangTax')"></el-input> <el-input type="text" v-model="addMsg.InTangTax" class="w300" maxlength="10"
@keyup.native="checkPrice(addMsg,'InTangTax')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('ground.chengshishui')"> <el-form-item :label="$t('ground.chengshishui')">
<el-input type="text" v-model="addMsg.CityTax" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'CityTax')"></el-input> <el-input type="text" v-model="addMsg.CityTax" class="w300" maxlength="10"
@keyup.native="checkPrice(addMsg,'CityTax')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('ground.fanyongleixing')"> <el-form-item :label="$t('ground.fanyongleixing')">
<el-select v-model="addMsg.RebateType" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.RebateType" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')">
......
src/components/administrative/XaddFinancialProcess.vue
View file @ 0805450c
...@@ -1476,7 +1476,6 @@ export default { ...@@ -1476,7 +1476,6 @@ export default {
addNode(){ // 添加节点 addNode(){ // 添加节点
let AuditList = {}; let AuditList = {};
let type = this.approvalType let type = this.approvalType
console.log("this.approvalType",this.approvalType)
if(this.AuditDescription==''){ if(this.AuditDescription==''){
return this.$message.error(this.$t('tips.qtxjdmiaoshu')) return this.$message.error(this.$t('tips.qtxjdmiaoshu'))
} }
...@@ -1648,7 +1647,6 @@ export default { ...@@ -1648,7 +1647,6 @@ export default {
AuditList.SpecialNode = this.GetNodeValue; AuditList.SpecialNode = this.GetNodeValue;
this.myAuditList.push(AuditList); this.myAuditList.push(AuditList);
} }
console.log("this.myAuditList",this.myAuditList)
this.closeLayer() this.closeLayer()
}, },
clearValue(t){ // 选择会计出纳窗口获取对应下拉 clearValue(t){ // 选择会计出纳窗口获取对应下拉
......
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @ 0805450c
<style> <style>
.scenicSpotInfoManage .resourceImgAdd { .scenicSpotInfoManage .resourceImgAdd {
width: 620px; width: 620px;
margin: auto; margin: auto;
} }
.scenicSpotInfoManage .clearfix:after {
content: "\0020"; .scenicSpotInfoManage .clearfix:after {
display: block; content: "\0020";
height: 0; display: block;
clear: both; height: 0;
} clear: both;
.scenicSpotInfoManage .resource-content { }
width: 100%;
margin-top: 30px; .scenicSpotInfoManage .resource-content {
font-size: 12px; width: 100%;
min-width: 1200px; margin-top: 30px;
} font-size: 12px;
.scenicSpotInfoManage .resource-baseinfo { min-width: 1200px;
float: left; }
height: auto;
width: 600px; .scenicSpotInfoManage .resource-baseinfo {
margin: 0 0 20px 30px; float: left;
} height: auto;
.scenicSpotInfoManage .resource-imginfo { width: 600px;
float: left; margin: 0 0 20px 30px;
width: 510px; }
margin-top: 35px;
} .scenicSpotInfoManage .resource-imginfo {
.scenicSpotInfoManage .resource-lititle { float: left;
display: block; width: 510px;
border-left: 4px solid #e95252; margin-top: 35px;
padding-left: 10px; }
margin-bottom: 20px;
} .scenicSpotInfoManage .resource-lititle {
.scenicSpotInfoManage .resource-baseinfo span { display: block;
display: inline-block; border-left: 4px solid #e95252;
} padding-left: 10px;
.scenicSpotInfoManage .resource-name { margin-bottom: 20px;
width: 300px; }
height: 34px;
background: rgba(255, 255, 255, 1); .scenicSpotInfoManage .resource-baseinfo span {
border-radius: 17px; display: inline-block;
outline: none; }
border: 1px solid #d6d6d6;
padding-left: 10px; .scenicSpotInfoManage .resource-name {
} width: 300px;
.scenicSpotInfoManage .common-lefttit { height: 34px;
width: 80px; background: rgba(255, 255, 255, 1);
text-align: right; border-radius: 17px;
margin: 0 7px 0 8px; outline: none;
display: inline-block; border: 1px solid #d6d6d6;
} padding-left: 10px;
.scenicSpotInfoManage .resource-net { }
position: relative;
} .scenicSpotInfoManage .common-lefttit {
.scenicSpotInfoManage .resource-http { width: 80px;
position: absolute; text-align: right;
color: #999999; margin: 0 7px 0 8px;
width: 70px !important; display: inline-block;
background-color: #f5f7fa; }
border-right: 1px solid #d1d1d1;
height: 32px; .scenicSpotInfoManage .resource-net {
border-top-left-radius: 17px; position: relative;
border-bottom-left-radius: 17px; }
top: 5px;
left: 1px; .scenicSpotInfoManage .resource-http {
text-align: center; position: absolute;
line-height: 32px; color: #999999;
text-align: center; width: 70px !important;
} background-color: #f5f7fa;
.scenicSpotInfoManage .R1 { border-right: 1px solid #d1d1d1;
width: 300px; height: 32px;
padding: 0 15px 0 80px; border-top-left-radius: 17px;
transition: all 0.3s ease-in-out; border-bottom-left-radius: 17px;
} top: 5px;
.scenicSpotInfoManage .areaInput { left: 1px;
width: 300px; text-align: center;
padding-right: 120px; line-height: 32px;
} text-align: center;
.scenicSpotInfoManage .areaInput:focus { }
border: 1px solid #e95252;
} .scenicSpotInfoManage .R1 {
.scenicSpotInfoManage .map-icon { width: 300px;
position: absolute; padding: 0 15px 0 80px;
right: 1px; transition: all 0.3s ease-in-out;
top: 1px; }
line-height: 32px;
text-align: center; .scenicSpotInfoManage .areaInput {
border-left: 1px solid #cccccc; width: 300px;
border-top-right-radius: 17px; padding-right: 120px;
border-bottom-right-radius: 17px; }
padding-right: 15px;
padding-left: 10px; .scenicSpotInfoManage .areaInput:focus {
cursor: pointer; border: 1px solid #e95252;
display: inline-block; }
height: 32px;
background-color: #f5f7fa; .scenicSpotInfoManage .map-icon {
} position: absolute;
.scenicSpotInfoManage .map-icon i { right: 1px;
margin: 0 5px; top: 1px;
position: relative; line-height: 32px;
top: 1px; text-align: center;
} border-left: 1px solid #cccccc;
.scenicSpotInfoManage .save-Btn { border-top-right-radius: 17px;
width: 90px; border-bottom-right-radius: 17px;
height: 30px; padding-right: 15px;
background: rgba(233, 82, 82, 1); padding-left: 10px;
border-radius: 15px; cursor: pointer;
color: #fff; display: inline-block;
outline: none; height: 32px;
cursor: pointer; background-color: #f5f7fa;
margin-right: 20px; }
}
.scenicSpotInfoManage .cancel-Btn, .scenicSpotInfoManage .map-icon i {
.save-Btn:hover { margin: 0 5px;
opacity: 0.8; position: relative;
} top: 1px;
.scenicSpotInfoManage .cancel-Btn { }
width: 90px;
height: 30px; .scenicSpotInfoManage .save-Btn {
background: rgba(255, 255, 255, 1); width: 90px;
border-radius: 15px; height: 30px;
color: #e95252; background: rgba(233, 82, 82, 1);
outline: none; border-radius: 15px;
cursor: pointer; color: #fff;
border: 1px solid #e95252; outline: none;
} cursor: pointer;
.scenicSpotInfoManage .re-img { margin-right: 20px;
width: 140px; }
height: 93px;
border-radius: 10px; .scenicSpotInfoManage .cancel-Btn,
float: left; .save-Btn:hover {
margin: 0 30px 30px 0; opacity: 0.8;
position: relative; }
}
.scenicSpotInfoManage .re-img:first-child { .scenicSpotInfoManage .cancel-Btn {
margin-left: 0; width: 90px;
} height: 30px;
.scenicSpotInfoManage .resource-imglist { background: rgba(255, 255, 255, 1);
width: 100%; border-radius: 15px;
height: auto; color: #e95252;
margin-top: 20px; outline: none;
} cursor: pointer;
.scenicSpotInfoManage .resource-imglist img { border: 1px solid #e95252;
width: 100%; }
height: 100%;
border-radius: 10px; .scenicSpotInfoManage .re-img {
} width: 140px;
.scenicSpotInfoManage .add-img { height: 93px;
margin-top: 20px; border-radius: 10px;
} float: left;
.scenicSpotInfoManage .reimg-add { margin: 0 30px 30px 0;
width: 140px; position: relative;
height: 93px; }
background: rgba(236, 236, 236, 1);
border-radius: 10px; .scenicSpotInfoManage .re-img:first-child {
position: relative; margin-left: 0;
cursor: pointer; }
}
.scenicSpotInfoManage .ad-one { .scenicSpotInfoManage .resource-imglist {
display: none; width: 100%;
background: rgba(0, 0, 0, 0.4); height: auto;
width: 100%; margin-top: 20px;
height: 100%; }
border-radius: 10px;
position: absolute; .scenicSpotInfoManage .resource-imglist img {
top: 0; width: 100%;
z-index: 999; height: 100%;
} border-radius: 10px;
.scenicSpotInfoManage .bigAdd { }
font-size: 50px;
color: #d1d1d1; .scenicSpotInfoManage .add-img {
position: absolute; margin-top: 20px;
left: 45px; }
top: 10px;
} .scenicSpotInfoManage .reimg-add {
.scenicSpotInfoManage .imgzhe { width: 140px;
display: none; height: 93px;
background: rgba(0, 0, 0, 0.4); background: rgba(236, 236, 236, 1);
width: 100%; border-radius: 10px;
height: 100%; position: relative;
text-align: center; cursor: pointer;
line-height: 93px; }
border-radius: 10px;
position: absolute; .scenicSpotInfoManage .ad-one {
top: 0; display: none;
} background: rgba(0, 0, 0, 0.4);
.scenicSpotInfoManage .reimg-add:hover .ad-one { width: 100%;
display: block; height: 100%;
} border-radius: 10px;
.scenicSpotInfoManage .re-img:hover .imgzhe { position: absolute;
display: block; top: 0;
} z-index: 999;
.scenicSpotInfoManage .ad-one div { }
width: 32px;
height: 32px; .scenicSpotInfoManage .bigAdd {
border-radius: 50%; font-size: 50px;
line-height: 32px; color: #d1d1d1;
text-align: center; position: absolute;
background: gray; left: 45px;
color: #fff; top: 10px;
} }
.scenicSpotInfoManage .ad-one div:hover {
background-color: #fff; .scenicSpotInfoManage .imgzhe {
color: #e95252; display: none;
} background: rgba(0, 0, 0, 0.4);
.scenicSpotInfoManage .re-upload { width: 100%;
position: absolute; height: 100%;
top: 30px; text-align: center;
left: 30px; line-height: 93px;
} border-radius: 10px;
.scenicSpotInfoManage .re-find { position: absolute;
position: absolute; top: 0;
top: 30px; }
right: 30px;
} .scenicSpotInfoManage .reimg-add:hover .ad-one {
.scenicSpotInfoManage .search-imgicon { display: block;
padding-right: 20px; }
margin-left: -40px;
} .scenicSpotInfoManage .re-img:hover .imgzhe {
.scenicSpotInfoManage .resAddImg { display: block;
width: 520px; }
padding-right: 45px;
} .scenicSpotInfoManage .ad-one div {
.scenicSpotInfoManage .addimgContent { width: 32px;
height: 290px; height: 32px;
overflow: auto; border-radius: 50%;
margin: 30px 0 30px 25px; line-height: 32px;
width: 545px; text-align: center;
} background: gray;
.scenicSpotInfoManage .addimgDiv { color: #fff;
width: 160px; }
height: 155px;
float: left; .scenicSpotInfoManage .ad-one div:hover {
margin: 0 20px 15px 0; background-color: #fff;
overflow: hidden; color: #e95252;
} }
.scenicSpotInfoManage .addimgContent div:first-child {
margin-left: 0; .scenicSpotInfoManage .re-upload {
} position: absolute;
.addimgContent div:nth-child(3n) { top: 30px;
margin-right: 0; left: 30px;
} }
.scenicSpotInfoManage .itemImgdiv {
width: 160px; .scenicSpotInfoManage .re-find {
height: 106px; position: absolute;
position: relative; top: 30px;
} right: 30px;
.scenicSpotInfoManage .itemImgdiv img { }
width: 100%;
height: 100%; .scenicSpotInfoManage .search-imgicon {
border-radius: 10px; padding-right: 20px;
} margin-left: -40px;
.scenicSpotInfoManage .imgseclet { }
width: 100%;
height: 100%; .scenicSpotInfoManage .resAddImg {
background: rgba(0, 0, 0, 0.4); width: 520px;
border-radius: 10px; padding-right: 45px;
position: absolute; }
top: 0;
text-align: center; .scenicSpotInfoManage .addimgContent {
line-height: 106px; height: 290px;
color: #e95252; overflow: auto;
} margin: 30px 0 30px 25px;
.icon-dagouyouquan { width: 545px;
font-size: 25px; }
}
.scenicSpotInfoManage .test-1::-webkit-scrollbar { .scenicSpotInfoManage .addimgDiv {
width: 0px; width: 160px;
height: 0px; height: 155px;
background-color: #f5f5f5; float: left;
} margin: 0 20px 15px 0;
.scenicSpotInfoManage .test-1::-webkit-scrollbar-track { overflow: hidden;
background-color: #f5f5f5; }
}
.scenicSpotInfoManage .test-1::-webkit-scrollbar-thumb { .scenicSpotInfoManage .addimgContent div:first-child {
border-radius: 20px; margin-left: 0;
background-color: #aaa; }
margin-bottom: 24px;
} .addimgContent div:nth-child(3n) {
.scenicSpotInfoManage .test-1:hover::-webkit-scrollbar { margin-right: 0;
width: 4px; }
height: 4px;
background-color: #f5f5f5; .scenicSpotInfoManage .itemImgdiv {
} width: 160px;
.scenicSpotInfoManage .addimg-btnlist { height: 106px;
text-align: center; position: relative;
} }
.scenicSpotInfoManage .addimg-select {
font-size: 14px; .scenicSpotInfoManage .itemImgdiv img {
color: #999999; width: 100%;
float: right; height: 100%;
margin-bottom: 10px; border-radius: 10px;
position: relative; }
bottom: 20px;
} .scenicSpotInfoManage .imgseclet {
.scenicSpotInfoManage .re-delte { width: 100%;
width: 32px; height: 100%;
height: 32px; background: rgba(0, 0, 0, 0.4);
background: gray; border-radius: 10px;
border-radius: 50%; position: absolute;
text-align: center; top: 0;
display: inline-block; text-align: center;
line-height: 32px; line-height: 106px;
color: #fff; color: #e95252;
cursor: pointer; }
}
.scenicSpotInfoManage .re-delte:hover { .icon-dagouyouquan {
color: #e95252; font-size: 25px;
background: #fff; }
}
.scenicSpotInfoManage .imgDescription { .scenicSpotInfoManage .test-1::-webkit-scrollbar {
font-size: 12px; width: 0px;
margin-top: 12px; height: 0px;
color: #333333; background-color: #f5f5f5;
width: 100%; }
line-height: 20px;
overflow: hidden; .scenicSpotInfoManage .test-1::-webkit-scrollbar-track {
text-overflow: ellipsis; background-color: #f5f5f5;
display: -webkit-box; }
-webkit-line-clamp: 2;
-webkit-box-orient: vertical; .scenicSpotInfoManage .test-1::-webkit-scrollbar-thumb {
} border-radius: 20px;
.scenicSpotInfoManage .el-upload-dragger { background-color: #aaa;
border: none; margin-bottom: 24px;
} }
.scenicSpotInfoManage .res-span span:last-child {
display: inline; .scenicSpotInfoManage .test-1:hover::-webkit-scrollbar {
} width: 4px;
.scenicSpotInfoManage .resourcerightTop span { height: 4px;
display: inline-block; background-color: #f5f5f5;
} }
.scenicSpotInfoManage .sheshi {
margin-bottom: 20px; .scenicSpotInfoManage .addimg-btnlist {
} text-align: center;
.scenicSpotInfoManage .dialog-footer { }
padding-bottom: 30px;
} .scenicSpotInfoManage .addimg-select {
.scenicSpotInfoManage .btn-list { font-size: 14px;
margin: 0 0 40px 30px; color: #999999;
} float: right;
.scenicSpotInfoManage .input-with-select .el-input-group__prepend { margin-bottom: 10px;
background-color: #fff; position: relative;
} bottom: 20px;
.scenicSpotInfoManage .el-textarea__inner { }
resize: none;
height: 120px; .scenicSpotInfoManage .re-delte {
font-family: "微软雅黑"; width: 32px;
} height: 32px;
.scenicSpotInfoManage .R1:focus { background: gray;
border: 1px solid #e95252; border-radius: 50%;
} text-align: center;
.scenicSpotInfoManage .el-form-item__label { display: inline-block;
width: 96px; line-height: 32px;
font-size: 12px; color: #fff;
} cursor: pointer;
.scenicSpotInfoManage .el-form-item__error { }
left: 100px;
} .scenicSpotInfoManage .re-delte:hover {
.scenicSpotInfoManage .hotelDay { color: #e95252;
margin-left: 10px; background: #fff;
} }
.scenicSpotInfoManage .searchImgIcon {
cursor: pointer; .scenicSpotInfoManage .imgDescription {
} font-size: 12px;
.scenicSpotInfoManage .el-dialog--center .el-dialog__body { margin-top: 12px;
padding: 25px 25px 0; color: #333333;
} width: 100%;
.scenicSpotInfoManage .addressInput .el-input-group__append { line-height: 20px;
border-top-right-radius: 17px; overflow: hidden;
border-bottom-right-radius: 17px; text-overflow: ellipsis;
} display: -webkit-box;
.scenicSpotInfoManage ::-webkit-input-placeholder { -webkit-line-clamp: 2;
color: #d1d1d1; -webkit-box-orient: vertical;
} }
.scenicSpotInfoManage :-moz-placeholder {
color: #d1d1d1; .scenicSpotInfoManage .el-upload-dragger {
} border: none;
.scenicSpotInfoManage ::-moz-placeholder { }
color: #d1d1d1;
} .scenicSpotInfoManage .res-span span:last-child {
.scenicSpotInfoManage :-ms-input-placeholder { display: inline;
color: #d1d1d1; }
}
.scenicSpotInfoManage .el-switch.is-checked .el-switch__core { .scenicSpotInfoManage .resourcerightTop span {
border-color: #4bca81; display: inline-block;
background-color: #4bca81; }
}
.scenicSpotInfoManage .orderAdd { .scenicSpotInfoManage .sheshi {
position: relative; margin-bottom: 20px;
width: 340px; }
}
.scenicSpotInfoManage .minus:hover { .scenicSpotInfoManage .dialog-footer {
background-color: #cccccc; padding-bottom: 30px;
cursor: pointer; }
}
.scenicSpotInfoManage .minus { .scenicSpotInfoManage .btn-list {
width: 34px; margin: 0 0 40px 30px;
height: 32px; }
border: #dcdfe6;
color: #fff; .scenicSpotInfoManage .input-with-select .el-input-group__prepend {
text-align: center; background-color: #fff;
line-height: 34px; }
position: absolute;
left: 101px; .scenicSpotInfoManage .el-textarea__inner {
border-radius: 50%; resize: none;
z-index: 999; height: 120px;
top: 4px; font-family: "微软雅黑";
background-color: #dcdfe6; }
}
.scenicSpotInfoManage .addPeople { .scenicSpotInfoManage .R1:focus {
width: 34px; border: 1px solid #e95252;
height: 32px; }
top: 4px;
background-color: #dcdfe6; .scenicSpotInfoManage .el-form-item__label {
color: #fff; width: 96px;
text-align: center; font-size: 12px;
line-height: 34px; }
position: absolute;
right: 41px; .scenicSpotInfoManage .el-form-item__error {
border-radius: 50%; left: 100px;
z-index: 999; }
}
.scenicSpotInfoManage .addPeople:hover { .scenicSpotInfoManage .hotelDay {
background-color: #cccccc; margin-left: 10px;
cursor: pointer; }
}
.scenicSpotInfoManage .orderAdd .el-input__inner { .scenicSpotInfoManage .searchImgIcon {
padding-left: 90px; cursor: pointer;
} }
.scenicSpotInfoManage .littleadd {
font-size: 12px !important; .scenicSpotInfoManage .el-dialog--center .el-dialog__body {
color: #fff; padding: 25px 25px 0;
display: inline-block; }
}
.scenicSpotInfoManage .footabs { .scenicSpotInfoManage .addressInput .el-input-group__append {
width: 300px; border-top-right-radius: 17px;
min-height: 34px; border-bottom-right-radius: 17px;
border: 1px solid #d1d1d1; }
margin-left: 10px;
display: inline-block; .scenicSpotInfoManage ::-webkit-input-placeholder {
background-color: #fff; color: #d1d1d1;
padding: 5px 10px; }
display: flex;
flex-wrap: wrap; .scenicSpotInfoManage :-moz-placeholder {
} color: #d1d1d1;
.scenicSpotInfoManage .foodtips { }
display: inline-block;
padding: 3px 5px; .scenicSpotInfoManage ::-moz-placeholder {
background-color: #efefef; color: #d1d1d1;
margin: 3px; }
position: relative;
} .scenicSpotInfoManage :-ms-input-placeholder {
.scenicSpotInfoManage .toolOne { color: #d1d1d1;
margin: 0 0 28px 38px; }
display: flex;
} .scenicSpotInfoManage .el-switch.is-checked .el-switch__core {
.scenicSpotInfoManage .foodTipsDiv { border-color: #4bca81;
max-width: 200px; background-color: #4bca81;
display: inline; }
}
.scenicSpotInfoManage .wInput { .scenicSpotInfoManage .orderAdd {
border: none; position: relative;
height: 30px; width: 340px;
} }
.scenicSpotInfoManage .wInput .el-input__inner {
border: none !important; .scenicSpotInfoManage .minus:hover {
height: 28px; background-color: #cccccc;
padding: 0; cursor: pointer;
border-radius: 0; }
margin-top: 2px;
} .scenicSpotInfoManage .minus {
.scenicSpotInfoManage .delTips { width: 34px;
position: absolute; height: 32px;
right: -5px; border: #dcdfe6;
top: -5px; color: #fff;
cursor: pointer; text-align: center;
color: #999; line-height: 34px;
font-size: 14px; position: absolute;
} left: 101px;
.scenicSpotInfoManage .delTips:hover { border-radius: 50%;
color: #e95252; z-index: 999;
} top: 4px;
.scenicSpotInfoManage .fanyong { background-color: #dcdfe6;
font-size: 12px; }
color: #666666;
margin-right: 10px; .scenicSpotInfoManage .addPeople {
} width: 34px;
.scenicSpotInfoManage .footabs .el-tag { height: 32px;
margin: 0 5px 5px 0; top: 4px;
} background-color: #dcdfe6;
.scenicSpotInfoManage .footabs .el-input__inner { color: #fff;
height: 30px; text-align: center;
position: relative; line-height: 34px;
} position: absolute;
.scenicSpotInfoManage .button-new-tag { right: 41px;
height: 30px; border-radius: 50%;
line-height: 30px; z-index: 999;
padding-top: 0; }
padding-bottom: 0;
} .scenicSpotInfoManage .addPeople:hover {
.scenicSpotInfoManage .input-new-tag { background-color: #cccccc;
width: 90px; cursor: pointer;
margin-left: 10px; }
vertical-align: bottom;
} .scenicSpotInfoManage .orderAdd .el-input__inner {
.scenicSpotInfoManage .el-dialog--center .el-dialog__body { padding-left: 90px;
padding: 15px 25px 0 !important; }
}
.scenicSpotInfoManage .mapList { .scenicSpotInfoManage .littleadd {
width: 850px !important; font-size: 12px !important;
height: 510px !important; color: #fff;
} display: inline-block;
.scenicSpotInfoManage .fanbili { }
margin-top: 8px;
} .scenicSpotInfoManage .footabs {
.scenicSpotInfoManage .RabateDiv { width: 300px;
margin-left: 10px; min-height: 34px;
} border: 1px solid #d1d1d1;
.scenicSpotInfoManage .RebateCount { margin-left: 10px;
height: 34px; display: inline-block;
border-radius: 17px; background-color: #fff;
float: left; padding: 5px 10px;
} display: flex;
.scenicSpotInfoManage .reOne, flex-wrap: wrap;
.scenicSpotInfoManage .reTwo, }
.scenicSpotInfoManage .dayNum {
position: relative; .scenicSpotInfoManage .foodtips {
} display: inline-block;
.scenicSpotInfoManage .leftPnum { padding: 3px 5px;
float: left; background-color: #efefef;
width: 50px; margin: 3px;
height: 32px; position: relative;
line-height: 32px; }
text-align: center;
border-right: 1px solid #cccccc; .scenicSpotInfoManage .toolOne {
position: absolute; margin: 0 0 28px 38px;
left: 1px; display: flex;
top: 1px; }
border-top-left-radius: 17px;
border-bottom-left-radius: 17px; .scenicSpotInfoManage .foodTipsDiv {
} max-width: 200px;
.scenicSpotInfoManage .toolInput { display: inline;
height: 34px; }
padding-left: 5px;
border: none; .scenicSpotInfoManage .wInput {
} border: none;
.scenicSpotInfoManage .inpuOne { height: 30px;
width: 135px; }
padding-left: 55px;
border: 1px solid #d1d1d1; .scenicSpotInfoManage .wInput .el-input__inner {
border-right: none; border: none !important;
} height: 28px;
.scenicSpotInfoManage .inpuTwo { padding: 0;
width: 166px; border-radius: 0;
padding: 0 45px 0 55px; margin-top: 2px;
border: 1px solid #d1d1d1; }
}
.scenicSpotInfoManage .percentCon { .scenicSpotInfoManage .delTips {
float: right; position: absolute;
width: 40px; right: -5px;
height: 32px; top: -5px;
text-align: center; cursor: pointer;
border-left: 1px solid #cccccc; color: #999;
line-height: 32px; font-size: 14px;
border-top-right-radius: 17px; }
border-bottom-right-radius: 17px;
position: absolute; .scenicSpotInfoManage .delTips:hover {
right: 1px; color: #e95252;
top: 1px; }
}
.scenicSpotInfoManage .fanNum { .scenicSpotInfoManage .fanyong {
float: left; font-size: 12px;
width: 50px; color: #666666;
height: 32px; margin-right: 10px;
line-height: 32px; }
text-align: center;
border-right: 1px solid #cccccc; .scenicSpotInfoManage .footabs .el-tag {
position: absolute; margin: 0 5px 5px 0;
left: 1px; }
top: 1px;
} .scenicSpotInfoManage .footabs .el-input__inner {
.scenicSpotInfoManage .fdTag { height: 30px;
margin-top: 13px; position: relative;
} }
.scenicSpotInfoManage .addAddress .el-input__inner {
border-top-right-radius: 0; .scenicSpotInfoManage .button-new-tag {
border-bottom-right-radius: 0; height: 30px;
border: 1px solid #d1d1d1 !important; line-height: 30px;
} padding-top: 0;
.scenicSpotInfoManage .el-input-group__append { padding-bottom: 0;
border-top-right-radius: 0 !important; }
border-bottom-right-radius: 0 !important;
} .scenicSpotInfoManage .input-new-tag {
width: 90px;
margin-left: 10px;
vertical-align: bottom;
}
.scenicSpotInfoManage .el-dialog--center .el-dialog__body {
padding: 15px 25px 0 !important;
}
.scenicSpotInfoManage .mapList {
width: 850px !important;
height: 510px !important;
}
.scenicSpotInfoManage .fanbili {
margin-top: 8px;
}
.scenicSpotInfoManage .RabateDiv {
margin-left: 10px;
}
.scenicSpotInfoManage .RebateCount {
height: 34px;
border-radius: 17px;
float: left;
}
.scenicSpotInfoManage .reOne,
.scenicSpotInfoManage .reTwo,
.scenicSpotInfoManage .dayNum {
position: relative;
}
.scenicSpotInfoManage .leftPnum {
float: left;
width: 50px;
height: 32px;
line-height: 32px;
text-align: center;
border-right: 1px solid #cccccc;
position: absolute;
left: 1px;
top: 1px;
border-top-left-radius: 17px;
border-bottom-left-radius: 17px;
}
.scenicSpotInfoManage .toolInput {
height: 34px;
padding-left: 5px;
border: none;
}
.scenicSpotInfoManage .inpuOne {
width: 135px;
padding-left: 55px;
border: 1px solid #d1d1d1;
border-right: none;
}
.scenicSpotInfoManage .inpuTwo {
width: 166px;
padding: 0 45px 0 55px;
border: 1px solid #d1d1d1;
}
.scenicSpotInfoManage .percentCon {
float: right;
width: 40px;
height: 32px;
text-align: center;
border-left: 1px solid #cccccc;
line-height: 32px;
border-top-right-radius: 17px;
border-bottom-right-radius: 17px;
position: absolute;
right: 1px;
top: 1px;
}
.scenicSpotInfoManage .fanNum {
float: left;
width: 50px;
height: 32px;
line-height: 32px;
text-align: center;
border-right: 1px solid #cccccc;
position: absolute;
left: 1px;
top: 1px;
}
.scenicSpotInfoManage .fdTag {
margin-top: 13px;
}
.scenicSpotInfoManage .addAddress .el-input__inner {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border: 1px solid #d1d1d1 !important;
}
.scenicSpotInfoManage .el-input-group__append {
border-top-right-radius: 0 !important;
border-bottom-right-radius: 0 !important;
}
</style> </style>
<template> <template>
<div class="flexOne scenicSpotInfoManage"> <div class="flexOne scenicSpotInfoManage">
...@@ -607,23 +715,28 @@ ...@@ -607,23 +715,28 @@
</el-form-item> </el-form-item>
<el-form-item label="国家"> <el-form-item label="国家">
<el-select placeholder="请选择国家" filterable v-model="addMsg.Country" class='multiple_input w300' @change="GetSubAreaList(addMsg.Country,1)"> <el-select placeholder="请选择国家" filterable v-model="addMsg.Country" class='multiple_input w300'
@change="GetSubAreaList(addMsg.Country,1)">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <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 v-for="childItem in CountryList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="省"> <el-form-item label="省">
<el-select placeholder="请选择省" filterable class='multiple_input w300' v-model="addMsg.Province" @change="GetSubAreaList(addMsg.Province,2)"> <el-select placeholder="请选择省" filterable class='multiple_input w300' v-model="addMsg.Province"
@change="GetSubAreaList(addMsg.Province,2)">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in ProvinceList" :key="childItem.ID" :label="childItem.Name" :value="childItem.ID"> <el-option v-for="childItem in ProvinceList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="市"> <el-form-item label="市">
<el-select placeholder="请选择市" filterable class='multiple_input w300' v-model="addMsg.City"> <el-select placeholder="请选择市" filterable class='multiple_input w300' v-model="addMsg.City">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in CityList" :key="childItem.ID" :label="childItem.Name" :value="childItem.ID"> <el-option v-for="childItem in CityList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -632,9 +745,19 @@ ...@@ -632,9 +745,19 @@
<el-button slot="append" @click="selectAddress = true" icon="iconfont icon-img_dw"></el-button> <el-button slot="append" @click="selectAddress = true" icon="iconfont icon-img_dw"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="经纬度"> <div class="toolOne">
维度:{{addMsg.Lat}} 经度:{{addMsg.Lng}} <span class="fanbili">地理位置</span>
</el-form-item> <div class="RabateDiv clearfix">
<div class="RebateCount reOne">
<div class="leftPnum">经度</div>
<input type="text" class="toolInput inpuOne" v-model="addMsg.Lng" maxlength="20">
</div>
<div class="RebateCount reTwo">
<div class="fanNum">纬度</div>
<input type="text" class="toolInput inpuTwo" v-model="addMsg.Lat" maxlength="20">
</div>
</div>
</div>
<el-form-item :label="$t('restaurant.res_BusinessHours')" prop="OpeningHours"> <el-form-item :label="$t('restaurant.res_BusinessHours')" prop="OpeningHours">
<el-input type="text" v-model="addMsg.OpeningHours" maxlength="100" class="w300"></el-input> <el-input type="text" v-model="addMsg.OpeningHours" maxlength="100" class="w300"></el-input>
</el-form-item> </el-form-item>
...@@ -652,37 +775,40 @@ ...@@ -652,37 +775,40 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('restaurant.res_advanceDays')" prop="DieLine"> <el-form-item :label="$t('restaurant.res_advanceDays')" prop="DieLine">
<el-input type="text" maxlength="10" class="w300" v-model="addMsg.DieLine" @keyup.native="checkInteger(addMsg,'DieLine')"></el-input>&nbsp;{{$t('hotel.hotel_day')}} <el-input type="text" maxlength="10" class="w300" v-model="addMsg.DieLine"
@keyup.native="checkInteger(addMsg,'DieLine')"></el-input>&nbsp;{{$t('hotel.hotel_day')}}
</el-form-item> </el-form-item>
<el-form-item label="是否预约"> <el-form-item label="是否预约">
<el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive"></el-switch> <el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive">
</el-switch>
</el-form-item> </el-form-item>
<el-form-item label="支付方式"> <el-form-item label="支付方式">
<el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')" :disabled="IsHaveAuth==1?false:true"> <el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')"
:disabled="IsHaveAuth==1?false:true">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否免费"> <el-form-item label="是否免费">
<el-select v-model="addMsg.IsFree" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.IsFree" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in IsFreeList" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in IsFreeList" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<div class="toolOne"> <div class="toolOne">
<span class="fanbili">游玩时间</span> <span class="fanbili">游玩时间</span>
<div class="RabateDiv clearfix"> <div class="RabateDiv clearfix">
<div class="RebateCount reOne"> <div class="RebateCount reOne">
<div class="leftPnum">小时</div> <div class="leftPnum">小时</div>
<input type="text" class="toolInput inpuOne" v-model="addMsg.PlayTimeHour" maxlength="20"> <input type="text" class="toolInput inpuOne" v-model="addMsg.PlayTimeHour" maxlength="20">
</div> </div>
<div class="RebateCount reTwo"> <div class="RebateCount reTwo">
<div class="fanNum">分钟</div> <div class="fanNum">分钟</div>
<input type="text" class="toolInput inpuTwo" v-model="addMsg.PlayTimeMinutes" maxlength="20"> <input type="text" class="toolInput inpuTwo" v-model="addMsg.PlayTimeMinutes" maxlength="20">
</div>
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="resource-imginfo"> <div class="resource-imginfo">
<div class="resourcerightTop"> <div class="resourcerightTop">
...@@ -691,13 +817,13 @@ ...@@ -691,13 +817,13 @@
<div class="RabateDiv clearfix"> <div class="RabateDiv clearfix">
<div class="RebateCount reOne"> <div class="RebateCount reOne">
<div class="leftPnum">{{$t('admin.admin_personNumber')}}></div> <div class="leftPnum">{{$t('admin.admin_personNumber')}}></div>
<input type="text" class="toolInput inpuOne" v-model="addMsg.RebateCount" onkeyup="value=value.replace(/[^\d]/g,'')" <input type="text" class="toolInput inpuOne" v-model="addMsg.RebateCount"
maxlength="20"> onkeyup="value=value.replace(/[^\d]/g,'')" maxlength="20">
</div> </div>
<div class="RebateCount reTwo"> <div class="RebateCount reTwo">
<div class="fanNum">{{$t('restaurant.res_return')}}</div> <div class="fanNum">{{$t('restaurant.res_return')}}</div>
<input type="text" class="toolInput inpuTwo" v-model="addMsg.RebateRatio" onkeyup="value=value.replace(/[^\d]/g,'')" <input type="text" class="toolInput inpuTwo" v-model="addMsg.RebateRatio"
maxlength="20"> onkeyup="value=value.replace(/[^\d]/g,'')" maxlength="20">
<div class="percentCon">%</div> <div class="percentCon">%</div>
</div> </div>
</div> </div>
...@@ -706,21 +832,25 @@ ...@@ -706,21 +832,25 @@
<div class="toolOne"> <div class="toolOne">
<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" @close="handleClose(tag)">{{tag}}</el-tag> <el-tag :key="tag" v-for="tag in tipsList" closable :disable-transitions="false"
<el-input class="input-new-tag" v-if="inputVisible" v-model="inputValue" maxlength="6" ref="saveTagInput" @close="handleClose(tag)">{{tag}}</el-tag>
size="small" @keyup.enter.native="handleInputConfirm" @blur="handleInputConfirm"> <el-input class="input-new-tag" v-if="inputVisible" v-model="inputValue" maxlength="6"
ref="saveTagInput" size="small" @keyup.enter.native="handleInputConfirm" @blur="handleInputConfirm">
</el-input> </el-input>
<el-button v-else class="button-new-tag" size="small" @click="showInput">+ {{$t('pub.addBtn')}}</el-button> <el-button v-else class="button-new-tag" size="small" @click="showInput">+ {{$t('pub.addBtn')}}
</el-button>
</div> </div>
</div> </div>
<div class="toolOne"> <div class="toolOne">
<span class="fdTag">{{$t('scen.sc_dlTag')}}</span> <span class="fdTag">{{$t('scen.sc_dlTag')}}</span>
<div class="footabs"> <div class="footabs">
<el-tag :key="tag" v-for="tag in Geographic" closable :disable-transitions="false" @close="handleClose2(tag)">{{tag}}</el-tag> <el-tag :key="tag" v-for="tag in Geographic" closable :disable-transitions="false"
<el-input class="input-new-tag" v-if="inputVisible2" v-model="inputValue2" maxlength="6" ref="saveTagInput" @close="handleClose2(tag)">{{tag}}</el-tag>
size="small" @keyup.enter.native="handleInputConfirm2" @blur="handleInputConfirm2"> <el-input class="input-new-tag" v-if="inputVisible2" v-model="inputValue2" maxlength="6"
ref="saveTagInput" size="small" @keyup.enter.native="handleInputConfirm2" @blur="handleInputConfirm2">
</el-input> </el-input>
<el-button v-else class="button-new-tag" size="small" @click="showInput2">+ {{$t('pub.addBtn')}}</el-button> <el-button v-else class="button-new-tag" size="small" @click="showInput2">+ {{$t('pub.addBtn')}}
</el-button>
</div> </div>
</div> </div>
<el-form-item :label="$t('restaurant.res_special')"> <el-form-item :label="$t('restaurant.res_special')">
...@@ -750,12 +880,13 @@ ...@@ -750,12 +880,13 @@
<img v-if="!item" src="../../assets/img/bg_c3@3x.png"> <img v-if="!item" src="../../assets/img/bg_c3@3x.png">
<img :src="item.ShowPath" :onerror='defaultImg' /> <img :src="item.ShowPath" :onerror='defaultImg' />
<div class="imgzhe"> <div class="imgzhe">
<div class="re-delte" ><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div> <div class="re-delte"><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div> <div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath"> <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
<i class="iconfont icon-zuoyi"></i> <i class="iconfont icon-zuoyi"></i>
</div> </div>
<div class="re-delte" @click.stop="ExchangeImg(index,1)" v-if="index!=TicketCouponsImageArray.length-1&&item.ShowPath"> <div class="re-delte" @click.stop="ExchangeImg(index,1)"
v-if="index!=TicketCouponsImageArray.length-1&&item.ShowPath">
<i class="iconfont icon-youyi"></i> <i class="iconfont icon-youyi"></i>
</div> </div>
</div> </div>
...@@ -766,8 +897,8 @@ ...@@ -766,8 +897,8 @@
<i class="iconfont icon-img_haha bigAdd"></i> <i class="iconfont icon-img_haha bigAdd"></i>
<div class="ad-one"> <div class="ad-one">
<div class="re-upload"> <div class="re-upload">
<el-upload :file-list="fileList" :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" <el-upload :file-list="fileList" :http-request="UploadImage" :multiple="true"
:show-file-list="false" action=""> accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<i class="iconfont icon-img_bdsc"></i> <i class="iconfont icon-img_bdsc"></i>
</el-upload> </el-upload>
</div> </div>
...@@ -780,7 +911,8 @@ ...@@ -780,7 +911,8 @@
</el-form> </el-form>
</div> </div>
<el-dialog custom-class="resourceImgAdd" title="添加图片" center :visible.sync="addimg"> <el-dialog custom-class="resourceImgAdd" title="添加图片" center :visible.sync="addimg">
<DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:imgType="3"></DMCchooseImg> <DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:imgType="3">
</DMCchooseImg>
</el-dialog> </el-dialog>
<el-dialog custom-class="mapList" title="地图选址" center :visible.sync="selectAddress"> <el-dialog custom-class="mapList" title="地图选址" center :visible.sync="selectAddress">
...@@ -803,11 +935,11 @@ ...@@ -803,11 +935,11 @@
export default { export default {
data() { data() {
return { return {
imageOptions:{ imageOptions: {
navbar:false, navbar: false,
title:false title: false
}, },
//是否有权限操作支付方式 //是否有权限操作支付方式
IsHaveAuth: 0, IsHaveAuth: 0,
images: [], images: [],
selectAddress: false, selectAddress: false,
...@@ -831,7 +963,7 @@ ...@@ -831,7 +963,7 @@
inputValue: "", inputValue: "",
inputVisible2: false, inputVisible2: false,
inputValue2: "", inputValue2: "",
IsFreeList: [{ IsFreeList: [{
value: 0, value: 0,
label: "是" label: "是"
}, },
...@@ -866,7 +998,7 @@ ...@@ -866,7 +998,7 @@
OpeningHours: "", OpeningHours: "",
Tel: "", Tel: "",
TrafficInfo: "", TrafficInfo: "",
IsFree:0, IsFree: 0,
Feature: "", Feature: "",
About: "", About: "",
BookingInfo: "", BookingInfo: "",
...@@ -894,9 +1026,9 @@ ...@@ -894,9 +1026,9 @@
AppointmentStyle: 0, AppointmentStyle: 0,
//支付方式 //支付方式
PayStyle: 0, PayStyle: 0,
PlayTimeHour:"",//游玩小时 PlayTimeHour: "", //游玩小时
PlayTimeMinutes:"",//游玩分钟 PlayTimeMinutes: "", //游玩分钟
IsIncludeLeader:0,//是否包含领队:0-包含,1-不包含 IsIncludeLeader: 0, //是否包含领队:0-包含,1-不包含
}, },
rules: { rules: {
//表单必填验证 //表单必填验证
...@@ -940,21 +1072,21 @@ ...@@ -940,21 +1072,21 @@
DMCchooseImg: DMCchooseImg DMCchooseImg: DMCchooseImg
}, },
methods: { methods: {
inited (viewer){ inited(viewer) {
this.$viewer = viewer this.$viewer = viewer
}, },
showImg: function (src) { showImg: function (src) {
let srcArr = src.split('?') let srcArr = src.split('?')
src = srcArr[0] src = srcArr[0]
let isExsit=false let isExsit = false
this.images.forEach(x=>{ this.images.forEach(x => {
if(x===src) if (x === src)
isExsit=true isExsit = true
}) })
if(!isExsit) if (!isExsit)
this.images.push(src) this.images.push(src)
this.$viewer.show() this.$viewer.show()
this.$viewer.view(this.images.indexOf(src)) this.$viewer.view(this.images.indexOf(src))
}, },
//上传景点图片 //上传景点图片
UploadImage(file) { UploadImage(file) {
...@@ -1105,9 +1237,8 @@ ...@@ -1105,9 +1237,8 @@
if (res.data.data.GeographicTag) { if (res.data.data.GeographicTag) {
this.Geographic = res.data.data.GeographicTag.split(","); this.Geographic = res.data.data.GeographicTag.split(",");
} }
if(res.data.data.Sure!=null) if (res.data.data.Sure != null) {
{ this.addMsg.Sure = res.data.data.Sure.toString();
this.addMsg.Sure = res.data.data.Sure.toString();
} }
this.isBook = this.addMsg.IsSelfBook; this.isBook = this.addMsg.IsSelfBook;
res.data.data.PicPath.split(",").forEach(x => { res.data.data.PicPath.split(",").forEach(x => {
...@@ -1354,4 +1485,5 @@ ...@@ -1354,4 +1485,5 @@
} }
} }
}; };
</script> </script>
src/plug/index.js
View file @ 0805450c
...@@ -113,6 +113,7 @@ export default { ...@@ -113,6 +113,7 @@ export default {
let domainUrl = ''; let domainUrl = '';
// domainUrl = "http://192.168.2.66:8025"; // domainUrl = "http://192.168.2.66:8025";
domainUrl = "http://192.168.2.17:8083"; domainUrl = "http://192.168.2.17:8083";
domainUrl = "http://192.168.2.214:8082";
let locationName = window.location.hostname; let locationName = window.location.hostname;
let javaUrldo=""; let javaUrldo="";
...@@ -144,9 +145,9 @@ export default { ...@@ -144,9 +145,9 @@ export default {
//SocketUrl //SocketUrl
WebSocketUrl: "ws://192.168.1.110:8080?account=", WebSocketUrl: "ws://192.168.1.110:8080?account=",
//google地图Url //google地图Url
GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN", GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyBx6JAiyAFPwBN1nM-g_hpQ7lvdPY3n2oU&sensor=false&language=zh-CN",
//google地图图片地址 //google地图图片地址
GoogleMapImageUrl: "http://super.oytour.com", GoogleMapImageUrl: "http://imgfile.oytour.com",
//上传站点 //上传站点
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
//文件站点 //文件站点
......
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