Skip to content

S
SuperMan
Commit 7e915e1c authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 08a862b2 bb30d2fb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1498 additions and 614 deletions
src/assets/css/UpgradedVersion.css
View file @ 7e915e1c
...@@ -233,13 +233,13 @@ img { ...@@ -233,13 +233,13 @@ img {
height: 930px; height: 930px;
bottom: 290px; bottom: 290px;
left: 0; left: 0;
overflow: hidden;
} }
.featureHome-left-one img { .featureHome-left-one img {
width: 100%;
height: 100%; height: 100%;
display: block; display: block;
object-fit: cover; /* object-fit: cover; */
} }
.featureHome-right { .featureHome-right {
...@@ -457,9 +457,12 @@ img { ...@@ -457,9 +457,12 @@ img {
.MasterMapList-1 img { .MasterMapList-1 img {
left: 0; left: 0;
top: 0; top: 0;
width: 100%;
height: 100%; height: 100%;
object-fit: cover; /* object-fit: cover; */
}
.MasterMapList-1 img.width{
width: 100%;
height: auto;
} }
.MasterMapList-4 .MasterMapList-2 { .MasterMapList-4 .MasterMapList-2 {
...@@ -474,7 +477,7 @@ img { ...@@ -474,7 +477,7 @@ img {
} }
.MasterMapList-8-oneL { .MasterMapList-8-oneL {
width: 776px; width: 761px;
height: 427px; height: 427px;
} }
...@@ -492,7 +495,7 @@ img { ...@@ -492,7 +495,7 @@ img {
} }
.MasterMapList-8-oneR { .MasterMapList-8-oneR {
width: 240px; width: 244px;
} }
.MasterMapList-7 .MasterMapList-8-oneR { .MasterMapList-7 .MasterMapList-8-oneR {
...@@ -552,8 +555,8 @@ img { ...@@ -552,8 +555,8 @@ img {
} }
.UpgradedVersionDetails-imgOne { .UpgradedVersionDetails-imgOne {
left: 0; /* left: 0;
top: 0; top: 0; */
width: 312px; width: 312px;
height: 312px; height: 312px;
border-radius: 50%; border-radius: 50%;
...@@ -563,9 +566,9 @@ img { ...@@ -563,9 +566,9 @@ img {
.UpgradedVersionDetails-imgOne img { .UpgradedVersionDetails-imgOne img {
left: 0; left: 0;
top: 0; top: 0;
width: 100%; /* width: 100%; */
height: 100%; height: 100%;
object-fit: cover; /* object-fit: cover; */
} }
.UpgradedVersionDetails-detailsTop { .UpgradedVersionDetails-detailsTop {
...@@ -573,7 +576,7 @@ img { ...@@ -573,7 +576,7 @@ img {
height: 56px; height: 56px;
background: url("http://imgfile.oytour.com/Static/NewTripFeature/detailsTop.png") no-repeat center; background: url("http://imgfile.oytour.com/Static/NewTripFeature/detailsTop.png") no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
left: 136px; left: 146px;
bottom: -84px; bottom: -84px;
} }
...@@ -655,8 +658,8 @@ img { ...@@ -655,8 +658,8 @@ img {
} }
.UpgradedVersionDetails1 { .UpgradedVersionDetails1 {
left: 16px; left: 11px;
top: 122px; top: 155px;
} }
/**/ /**/
...@@ -884,9 +887,13 @@ img { ...@@ -884,9 +887,13 @@ img {
.subIdeImg1relative img { .subIdeImg1relative img {
left: 0; left: 0;
top: 0; top: 0;
width: 100%; /* width: 100%; */
height: 100%; height: 100%;
object-fit: cover; /* object-fit: cover; */
}
.subIdeImg1relative img.width{
width: 100%;
height: auto;
} }
.subIdeImgForm1Box { .subIdeImgForm1Box {
...@@ -1123,3 +1130,9 @@ img { ...@@ -1123,3 +1130,9 @@ img {
bottom: 0; bottom: 0;
color: #e95252; color: #e95252;
} }
.cursorInitial{
cursor: initial
}
.UpgradedVersion-box>img{
pointer-events: none !important;
}
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 7e915e1c
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.rb_top_row ._r_time span{color: #333333} .rb_top_row ._r_time span{color: #333333}
._r_mb5{margin-bottom: 5px;} ._r_mb5{margin-bottom: 5px;}
.Receipt_table{width: 100%;font-size: 14px;text-align: center} .Receipt_table{width: 100%;font-size: 14px;text-align: center}
.Receipt_table th{font-weight: 200 !important} /* .Receipt_table th{font-weight: 200 !important} */
.Receipt_table tr th,.Receipt_table tr td{background-color: white} .Receipt_table tr th,.Receipt_table tr td{background-color: white}
._r_mt10{margin-top: 10px;} ._r_mt10{margin-top: 10px;}
.Receipt_box.color_blur{color: #106BAF;} .Receipt_box.color_blur{color: #106BAF;}
......
src/components/LeaveGroupDownload/ItineraryFeatures.vue
View file @ 7e915e1c
<template> <template>
<div id="pdf_2"> <div id="pdf_2" v-if="vshowC">
<div class="template-box"> <div class="template-box">
<div id="gernalCanvas" style="margin:auto;width:100%" v-html="feature.featureHtml"> <div class="slider" v-if="showType==1">
</div> <img v-for="(i,index) in feature.featureImgList" :key="index" :src="i.url" style="width:100%;">
</div>
<div class="zidingyi" v-if="showType==3">
<div v-html="feature.featureContent"></div>
</div>
<div v-if="showType>=4" id="gernalCanvas" style="margin:auto;width:100%" v-html="feature.featureHtml">
</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -14,6 +20,8 @@ ...@@ -14,6 +20,8 @@
}, },
props: [ props: [
'feature', 'feature',
'vshowC',
'showType'
], ],
data() { data() {
return { return {
...@@ -41,4 +49,3 @@ ...@@ -41,4 +49,3 @@
}; };
</script> </script>
src/components/LeaveGroupDownload/TourFareDescription.vue
View file @ 7e915e1c
<template> <template>
<div id="pdf_5"> <div id="pdf_5">
<div class="module-title"> <div class="module-title" v-if='vshowE'>
<div <div style="font-size:36px;margin-top:40px;text-align:center;margin-bottom:20px;">
style="font-size:36px;margin-top:40px;text-align:center;margin-bottom:20px;"
>
团费说明 团费说明
</div> </div>
</div> </div>
...@@ -48,9 +46,7 @@ ...@@ -48,9 +46,7 @@
</div> </div>
<template v-if='vshowF&&(feature.shopRemark||(dataList.shopList && dataList.shopList.length>0&&vshowF))'> <template v-if='vshowF&&(feature.shopRemark||(dataList.shopList && dataList.shopList.length>0&&vshowF))'>
<div class="module-title"> <div class="module-title">
<div <div style="font-size:36px;margin-top:40px;text-align:center;margin-bottom:20px;">
style="font-size:36px;margin-top:40px;text-align:center;margin-bottom:20px;"
>
购物说明 购物说明
</div> </div>
</div> </div>
......
src/components/LeaveGroupDownload/VisaInformation.vue
View file @ 7e915e1c
<template> <template>
<div id="pdf_6"> <div id="pdf_6">
<div class="module-title" v-if="vshowG"> <div class="module-title" v-if="vshowG">
<div <div style="font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;">
style="font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;"
>
签证 签证
</div> </div>
</div> </div>
...@@ -17,10 +15,19 @@ ...@@ -17,10 +15,19 @@
<div v-html="feature.visaRemark"></div> <div v-html="feature.visaRemark"></div>
</div> </div>
</div> </div>
<div v-if='vshowI' class="module-title">
<div style="font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;">
同行备注
</div>
</div>
<div v-if='vshowI' class="expense">
<div class="left"></div>
<div class="right">
<div v-html="feature.b2BRemark"></div>
</div>
</div>
<div class="module-title" v-if="vshowM"> <div class="module-title" v-if="vshowM">
<div <div style="font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;">
style="font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;"
>
旅客信息 旅客信息
</div> </div>
</div> </div>
...@@ -52,27 +59,28 @@ ...@@ -52,27 +59,28 @@
</template> </template>
<script> <script>
import Header from "./components/header"; import Header from "./components/header";
export default { export default {
components: { components: {
Header Header
}, },
props: ["vshowG", "vshowM","vshowJ", "feature","orderMsg"], props: ["vshowG", "vshowM", "vshowJ", "feature", "orderMsg", "vshowI"],
data() { data() {
return {}; return {};
}, },
methods: {},
computed: {},
watch: {
feature: {
handler(val, oldVal) {},
deep: true,
immediate: true
}
},
mounted() {}
};
methods: {},
computed: {},
watch: {
feature: {
handler(val, oldVal) {},
deep: true,
immediate: true
}
},
mounted() {}
};
</script> </script>
<style></style> <style></style>
src/components/LeaveGroupDownload/index.vue
View file @ 7e915e1c
...@@ -71,10 +71,10 @@ ...@@ -71,10 +71,10 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="trip-v3-title small-margin"> <div class="trip-v3-title small-margin" v-if="vshowL">
<h2>集合地点&amp;联系人</h2> <h2>集合地点&amp;联系人</h2>
</div> </div>
<table class="baseTable trip-v3-base"> <table class="baseTable trip-v3-base" v-if="vshowL">
<tbody> <tbody>
<tr> <tr>
<td class="essential-item jianju"> <td class="essential-item jianju">
......
src/components/TravelManager/TravelList/OpTripList.vue
View file @ 7e915e1c
...@@ -128,9 +128,9 @@ ...@@ -128,9 +128,9 @@
<el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary"> <el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">
{{$t('Operation.Op_tripUpdate')}}</el-button> {{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button> <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary"> <el-button @click="goUrlR('confirmationOrderDownLoadNew',item)" type="primary">
{{$t('Operation.Op_tripDownLoad')}}</el-button> {{$t('Operation.Op_tripDownLoad')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary"> <el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">
{{$t('system.table_delete')}}</el-button> {{$t('system.table_delete')}}</el-button>
......
src/components/TravelManager/TravelList/SaleTripList.vue
View file @ 7e915e1c
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<li> <li>
<span> <span>
<em>{{$t('visa.v_tuanhao')}}</em> <em>{{$t('visa.v_tuanhao')}}</em>
<el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150" <el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
...@@ -101,12 +101,12 @@ ...@@ -101,12 +101,12 @@
<div class="el-col"> <div class="el-col">
<div class="d7"> <div class="d7">
<el-button v-if="item.CreateBy==CurrentUserId && item.ShareTeamType<0" @click="goToOpenTravel('TravelManager3',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button> <el-button v-if="item.CreateBy==CurrentUserId && item.ShareTeamType<0" @click="goToOpenTravel('TravelManager3',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
<!-- <el-button v-if="item.CreateBy==CurrentUserId" @click="goToOpenTravel('TravelManager5',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button> --> <!-- <el-button v-if="item.CreateBy==CurrentUserId" @click="goToOpenTravel('TravelManager5',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button> -->
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button> <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button> <el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
<!-- <el-button @click="goUrlR('SalesconfirmationOrder',item)" type="primary">行程下载</el-button> --> <!-- <el-button @click="goUrlR('SalesconfirmationOrder',item)" type="primary">行程下载</el-button> -->
<el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary"> <el-button @click="goUrlR('confirmationOrderDownLoadNew',item)" type="primary">
{{$t('Operation.Op_tripDownLoad')}}</el-button> {{$t('Operation.Op_tripDownLoad')}}</el-button>
</div> </div>
</div> </div>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 7e915e1c
...@@ -1086,7 +1086,7 @@ ...@@ -1086,7 +1086,7 @@
@click.native="goTeamBalance(item.TCID,item.OutBranchId)"> @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
{{$t('Operation.Op_shouzhiDetail')}} {{$t('Operation.Op_shouzhiDetail')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item)"> <el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoadNew',item)">
{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item> {{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}} <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
</el-dropdown-item> </el-dropdown-item>
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 7e915e1c
...@@ -783,7 +783,7 @@ ...@@ -783,7 +783,7 @@
<el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)"> <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
{{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item> {{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item>
<el-dropdown-item <el-dropdown-item
@click.native="goUrlR('confirmationOrderDownLoad',item)"> @click.native="goUrlR('confirmationOrderDownLoadNew',item)">
{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item> {{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}} <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
</el-dropdown-item> </el-dropdown-item>
...@@ -1558,7 +1558,7 @@ ...@@ -1558,7 +1558,7 @@
} }
}); });
}, },
goUrlR(path, TCID, ConfigId, cityId) { goUrlR(path, item) {
var cityId = item.StartCityID; var cityId = item.StartCityID;
if (item.IsUnion == 1 && item.UnionTypeStr == 2) { if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
cityId = item.UnionCityId; cityId = item.UnionCityId;
......
src/components/commonPage/TripDownLoadCommon.vue
View file @ 7e915e1c
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
data() { data() {
return { return {
TripLayer: {}, TripLayer: {},
TripPath: "confirmationOrderDownLoad" TripPath: "confirmationOrderDownLoadNew"
}; };
}, },
methods: { methods: {
......
src/components/newTravelmanager/TravelGroupControl/TravelNotice.vue
View file @ 7e915e1c
...@@ -60,7 +60,8 @@ ...@@ -60,7 +60,8 @@
<td> <td>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start" <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start"
v-if="(selfItem.IsShow==0)"> v-if="(selfItem.IsShow==0)">
<el-button type="primary" icon="el-icon-edit" circle @click="getCityList('',selfItem),SelfpayingShow(selfItem)"></el-button> <el-button type="primary" icon="el-icon-edit" circle
@click="getCityList('',selfItem),SelfpayingShow(selfItem)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start" <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="selfItem.IsShow==1"> v-if="selfItem.IsShow==1">
...@@ -367,6 +368,9 @@ ...@@ -367,6 +368,9 @@
var qmsg = { var qmsg = {
QCountry: this.CountryID QCountry: this.CountryID
}; };
if (this.PostConfig.LineId == 168) {
qmsg.QCountry = "";
}
this.apipost( this.apipost(
"Shopping_Post_GetList", "Shopping_Post_GetList",
qmsg, qmsg,
...@@ -467,14 +471,13 @@ ...@@ -467,14 +471,13 @@
CodeLevel: 3, CodeLevel: 3,
Name: '', Name: '',
}; };
if(selfItem.CityName!='') if (selfItem.CityName != '') {
{ postMsg.Name = selfItem.CityName;
postMsg.Name = selfItem.CityName;
} }
if (query != '') { if (query != '') {
postMsg.Name = query; postMsg.Name = query;
} }
this.apipost("dict_get_Destination_GetCityExtList", postMsg, res => { this.apipost("dict_get_Destination_GetCityExtList", postMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
selfItem.CityList = res.data.data; selfItem.CityList = res.data.data;
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @ 7e915e1c
...@@ -7,23 +7,31 @@ ...@@ -7,23 +7,31 @@
:isDeletePage="FeatureData.isDeletePage" :pagesType="3" @toAddPages="toAddPages" :isDeletePage="FeatureData.isDeletePage" :pagesType="3" @toAddPages="toAddPages"
@toDeletePages="toDeletePages"> @toDeletePages="toDeletePages">
</FeatureControls> </FeatureControls>
<input type="file" style="display:none" :id="'GouDetaFile_'+(index * 2 + 1)+'_0'" @change="uploadpic">
</div> </div>
</div> </div>
<div class="UpgradedVersionDetails-box column" v-for="(item,i) in FeatureData.dataObj.SubList"> <div class="UpgradedVersionDetails-box column" v-for="(item,i) in FeatureData.dataObj.SubList">
<div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover"> <div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover">
<div class="UpgradedVersionDetails-img relative"> <div class="UpgradedVersionDetails-img relative">
<div class="UpgradedVersionDetails1 absolute z-index1"> <div class="UpgradedVersionDetails1 absolute z-index3">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'column'" isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" isImg="1" :isUploadImg="true"
:isSelectImg="true" @toUploadImg="UploadImg(i)" @toSelectImg="SelectImg(i)" @toAddImg="AddImg" :isSelectImg="true" @toUploadImg="UploadImg(i)" @toSelectImg="SelectImg(i)" @toAddImg="AddImg"
@toDeleteImg="DeleteImg(i)" /> @toDeleteImg="DeleteImg(i)" :x="312" :y="312" />
<input type="file" style="display:none" :id="'GouDetaFile_'+(FeatureData * 2 + 1)+'_'+i+'_'+index" @change="uploadpic">
</div> </div>
<div class="UpgradedVersionDetails-imgOne bjE6"> <div class="UpgradedVersionDetails-imgOne relative bjE6"
<template v-if="item.ImgList&&item.ImgList.length>0"> :id="'viewSpotBox_' + (FeatureData * 4) +'_deta_'+i+index">
<img :src="item.ImgList[0].url" /> <VueDraggableResizable v-if="item.ImgList&&item.ImgList.length>0"
</template> :w="312" :h="312"
:ref="'viewSpotVds_' + FeatureData * 4 + '_deta_'+i+index"
tabindex="0" :resizable="false" :active="false" :parent="false" axis="x"
@activated="onActivated(FeatureData * 4, i)" :x="item.ImgList[0].x"
:y="item.ImgList[0].y" :z="2" @dragstop="onViewSpotDragstopX">
<img v-if="item.ImgList[0].url" :src="item.ImgList[0].url"
:id="'viewSpotImg_' + FeatureData * 4 + '_deta_'+i+index"/>
<!-- <img :src="item.ImgList[0].url" :id="'viewSpotImg_' + FeatureData * 4 + 'deta_'+i+index"/> -->
</VueDraggableResizable>
<template v-else> <template v-else>
<img src="http://imgfile.oytour.com/Static/NewTripFeature/homeBj.png" /> <img src="http://imgfile.oytour.com/Static/NewTripFeature/homeBj.png"/>
</template> </template>
</div> </div>
<div class="UpgradedVersionDetails-detailsTop absolute"></div> <div class="UpgradedVersionDetails-detailsTop absolute"></div>
...@@ -66,12 +74,14 @@ ...@@ -66,12 +74,14 @@
import vEditDiv from "../TravelTemp/VEditDiv"; import vEditDiv from "../TravelTemp/VEditDiv";
import FeatureControls from "./components/featureControls"; import FeatureControls from "./components/featureControls";
import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue"; import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue";
import VueDraggableResizable from "vue-draggable-resizable";
export default { export default {
components: { components: {
DMCchooseImg, DMCchooseImg,
MasterMapList, MasterMapList,
vEditDiv, vEditDiv,
FeatureControls, FeatureControls,
VueDraggableResizable
}, },
props: [ props: [
'index', 'index',
...@@ -102,12 +112,67 @@ ...@@ -102,12 +112,67 @@
}, },
isShowScenicImg: false, isShowScenicImg: false,
MasterMapIndex: null, //主图下标 MasterMapIndex: null, //主图下标
imgIndex:null
}; };
}, },
methods: { methods: {
onActivated(i, j) {
this.imgIndex = j;
},
onViewSpotDragstopX(x,y) {
let imgWidth = document.querySelector(
"#viewSpotImg_" + (this.FeatureItem * 4) + "_deta_"+this.imgIndex + this.index
).width;
let boxWidth = document.querySelector(
"#viewSpotBox_" + (this.FeatureItem * 4) + "_deta_"+this.imgIndex + this.index
).offsetWidth;
let cha = boxWidth - imgWidth;
if (cha <= 0) {
if (x < 0 && x < cha) {
x = cha;
} else if (x > 0) {
x = 0;
}
} else {
if (x < 0) {
x = 0;
} else if (x > 0 && x > cha) {
x = cha;
}
}
this.FeatureData.dataObj.SubList[this.imgIndex].x = x;
this.$refs["viewSpotVds_" + (this.FeatureData * 4) + "_deta_"+this.imgIndex + this.index][0]._data.left = x;
},
onViewSpotDragstop(x, y) {
let imgHeight = document.querySelector(
"#viewSpotImg_" + (this.FeatureData * 4)+ "_deta_"+this.imgIndex + this.index
).height;
let boxHeight = document.querySelector(
"#viewSpotBox_" + (this.FeatureData * 4)+ "_deta_"+this.imgIndex + this.index
).offsetHeight;
let cha = boxHeight - imgHeight;
if (cha <= 0) {
if (y < 0 && y < cha) {
y = cha;
} else if (y > 0) {
y = 0;
}
} else {
if (y < 0) {
y = 0;
} else if (y > 0 && y > cha) {
y = cha;
}
}
this.FeatureData.dataObj.SubList[this.imgIndex].y = y;
this.$refs[
"viewSpotVds_" + (this.FeatureData * 4)+ "_deta_"+this.imgIndex + this.index
][0]._data.top = y;
},
UploadImg(index) { UploadImg(index) {
this.MasterMapIndex = index this.MasterMapIndex = index
document.querySelector(`#GouDetaFile_${(this.index * 2 + 1)}_0`).click(); document.querySelector(`#GouDetaFile_${(this.FeatureData * 2 + 1)}_${index}_${this.index}`).click();
}, },
uploadpic(e) { uploadpic(e) {
let that = this; let that = this;
...@@ -125,6 +190,8 @@ ...@@ -125,6 +190,8 @@
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath; let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2]; let i = e.target.id.split("_")[2];
that.FeatureData.dataObj.SubList[that.MasterMapIndex].ImgList[0].url = allPath that.FeatureData.dataObj.SubList[that.MasterMapIndex].ImgList[0].url = allPath
that.FeatureData.dataObj.SubList[that.MasterMapIndex].ImgList[0].x = 0
that.FeatureData.dataObj.SubList[that.MasterMapIndex].ImgList[0].y = 0
that.$message.success('上传成功'); that.$message.success('上传成功');
}); });
}; };
...@@ -158,6 +225,8 @@ ...@@ -158,6 +225,8 @@
getDMCimg(selectImgArr) { getDMCimg(selectImgArr) {
let Path = selectImgArr[0].Path let Path = selectImgArr[0].Path
this.FeatureData.dataObj.SubList[this.MasterMapIndex].ImgList[0].url = Path this.FeatureData.dataObj.SubList[this.MasterMapIndex].ImgList[0].url = Path
this.FeatureData.dataObj.SubList[this.MasterMapIndex].ImgList[0].x = 0
this.FeatureData.dataObj.SubList[this.MasterMapIndex].ImgList[0].y = 0
this.isShowScenicImg = false this.isShowScenicImg = false
} }
}, },
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @ 7e915e1c
<template> <template>
<div class="featureControls"> <div class="featureControls">
<div class="row-aic featureControls-bottom featureControls-bottomOne" v-if="ControlsType=='row'"> <div class="row-aic featureControls-bottom featureControls-bottomOne" v-if="ControlsType=='row'">
<el-tooltip class="item" effect="dark" content="上传图" placement="top"> <el-tooltip class="item" effect="dark" content="上传图" placement="top">
<div @click="toUploadImg" v-if="isUploadImg"> <div @click="toUploadImg" v-if="isUploadImg">
<i class="el-icon-upload2"></i> <i class="el-icon-upload2"></i>
...@@ -22,6 +21,9 @@ ...@@ -22,6 +21,9 @@
<i class="el-icon-delete"></i> <i class="el-icon-delete"></i>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="尺寸" placement="top" v-if="x&&y">
<div class="cursorInitial fz14">{{x}} * {{y}}</div>
</el-tooltip>
</div> </div>
<div class="column featureControls-bottom featureControls-bottomTwo" v-else> <div class="column featureControls-bottom featureControls-bottomTwo" v-else>
<template v-if="!isImg&&!isTemplate"> <template v-if="!isImg&&!isTemplate">
...@@ -74,7 +76,7 @@ ...@@ -74,7 +76,7 @@
}, },
props: ['index', 'FeatureData', 'ControlsType','isImg', 'pagesType', 'isDeletePage', props: ['index', 'FeatureData', 'ControlsType','isImg', 'pagesType', 'isDeletePage',
'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template' 'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template','x','y'
], ],
data() { data() {
return { return {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @ 7e915e1c
...@@ -59,31 +59,56 @@ ...@@ -59,31 +59,56 @@
<div class="UpgradedVersion-subIdeImgForm1 absolute z-index2" <div class="UpgradedVersion-subIdeImgForm1 absolute z-index2"
:class="[Template==1?'':Template==2?'subIdeImgForm2':'subIdeImgForm3']"> :class="[Template==1?'':Template==2?'subIdeImgForm2':'subIdeImgForm3']">
<div class="subIdeImg1 bjE6 UpgradedVersion-Hover"> <div class="subIdeImg1 bjE6 UpgradedVersion-Hover">
<div class="subIdeImg1relative relative UpgradedVersion-Hover"> <div class="subIdeImg1relative relative UpgradedVersion-Hover"
<div class="subIdeImgForm1Box absolute"> :id="'viewSpotBox_' + (FeatureData * 4) + 'subheading_0'+index">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isImg="1" :isUploadImg="true" <div class="subIdeImgForm1Box absolute z-index3">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="Template>2?178:250" :y="187" />
</div> </div>
<template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>0"> <!-- <img :src="FeatureData.dataObj.SubList[0].url" /> -->
<img :src="FeatureData.dataObj.SubList[0].url" /> <VueDraggableResizable v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>0&&Template!=3"
</template> :w="Template>2?178:250" :h="187"
:ref="'viewSpotVds_' + FeatureData * 4 + 'subheading_0'+index"
tabindex="0" :resizable="false" :active="false" :parent="false" axis="y"
@activated="onActivated(FeatureData * 4, 0)" :x="FeatureData.dataObj.SubList[0].x"
:y="FeatureData.dataObj.SubList[0].y" :z="2" @dragstop="onViewSpotDragstop">
<img v-if="FeatureData.dataObj.SubList[0].url" class="absolute" :src="FeatureData.dataObj.SubList[0].url"
:id="'viewSpotImg_' + FeatureData * 4 + 'subheading_0'+index"/>
</VueDraggableResizable>
<VueDraggableResizable v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>0&&Template==3"
:w="Template>2?178:250" :h="187"
:ref="'viewSpotVds_' + FeatureData * 4 + 'subheading_0'+index"
tabindex="0" :resizable="false" :active="false" :parent="false" axis="x"
@activated="onActivated(FeatureData * 4, 0)" :x="FeatureData.dataObj.SubList[0].x"
:y="FeatureData.dataObj.SubList[0].y" :z="2" @dragstop="onViewSpotDragstopX">
<img v-if="FeatureData.dataObj.SubList[0].url" class="absolute" :src="FeatureData.dataObj.SubList[0].url"
:id="'viewSpotImg_' + FeatureData * 4 + 'subheading_0'+index"/>
</VueDraggableResizable>
</div> </div>
</div> </div>
</div> </div>
<!-- subIdeImgForm2-two 食 subIdeImgForm3-two 景 --> <!-- subIdeImgForm2-two 食 subIdeImgForm3-two 景 -->
<div class="UpgradedVersion-subIdeImgForm1 absolute z-index2" <div class="UpgradedVersion-subIdeImgForm1 absolute z-index2"
:class="[Template==1?'':Template==2?'subIdeImgForm2-two':'subIdeImgForm3-two']"> :class="[Template==1?'':Template==2?'subIdeImgForm2-two':'subIdeImgForm3-two']">
<div class="subIdeImg1 bjE6 UpgradedVersion-Hover"> <div class="subIdeImg1 bjE6 UpgradedVersion-Hover"
:id="'viewSpotBox_' + (FeatureData * 4) + 'subheading_1'+index">
<div class="subIdeImg1relative relative"> <div class="subIdeImg1relative relative">
<div class="subIdeImgForm1Box absolute"> <div class="subIdeImgForm1Box absolute z-index3">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" :x="Template==1?331:250" :y="187" />
</div> </div>
<template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>1 "> <VueDraggableResizable v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>1"
<img :src="FeatureData.dataObj.SubList[1].url" /> :w="Template==1?331:250" :h="187"
</template> :ref="'viewSpotVds_' + FeatureData * 4 + 'subheading_1'+index"
tabindex="0" :resizable="false" :active="false" :parent="false" axis="y"
@activated="onActivated(FeatureData * 4, 1)" :x="FeatureData.dataObj.SubList[1].x"
:y="FeatureData.dataObj.SubList[1].y" :z="2" @dragstop="onViewSpotDragstop">
<img v-if="FeatureData.dataObj.SubList[1].url" class="absolute"
:class="[Template==1?'width':'']" :src="FeatureData.dataObj.SubList[1].url"
:id="'viewSpotImg_' + FeatureData * 4 + 'subheading_1'+index"/>
</VueDraggableResizable>
</div> </div>
</div> </div>
</div> </div>
...@@ -104,10 +129,12 @@ ...@@ -104,10 +129,12 @@
<script> <script>
import vEditDiv from "../../TravelTemp/VEditDiv"; import vEditDiv from "../../TravelTemp/VEditDiv";
import FeatureControls from "./featureControls"; import FeatureControls from "./featureControls";
import VueDraggableResizable from "vue-draggable-resizable";
export default { export default {
components: { components: {
vEditDiv, vEditDiv,
FeatureControls FeatureControls,
VueDraggableResizable
}, },
props: [ props: [
'Template', 'Template',
...@@ -118,10 +145,66 @@ ...@@ -118,10 +145,66 @@
], ],
data() { data() {
return { return {
currentIndex: null,
imgIndex: null
}; };
}, },
methods: { methods: {
onActivated(i, j) {
this.currentIndex = i;
this.imgIndex = j;
},
onViewSpotDragstopX(x,y) {
let imgWidth = document.querySelector(
"#viewSpotImg_" + (this.FeatureItem * 4) + "subheading_"+this.imgIndex + this.index
).width;
let boxWidth = document.querySelector(
"#viewSpotBox_" + (this.FeatureItem * 4) + "subheading_"+this.imgIndex + this.index
).offsetWidth;
let cha = boxWidth - imgWidth;
if (cha <= 0) {
if (x < 0 && x < cha) {
x = cha;
} else if (x > 0) {
x = 0;
}
} else {
if (x < 0) {
x = 0;
} else if (x > 0 && x > cha) {
x = cha;
}
}
this.FeatureData.dataObj.SubList[this.imgIndex].x = x;
this.$refs["viewSpotVds_" + (this.FeatureData * 4) + "subheading_"+this.imgIndex + this.index]._data.left = x;
},
onViewSpotDragstop(x, y) {
let imgHeight = document.querySelector(
"#viewSpotImg_" + (this.FeatureData * 4)+ "subheading_"+this.imgIndex + this.index
).height;
let boxHeight = document.querySelector(
"#viewSpotBox_" + (this.FeatureData * 4)+ "subheading_"+this.imgIndex + this.index
).offsetHeight;
let cha = boxHeight - imgHeight;
if (cha <= 0) {
if (y < 0 && y < cha) {
y = cha;
} else if (y > 0) {
y = 0;
}
} else {
if (y < 0) {
y = 0;
} else if (y > 0 && y > cha) {
y = cha;
}
}
this.FeatureData.dataObj.SubList[this.imgIndex].y = y;
this.$refs[
"viewSpotVds_" + (this.FeatureData * 4)+ "subheading_"+this.imgIndex + this.index
]._data.top = y;
},
toUploadImg(index) { toUploadImg(index) {
this.$emit('toUploadImg', index, '模版图') this.$emit('toUploadImg', index, '模版图')
}, },
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @ 7e915e1c
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
<div class="featureHome-vToolBar-one absolute z-index3"> <div class="featureHome-vToolBar-one absolute z-index3">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg" :isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg"
@toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls> @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"
:x="697" :y="930"></FeatureControls>
<input type="file" style="display:none" :id="'homefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic"> <input type="file" style="display:none" :id="'homefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<div class="featureHome-vToolBar-two absolute z-index3"> <div class="featureHome-vToolBar-two absolute z-index3">
...@@ -27,10 +28,15 @@ ...@@ -27,10 +28,15 @@
</FeatureControls> </FeatureControls>
</div> </div>
<div class="featureHome-left-one bjF6 absolute z-index2"> <div class="featureHome-left-one bjF6 absolute z-index2" :id="'viewSpotBox_' + (FeatureItem * 4 + 1) + '_' +index">
<template v-if="FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0"> <VueDraggableResizable v-if="FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0"
<img :src="FeatureItem.dataObj.ImgList[0].url" /> :w="697" :h="930"
</template> :ref="'viewSpotVds_' + (FeatureItem * 4 + 1) + '_'+index" tabindex="0" :resizable="false" :active="false"
:parent="false" axis="x" @activated="onActivated(FeatureItem * 4 + 1, index)"
:x="FeatureItem.dataObj.ImgList[0].x" :y="0" :z="2" @dragstop="onViewSpotDragstopY">
<img :src="FeatureItem.dataObj.ImgList[0].url"
:id="'viewSpotImg_' + (FeatureItem * 4 + 1) + '_'+index"/>
</VueDraggableResizable>
</div> </div>
<div class="featureHome-left-two absolute z-index1" :style="{'background':TripColor}"> <div class="featureHome-left-two absolute z-index1" :style="{'background':TripColor}">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.DetailsName"></vEditDiv> <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.DetailsName"></vEditDiv>
...@@ -81,11 +87,13 @@ ...@@ -81,11 +87,13 @@
import vEditDiv from "../TravelTemp/VEditDiv"; import vEditDiv from "../TravelTemp/VEditDiv";
import FeatureControls from "./components/featureControls"; import FeatureControls from "./components/featureControls";
import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue"; import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue";
import VueDraggableResizable from "vue-draggable-resizable";
export default { export default {
components: { components: {
vEditDiv, vEditDiv,
FeatureControls, FeatureControls,
DMCchooseImg DMCchooseImg,
VueDraggableResizable
}, },
props: [ props: [
'TripColor', 'TripColor',
...@@ -103,10 +111,40 @@ ...@@ -103,10 +111,40 @@
queryName: '', queryName: '',
queryId: 0, queryId: 0,
}, },
borderBox: '' borderBox: '',
currentIndex: null,
imgIndex: null
}; };
}, },
methods: { methods: {
onActivated(i, j) {
this.currentIndex = i;
this.imgIndex = j;
},
onViewSpotDragstopY(x, y) {
let imgWidth = document.querySelector(
"#viewSpotImg_" + (this.FeatureItem * 2 + 1) + "_" + this.index
).width;
let boxWidth = document.querySelector(
"#viewSpotBox_" + (this.FeatureItem * 2 + 1) + "_" + this.index
).offsetWidth;
let cha = boxWidth - imgWidth;
if (cha <= 0) {
if (x < 0 && x < cha) {
x = cha;
} else if (x > 0) {
x = 0;
}
} else {
if (x < 0) {
x = 0;
} else if (x > 0 && x > cha) {
x = cha;
}
}
this.FeatureItem.dataObj.ImgList[0].x = x;
this.$refs["viewSpotVds_" + (this.FeatureItem * 2 + 1) + "_" + this.index]._data.left = x;
},
UploadImg() { UploadImg() {
document.querySelector(`#homefile_${(this.FeatureItem * 2 + 1)}_${this.index}`).click(); document.querySelector(`#homefile_${(this.FeatureItem * 2 + 1)}_${this.index}`).click();
}, },
...@@ -126,6 +164,8 @@ ...@@ -126,6 +164,8 @@
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath; let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2]; let i = e.target.id.split("_")[2];
that.FeatureItem.dataObj.ImgList[0].url = allPath that.FeatureItem.dataObj.ImgList[0].url = allPath
that.FeatureItem.dataObj.ImgList[0].x = 0
that.FeatureItem.dataObj.ImgList[0].y = 0
that.$message.success('上传成功'); that.$message.success('上传成功');
}); });
}; };
...@@ -152,6 +192,8 @@ ...@@ -152,6 +192,8 @@
}, },
getDMCimg(selectImgArr) { getDMCimg(selectImgArr) {
this.FeatureItem.dataObj.ImgList[0].url = selectImgArr[0].Path; this.FeatureItem.dataObj.ImgList[0].url = selectImgArr[0].Path;
this.FeatureItem.dataObj.ImgList[0].x = 0
this.FeatureItem.dataObj.ImgList[0].y = 0
this.isShowScenicImg = false; this.isShowScenicImg = false;
} }
}, },
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ 7e915e1c
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
else if (pageData.pageType == 3) { else if (pageData.pageType == 3) {
pageData.pageTitle = "食详情"; pageData.pageTitle = "食详情";
this.getDetailsData(tripObj, newObj); this.getDetailsData(tripObj, newObj);
} //宿 } //宿
else if (pageData.pageType == 4) { else if (pageData.pageType == 4) {
pageData.pageTitle = "宿"; pageData.pageTitle = "宿";
this.getHotelData(tripObj, newObj); this.getHotelData(tripObj, newObj);
...@@ -258,13 +258,17 @@ ...@@ -258,13 +258,17 @@
tempImgUrl = tripObj.scenicArray[0].ImgList[0].url; tempImgUrl = tripObj.scenicArray[0].ImgList[0].url;
} }
newObj.ImgList = [{ newObj.ImgList = [{
url: tempImgUrl url: tempImgUrl,
x: 0,
y: 0,
}];; }];;
newObj.MainDesc = tripObj.scenicArray[0].MainDesc; newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
} else { } else {
newObj.DetailsName = "景点介绍"; newObj.DetailsName = "景点介绍";
newObj.ImgList = [{ newObj.ImgList = [{
url: this.homeBg2 url: this.homeBg2,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = "景点描述"; newObj.MainDesc = "景点描述";
} }
...@@ -274,7 +278,9 @@ ...@@ -274,7 +278,9 @@
newObj.MainName = "日本旅行专家"; newObj.MainName = "日本旅行专家";
newObj.SubName = "『印象日本』日本豪华游代名词"; newObj.SubName = "『印象日本』日本豪华游代名词";
newObj.ImgList = [{ newObj.ImgList = [{
url: this.homeBg1 url: this.homeBg1,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = "描述信息"; newObj.MainDesc = "描述信息";
}, },
...@@ -283,7 +289,9 @@ ...@@ -283,7 +289,9 @@
var dinnerObj = { var dinnerObj = {
MainName: "行程特色餐1", MainName: "行程特色餐1",
ImgList: [{ ImgList: [{
url: this.dinner1 url: this.dinner1,
x: 0,
y: 0,
}], }],
MainDesc: "行程特色餐1描述" MainDesc: "行程特色餐1描述"
}; };
...@@ -313,7 +321,9 @@ ...@@ -313,7 +321,9 @@
newObj.SubList.push({ newObj.SubList.push({
MainName: dItem.MainName, MainName: dItem.MainName,
ImgList: [{ ImgList: [{
url: tempUrl url: tempUrl,
x: 0,
y: 0,
}], }],
MainDesc: dItem.MainDesc MainDesc: dItem.MainDesc
}); });
...@@ -328,7 +338,9 @@ ...@@ -328,7 +338,9 @@
newObj.SubList.push({ newObj.SubList.push({
MainName: dItem.MainName, MainName: dItem.MainName,
ImgList: [{ ImgList: [{
url: tempUrl2 url: tempUrl2,
x: 0,
y: 0,
}], }],
MainDesc: dItem.MainDesc MainDesc: dItem.MainDesc
}); });
...@@ -340,7 +352,9 @@ ...@@ -340,7 +352,9 @@
newObj.SubList.push({ newObj.SubList.push({
MainName: dItem.MainName, MainName: dItem.MainName,
ImgList: [{ ImgList: [{
url: tempUrl3 url: tempUrl3,
x: 0,
y: 0,
}], }],
MainDesc: dItem.MainDesc MainDesc: dItem.MainDesc
}); });
...@@ -359,13 +373,19 @@ ...@@ -359,13 +373,19 @@
newObj.SubName = "特色酒店"; newObj.SubName = "特色酒店";
newObj.MainName = "行程酒店"; newObj.MainName = "行程酒店";
newObj.ImgList = [{ newObj.ImgList = [{
url: this.homeBg1 url: this.homeBg1,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = "行程酒店描述信息"; newObj.MainDesc = "行程酒店描述信息";
newObj.SubList = [{ newObj.SubList = [{
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}, { }, {
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}]; }];
if (tripObj.hotelArray && tripObj.hotelArray.length > 0) { if (tripObj.hotelArray && tripObj.hotelArray.length > 0) {
newObj.MainName = tripObj.hotelArray[0].MainName; newObj.MainName = tripObj.hotelArray[0].MainName;
...@@ -376,22 +396,32 @@ ...@@ -376,22 +396,32 @@
if (tripObj.hotelArray[0].ImgList && tripObj.hotelArray[0].ImgList.length > 2) { if (tripObj.hotelArray[0].ImgList && tripObj.hotelArray[0].ImgList.length > 2) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.hotelArray[0].ImgList[1].url url: tripObj.hotelArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.hotelArray[0].ImgList[2].url url: tripObj.hotelArray[0].ImgList[2].url,
x: 0,
y: 0,
}); });
} else if (tripObj.hotelArray[0].ImgList && tripObj.hotelArray[0].ImgList.length > 1) { } else if (tripObj.hotelArray[0].ImgList && tripObj.hotelArray[0].ImgList.length > 1) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.hotelArray[0].ImgList[1].url url: tripObj.hotelArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}); });
} }
newObj.ImgList = [{ newObj.ImgList = [{
url: tempHotelImg url: tempHotelImg,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = tripObj.hotelArray[0].MainDesc; newObj.MainDesc = tripObj.hotelArray[0].MainDesc;
} }
...@@ -400,13 +430,19 @@ ...@@ -400,13 +430,19 @@
getDinnerData(tripObj, newObj) { getDinnerData(tripObj, newObj) {
newObj.SubName = "特色餐食"; newObj.SubName = "特色餐食";
newObj.SubList = [{ newObj.SubList = [{
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}, { }, {
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}]; }];
newObj.MainName = "行程餐食"; newObj.MainName = "行程餐食";
newObj.ImgList = [{ newObj.ImgList = [{
url: this.dinner4, url: this.dinner4,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = "行程餐食描述"; newObj.MainDesc = "行程餐食描述";
if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) { if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) {
...@@ -418,23 +454,33 @@ ...@@ -418,23 +454,33 @@
if (tripObj.dinnerArray[0].ImgList && tripObj.dinnerArray[0].ImgList.length > 2) { if (tripObj.dinnerArray[0].ImgList && tripObj.dinnerArray[0].ImgList.length > 2) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.dinnerArray[0].ImgList[1].url url: tripObj.dinnerArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.dinnerArray[0].ImgList[2].url url: tripObj.dinnerArray[0].ImgList[2].url,
x: 0,
y: 0,
}); });
} }
if (tripObj.dinnerArray[0].ImgList && tripObj.dinnerArray[0].ImgList.length > 1) { if (tripObj.dinnerArray[0].ImgList && tripObj.dinnerArray[0].ImgList.length > 1) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.dinnerArray[0].ImgList[1].url url: tripObj.dinnerArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}); });
} }
newObj.ImgList = [{ newObj.ImgList = [{
url: tempDinnerImg url: tempDinnerImg,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = tripObj.dinnerArray[0].MainDesc; newObj.MainDesc = tripObj.dinnerArray[0].MainDesc;
} }
...@@ -443,13 +489,19 @@ ...@@ -443,13 +489,19 @@
getScenicData(tripObj, newObj) { getScenicData(tripObj, newObj) {
newObj.SubName = "特色景点"; newObj.SubName = "特色景点";
newObj.SubList = [{ newObj.SubList = [{
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}, { }, {
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}]; }];
newObj.MainName = "行程景点"; newObj.MainName = "行程景点";
newObj.ImgList = [{ newObj.ImgList = [{
url: this.homeBg1 url: this.homeBg1,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = "行程景点描述信息"; newObj.MainDesc = "行程景点描述信息";
if (tripObj.scenicArray && tripObj.scenicArray.length > 0) { if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
...@@ -461,22 +513,32 @@ ...@@ -461,22 +513,32 @@
if (tripObj.scenicArray[0].ImgList && tripObj.scenicArray[0].ImgList.length > 2) { if (tripObj.scenicArray[0].ImgList && tripObj.scenicArray[0].ImgList.length > 2) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.scenicArray[0].ImgList[1].url url: tripObj.scenicArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.scenicArray[0].ImgList[2].url url: tripObj.scenicArray[0].ImgList[2].url,
x: 0,
y: 0,
}); });
} else if (tripObj.scenicArray[0].ImgList && tripObj.scenicArray[0].ImgList.length > 1) { } else if (tripObj.scenicArray[0].ImgList && tripObj.scenicArray[0].ImgList.length > 1) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.scenicArray[0].ImgList[1].url url: tripObj.scenicArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}); });
} }
newObj.ImgList = [{ newObj.ImgList = [{
url: tempScenicImg url: tempScenicImg,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = tripObj.scenicArray[0].MainDesc; newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
} }
...@@ -509,7 +571,9 @@ ...@@ -509,7 +571,9 @@
if (sItem.NewImaArray && sItem.NewImaArray.length > 0) { if (sItem.NewImaArray && sItem.NewImaArray.length > 0) {
sItem.NewImaArray.forEach(iItem => { sItem.NewImaArray.forEach(iItem => {
tempImgList.push({ tempImgList.push({
url: iItem.Url url: iItem.Url,
x: 0,
y: 0,
}); });
}) })
} }
...@@ -534,7 +598,9 @@ ...@@ -534,7 +598,9 @@
if (sItem.ImaArray && sItem.ImaArray.length > 0) { if (sItem.ImaArray && sItem.ImaArray.length > 0) {
sItem.ImaArray.forEach(iItem => { sItem.ImaArray.forEach(iItem => {
tempImgList.push({ tempImgList.push({
url: iItem.Url url: iItem.Url,
x: 0,
y: 0,
}); });
}) })
} }
...@@ -558,7 +624,9 @@ ...@@ -558,7 +624,9 @@
if (sItem.ImaArray && sItem.ImaArray.length > 0) { if (sItem.ImaArray && sItem.ImaArray.length > 0) {
sItem.ImaArray.forEach(iItem => { sItem.ImaArray.forEach(iItem => {
tempImgList.push({ tempImgList.push({
url: iItem.Url url: iItem.Url,
x: 0,
y: 0,
}); });
}) })
} }
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue
View file @ 7e915e1c
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
<!-- 主图 --> <!-- 主图 -->
<div class="MasterMapList-boxRelative absolute z-index1" <div class="MasterMapList-boxRelative absolute z-index1"
:class="[FeatureItem.pageType==2?'':'UpgradedVersion-Hover']"> :class="[FeatureItem.pageType==2?'':'UpgradedVersion-Hover']">
<div class="MasterMapList-box-one absolute"> <div class="MasterMapList-box-one absolute" v-if="(FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList
&&FeatureItem.dataObj.ImgList.length!=9)||FeatureItem.pageType==2">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'"
:isUploadImg="FeatureItem.pageType==2?true:false" :isSelectImg="FeatureItem.pageType==2?true:false" :isAddImg="FeatureItem.pageType==2?false: :isUploadImg="FeatureItem.pageType==2?true:false" :isSelectImg="FeatureItem.pageType==2?true:false" :isAddImg="FeatureItem.pageType==2?false:
FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList FeatureItem.pageType!=2?true:false" :isDeleteImg="false" @toUploadImg="UploadImg"
&&FeatureItem.dataObj.ImgList.length!=9?true:false" :isDeleteImg="false" @toUploadImg="UploadImg" @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg" :x="FeatureItem.pageType==2?1019:''" :y="FeatureItem.pageType==2?577:''"></FeatureControls>
@toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls>
<input type="file" style="display:none" :id="'introducefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic"> <input type="file" style="display:none" :id="'introducefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<div class="MasterMapList-box-two absolute z-index3"> <div class="MasterMapList-box-two absolute z-index3">
...@@ -84,7 +84,6 @@ ...@@ -84,7 +84,6 @@
}, },
MasterMapIndex: null, //主图下标 MasterMapIndex: null, //主图下标
StencilDrawing: false, //是否是模版图 StencilDrawing: false, //是否是模版图
imglistArry:[],
homeBg3: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg", homeBg3: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg",
dinner2: "http://imgfile.oytour.com/Static/NewTripFeature/dinner2.jpg", dinner2: "http://imgfile.oytour.com/Static/NewTripFeature/dinner2.jpg",
homeBg1: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg", homeBg1: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg",
...@@ -92,33 +91,6 @@ ...@@ -92,33 +91,6 @@
}, },
methods: { methods: {
getList() {
//初始化弹窗图片列表
let obj = {
url: 'http://192.168.10.214:8120/image/index?filePath=/Upload/DMC/20180722/636678151855193385.jpg&process=resize,m_filt,w_160,h_'
}
this.imglistArry = [];
this.apipost(
"hotel_post_GetPicList",
this.msg,
res => {
if (res.data.resultCode == 1) {
this.imglistArry = res.data.data.pageData;
this.imglistArry.forEach(x => {
x.isShowImgDiv = true;
})
this.msg.total = res.data.data.count;
if(this.imglistArry&&this.imglistArry.length>0){
obj.url = this.imglistArry[0].Path
}
this.FeatureItem.dataObj.ImgList.push(obj)
}else{
this.FeatureItem.dataObj.ImgList.push(obj)
}
},
null
);
},
UploadImg(index, type) { UploadImg(index, type) {
this.MasterMapIndex = index ? index : 0 this.MasterMapIndex = index ? index : 0
if (type) this.StencilDrawing = true if (type) this.StencilDrawing = true
...@@ -167,30 +139,31 @@ ...@@ -167,30 +139,31 @@
}, },
AddImg() { AddImg() {
let obj = { let obj = {
url: this.FeatureItem.pageType==4?this.homeBg3:this.FeatureItem.pageType==5?this.dinner2:this.homeBg1 url: this.FeatureItem.pageType==4?this.homeBg3:this.FeatureItem.pageType==5?this.dinner2:this.homeBg1,
x: 0,
y: 0,
} }
this.FeatureItem.dataObj.ImgList.push(obj) this.FeatureItem.dataObj.ImgList.push(obj)
return this.FeatureItem.dataObj.ImgList.forEach(x => {
if(this.FeatureItem.pageType==4||this.FeatureItem.pageType==5||this.FeatureItem.pageType==6){ x.x = 0
if(this.FeatureItem.pageType==4){ x.y =0
this.choseType = 1 });
}else if(this.FeatureItem.pageType==5){
this.choseType = 2
}else if(this.FeatureItem.pageType==6){
this.choseType = 3
}else{
this.choseType = 0
}
this.getList()
}
}, },
DeleteImg(index, type) { DeleteImg(index, type) {
if (type) this.StencilDrawing = true if (type) this.StencilDrawing = true
else this.StencilDrawing = false else this.StencilDrawing = false
if (this.StencilDrawing) { if (this.StencilDrawing) {
this.FeatureItem.dataObj.SubList.splice(index, 1) this.FeatureItem.dataObj.SubList.splice(index, 1)
this.FeatureItem.dataObj.SubList.forEach(x => {
x.x = 0
x.y =0
});
} else { } else {
this.FeatureItem.dataObj.ImgList.splice(index, 1) this.FeatureItem.dataObj.ImgList.splice(index, 1)
this.FeatureItem.dataObj.ImgList.forEach(x => {
x.x = 0
x.y =0
});
} }
}, },
toAddPages() { toAddPages() {
......
src/components/rank/salesVolumeRank.vue
View file @ 7e915e1c
...@@ -111,66 +111,76 @@ ...@@ -111,66 +111,76 @@
</li> </li>
</ul> </ul>
</div> </div>
<v-table <el-table
v-if="isReady" v-if="isReady"
is-horizontal-resize ref="singleTable"
column-width-drag :data="tableData"
style="width: 100%" style="width: 100%">
:columns="columns" <el-table-column
:table-data="tableData" type="index"
:filter-method="filterMethod" label="序号"
:total="total" width="50">
:pageSize="pageSize" </el-table-column>
:pageIndex="pageIndex" <el-table-column
:handleCurrentChange="handleCurrentChanges" property="name"
:multiple-sort="multipleSort" label="名称"
:is-loading="loading" width="80">
sort-always </el-table-column>
@sort-change="sortChange" <el-table-column
@on-custom-comp="customCompFunc" property="SumPreferPrice"
></v-table> label="销售额"
width="" sortable>
<template slot-scope="scope">
<div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.SumPreferPrice}}</div>
</template>
</el-table-column>
<el-table-column
property="income"
label="收款金额"
width="" sortable>
<template slot-scope="scope">
<div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.income}}</div>
</template>
</el-table-column>
<el-table-column
property="notInCome"
label="未收金额"
width="" sortable>
<template slot-scope="scope">
<div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.notInCome}}</div>
</template>
</el-table-column>
<el-table-column
property="peopleCount"
label="正常收客数"
width="" sortable>
</el-table-column>
<el-table-column
property="CalcheCount"
label="取消收客数"
width="" sortable>
</el-table-column>
<el-table-column
property="totalGuestNum"
label="单项收客数"
width="">
</el-table-column>
<el-table-column
property="avgPrice"
label="客单价"
width="" sortable>
</el-table-column>
<el-table-column
property="zanBi"
label="销售额占比"
width="">
</el-table-column>
</el-table>
</div> </div>
</template> </template>
<script> <script>
import Vue from "vue"; import Vue from "vue";
import moment from 'moment' import moment from 'moment'
// 自定义列组件
Vue.component("table-operation", {
template: `<span>
<a href="" @click.stop.prevent="update(rowData,index)">
<span>{{content}}</span></a></span>
`,
props: {
rowData: {
type: Object,
},
field: {
type: String,
},
index: {
type: Number,
},
},
data() {
return {
content: "",
};
},
mounted() {
if (this.field === "SumPreferPrice") {
this.content = this.rowData["SumPreferPrice"];
} else if (this.field === "income") {
this.content = this.rowData["income"];
} else {
this.content = this.rowData.notInCome.toFixed(2);
}
},
methods: {
update(rowData, index) {
this.$emit('on-custom-comp',rowData);
},
},
});
export default { export default {
data() { data() {
return { return {
...@@ -239,6 +249,9 @@ export default { ...@@ -239,6 +249,9 @@ export default {
//this.pageSize = this.calcPageSize(40); 此页不需要分页 //this.pageSize = this.calcPageSize(40); 此页不需要分页
}, },
methods: { methods: {
goUrl(name,rowData){
if(name=='salesVolumeRankEntryForm') this.customCompFunc(rowData)
},
customCompFunc(rowData) { customCompFunc(rowData) {
this.$router.push({ this.$router.push({
path: "/salesVolumeRankEntryForm", path: "/salesVolumeRankEntryForm",
...@@ -260,174 +273,6 @@ export default { ...@@ -260,174 +273,6 @@ export default {
}); });
}, },
initColumns() { initColumns() {
this.isReady = false;
let that = this;
let no = {
title: this.$t("active.ad_xuhao"),
width: 50,
titleAlign: "center",
columnAlign: "center",
formatter: function (rowData, rowIndex, pagingIndex, field) {
return rowIndex + 1;
},
isResize: false,
};
let account = {
field: "name",
title: this.$t("system.query_airName"),
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: "",
// filterMultiple: false,
// filters: [{}],
// type: "text"
};
let sumMoney = {
field: "SumPreferPrice",
title: this.$t("sm.salemoney"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "desc",
componentName: "table-operation",
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["income"].length; i++) {
// content += "*";
// }
// return content;
// } else {
return `${rowData["SumPreferPrice"].toFixed(2)}`;
//}
},
};
let moneyCount = {
field: "income",
title: this.$t("fnc.skjine"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
componentName: "table-operation",
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["income"].length; i++) {
// content += "*";
// }
// return content;
// } else {
return `${rowData["income"]}`;
//}
},
};
let notIncome = {
field: "notInCome",
title: this.$t("fnc.wsjine"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
componentName: "table-operation",
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["income"].length; i++) {
// content += "*";
// }
// return `<span style='color:red'>${content}</span>`;
// } else {
return `<span style='color:red'>${rowData.notInCome.toFixed(
2
)}</span>`;
//}
},
};
let pCount = {
field: "peopleCount",
title: this.$t("sm.sks"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
};
let cCount = {
field: "CalcheCount",
title: this.$t("sm.exitsks"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
};
let avgPCount = {
field: "avgPeopleCount",
title: this.$t("sm.personsks"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
};
let customerNum = {
field: "totalGuestNum",
title: "单项收客数",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
};
let unitPrice = {
field: "avgPrice",
title: this.$t("sm.keprice"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["avgPrice"].length; i++) {
// content += "*";
// }
// return content;
// } else {
return rowData["avgPrice"].toFixed(2);
// }
},
};
let proportion = {
field: "zanBi",
title: this.$t("sm.xiaoshouzb"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
};
this.columns = [];
this.columns.push(no);
this.columns.push(account);
this.columns.push(sumMoney);
this.columns.push(moneyCount);
this.columns.push(notIncome);
this.columns.push(pCount);
this.columns.push(cCount);
if (this.activeName != "first" && this.activeName != "four") {
unitPrice.title = this.$t("sm.renxiaoshou");
this.columns.push(avgPCount);
}
this.columns.push(customerNum);
this.columns.push(unitPrice);
this.columns.push(proportion);
this.isReady = true; this.isReady = true;
}, },
initData() { initData() {
...@@ -620,4 +465,8 @@ export default { ...@@ -620,4 +465,8 @@ export default {
.el-date-editor .el-range-separator { .el-date-editor .el-range-separator {
font-size: 12px; font-size: 12px;
} }
.clickText{
color: #33B3FF;
cursor: pointer;
}
</style> </style>
src/plug/index.js
View file @ 7e915e1c
...@@ -119,6 +119,7 @@ export default { ...@@ -119,6 +119,7 @@ export default {
let lxymallUrl = ''; //国内游api let lxymallUrl = ''; //国内游api
let crmUrl = ""; //crm API let crmUrl = ""; //crm API
let locationName = window.location.hostname; let locationName = window.location.hostname;
let ocrUrl="http://192.168.10.68:8888";
// domainUrl = "http://192.168.10.238:8083"; // 刘东电脑 // domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
// domainUrl = "http://192.168.10.226"; //春姐 // domainUrl = "http://192.168.10.226"; //春姐
domainUrl = "http://192.168.10.128"; //奎哥 domainUrl = "http://192.168.10.128"; //奎哥
...@@ -137,16 +138,19 @@ export default { ...@@ -137,16 +138,19 @@ export default {
domainUrl = "http://testapi.oytour.com"; domainUrl = "http://testapi.oytour.com";
mallUrl = "https://mallapi.oytour.com"; mallUrl = "https://mallapi.oytour.com";
lxymallUrl = "https://erpmallapi.oytour.com"; lxymallUrl = "https://erpmallapi.oytour.com";
crmUrl = "http://testcrm.oytour.com" crmUrl = "http://testcrm.oytour.com";
ocrUrl="http://ocr.oytour.com";
} else if (locationName.indexOf('oytour') !== -1) { } else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
mallUrl = "https://mallapi.oytour.com"; mallUrl = "https://mallapi.oytour.com";
lxymallUrl = "https://erpmallapi.oytour.com"; lxymallUrl = "https://erpmallapi.oytour.com";
crmUrl = "http://crm.oytour.com" crmUrl = "http://crm.oytour.com";
ocrUrl="http://ocr.oytour.com";
} }
var obj = { var obj = {
//主地址 //主地址
DomainUrl: domainUrl, DomainUrl: domainUrl,
ocrUrl:ocrUrl,//行程下载地址
//常用提交数据URL //常用提交数据URL
PostUrl: domainUrl + "/api/common/post", PostUrl: domainUrl + "/api/common/post",
//上传文件URL //上传文件URL
...@@ -253,7 +257,7 @@ export default { ...@@ -253,7 +257,7 @@ export default {
//HTTP提交数据 //HTTP提交数据
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline, isTerminate) { Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline, isTerminate) {
if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 && if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 &&
this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('confirmationOrderDownLoadNew') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 && this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
this.$route.name.indexOf('OrderProfitLossList') === -1 this.$route.name.indexOf('OrderProfitLossList') === -1
) { ) {
...@@ -682,7 +686,7 @@ export default { ...@@ -682,7 +686,7 @@ export default {
//请求Java接口 //请求Java接口
Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) { Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) {
if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('clientConfirm') === -1) { if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoadNew') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('clientConfirm') === -1) {
let previousPathInfo = { let previousPathInfo = {
path: this.$route.name, path: this.$route.name,
query: this.$route.query query: this.$route.query
...@@ -739,7 +743,7 @@ export default { ...@@ -739,7 +743,7 @@ export default {
}, },
//请求资产管理接口 //请求资产管理接口
Vue.prototype.apiJavaPostZc = function (cmd, msg, successCall, faildCall) { Vue.prototype.apiJavaPostZc = function (cmd, msg, successCall, faildCall) {
if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('clientConfirm') === -1) { if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoadNew') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('clientConfirm') === -1) {
let previousPathInfo = { let previousPathInfo = {
path: this.$route.name, path: this.$route.name,
......
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