Skip to content

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

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

parents f0a34383 b61084f2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1755 additions and 417 deletions
index.html
View file @ d2f1bbb0
......@@ -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="static/MarkerClusterer.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">
window.google = {
......
src/assets/utils/tripUtils.js
View file @ d2f1bbb0
let locationName = window.location.hostname;
let ViittoFileUrl = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130'
let ViittoFileUrl = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.10.214:8130'
var tripUtils = {
TypeKey: {
traffic: "1",
......@@ -356,9 +356,9 @@ var tripUtils = {
IsUseBus: 0, //是否用车(0-不用车,1-用车)
//行程介绍
trafficIntroduce: {
IntroduceTitle: "", //行程介绍标题
IntroduceTitle: "提示信息", //行程介绍标题
IntroduceImage: ViittoFileUrl + "/Upload/DefalutImage/DMC/defaultairline.png", //行程介绍图片
IntroduceDetail: "", //行程介绍详细信息
IntroduceDetail: "集合于国际机场，由专人为您办理登机手续后，搭程专机", //行程介绍详细信息
TrafficType: 2, //交通类型,默认为专车
TrafficContent: "", //交通详情
TrafficImage: "", //交通图片
......@@ -470,7 +470,7 @@ var tripUtils = {
ImaArray: [],
Rank: 0,
//餐厅名称
DinnerName: "",
DinnerName: "酒店内享用早餐",
//套餐名称
MealName: "",
QCity: '',
......@@ -518,6 +518,7 @@ var tripUtils = {
Title: "",
Description: "",
Rank: 0,
KMNumber:"",
};
},
......
src/components/PersonalInfoSet.vue
View file @ d2f1bbb0
......@@ -1351,7 +1351,7 @@
newArr.push(blob);
var fileName = `${that.uuid(10,10)}.png`;
var path = `/Upload/Temporary`;
that.uploadSelfBlob(path, newArr, x => {
that.uploadSelfBlob(path, newArr,'', x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
this.postImg(allPath)
})
......
src/components/SalesModule/enrollTotal.vue
View file @ d2f1bbb0
......@@ -350,6 +350,7 @@
</p>
<p v-if="item.lureEmpName">引流人：{{ item.lureEmpName }}</p>
<p>{{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}</p>
<p v-if="item.teamType==1||item.teamType==2">{{item.status==1?"未结团":(item.status==2?"已结团 ":(item.status==5?"待结团审核":""))}}{{item.status==2?item.outGroupAuditDate:""}}</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<!-- <p v-if="item.commissionMoney" style="color: red;">
{{ $t("salesModule.CommissionNum") }}：{{ item.commissionMoney }}
......
src/components/SalesModule/groupTourOrder.vue
View file @ d2f1bbb0
......@@ -1692,6 +1692,7 @@
">
{{ item.tcnum }}
</p>
<p class="fz12 over_ellipsis" style="width: 100%">
{{ item.commissionSPeopleName }}
</p>
......@@ -1700,6 +1701,7 @@
{{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}
</p>
<p>{{ $t("restaurant.res_oderTime") }}：{{ item.createDate }}</p>
<p v-if="item.teamType==1||item.teamType==2">{{item.status==1?"未结团":(item.status==2?"已结团 ":(item.status==5?"待结团审核":""))}}{{item.status==2?item.outGroupAuditDate:""}}</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<p v-if="item.commissionMoney" style="color: red;cursor: pointer;">
<span style="float: left;">{{ $t("salesModule.Commission") }}：</span>
......
src/components/ShoppingStore/ShoppingReimbursementDetails.vue
View file @ d2f1bbb0
......@@ -106,7 +106,7 @@
</td>
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<!--汇率 DMCRate-->
<el-input type="number" v-model="item.ShopDetailsList[0].DMCRate" disabled="true"></el-input>
<el-input type="number" v-model="item.ShopDetailsList[0].DMCRate" ></el-input>
</td>
<td @click="upIndex = outindex" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<!--DMCOPCredentials (地接OP上传凭证)-->
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ d2f1bbb0
......@@ -1033,20 +1033,18 @@
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item v-if="item.TeamType!=3"
@click.native="goToOpenTravel('TravelManager2',item.ID,0,item)">
<el-dropdown-item @click.native="goToOpenTravel('TravelManager2',item.ID,0,item)">
{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item>
<el-dropdown-item v-else @click.native="goToOpenTravel('TravelManager6',item.ID,0,item)">
{{$t('Operation.Op_xilieModyfi')}}
<el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
{{$t('Operation.Op_xilieModyfi')}}(新)
</el-dropdown-item>
<el-dropdown-item v-if="item.TeamType!=3"
@click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM,item)">
<el-dropdown-item @click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM,item)">
{{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item>
<el-dropdown-item v-else
@click.native="goTonowTeam('TravelManager6',item.ID,item.TCID,item.TCNUM,item)">
{{$t('Operation.Op_dangtuanModify')}}
<el-dropdown-item @click.native="goTonowTeam('TravelManager',item.ID,item.TCID,item.TCNUM,item)">
{{$t('Operation.Op_dangtuanModify')}}(新)
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -1101,9 +1099,8 @@
@click.native="RemoveHotelJourneyOrder(item.TCID)">
{{$t('op.HotelXJ')}}
</el-dropdown-item>
<!-- 结团 -->
<el-dropdown-item v-if="item.Status==1&&Number(item.OrderGuestNum)>0"
@click.native="OutGroup(item.TCID,2,item.TravelEndAudit)">
<!-- 结团 &&Number(item.OrderGuestNum)>0 HK2023-09-14 取消人数判断（南亚线没有人数，损失机票）-->
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2,item.TravelEndAudit)">
{{$t('Operation.Op_jietuan')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1,item.TravelEndAudit)">
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ d2f1bbb0
......@@ -792,7 +792,8 @@
@click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
{{$t('Operation.Op_xiajia')}}</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1&&Number(item.OrderGuestNum)>0"
<!--&&Number(item.OrderGuestNum)>0 HK 2023-09-14去掉人数判断-->
<el-dropdown-item v-if="item.Status==1"
@click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}}
</el-dropdown-item>
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ d2f1bbb0
......@@ -690,7 +690,8 @@
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
{{$t('Operation.Op_xiajia')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1&&Number(item.OrderGuestNum)>0"
<!--&&Number(item.OrderGuestNum)>0 HK 2023-09-14 取消人数判断-->
<el-dropdown-item v-if="item.Status==1"
@click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}}
</el-dropdown-item>
......
src/components/dmc/manager/teamRevenueExpenditure.vue
View file @ d2f1bbb0
......@@ -49,6 +49,7 @@
<th width="100">序号</th>
<th width="10%">单号</th>
<th width="10%">费用说明</th>
<th width="10%">付款对象</th>
<th width="10%">日期</th>
<th width="20%">备注</th>
<th width="10%">应付/应付金额</th>
......@@ -62,6 +63,7 @@
<td>
<span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
</td>
<td>{{item.ClientName}}</td>
<td>{{item.CreateDate}}</td>
<td>
<div v-for="childItem in item.TradeWayList">
......@@ -71,7 +73,8 @@
</div>
</td>
<td>
<span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
<p><span>原币{{item.WBMoney}}</span></p>
<p><span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span></p>
</td>
<td>{{item.EmName}}</td>
<td>
......@@ -88,12 +91,12 @@
</tr>
<tr v-if='hotelList.length!=0'>
<td>成本总价</td>
<td style="text-align:left;padding-left:5px;" colspan="8">
<td style="text-align:left;padding-left:5px;" colspan="9">
￥{{getTotalMoney(hotelList)}}
</td>
</tr>
<tr v-if='hotelList.length==0'>
<td colspan="9" class="color666">没有找到你需要的财务数据</td>
<td colspan="10" class="color666">没有找到你需要的财务数据</td>
</tr>
</table>
<p class="teamRevenueExpenditureTitle">
......@@ -109,6 +112,7 @@
<th width="100">序号</th>
<th width="10%">单号</th>
<th width="10%">费用说明</th>
<th width="10%">付款对象</th>
<th width="10%">日期</th>
<th width="20%">备注</th>
<th width="10%">应付/应付金额</th>
......@@ -122,6 +126,7 @@
<td>
<span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
</td>
<td>{{item.ClientName}}</td>
<td>{{item.CreateDate}}</td>
<td>
<div v-for="childItem in item.TradeWayList">
......@@ -131,7 +136,8 @@
</div>
</td>
<td>
<span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
<p><span>原币{{item.WBMoney}}</span></p>
<p><span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span></p>
</td>
<td>{{item.EmName}}</td>
<td>
......@@ -148,12 +154,12 @@
</tr>
<tr v-if='eatList.length!=0'>
<td>成本总价</td>
<td style="text-align:left;padding-left:5px;" colspan="8">
<td style="text-align:left;padding-left:5px;" colspan="9">
￥{{getTotalMoney(eatList)}}
</td>
</tr>
<tr v-if='eatList.length==0'>
<td colspan="9" class="color666">没有找到你需要的财务数据</td>
<td colspan="10" class="color666">没有找到你需要的财务数据</td>
</tr>
</table>
<p class="teamRevenueExpenditureTitle">
......@@ -169,6 +175,7 @@
<th width="100">序号</th>
<th width="10%">单号</th>
<th width="10%">费用说明</th>
<th width="10%">付款对象</th>
<th width="10%">日期</th>
<th width="20%">备注</th>
<th width="10%">应付/应付金额</th>
......@@ -182,6 +189,7 @@
<td>
<span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
</td>
<td>{{item.ClientName}}</td>
<td>{{item.CreateDate}}</td>
<td>
<div v-for="childItem in item.TradeWayList">
......@@ -191,7 +199,8 @@
</div>
</td>
<td>
<span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
<p><span>原币{{item.WBMoney}}</span></p>
<p><span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span></p>
</td>
<td>{{item.EmName}}</td>
<td>
......@@ -208,12 +217,12 @@
</tr>
<tr v-if='ticketList.length!=0'>
<td>成本总价</td>
<td style="text-align:left;padding-left:5px;" colspan="8">
<td style="text-align:left;padding-left:5px;" colspan="9">
￥{{getTotalMoney(ticketList)}}
</td>
</tr>
<tr v-if='ticketList.length==0'>
<td colspan="9" class="color666">没有找到你需要的财务数据</td>
<td colspan="10" class="color666">没有找到你需要的财务数据</td>
</tr>
</table>
<p class="teamRevenueExpenditureTitle">
......@@ -229,6 +238,7 @@
<th width="100">序号</th>
<th width="10%">单号</th>
<th width="10%">费用说明</th>
<th width="10%">付款对象</th>
<th width="10%">日期</th>
<th width="20%">备注</th>
<th width="10%">应付/应付金额</th>
......@@ -242,6 +252,7 @@
<td>
<span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
</td>
<td>{{item.ClientName}}</td>
<td>{{item.CreateDate}}</td>
<td>
<div v-for="childItem in item.TradeWayList">
......@@ -251,7 +262,8 @@
</div>
</td>
<td>
<span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
<p><span>原币{{item.WBMoney}}</span></p>
<p><span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span></p>
</td>
<td>{{item.EmName}}</td>
<td>
......@@ -268,12 +280,12 @@
</tr>
<tr v-if='busList.length!=0'>
<td>成本总价</td>
<td style="text-align:left;padding-left:5px;" colspan="8">
<td style="text-align:left;padding-left:5px;" colspan="9">
￥{{getTotalMoney(busList)}}
</td>
</tr>
<tr v-if='busList.length==0'>
<td colspan="9" class="color666">没有找到你需要的财务数据</td>
<td colspan="10" class="color666">没有找到你需要的财务数据</td>
</tr>
</table>
......@@ -290,6 +302,7 @@
<th width="100">序号</th>
<th width="10%">单号</th>
<th width="10%">费用说明</th>
<th width="10%">付款对象</th>
<th width="10%">日期</th>
<th width="20%">备注</th>
<th width="10%">应付/应付金额</th>
......@@ -303,6 +316,7 @@
<td>
<span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
</td>
<td>{{item.ClientName}}</td>
<td>{{item.CreateDate}}</td>
<td>
<div v-for="childItem in item.TradeWayList">
......@@ -312,7 +326,8 @@
</div>
</td>
<td>
<span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
<p><span>原币{{item.WBMoney}}</span></p>
<p><span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span></p>
</td>
<td>{{item.EmName}}</td>
<td>
......@@ -329,12 +344,12 @@
</tr>
<tr v-if='otherList.length!=0'>
<td>成本总价</td>
<td style="text-align:left;padding-left:5px;" colspan="8">
<td style="text-align:left;padding-left:5px;" colspan="9">
￥{{getTotalMoney(otherList)}}
</td>
</tr>
<tr v-if='otherList.length==0'>
<td colspan="9" class="color666">没有找到你需要的财务数据</td>
<td colspan="10" class="color666">没有找到你需要的财务数据</td>
</tr>
</table>
<div v-if='picIsShow' class="viewBigPicLayer" @click="picIsShow=false,picObj=[]">
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ d2f1bbb0
......@@ -19,6 +19,7 @@
<p class=" fz14" :class="{'cursor-pointer c059FF6':scope.row.OrderType==2}"
@click="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}</p>
<p>出发日期：{{scope.row.StartDate}}</p>
<p v-if="scope.row.OrderType==2&&scope.row.Status>=0">{{scope.row.Status==1?"未结团":(scope.row.Status==2?"已结团 ":(scope.row.Status==5?"待结团审核":""))}}{{scope.row.Status==2?scope.row.OutGroupAuditDate:""}}</p>
</div>
</template>
</el-table-column>
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ d2f1bbb0
......@@ -15,6 +15,7 @@
v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)">
<img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div>
</div>
</template>
</div>
......@@ -30,7 +31,9 @@
<div v-if="CurrentUserInfo.RB_Group_id==QjGroupId()" class="ScraList">{{$t('sm.imgLongtips')}}</div>
<div class="TFContent">
<div class="TFconTitle">
<span>{{ckTitle}}</span>
<el-tooltip class="item" effect="dark" content="点击重新加载行程特色" placement="top-start">
<span style="cursor:pointer;" @click="ReLoadFeature()">{{ckTitle}}</span>
</el-tooltip>
<div class="TFBTline"></div>
</div>
<div class="TFchildContent clearfix">
......@@ -252,6 +255,13 @@
created: function () {},
methods: {
//重新加载行程特色
ReLoadFeature() {
if (this.$refs.UpgradedVersion != undefined) {
this.FeatureData.FeatureHtmlJson = '';
this.$refs.UpgradedVersion.initFeature(true)
}
},
// 初始化行程特色
init: function () {},
// 行程特色删除区块
......@@ -373,19 +383,8 @@
if (res.data.resultCode == 1) {
//保存按钮跳转当当前页码
if (SaveType == 1) {
let path = "TravelManager2";
if (TeamType == 0) {
path = "TravelManager2";
} else if (TeamType == 1) {
path = "TravelManager3";
} else if (TeamType == 2) {
path = "TravelManager5";
} else if (TeamType == 3) {
path = "TravelManager6";
}
if (postData.isfromManager) {
path = "TravelManager5";
}
let path = this.$route.path;
console.log("path", path);
this.Success("保存成功");
if (this.isNewConfig) {
this.$router.push({
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ d2f1bbb0
<style>
@import "../../../assets/css/newTravelManager.css";
@import "../../../assets/css/endTravelManager.css";
.mapImg-Img p{
text-align: center;
padding: 20px 40px;
font-size: 18px;
color: #E95252;
}
</style>
<template>
<div>
......@@ -43,6 +48,24 @@
id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo">
</TravelFeature>
<!-- 地图 -->
<div class="TravelPrice clearfix" style="padding: 25px;">
<div class="mapImg-buttom">
<span class="TMTitle"><i></i>地图</span>
<span class="foldList" @click="ShowMap=!ShowMap">编辑地图</span>
</div>
<div class="mapImg-Img marginT20">
<div v-if="PostConfig&&PostConfig.MapUrl">
<el-image
style="width: 100%; height: auto"
:src="PostConfig.MapUrl"
:preview-src-list="[PostConfig.MapUrl]">
</el-image>
</div>
<p v-else @click="ShowMap=!ShowMap" style="cursor: pointer;">地图暂未生成图</p>
</div>
</div>
<Tripmap v-if="ShowMap" :dataAll="PostConfig" :ConfigId="ConfigId" @Cancel="ShowMap=false" @Success="getMapImgSuccess"></Tripmap>
<TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
:subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
......@@ -94,8 +117,20 @@
import TravelPrice2 from "../TravelGroupControl/TravelPrice2";
import TravelPrice3 from "../TravelGroupControl/TravelPrice3";
import TravelPrice4 from "../TravelGroupControl/TravelPrice4";
import Tripmap from "../TravelGroupControl/tripmap";
export default {
components: {
TravelConfig: TravelConfig,
TravelDaysTripDirect: TravelDaysTripDirect,
TravelFeature: TravelFeature,
TravelNotice: TravelNotice,
TravelPrice: TravelPrice,
TravelPrice2: TravelPrice2,
TravelPrice3: TravelPrice3,
TravelPrice4: TravelPrice4,
Tripmap,
},
provide() {
return {
loadConfigInfo: this.firstLoadConfigInfo,
......@@ -104,6 +139,7 @@
},
data() {
return {
ShowMap: false,
//当前登录用户信息
CurrentUserInfo: {},
IsShowBtn: false, //是否显示按钮
......@@ -165,6 +201,9 @@
WLocationId: 0, //位置编号
WCityId: 0, //城市编号
TripColor:"",//行程特色主色
TripCountryList: [],//行程国家
TripCitwlist: [],//行程城市
TripMapList: [],
},
//行程
FeatureData: {
......@@ -246,17 +285,11 @@
saveLoading: false, //保存按钮loading
};
},
components: {
TravelConfig: TravelConfig,
TravelDaysTripDirect: TravelDaysTripDirect,
TravelFeature: TravelFeature,
TravelNotice: TravelNotice,
TravelPrice: TravelPrice,
TravelPrice2: TravelPrice2,
TravelPrice3: TravelPrice3,
TravelPrice4: TravelPrice4
},
methods: {
getMapImgSuccess(path){
this.PostConfig.MapUrl = path
this.ShowMap = false
},
/*获取行程特色内容对象*/
getFeature(featureObj) {
this.PostFeature = featureObj;
......@@ -405,6 +438,9 @@
basicData.WCountryId = this.PostConfig.WCountryId;
basicData.WLocationId = this.PostConfig.WLocationId;
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;
//行程特色数据
var TripFeature = {};
......@@ -839,7 +875,18 @@
this.PostConfig.WCountryId = tempData.WCountryId;
this.PostConfig.WLocationId = tempData.WLocationId;
this.PostConfig.WCityId = tempData.WCityId;
this.PostConfig.TripCountryList = tempData.TripCountryList;
this.PostConfig.TripCitwlist = tempData.TripCitwlist;
this.PostConfig.TripMapList = tempData.TripMapList;
this.PostConfig.MapUrl = tempData.MapUrl;
let arrList = function(list){
list.forEach(x=>{
x.NationList = []
x.CityListAll = []
x.CityListIds = []
})
}
arrList(this.PostConfig.TripMapList)
this.NoticeParameters.ConfigId = tempData.ConfigId;
this.NoticeParameters.CountryID = tempData.CountryID;
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/VEditDiv.vue
View file @ d2f1bbb0
......@@ -28,14 +28,17 @@
}
this.$emit("input", this.$el.innerText);
setTimeout(() => {
try {
var range = sel.getRangeAt(0);
var textNode = range.startContainer;
range.setStart(textNode, offset);
sel.removeAllRanges();
sel.addRange(range);
} catch (err) {
console.warn(err);
}
}, 0);
},
}
};
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ d2f1bbb0
......@@ -1498,7 +1498,7 @@
newArr.push(blob);
var fileName = `${that.uuid(10, 10)}.png`;
var path = `/newFeature`;
that.uploadSelfBlob(path, newArr, x => {
that.uploadSelfBlob(path, newArr,'', x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
that.imgUrlChange(allPath);
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @ d2f1bbb0
......@@ -9,29 +9,28 @@
</FeatureControls>
</div>
</div>
<div class="UpgradedVersionDetails-box column" v-for="(item,i) in FeatureData.dataObj.SubList">
<div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover">
<div class="UpgradedVersionDetails-img relative">
<div class="UpgradedVersionDetails1 absolute z-index3">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" isImg="1" :isUploadImg="true"
:isSelectImg="true" @toUploadImg="UploadImg(i)" @toSelectImg="SelectImg(i)" @toAddImg="AddImg"
@toDeleteImg="DeleteImg(i)" :x="312" :y="312" />
<input type="file" style="display:none" :id="'GouDetaFile_'+(FeatureData * 2 + 1)+'_'+i+'_'+index" @change="uploadpic">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'"
isImg="1" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(i)"
@toSelectImg="SelectImg(i)" @toAddImg="AddImg" @toDeleteImg="DeleteImg(i)" :x="312" :y="312" />
<input type="file" style="display:none" :id="'GouDetaFile_'+(FeatureData * 2 + 1)+'_'+i+'_'+index"
@change="uploadpic">
</div>
<div class="UpgradedVersionDetails-imgOne relative bjE6"
:id="'viewSpotBox_' + (FeatureData * 4) +'_deta_'+i+index">
<VueDraggableResizable v-if="item.ImgList&&item.ImgList.length>0"
: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">
<VueDraggableResizable v-if="item.ImgList&&item.ImgList.length>0" :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"/> -->
:id="'viewSpotImg_' + FeatureData * 4 + '_deta_'+i+index" />
</VueDraggableResizable>
<template v-else>
<img src="http://imgfile.oytour.com/Static/NewTripFeature/homeBj.png"/>
<img src="http://imgfile.oytour.com/Static/NewTripFeature/homeBj.png" />
</template>
</div>
<div class="UpgradedVersionDetails-detailsTop absolute"></div>
......@@ -112,19 +111,19 @@
},
isShowScenicImg: false,
MasterMapIndex: null, //主图下标
imgIndex:null
imgIndex: null
};
},
methods: {
onActivated(i, j) {
this.imgIndex = j;
},
onViewSpotDragstopX(x,y) {
onViewSpotDragstopX(x, y) {
let imgWidth = document.querySelector(
"#viewSpotImg_" + (this.FeatureItem * 4) + "_deta_"+this.imgIndex + this.index
"#viewSpotImg_" + (this.FeatureItem * 4) + "_deta_" + this.imgIndex + this.index
).width;
let boxWidth = document.querySelector(
"#viewSpotBox_" + (this.FeatureItem * 4) + "_deta_"+this.imgIndex + this.index
"#viewSpotBox_" + (this.FeatureItem * 4) + "_deta_" + this.imgIndex + this.index
).offsetWidth;
let cha = boxWidth - imgWidth;
if (cha <= 0) {
......@@ -141,14 +140,14 @@
}
}
this.FeatureData.dataObj.SubList[this.imgIndex].x = x;
this.$refs["viewSpotVds_" + (this.FeatureData * 4) + "_deta_"+this.imgIndex + this.index][0]._data.left = 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
"#viewSpotImg_" + (this.FeatureData * 4) + "_deta_" + this.imgIndex + this.index
).height;
let boxHeight = document.querySelector(
"#viewSpotBox_" + (this.FeatureData * 4)+ "_deta_"+this.imgIndex + this.index
"#viewSpotBox_" + (this.FeatureData * 4) + "_deta_" + this.imgIndex + this.index
).offsetHeight;
let cha = boxHeight - imgHeight;
if (cha <= 0) {
......@@ -166,7 +165,7 @@
}
this.FeatureData.dataObj.SubList[this.imgIndex].y = y;
this.$refs[
"viewSpotVds_" + (this.FeatureData * 4)+ "_deta_"+this.imgIndex + this.index
"viewSpotVds_" + (this.FeatureData * 4) + "_deta_" + this.imgIndex + this.index
][0]._data.top = y;
},
......@@ -186,7 +185,7 @@
newArr.push(blob);
var fileName = `${that.uuid(10, 10)}.png`;
var path = `/newFeature`;
that.uploadSelfBlob(path, newArr, x => {
that.uploadSelfBlob(path, newArr, '', x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
that.FeatureData.dataObj.SubList[that.MasterMapIndex].ImgList[0].url = allPath
......@@ -256,4 +255,5 @@
<style>
@import url("../../../../assets/css/UpgradedVersion.css");
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @ d2f1bbb0
......@@ -17,8 +17,7 @@
<div class="featureHome-vToolBar-one absolute z-index3">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg"
@toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"
:x="697" :y="930"></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">
</div>
<div class="featureHome-vToolBar-two absolute z-index3">
......@@ -28,14 +27,13 @@
</FeatureControls>
</div>
<div class="featureHome-left-one bjF6 absolute z-index2" :id="'viewSpotBox_' + (FeatureItem * 4 + 1) + '_' +index">
<VueDraggableResizable v-if="FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0"
:w="697" :h="930"
:ref="'viewSpotVds_' + (FeatureItem * 4 + 1) + '_'+index" tabindex="0" :resizable="false" :active="false"
:parent="false" axis="x" @activated="onActivated(FeatureItem * 4 + 1, index)"
<div class="featureHome-left-one bjF6 absolute z-index2"
:id="'viewSpotBox_' + (FeatureItem * 4 + 1) + '_' +index">
<VueDraggableResizable v-if="FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0" :w="697"
:h="930" :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"/>
<img :src="FeatureItem.dataObj.ImgList[0].url" :id="'viewSpotImg_' + (FeatureItem * 4 + 1) + '_'+index" />
</VueDraggableResizable>
</div>
<div class="featureHome-left-two absolute z-index1" :style="{'background':TripColor}">
......@@ -150,6 +148,10 @@
},
uploadpic(e) {
let that = this;
var postJson = {
// ConfigId: 8757,
// MapLevel: 11,
};
that.$message.info('上传中...')
if (e.target.files.length > 0 && e.target.files[0].size > 0) {
// 压缩图片需要的一些元素和对象
......@@ -160,7 +162,7 @@
newArr.push(blob);
var fileName = `${that.uuid(10, 10)}.png`;
var path = `/newFeature`;
that.uploadSelfBlob(path, newArr, x => {
that.uploadSelfBlob(path, newArr, postJson, x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
that.FeatureItem.dataObj.ImgList[0].url = allPath
......@@ -211,8 +213,10 @@
}
};
</script>
<style>
@import url("../../../../assets/css/UpgradedVersion.css");
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ d2f1bbb0
......@@ -194,10 +194,14 @@
};
return detailsObj;
},
initFeature() {
initFeature(isReload) {
var oldJson = this.FeatureData.FeatureHtmlJson ?
JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) :
"";
if (isReload) {
console.log("重新更新行程特色");
oldJson = [];
}
if (oldJson && oldJson.length > 0) {
oldJson.forEach(item => {
item.isDeletePage = true;
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue
View file @ d2f1bbb0
......@@ -112,7 +112,7 @@
newArr.push(blob);
var fileName = `${that.uuid(10, 10)}.png`;
var path = `/newFeature`;
that.uploadSelfBlob(path, newArr, x => {
that.uploadSelfBlob(path, newArr,'', x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
if (that.StencilDrawing) {
......
src/components/newTravelmanager/TravelGroupControl/tripmap.vue 0 → 100644
View file @ d2f1bbb0
This diff is collapsed.
src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue
View file @ d2f1bbb0
<style>
.TravelDayContentThree .TC-HotelDinner td{
.TravelDayContentThree .TC-HotelDinner td {
padding-left: 0 !important;
}
.TC-HotelDinner{
.TC-HotelDinner {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
}
.TC-Comtitlediv{
.TC-Comtitlediv {
width: 100%;
}
.Traveltrip-item-box{
.Traveltrip-item-box {
overflow: hidden;
}
.TC-HotelDinner{
.TC-HotelDinner {
display: flex;
flex-wrap: wrap;
padding: 0 10px;
}
.TC-HotelDinner tr td {
vertical-align: middle;
}
......@@ -40,7 +45,8 @@
font-size: 13px;
margin-left: 20px;
}
.Ht_hotelSelect{
.Ht_hotelSelect {
width: 330px;
}
......@@ -64,9 +70,10 @@
</td>
<td width="140" valign="middle">
<el-select v-if="!dayObj.isRead&&IsDirect==1" class="" :placeholder="$t('pub.pleaseSel')" filterable
v-model="dayObj.DinnerArray[0].BreakfastUseType">
v-model="dayObj.DinnerArray[0].BreakfastUseType" @change="changeBreakfastList(dayObj.DinnerArray[0])">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in breakFirstList" :label="item.name" :value="item.Id" :key="item.Id"></el-option>
<el-option v-for="item in breakFirstList" :label="item.name" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
<el-input type="text" v-model="dayObj.DinnerArray[0].DinnerName" class=""
v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(0)"></el-input>
......@@ -101,29 +108,23 @@
<img src="../../../assets/img/daily_dinner.png">
</td>
<td valign="middle">
<el-select v-if="!dayObj.isRead&&IsDirect==1" class="" style="width: 140px;" :placeholder="$t('pub.pleaseSel')" filterable
v-model="dayObj.DinnerArray[2].DinnerId" @visible-change="getDinnerList($event)"
@change="changeDinner2List(dayObj.DinnerArray[2])">
<el-select v-if="!dayObj.isRead&&IsDirect==1" class="" style="width: 140px;"
:placeholder="$t('pub.pleaseSel')" filterable v-model="dayObj.DinnerArray[2].DinnerId"
@visible-change="getDinnerList($event)" @change="changeDinner2List(dayObj.DinnerArray[2])">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in QDinnerList2" :label="item.Name" :value="item.ID" :key="item.ID">
<span>{{ item.Name }}</span>
<span class="TC-realSpan">{{item.RealName}}</span>
</el-option>
</el-select>
<el-input type="text" v-model="dayObj.DinnerArray[2].DinnerName" class=""
v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(2)"></el-input>
<span class="TC-hotelName" v-if="dayObj.isRead">
{{IsDirect==1?getQDinnerList2(dayObj.DinnerArray[2].DinnerId):dayObj.DinnerArray[2].DinnerName}}
</span>
</td>
</tr>
</template>
<!-- <tr>
<td colspan="6" height="15"></td>
</tr> -->
<tr class="marginT10">
<td width="70" valign="top">
<img crossorigin="Anonymous" src="../../../assets/img/daily_hotel-1.png">
......@@ -168,7 +169,7 @@
QDinnerList: [],
QDinnerList2: [],
DefaultSelectValue: 0,
breakFirstList: [ ],
breakFirstList: [],
showDining: false,
HotelChooseArray: this.dayObj.HotelChooseArray,
dinnerArray: this.dayObj.DinnerArray,
......@@ -269,7 +270,7 @@
hotelDescribeObj.Id = hotelObj.HotelId;
hotelDescribeObj.Describe = obj.WarmTip;
if (hotelDescribeObj.Describe != null && hotelDescribeObj.Describe != "") {
this.dayObj.WarmTipObj.Description += "<p>" + hotelDescribeObj.Describe + "</p>";
//this.dayObj.WarmTipObj.Description += "<p>" + hotelDescribeObj.Describe + "</p>";
}
}
}
......@@ -326,6 +327,21 @@
});
return isExist;
},
//早餐切换
changeBreakfastList(breakfastObj) {
if (breakfastObj.BreakfastUseType != 0) {
//获取当前选中的对象
let obj = {};
obj = this.breakFirstList.find(item => {
return item.Id === breakfastObj.BreakfastUseType; //筛选出匹配数据
});
if (obj != undefined) {
breakfastObj.DinnerName = obj.name;
}
} else {
breakfastObj.DinnerName = "";
}
},
//获取餐厅列表
getDinnerList(event) {
if (event) {
......@@ -397,7 +413,7 @@
dinnerDescribeObj.Describe = obj.About;
dinnerDescribeObj.Sort = dinnerObj.UseDinnerType;
if (dinnerDescribeObj.Describe != null && dinnerDescribeObj.Describe != "") {
this.dayObj.WarmTipObj.Description += "<p>" + dinnerDescribeObj.Describe + "</p>";
//this.dayObj.WarmTipObj.Description += "<p>" + dinnerDescribeObj.Describe + "</p>";
}
}
}
......@@ -483,7 +499,7 @@
dinnerDescribeArr.push(x);
}
});
this.WarmTripDescribe.DinnerDescribeArr = dinnerDescribeArr;
//this.WarmTripDescribe.DinnerDescribeArr = dinnerDescribeArr;
},
//餐饮对象创建
dinnerFactory(useDinnerType) {
......@@ -632,9 +648,9 @@
"travel_get_GetConfigDinnerList", {},
res => {
if (res.data.resultCode == 1) {
this.breakFirstList= res.data.data.breakFirstList;
this.otherDinner=res.data.data.otherDinner;
this.hotelHotSpringDinner=res.data.data.hotelHotSpringDinner;
this.breakFirstList = res.data.data.breakFirstList;
this.otherDinner = res.data.data.otherDinner;
this.hotelHotSpringDinner = res.data.data.hotelHotSpringDinner;
}
},
err => {}
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ d2f1bbb0
......@@ -136,8 +136,13 @@
<el-input type="textarea" :autosize="{minRows: 1, maxRows: 8 }" resize="none" class="w700"
placeholder="请输入行程大点信息" v-model="dayObj.TitleObj.Title"></el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input placeholder="请输入公里数" class="w120" v-model="dayObj.TitleObj.KMNumber">
<template slot="append">KM</template>
</el-input>
</el-form-item>
</span>
<span class="TC-spanTitle" v-if="dayObj.isRead">{{dayObj.TitleObj.Title}}</span>
<span class="TC-spanTitle" v-if="dayObj.isRead">{{dayObj.TitleObj.Title}} </span>
</div>
</div>
<div class="TC-Comtitlediv">
......
src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
View file @ d2f1bbb0
......@@ -147,6 +147,11 @@
<el-input type="textarea" :autosize="{minRows: 1, maxRows: 8 }" resize="none"
placeholder="请输入行程大点信息" v-model="dayObj.TitleObj.Title"></el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="请输入公里数" class="w120" v-model="dayObj.TitleObj.KMNumber">
<template slot="append">KM</template>
</el-input>
</el-form-item>
</span>
<span class="TC-spanTitle" v-if="dayObj.isRead">{{dayObj.TitleObj.Title}}</span>
</div>
......@@ -218,42 +223,14 @@
</el-select>
</div>
</div>
</div>
</div>
<!-- 行程景点信息 -->
<!--
<div class>
<noScenic v-if="!ishasScenic" :trafficObj="dayObj.TrafficObj" :class="{'showOther':TeamType==3}"></noScenic>
</div>
<div class="TC-ComInfoDiv" :class="scenicCheck>0||dayObj.ScenicArray.length>0?'_margin_bottom':''">
<onedayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==1)||(scenicCheck==1 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray" :IsDirect="NoticeParameters.IsDirect"
:DayNum="dayObj.DayNum"></onedayList>
<twodayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==2)||(scenicCheck==2 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray" :IsDirect="NoticeParameters.IsDirect"
:DayNum="dayObj.DayNum"></twodayList>
<threedayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==3)||(scenicCheck==3 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray" :IsDirect="NoticeParameters.IsDirect"
:DayNum="dayObj.DayNum"></threedayList>
<fourdayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==4)||(scenicCheck==4 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray" :IsDirect="NoticeParameters.IsDirect"
:DayNum="dayObj.DayNum"></fourdayList>
<fivedayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==5)||(scenicCheck==5 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray" :IsDirect="NoticeParameters.IsDirect"
:DayNum="dayObj.DayNum"></fivedayList>
</div> -->
<div class="TC-warmTips TC-Comtitlediv" v-if="!dayObj.isRead" :class="{'showOther':TeamType==3}">
<div class="TC-SpecialInstruction clearfix column">
<div class="TC-leftTitle" style="height: 20px;">温馨提示</div>
<div class="TC-rightContent" style="width: 100%;">
<!--<el-input type="textarea" v-model="dayObj.WarmTipObj.Description"></el-input>-->
<my-edit v-on:edit-value="dayObj.WarmTipObj.Description = arguments[0]"
v-bind:editValue="dayObj.WarmTipObj.Description" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList"></my-edit>
......@@ -294,11 +271,6 @@
<script>
import hotelTrip from "../travelLineTrip/HotelTripThree";
import noScenic from "../TravelTripPreview/noScenic";
import onedayList from "../TravelTripPreview/onedayList";
import twodayList from "../TravelTripPreview/twodayList";
import threedayList from "../TravelTripPreview/threedayList";
import fourdayList from "../TravelTripPreview/fourdayList";
import fivedayList from "../TravelTripPreview/fivedayList";
import trifficTrip from "../travelLineTrip/trifficTripThree";
import MyEdit from "../../EditTemplate.vue";
import ScenicTraffic from "../travelLineTrip/ScenicTraffic";
......@@ -347,25 +319,7 @@
getScenicArray(){
let i = 1
let list = []
// this.ScenicArray.forEach(y=>{
// this.dayObj.ScenicArray.forEach(x=>{
// x.Rank = 0
// if(x.CouponsId==y){
// list.push(x)
// }
// })
// })
// this.dayObj.ScenicArrayImg = JSON.parse(JSON.stringify(this.ScenicArray));
// list.forEach((x,index)=>{
// x.Rank = index+1
// })
// this.dayObj.ScenicArray.forEach(x=>{
// list.forEach(y=>{
// if(x.CouponsId==y.CouponsId){
// x.Rank = y.Rank
// }
// })
// })
this.dayObj.ScenicArray.forEach(x=>{
x.Rank = 0
if(x.CouponsId===this.ScenicArraySingle){
......@@ -832,12 +786,11 @@
},
mounted() {},
components: {
onedayList,
hotelTrip,
twodayList,
threedayList,
fourdayList,
fivedayList,
trifficTrip,
noScenic,
"my-edit": MyEdit,
......
src/plug/index.js
View file @ d2f1bbb0
......@@ -119,7 +119,7 @@ export default {
let lxymallUrl = ''; //国内游api
let crmUrl = ""; //crm API
let locationName = window.location.hostname;
let ocrUrl="http://192.168.10.68:8888";
let ocrUrl = "http://192.168.10.68:8888";
// domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
// domainUrl = "http://192.168.10.226"; //春姐
domainUrl = "http://192.168.10.128"; //奎哥
......@@ -139,18 +139,18 @@ export default {
mallUrl = "https://mallapi.oytour.com";
lxymallUrl = "https://erpmallapi.oytour.com";
crmUrl = "http://testcrm.oytour.com";
ocrUrl="http://ocr.oytour.com";
ocrUrl = "http://ocr.oytour.com";
} else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
mallUrl = "https://mallapi.oytour.com";
lxymallUrl = "https://erpmallapi.oytour.com";
crmUrl = "http://crm.oytour.com";
ocrUrl="http://ocr.oytour.com";
ocrUrl = "http://ocr.oytour.com";
}
var obj = {
//主地址
DomainUrl: domainUrl,
ocrUrl:ocrUrl,//行程下载地址
ocrUrl: ocrUrl, //行程下载地址
//常用提交数据URL
PostUrl: domainUrl + "/api/common/post",
//上传文件URL
......@@ -287,8 +287,7 @@ export default {
this.$router.push({
path: '/signname'
})
}
else if (this.$route.path == "/clientConfirm") {
} else if (this.$route.path == "/clientConfirm") {
let TCID = this.$route.query.TCID;
let orderID = this.$route.query.orderID;
let guestId = this.$route.query.guestId;
......@@ -300,8 +299,7 @@ export default {
guestId: guestId,
}
})
}
else if (this.$route.path == "/clientConfirmRB") {
} else if (this.$route.path == "/clientConfirmRB") {
let TCID = this.$route.query.TCID;
let orderID = this.$route.query.orderID;
let guestId = this.$route.query.guestId;
......@@ -313,8 +311,7 @@ export default {
guestId: guestId,
}
})
}
else if (this.$route.path == "/TravelContractConfirm") {
} else if (this.$route.path == "/TravelContractConfirm") {
let ContractId = this.$route.query.ContractId;
this.$router.push({
name: "TravelContractConfirm",
......@@ -1061,10 +1058,14 @@ export default {
}, faildCall)
},
//Blob文件上传
Vue.prototype.uploadSelfBlob = function (path, files, successCall) {
Vue.prototype.uploadSelfBlob = function (path, files, paramsObj, successCall) {
console.log("paramsObj", paramsObj);
let that = this;
var uploadUrl = that.domainManager().UploadUrl + "/Upload/UploadBlob?fileType=1&fileLimit=5&&filePath=" + path;
var formData = new FormData();
if (paramsObj && paramsObj != '') {
formData.append("paramsObj", JSON.stringify(paramsObj));
}
formData.append("myfile", files[0]);
that.$http.post(uploadUrl, formData, {
'Content-Type': 'multipart/form-data'
......@@ -1073,6 +1074,7 @@ export default {
successCall(res);
})
},
//path 请按照"/模块名称/用户ID/自定义文件夹/" /谁搞错一次5块红包
//files 文件数组
//p 进度回调函数
......@@ -1722,20 +1724,20 @@ export default {
// 多位小数点四舍五入
Vue.prototype.RoundItUp = function (Money) {
let FractionalPart = String(Money).split('.')
if(FractionalPart&&FractionalPart[1]&&FractionalPart[1].length>2){
if (FractionalPart && FractionalPart[1] && FractionalPart[1].length > 2) {
return Money = (parseFloat(Money)).toFixed(2) //(parseFloat(Money.toFixed(3))+0.001).toFixed(2)
}else{
} else {
return Money = Math.round(Money * 100) / 100
}
}
// 颜色转换rgb
Vue.prototype.hexToRgb = function (hexValue, opc) {
var rgx = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
var hex = hexValue.replace(rgx, function(m, r, g, b) {
var hex = hexValue.replace(rgx, function (m, r, g, b) {
return r + r + g + g + b + b;
});
var rgb = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
if(!rgb){
if (!rgb) {
return hexValue;
}
var r = parseInt(rgb[1], 16);
......@@ -1785,5 +1787,13 @@ export default {
}
return uuid.join("");
}
Vue.prototype.getRandomColor = function () {
var letters = '0123456789ABCDEF';
var color = '#';
for (var i = 0; i < 6; i++) {
color += letters[Math.floor(Math.random() * 16)];
}
return color;
}
}
}
src/utils/geojson.json 0 → 100644
View file @ d2f1bbb0
This diff is collapsed.
src/utils/japan_geo.json 0 → 100644
View file @ d2f1bbb0
This diff is collapsed.
src/utils/korea_geo.json 0 → 100644
View file @ d2f1bbb0
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