Skip to content

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

解决冲突

parents 99643a58 8d4c274b
Show whitespace changes
Inline Side-by-side
Showing with 1043 additions and 881 deletions
index.html
View file @ 0805450c
......@@ -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="static/MarkerClusterer.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>
</head>
<body>
......
src/assets/utils/googleMap.js
View file @ 0805450c
/**
* Created by Administrator on 2018/7/17.
*/
......@@ -35,8 +34,7 @@ var googleMap = {
googleMap.initMap();
if (googleMap.defaultAddress == "") {
googleMap.initMapFirst();
}
else {
} else {
googleMap.searchAddress();
}
googleMap.callback = callback;
......@@ -57,7 +55,8 @@ var googleMap = {
var LatLng = new google.maps.LatLng(data[0].lat, data[0].lng);
if (data.length > 0) {
googleMap.map = new google.maps.Map(googleMap.map_id, {
zoom: 14, center: LatLng
zoom: 14,
center: LatLng
});
}
}
......@@ -90,9 +89,17 @@ var googleMap = {
if (googleMap.marker) {
googleMap.marker.setMap(null);
}
var imageUrl = googleMap.imageDomain + "/static/img/position_red.png";
var imageUrl = {};
if (isCallBack == 1) {
imageUrl = googleMap.imageDomain + "/static/img/position_blue.png";
imageUrl = {
url: googleMap.imageDomain + "/static/location_01.png", // image is 512 x 512
scaledSize: new google.maps.Size(30, 40),
}
} else {
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,
......@@ -129,16 +136,20 @@ var googleMap = {
},
searchAddress: function () {
var address = googleMap.search_id.value;
googleMap.geocoder.geocode({ 'address': address }, function (results, status) {
googleMap.geocoder.geocode({
'address': address
}, function (results, status) {
if (status == google.maps.GeocoderStatus.OK) {
googleMap.getAddress(results,1);
googleMap.getAddress(results, 1);
}
});
},
placeMarker: function (location) {
//地图的点击事件，根据点击的点获取经度，纬度和地址信息
if (googleMap.geocoder) {
googleMap.geocoder.geocode({ 'location': location }, function (results, status) {
googleMap.geocoder.geocode({
'location': location
}, function (results, status) {
if (status == google.maps.GeocoderStatus.OK) {
googleMap.getAddress(results, 1);
}
......@@ -178,7 +189,10 @@ var googleMap = {
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}
let center = {
lng: lng,
lat: lat
}
//创建地图实例，zoom是缩放比例
_this.map = new google.maps.Map(document.getElementById('map_canvas'), {
zoom: 7,
......@@ -188,18 +202,18 @@ var googleMap = {
_this.directionsDisplay.setMap(_this.map);
googleMap.calcRoute(_dataList, _this)
},
calcRoute: function(_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 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)) {
if (index >= 1 && index !== (_dataList.length - 1)) {
let obj = {
location: x.lat + ',' + x.lng
};
......@@ -208,8 +222,8 @@ var googleMap = {
});
}
let request = { // 组装连线数据
origin:start, // 起
destination:end, // 止
origin: start, // 起
destination: end, // 止
travelMode: google.maps.TravelMode.DRIVING,
// waypoints: [{location:"30.5226477,104.05806469999993"},{location:"30.67416759999999,104.04721970000003"}] // 中间点数据
};
......@@ -217,7 +231,7 @@ var googleMap = {
request.waypoints = waypoints
}
_this.directionsService.route(request, function(result, status) {
_this.directionsService.route(request, function (result, status) {
if (status == google.maps.DirectionsStatus.OK) {
_this.directionsDisplay.setDirections(result);
}
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 0805450c
......@@ -273,7 +273,6 @@
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj;
this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
console.log("this.Handmsg",this.Handmsg)
this.Financial_post_GetList();
},components: {
"my-FlowChartModule": myFlowChartModule
......
src/components/FinancialModule/accountingWork.vue
View file @ 0805450c
......@@ -316,7 +316,6 @@ export default {
},methods:{
getSingleList(){ // 获取费用类型
this.apipost('FinancialFlowTemplate_post_GetSingleList',{},res=>{
console.log("1231",res);
if(res.data.resultCode==1){
this.SingleList=res.data.data;
}else{}
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 0805450c
......@@ -1099,7 +1099,6 @@ export default {
this.msg.OrderTradeWay=this.tradeWay;
this.msg.PlatformAccountId=this.platformAccount;
this.loading = true;
console.log("this.msg",this.msg)
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
......
src/components/Hotel/HotelInfo.vue
View file @ 0805450c
......@@ -73,24 +73,28 @@
</el-select>
</span>
</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>
<div class="jiudianyouhuiDiv">
<el-row v-for="(list,index) in addMsg.DiscountList" :key="index">
<el-col :span="6" :gutter="35">
<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-col>
<el-col :span="6" :gutter="35">
<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-col>
<el-col :span="6" :gutter="35">
<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-col>
<el-col :span="6" :gutter="35" v-if="index==0">
......@@ -125,8 +129,8 @@
class="w300"></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_country')">
<el-select :placeholder="$t('visaT.qxzguojia')" filterable v-model="addMsg.Country" class='multiple_input w300'
@change="GetSubAreaList(addMsg.Country,1)">
<el-select :placeholder="$t('visaT.qxzguojia')" 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 v-for="childItem in CountryList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
......@@ -134,8 +138,8 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_province')">
<el-select :placeholder="$t('ground.qingxuanzesheng')" filterable class='multiple_input w300' v-model="addMsg.Province"
@change="GetSubAreaList(addMsg.Province,2)">
<el-select :placeholder="$t('ground.qingxuanzesheng')" 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 v-for="childItem in ProvinceList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
......@@ -143,7 +147,8 @@
</el-select>
</el-form-item>
<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 v-for="childItem in CityList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
......@@ -155,6 +160,19 @@
<el-button slot="append" @click="selectAddress = true" icon="iconfont icon-img_dw"></el-button>
</el-input>
</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-input type="text" v-model="addMsg.Fax" maxlength="20" class="w300"></el-input>
</el-form-item>
......@@ -169,8 +187,8 @@
<el-input type="textarea" v-model="addMsg.WarmTip" class="w300"></el-input>
</el-form-item>
<el-form-item>
<el-switch v-model="isBook" active-color="#13ce66" inactive-color="#ff4949" :active-text="$t('hotel.hotel_Supplier')"
:inactive-text="$t('ground.ziding')"></el-switch>
<el-switch v-model="isBook" active-color="#13ce66" inactive-color="#ff4949"
:active-text="$t('hotel.hotel_Supplier')" :inactive-text="$t('ground.ziding')"></el-switch>
</el-form-item>
<el-form-item>
<el-switch v-model="isDinner" active-color="#13ce66" @change="getDinnerList" inactive-color="#ff4949"
......@@ -187,13 +205,16 @@
<el-switch v-model="addMsg.IsHavearking" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<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 :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 :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 :label="$t('ground.fanyongleixing')">
<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 {
addNode(){ // 添加节点
let AuditList = {};
let type = this.approvalType
console.log("this.approvalType",this.approvalType)
if(this.AuditDescription==''){
return this.$message.error(this.$t('tips.qtxjdmiaoshu'))
}
......@@ -1648,7 +1647,6 @@ export default {
AuditList.SpecialNode = this.GetNodeValue;
this.myAuditList.push(AuditList);
}
console.log("this.myAuditList",this.myAuditList)
this.closeLayer()
},
clearValue(t){ // 选择会计出纳窗口获取对应下拉
......
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @ 0805450c
......@@ -2,40 +2,47 @@
.scenicSpotInfoManage .resourceImgAdd {
width: 620px;
margin: auto;
}
.scenicSpotInfoManage .clearfix:after {
}
.scenicSpotInfoManage .clearfix:after {
content: "\0020";
display: block;
height: 0;
clear: both;
}
.scenicSpotInfoManage .resource-content {
}
.scenicSpotInfoManage .resource-content {
width: 100%;
margin-top: 30px;
font-size: 12px;
min-width: 1200px;
}
.scenicSpotInfoManage .resource-baseinfo {
}
.scenicSpotInfoManage .resource-baseinfo {
float: left;
height: auto;
width: 600px;
margin: 0 0 20px 30px;
}
.scenicSpotInfoManage .resource-imginfo {
}
.scenicSpotInfoManage .resource-imginfo {
float: left;
width: 510px;
margin-top: 35px;
}
.scenicSpotInfoManage .resource-lititle {
}
.scenicSpotInfoManage .resource-lititle {
display: block;
border-left: 4px solid #e95252;
padding-left: 10px;
margin-bottom: 20px;
}
.scenicSpotInfoManage .resource-baseinfo span {
}
.scenicSpotInfoManage .resource-baseinfo span {
display: inline-block;
}
.scenicSpotInfoManage .resource-name {
}
.scenicSpotInfoManage .resource-name {
width: 300px;
height: 34px;
background: rgba(255, 255, 255, 1);
......@@ -43,17 +50,20 @@
outline: none;
border: 1px solid #d6d6d6;
padding-left: 10px;
}
.scenicSpotInfoManage .common-lefttit {
}
.scenicSpotInfoManage .common-lefttit {
width: 80px;
text-align: right;
margin: 0 7px 0 8px;
display: inline-block;
}
.scenicSpotInfoManage .resource-net {
}
.scenicSpotInfoManage .resource-net {
position: relative;
}
.scenicSpotInfoManage .resource-http {
}
.scenicSpotInfoManage .resource-http {
position: absolute;
color: #999999;
width: 70px !important;
......@@ -67,20 +77,24 @@
text-align: center;
line-height: 32px;
text-align: center;
}
.scenicSpotInfoManage .R1 {
}
.scenicSpotInfoManage .R1 {
width: 300px;
padding: 0 15px 0 80px;
transition: all 0.3s ease-in-out;
}
.scenicSpotInfoManage .areaInput {
}
.scenicSpotInfoManage .areaInput {
width: 300px;
padding-right: 120px;
}
.scenicSpotInfoManage .areaInput:focus {
}
.scenicSpotInfoManage .areaInput:focus {
border: 1px solid #e95252;
}
.scenicSpotInfoManage .map-icon {
}
.scenicSpotInfoManage .map-icon {
position: absolute;
right: 1px;
top: 1px;
......@@ -95,13 +109,15 @@
display: inline-block;
height: 32px;
background-color: #f5f7fa;
}
.scenicSpotInfoManage .map-icon i {
}
.scenicSpotInfoManage .map-icon i {
margin: 0 5px;
position: relative;
top: 1px;
}
.scenicSpotInfoManage .save-Btn {
}
.scenicSpotInfoManage .save-Btn {
width: 90px;
height: 30px;
background: rgba(233, 82, 82, 1);
......@@ -110,12 +126,14 @@
outline: none;
cursor: pointer;
margin-right: 20px;
}
.scenicSpotInfoManage .cancel-Btn,
.save-Btn:hover {
}
.scenicSpotInfoManage .cancel-Btn,
.save-Btn:hover {
opacity: 0.8;
}
.scenicSpotInfoManage .cancel-Btn {
}
.scenicSpotInfoManage .cancel-Btn {
width: 90px;
height: 30px;
background: rgba(255, 255, 255, 1);
......@@ -124,40 +142,47 @@
outline: none;
cursor: pointer;
border: 1px solid #e95252;
}
.scenicSpotInfoManage .re-img {
}
.scenicSpotInfoManage .re-img {
width: 140px;
height: 93px;
border-radius: 10px;
float: left;
margin: 0 30px 30px 0;
position: relative;
}
.scenicSpotInfoManage .re-img:first-child {
}
.scenicSpotInfoManage .re-img:first-child {
margin-left: 0;
}
.scenicSpotInfoManage .resource-imglist {
}
.scenicSpotInfoManage .resource-imglist {
width: 100%;
height: auto;
margin-top: 20px;
}
.scenicSpotInfoManage .resource-imglist img {
}
.scenicSpotInfoManage .resource-imglist img {
width: 100%;
height: 100%;
border-radius: 10px;
}
.scenicSpotInfoManage .add-img {
}
.scenicSpotInfoManage .add-img {
margin-top: 20px;
}
.scenicSpotInfoManage .reimg-add {
}
.scenicSpotInfoManage .reimg-add {
width: 140px;
height: 93px;
background: rgba(236, 236, 236, 1);
border-radius: 10px;
position: relative;
cursor: pointer;
}
.scenicSpotInfoManage .ad-one {
}
.scenicSpotInfoManage .ad-one {
display: none;
background: rgba(0, 0, 0, 0.4);
width: 100%;
......@@ -166,15 +191,17 @@
position: absolute;
top: 0;
z-index: 999;
}
.scenicSpotInfoManage .bigAdd {
}
.scenicSpotInfoManage .bigAdd {
font-size: 50px;
color: #d1d1d1;
position: absolute;
left: 45px;
top: 10px;
}
.scenicSpotInfoManage .imgzhe {
}
.scenicSpotInfoManage .imgzhe {
display: none;
background: rgba(0, 0, 0, 0.4);
width: 100%;
......@@ -184,14 +211,17 @@
border-radius: 10px;
position: absolute;
top: 0;
}
.scenicSpotInfoManage .reimg-add:hover .ad-one {
}
.scenicSpotInfoManage .reimg-add:hover .ad-one {
display: block;
}
.scenicSpotInfoManage .re-img:hover .imgzhe {
}
.scenicSpotInfoManage .re-img:hover .imgzhe {
display: block;
}
.scenicSpotInfoManage .ad-one div {
}
.scenicSpotInfoManage .ad-one div {
width: 32px;
height: 32px;
border-radius: 50%;
......@@ -199,59 +229,71 @@
text-align: center;
background: gray;
color: #fff;
}
.scenicSpotInfoManage .ad-one div:hover {
}
.scenicSpotInfoManage .ad-one div:hover {
background-color: #fff;
color: #e95252;
}
.scenicSpotInfoManage .re-upload {
}
.scenicSpotInfoManage .re-upload {
position: absolute;
top: 30px;
left: 30px;
}
.scenicSpotInfoManage .re-find {
}
.scenicSpotInfoManage .re-find {
position: absolute;
top: 30px;
right: 30px;
}
.scenicSpotInfoManage .search-imgicon {
}
.scenicSpotInfoManage .search-imgicon {
padding-right: 20px;
margin-left: -40px;
}
.scenicSpotInfoManage .resAddImg {
}
.scenicSpotInfoManage .resAddImg {
width: 520px;
padding-right: 45px;
}
.scenicSpotInfoManage .addimgContent {
}
.scenicSpotInfoManage .addimgContent {
height: 290px;
overflow: auto;
margin: 30px 0 30px 25px;
width: 545px;
}
.scenicSpotInfoManage .addimgDiv {
}
.scenicSpotInfoManage .addimgDiv {
width: 160px;
height: 155px;
float: left;
margin: 0 20px 15px 0;
overflow: hidden;
}
.scenicSpotInfoManage .addimgContent div:first-child {
}
.scenicSpotInfoManage .addimgContent div:first-child {
margin-left: 0;
}
.addimgContent div:nth-child(3n) {
}
.addimgContent div:nth-child(3n) {
margin-right: 0;
}
.scenicSpotInfoManage .itemImgdiv {
}
.scenicSpotInfoManage .itemImgdiv {
width: 160px;
height: 106px;
position: relative;
}
.scenicSpotInfoManage .itemImgdiv img {
}
.scenicSpotInfoManage .itemImgdiv img {
width: 100%;
height: 100%;
border-radius: 10px;
}
.scenicSpotInfoManage .imgseclet {
}
.scenicSpotInfoManage .imgseclet {
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.4);
......@@ -261,40 +303,48 @@
text-align: center;
line-height: 106px;
color: #e95252;
}
.icon-dagouyouquan {
}
.icon-dagouyouquan {
font-size: 25px;
}
.scenicSpotInfoManage .test-1::-webkit-scrollbar {
}
.scenicSpotInfoManage .test-1::-webkit-scrollbar {
width: 0px;
height: 0px;
background-color: #f5f5f5;
}
.scenicSpotInfoManage .test-1::-webkit-scrollbar-track {
}
.scenicSpotInfoManage .test-1::-webkit-scrollbar-track {
background-color: #f5f5f5;
}
.scenicSpotInfoManage .test-1::-webkit-scrollbar-thumb {
}
.scenicSpotInfoManage .test-1::-webkit-scrollbar-thumb {
border-radius: 20px;
background-color: #aaa;
margin-bottom: 24px;
}
.scenicSpotInfoManage .test-1:hover::-webkit-scrollbar {
}
.scenicSpotInfoManage .test-1:hover::-webkit-scrollbar {
width: 4px;
height: 4px;
background-color: #f5f5f5;
}
.scenicSpotInfoManage .addimg-btnlist {
}
.scenicSpotInfoManage .addimg-btnlist {
text-align: center;
}
.scenicSpotInfoManage .addimg-select {
}
.scenicSpotInfoManage .addimg-select {
font-size: 14px;
color: #999999;
float: right;
margin-bottom: 10px;
position: relative;
bottom: 20px;
}
.scenicSpotInfoManage .re-delte {
}
.scenicSpotInfoManage .re-delte {
width: 32px;
height: 32px;
background: gray;
......@@ -304,12 +354,14 @@
line-height: 32px;
color: #fff;
cursor: pointer;
}
.scenicSpotInfoManage .re-delte:hover {
}
.scenicSpotInfoManage .re-delte:hover {
color: #e95252;
background: #fff;
}
.scenicSpotInfoManage .imgDescription {
}
.scenicSpotInfoManage .imgDescription {
font-size: 12px;
margin-top: 12px;
color: #333333;
......@@ -320,81 +372,104 @@
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.scenicSpotInfoManage .el-upload-dragger {
}
.scenicSpotInfoManage .el-upload-dragger {
border: none;
}
.scenicSpotInfoManage .res-span span:last-child {
}
.scenicSpotInfoManage .res-span span:last-child {
display: inline;
}
.scenicSpotInfoManage .resourcerightTop span {
}
.scenicSpotInfoManage .resourcerightTop span {
display: inline-block;
}
.scenicSpotInfoManage .sheshi {
}
.scenicSpotInfoManage .sheshi {
margin-bottom: 20px;
}
.scenicSpotInfoManage .dialog-footer {
}
.scenicSpotInfoManage .dialog-footer {
padding-bottom: 30px;
}
.scenicSpotInfoManage .btn-list {
}
.scenicSpotInfoManage .btn-list {
margin: 0 0 40px 30px;
}
.scenicSpotInfoManage .input-with-select .el-input-group__prepend {
}
.scenicSpotInfoManage .input-with-select .el-input-group__prepend {
background-color: #fff;
}
.scenicSpotInfoManage .el-textarea__inner {
}
.scenicSpotInfoManage .el-textarea__inner {
resize: none;
height: 120px;
font-family: "微软雅黑";
}
.scenicSpotInfoManage .R1:focus {
}
.scenicSpotInfoManage .R1:focus {
border: 1px solid #e95252;
}
.scenicSpotInfoManage .el-form-item__label {
}
.scenicSpotInfoManage .el-form-item__label {
width: 96px;
font-size: 12px;
}
.scenicSpotInfoManage .el-form-item__error {
}
.scenicSpotInfoManage .el-form-item__error {
left: 100px;
}
.scenicSpotInfoManage .hotelDay {
}
.scenicSpotInfoManage .hotelDay {
margin-left: 10px;
}
.scenicSpotInfoManage .searchImgIcon {
}
.scenicSpotInfoManage .searchImgIcon {
cursor: pointer;
}
.scenicSpotInfoManage .el-dialog--center .el-dialog__body {
}
.scenicSpotInfoManage .el-dialog--center .el-dialog__body {
padding: 25px 25px 0;
}
.scenicSpotInfoManage .addressInput .el-input-group__append {
}
.scenicSpotInfoManage .addressInput .el-input-group__append {
border-top-right-radius: 17px;
border-bottom-right-radius: 17px;
}
.scenicSpotInfoManage ::-webkit-input-placeholder {
}
.scenicSpotInfoManage ::-webkit-input-placeholder {
color: #d1d1d1;
}
.scenicSpotInfoManage :-moz-placeholder {
}
.scenicSpotInfoManage :-moz-placeholder {
color: #d1d1d1;
}
.scenicSpotInfoManage ::-moz-placeholder {
}
.scenicSpotInfoManage ::-moz-placeholder {
color: #d1d1d1;
}
.scenicSpotInfoManage :-ms-input-placeholder {
}
.scenicSpotInfoManage :-ms-input-placeholder {
color: #d1d1d1;
}
.scenicSpotInfoManage .el-switch.is-checked .el-switch__core {
}
.scenicSpotInfoManage .el-switch.is-checked .el-switch__core {
border-color: #4bca81;
background-color: #4bca81;
}
.scenicSpotInfoManage .orderAdd {
}
.scenicSpotInfoManage .orderAdd {
position: relative;
width: 340px;
}
.scenicSpotInfoManage .minus:hover {
}
.scenicSpotInfoManage .minus:hover {
background-color: #cccccc;
cursor: pointer;
}
.scenicSpotInfoManage .minus {
}
.scenicSpotInfoManage .minus {
width: 34px;
height: 32px;
border: #dcdfe6;
......@@ -407,8 +482,9 @@
z-index: 999;
top: 4px;
background-color: #dcdfe6;
}
.scenicSpotInfoManage .addPeople {
}
.scenicSpotInfoManage .addPeople {
width: 34px;
height: 32px;
top: 4px;
......@@ -420,20 +496,24 @@
right: 41px;
border-radius: 50%;
z-index: 999;
}
.scenicSpotInfoManage .addPeople:hover {
}
.scenicSpotInfoManage .addPeople:hover {
background-color: #cccccc;
cursor: pointer;
}
.scenicSpotInfoManage .orderAdd .el-input__inner {
}
.scenicSpotInfoManage .orderAdd .el-input__inner {
padding-left: 90px;
}
.scenicSpotInfoManage .littleadd {
}
.scenicSpotInfoManage .littleadd {
font-size: 12px !important;
color: #fff;
display: inline-block;
}
.scenicSpotInfoManage .footabs {
}
.scenicSpotInfoManage .footabs {
width: 300px;
min-height: 34px;
border: 1px solid #d1d1d1;
......@@ -443,91 +523,110 @@
padding: 5px 10px;
display: flex;
flex-wrap: wrap;
}
.scenicSpotInfoManage .foodtips {
}
.scenicSpotInfoManage .foodtips {
display: inline-block;
padding: 3px 5px;
background-color: #efefef;
margin: 3px;
position: relative;
}
.scenicSpotInfoManage .toolOne {
}
.scenicSpotInfoManage .toolOne {
margin: 0 0 28px 38px;
display: flex;
}
.scenicSpotInfoManage .foodTipsDiv {
}
.scenicSpotInfoManage .foodTipsDiv {
max-width: 200px;
display: inline;
}
.scenicSpotInfoManage .wInput {
}
.scenicSpotInfoManage .wInput {
border: none;
height: 30px;
}
.scenicSpotInfoManage .wInput .el-input__inner {
}
.scenicSpotInfoManage .wInput .el-input__inner {
border: none !important;
height: 28px;
padding: 0;
border-radius: 0;
margin-top: 2px;
}
.scenicSpotInfoManage .delTips {
}
.scenicSpotInfoManage .delTips {
position: absolute;
right: -5px;
top: -5px;
cursor: pointer;
color: #999;
font-size: 14px;
}
.scenicSpotInfoManage .delTips:hover {
}
.scenicSpotInfoManage .delTips:hover {
color: #e95252;
}
.scenicSpotInfoManage .fanyong {
}
.scenicSpotInfoManage .fanyong {
font-size: 12px;
color: #666666;
margin-right: 10px;
}
.scenicSpotInfoManage .footabs .el-tag {
}
.scenicSpotInfoManage .footabs .el-tag {
margin: 0 5px 5px 0;
}
.scenicSpotInfoManage .footabs .el-input__inner {
}
.scenicSpotInfoManage .footabs .el-input__inner {
height: 30px;
position: relative;
}
.scenicSpotInfoManage .button-new-tag {
}
.scenicSpotInfoManage .button-new-tag {
height: 30px;
line-height: 30px;
padding-top: 0;
padding-bottom: 0;
}
.scenicSpotInfoManage .input-new-tag {
}
.scenicSpotInfoManage .input-new-tag {
width: 90px;
margin-left: 10px;
vertical-align: bottom;
}
.scenicSpotInfoManage .el-dialog--center .el-dialog__body {
}
.scenicSpotInfoManage .el-dialog--center .el-dialog__body {
padding: 15px 25px 0 !important;
}
.scenicSpotInfoManage .mapList {
}
.scenicSpotInfoManage .mapList {
width: 850px !important;
height: 510px !important;
}
.scenicSpotInfoManage .fanbili {
}
.scenicSpotInfoManage .fanbili {
margin-top: 8px;
}
.scenicSpotInfoManage .RabateDiv {
}
.scenicSpotInfoManage .RabateDiv {
margin-left: 10px;
}
.scenicSpotInfoManage .RebateCount {
}
.scenicSpotInfoManage .RebateCount {
height: 34px;
border-radius: 17px;
float: left;
}
.scenicSpotInfoManage .reOne,
.scenicSpotInfoManage .reTwo,
.scenicSpotInfoManage .dayNum {
}
.scenicSpotInfoManage .reOne,
.scenicSpotInfoManage .reTwo,
.scenicSpotInfoManage .dayNum {
position: relative;
}
.scenicSpotInfoManage .leftPnum {
}
.scenicSpotInfoManage .leftPnum {
float: left;
width: 50px;
height: 32px;
......@@ -539,24 +638,28 @@
top: 1px;
border-top-left-radius: 17px;
border-bottom-left-radius: 17px;
}
.scenicSpotInfoManage .toolInput {
}
.scenicSpotInfoManage .toolInput {
height: 34px;
padding-left: 5px;
border: none;
}
.scenicSpotInfoManage .inpuOne {
}
.scenicSpotInfoManage .inpuOne {
width: 135px;
padding-left: 55px;
border: 1px solid #d1d1d1;
border-right: none;
}
.scenicSpotInfoManage .inpuTwo {
}
.scenicSpotInfoManage .inpuTwo {
width: 166px;
padding: 0 45px 0 55px;
border: 1px solid #d1d1d1;
}
.scenicSpotInfoManage .percentCon {
}
.scenicSpotInfoManage .percentCon {
float: right;
width: 40px;
height: 32px;
......@@ -568,8 +671,9 @@
position: absolute;
right: 1px;
top: 1px;
}
.scenicSpotInfoManage .fanNum {
}
.scenicSpotInfoManage .fanNum {
float: left;
width: 50px;
height: 32px;
......@@ -579,19 +683,23 @@
position: absolute;
left: 1px;
top: 1px;
}
.scenicSpotInfoManage .fdTag {
}
.scenicSpotInfoManage .fdTag {
margin-top: 13px;
}
.scenicSpotInfoManage .addAddress .el-input__inner {
}
.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 {
}
.scenicSpotInfoManage .el-input-group__append {
border-top-right-radius: 0 !important;
border-bottom-right-radius: 0 !important;
}
}
</style>
<template>
<div class="flexOne scenicSpotInfoManage">
......@@ -607,23 +715,28 @@
</el-form-item>
<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 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-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)">
<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 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-select>
</el-form-item>
<el-form-item label="市">
<el-select placeholder="请选择市" filterable class='multiple_input w300' v-model="addMsg.City">
<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-select>
</el-form-item>
......@@ -632,9 +745,19 @@
<el-button slot="append" @click="selectAddress = true" icon="iconfont icon-img_dw"></el-button>
</el-input>
</el-form-item>
<el-form-item label="经纬度">
维度:{{addMsg.Lat}} 经度:{{addMsg.Lng}}
</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('restaurant.res_BusinessHours')" prop="OpeningHours">
<el-input type="text" v-model="addMsg.OpeningHours" maxlength="100" class="w300"></el-input>
</el-form-item>
......@@ -652,13 +775,16 @@
</el-select>
</el-form-item>
<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 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 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 v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
......@@ -691,13 +817,13 @@
<div class="RabateDiv clearfix">
<div class="RebateCount reOne">
<div class="leftPnum">{{$t('admin.admin_personNumber')}}></div>
<input type="text" class="toolInput inpuOne" v-model="addMsg.RebateCount" onkeyup="value=value.replace(/[^\d]/g,'')"
maxlength="20">
<input type="text" class="toolInput inpuOne" v-model="addMsg.RebateCount"
onkeyup="value=value.replace(/[^\d]/g,'')" maxlength="20">
</div>
<div class="RebateCount reTwo">
<div class="fanNum">{{$t('restaurant.res_return')}}</div>
<input type="text" class="toolInput inpuTwo" v-model="addMsg.RebateRatio" onkeyup="value=value.replace(/[^\d]/g,'')"
maxlength="20">
<input type="text" class="toolInput inpuTwo" v-model="addMsg.RebateRatio"
onkeyup="value=value.replace(/[^\d]/g,'')" maxlength="20">
<div class="percentCon">%</div>
</div>
</div>
......@@ -706,21 +832,25 @@
<div class="toolOne">
<span class="fdTag">{{$t('scen.sc_fdTag')}}</span>
<div class="footabs">
<el-tag :key="tag" v-for="tag in tipsList" closable :disable-transitions="false" @close="handleClose(tag)">{{tag}}</el-tag>
<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-tag :key="tag" v-for="tag in tipsList" closable :disable-transitions="false"
@close="handleClose(tag)">{{tag}}</el-tag>
<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-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 class="toolOne">
<span class="fdTag">{{$t('scen.sc_dlTag')}}</span>
<div class="footabs">
<el-tag :key="tag" v-for="tag in Geographic" closable :disable-transitions="false" @close="handleClose2(tag)">{{tag}}</el-tag>
<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-tag :key="tag" v-for="tag in Geographic" closable :disable-transitions="false"
@close="handleClose2(tag)">{{tag}}</el-tag>
<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-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>
<el-form-item :label="$t('restaurant.res_special')">
......@@ -750,12 +880,13 @@
<img v-if="!item" src="../../assets/img/bg_c3@3x.png">
<img :src="item.ShowPath" :onerror='defaultImg' />
<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.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
<i class="iconfont icon-zuoyi"></i>
</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>
</div>
</div>
......@@ -766,8 +897,8 @@
<i class="iconfont icon-img_haha bigAdd"></i>
<div class="ad-one">
<div class="re-upload">
<el-upload :file-list="fileList" :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<el-upload :file-list="fileList" :http-request="UploadImage" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<i class="iconfont icon-img_bdsc"></i>
</el-upload>
</div>
......@@ -780,7 +911,8 @@
</el-form>
</div>
<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 custom-class="mapList" title="地图选址" center :visible.sync="selectAddress">
......@@ -803,9 +935,9 @@
export default {
data() {
return {
imageOptions:{
navbar:false,
title:false
imageOptions: {
navbar: false,
title: false
},
//是否有权限操作支付方式
IsHaveAuth: 0,
......@@ -866,7 +998,7 @@
OpeningHours: "",
Tel: "",
TrafficInfo: "",
IsFree:0,
IsFree: 0,
Feature: "",
About: "",
BookingInfo: "",
......@@ -894,9 +1026,9 @@
AppointmentStyle: 0,
//支付方式
PayStyle: 0,
PlayTimeHour:"",//游玩小时
PlayTimeMinutes:"",//游玩分钟
IsIncludeLeader:0,//是否包含领队:0-包含,1-不包含
PlayTimeHour: "", //游玩小时
PlayTimeMinutes: "", //游玩分钟
IsIncludeLeader: 0, //是否包含领队:0-包含,1-不包含
},
rules: {
//表单必填验证
......@@ -940,18 +1072,18 @@
DMCchooseImg: DMCchooseImg
},
methods: {
inited (viewer){
inited(viewer) {
this.$viewer = viewer
},
showImg: function (src) {
let srcArr = src.split('?')
src = srcArr[0]
let isExsit=false
this.images.forEach(x=>{
if(x===src)
isExsit=true
let isExsit = false
this.images.forEach(x => {
if (x === src)
isExsit = true
})
if(!isExsit)
if (!isExsit)
this.images.push(src)
this.$viewer.show()
this.$viewer.view(this.images.indexOf(src))
......@@ -1105,8 +1237,7 @@
if (res.data.data.GeographicTag) {
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.isBook = this.addMsg.IsSelfBook;
......@@ -1354,4 +1485,5 @@
}
}
};
</script>
src/plug/index.js
View file @ 0805450c
......@@ -113,6 +113,7 @@ export default {
let domainUrl = '';
// domainUrl = "http://192.168.2.66:8025";
domainUrl = "http://192.168.2.17:8083";
domainUrl = "http://192.168.2.214:8082";
let locationName = window.location.hostname;
let javaUrldo="";
......@@ -144,9 +145,9 @@ export default {
//SocketUrl
WebSocketUrl: "ws://192.168.1.110:8080?account=",
//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地图图片地址
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",
//文件站点
......
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