Commit dc885c0c authored by youjie's avatar youjie

no message

parent d714ce5d
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<!-- <script type="text/javascript" src="http://api.map.baidu.com/library/MarkerClusterer/1.2/src/MarkerClusterer_min.js"></script> --> <!-- <script type="text/javascript" src="http://api.map.baidu.com/library/MarkerClusterer/1.2/src/MarkerClusterer_min.js"></script> -->
<script type="text/javascript" src="static/MarkerClusterer.js"></script> <script type="text/javascript" src="static/MarkerClusterer.js"></script>
<script type="text/javascript" src="static/CurveLine.min.js"></script> <script type="text/javascript" src="static/CurveLine.min.js"></script>
<link href="https://api.mapbox.com/mapbox-gl-js/v2.6.1/mapbox-gl.css" rel="stylesheet">
    <script src="https://api.mapbox.com/mapbox-gl-js/v2.6.1/mapbox-gl.js"></script>
<!-- <script type="text/javascript" src="http://activity.oytour.com/google.js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script> --> <!-- <script type="text/javascript" src="http://activity.oytour.com/google.js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script> -->
<!-- <script type="text/javascript"> <!-- <script type="text/javascript">
window.google = { window.google = {
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo"> :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo">
</TravelFeature> </TravelFeature>
<Tripmap :dataAll="PostConfig"></Tripmap>
<TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
:subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig" :subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice> v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
...@@ -94,8 +95,20 @@ ...@@ -94,8 +95,20 @@
import TravelPrice2 from "../TravelGroupControl/TravelPrice2"; import TravelPrice2 from "../TravelGroupControl/TravelPrice2";
import TravelPrice3 from "../TravelGroupControl/TravelPrice3"; import TravelPrice3 from "../TravelGroupControl/TravelPrice3";
import TravelPrice4 from "../TravelGroupControl/TravelPrice4"; import TravelPrice4 from "../TravelGroupControl/TravelPrice4";
import Tripmap from "../TravelGroupControl/tripmap";
export default { export default {
components: {
TravelConfig: TravelConfig,
TravelDaysTripDirect: TravelDaysTripDirect,
TravelFeature: TravelFeature,
TravelNotice: TravelNotice,
TravelPrice: TravelPrice,
TravelPrice2: TravelPrice2,
TravelPrice3: TravelPrice3,
TravelPrice4: TravelPrice4,
Tripmap,
},
provide() { provide() {
return { return {
loadConfigInfo: this.firstLoadConfigInfo, loadConfigInfo: this.firstLoadConfigInfo,
...@@ -165,6 +178,9 @@ ...@@ -165,6 +178,9 @@
WLocationId: 0, //位置编号 WLocationId: 0, //位置编号
WCityId: 0, //城市编号 WCityId: 0, //城市编号
TripColor:"",//行程特色主色 TripColor:"",//行程特色主色
TripCountryList: [],//行程国家
TripCitwlist: [],//行程城市
TripMapList: [],
}, },
//行程 //行程
FeatureData: { FeatureData: {
...@@ -246,16 +262,6 @@ ...@@ -246,16 +262,6 @@
saveLoading: false, //保存按钮loading saveLoading: false, //保存按钮loading
}; };
}, },
components: {
TravelConfig: TravelConfig,
TravelDaysTripDirect: TravelDaysTripDirect,
TravelFeature: TravelFeature,
TravelNotice: TravelNotice,
TravelPrice: TravelPrice,
TravelPrice2: TravelPrice2,
TravelPrice3: TravelPrice3,
TravelPrice4: TravelPrice4
},
methods: { methods: {
/*获取行程特色内容对象*/ /*获取行程特色内容对象*/
getFeature(featureObj) { getFeature(featureObj) {
...@@ -405,6 +411,9 @@ ...@@ -405,6 +411,9 @@
basicData.WCountryId = this.PostConfig.WCountryId; basicData.WCountryId = this.PostConfig.WCountryId;
basicData.WLocationId = this.PostConfig.WLocationId; basicData.WLocationId = this.PostConfig.WLocationId;
basicData.WCityId = this.PostConfig.WCityId; basicData.WCityId = this.PostConfig.WCityId;
basicData.TripCountryList = this.PostDaysTrip.TripCountryList;
basicData.TripCitwlist = this.PostDaysTrip.TripCitwlist;
basicData.TripMapList = this.PostDaysTrip.TripMapList;
this.journeyList.IsUpdateTrip = this.PostDaysTrip.IsUpdateTrip; this.journeyList.IsUpdateTrip = this.PostDaysTrip.IsUpdateTrip;
//行程特色数据 //行程特色数据
var TripFeature = {}; var TripFeature = {};
...@@ -839,7 +848,17 @@ ...@@ -839,7 +848,17 @@
this.PostConfig.WCountryId = tempData.WCountryId; this.PostConfig.WCountryId = tempData.WCountryId;
this.PostConfig.WLocationId = tempData.WLocationId; this.PostConfig.WLocationId = tempData.WLocationId;
this.PostConfig.WCityId = tempData.WCityId; this.PostConfig.WCityId = tempData.WCityId;
this.PostConfig.TripCountryList = tempData.TripCountryList;
this.PostConfig.TripCitwlist = tempData.TripCitwlist;
this.PostConfig.TripMapList = tempData.TripMapList;
let arrList = function(list){
list.forEach(x=>{
x.NationList = []
x.CityListAll = []
x.CityListIds = []
})
}
arrList(this.PostConfig.TripMapList)
this.NoticeParameters.ConfigId = tempData.ConfigId; this.NoticeParameters.ConfigId = tempData.ConfigId;
this.NoticeParameters.CountryID = tempData.CountryID; this.NoticeParameters.CountryID = tempData.CountryID;
......
This diff is collapsed.
This diff is collapsed.
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