Skip to content

A
Athena
Commit 39d48253 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents be140f75 8ec771d4
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 40 deletions
src/components/FreeTravel/FreeDetail.vue
View file @ 39d48253
<template>
<div class="commonF FreeDetail" v-if="loading">
<div class="w1200">
<div class="bannerImg">
<img style="width:100%;height:100%" :src="ActiveSrc" :onerror="defaultImg" alt="">
<div class="bannerImg" :style="{background:'url(' + ActiveSrc + ') no-repeat bottom left/100% auto'}">
<!-- <img style="width:100%;" :src="ActiveSrc" :onerror="defaultImg" alt=""> -->
<ul class="banImgList basefix">
<li @mouseover="LiHover(item,index)" :class="LiactiveIndex==index?'Liactive':''" v-if="index<6" v-for="(item,index) in dataDetail.img_list" :key="index">
<img :src="ConcatImg(item.img_url)" alt="">
<img :src="item.img_url" alt="">
</li>
</ul>
</div>
......@@ -71,13 +71,13 @@
</span>
</div>
</el-popover>
<p v-show="mealType.pkgs.length>0" class="f12">套餐列表</p>
<p v-show="mealType.pkgs.length>0" class="f14 pfR">套餐列表</p>
<div style="margin-top:16px" class="typeList">
<span :class="mealTypeindex==index?'mealactive':''" @click="getmealTypeItem(item,index)" v-for="(item,index) in mealType.pkgs" :key="index+100">{{item.pkg_name}}</span>
</div>
<div v-show="mealTypeindex!=-1">
<p style="margin:15px 0" class="f12">年龄范围</p>
<p style="margin:15px 0" class="f14 pfR">年龄范围</p>
<el-row style="margin-bottom:10px">
<el-col :span="17"><span class="f12">{{mealTypeItem.price1_age_range}}</span></el-col>
<el-col :span="2"><span class="cee">￥{{mealTypeItem.price1_b2c}}</span></el-col>
......@@ -100,7 +100,7 @@
</el-row>
</div>
<p v-show="eventnoList.length>0" style="margin:15px 0" class="f12">场次</p>
<p v-show="eventnoList.length>0" style="margin:15px 0" class="f14 pfR">场次</p>
<div style="margin-top:16px" class="typeList">
<span :class="eventTypeindex==index?'mealactive':''" @click="getEventTypeItem(item,index)" v-for="(item,index) in eventnoList" :key="index+100">{{item.day}}</span>
......@@ -113,8 +113,8 @@
<span class="f18 pfR">行程介绍</span>
</div>
<div style="padding:20px">
<div class="f12">
<div style="margin-bottom:20px">
<div class="f14">
<div style="margin-bottom:20px;line-height:2">
{{dataDetail.prod_desc}}
</div>
<p class="f14 pfR" style="color:#000000;margin-bottom:15px" v-if="dataDetail.tour_list.length>0">行程列表</p>
......@@ -122,7 +122,7 @@
<p>第{{item.tour_day}}天</p>
<p style="padding:8px 0">说明{{item.tour_desc}}</p>
<div>
<img v-if="item.photo_url&&item.photo_url!=''" style="width:100;height: auto;display:block" :src="ConcatImg(item.photo_url)" alt="">
<img v-if="item.photo_url&&item.photo_url!=''" style="width:100%;height: auto;display:block" :src="ConcatImg(item.photo_url)" alt="">
</div>
</div>
<p class="f14 pfR" style="color:#000000;margin-bottom:15px" v-if="dataDetail.meal_list.length>0">餐食列表</p>
......@@ -185,8 +185,8 @@
<span class="f14 pfR" style="color:#111111;margin-left:8px">{{dataDetail.prod_comment_info.sales_qty}}+已订购</span>
</p>
<el-row style="margin:20px">
<el-col :span="2">{{dataDetail.prod_comment_info.avg_scores}}</el-col>
<el-col :span="12"><el-rate
<el-col :span="3">{{dataDetail.prod_comment_info.avg_scores}}</el-col>
<el-col :span="11"><el-rate
v-model="dataDetail.prod_comment_info.avg_scores"
disabled
text-color="#ff9900">
......@@ -324,13 +324,13 @@ export default {
this.msgObj.event_backup_data=item.is_hl;
},
getmealTypeItem(item,index){
console.log("item",item)
this.msgObj.ProductPKGName=item.pkg_name;
this.msgObj.pkg_no=item.pkg_no;
this.mealTypeItem=item;
this.mealTypeindex=index;
this.getEventNoList(item.pkg_no);
this.PriceChange();
},
LiHover(item,index){
this.LiactiveIndex=index;
......@@ -352,7 +352,6 @@ export default {
res => {
if (res.data.data.result === "00") {
// console.log("cahngxi",res);
if(res.data.data.events){
this.eventnoList=res.data.data.events;
}
......@@ -372,7 +371,6 @@ export default {
if (res.data.data.result === "00") {
this.mealType=res.data.data;
// console.log("this.mealType",this.mealType)
this.msgObj.guid=this.mealType.guid;
this.dateList=this.mealType.sale_dates.saleDt;
this.dateList.forEach(item=>{
......@@ -399,7 +397,6 @@ export default {
month.dateStr=`${this.tomonth}-${i}`;
MonthdayList.push(month)
}
// console.log("MonthdayList",MonthdayList)
let list=MonthdayList;
for(let i=0;i<list.length;i++){
for(let j=0;j<this.dateList.length;j++){
......@@ -423,7 +420,6 @@ export default {
if (res.data.data.result === "00") {
this.DomainUrl=res.data.data.KkdayDomain;
let data = res.data.data.prod
console.log(data)
this.loading = true
this.dataDetail = data;
if(this.dataDetail.prod_comment_info.avg_scores){
......@@ -462,7 +458,6 @@ export default {
// this.msgObj.pkg_no=item.pkg_no;
this.msgObj.s_date=item.date_str;
this.msgObj.dateStr=item.date_str;
console.log("this.msgObj",this.msgObj.pkg_no)
this.visible=false;
},
creatCalendar(list) {
......@@ -649,6 +644,7 @@ export default {
width:100%;
height:340px;
position: relative;
overflow: hidden;
}
.FreeDetail .bannerImg .banImgList{
position: absolute;
......
src/components/FreeTravel/OrderConfirmation.vue
View file @ 39d48253
......@@ -36,8 +36,8 @@
<el-form-item label="Email" prop="buyer_email" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]">
<el-input placeholder="接收确认邮件，获得出行资讯" size="mini" style="width:300px" v-model="freeMsg.buyer_email"></el-input>
</el-form-item>
<el-form-item label="国籍" prop="buyer_country" :rules="[{required: true, message: '国籍不能为空', trigger: 'blur'}]">
<el-select @change="GenderSelect" v-show="tel_country_code.length>0" v-model="freeMsg.buyer_country" size="mini" style="margin-right:8px" filterable placeholder="请选择">
<el-form-item v-show="tel_country_code.length>0" label="国籍" prop="buyer_country" :rules="[{required: true, message: '国籍不能为空', trigger: 'blur'}]">
<el-select @change="GenderSelect" v-model="freeMsg.buyer_country" size="mini" style="margin-right:8px" filterable placeholder="请选择">
<el-option
v-for="(item,index) in tel_country_code"
:key="index"
......@@ -280,7 +280,7 @@ export default {
this.freeMsg.guide_lang="zh-tw";
this.freeMsg.custom=[];
this.freeMsg.pay={};
this.freeMsg.buyer_tel_country_code="";
this.freeMsg.buyer_tel_country_code="86";
this.freeMsg.pay={
type: "02",
// credit_card: {
......@@ -291,7 +291,6 @@ export default {
// type: ""
// }
};
// console.log("this.freeMsg",this.freeMsg)
this.getDetails(id)
this.GetInfo();
},
......@@ -372,7 +371,6 @@ export default {
}
this.BtnLoading=true;
this.apipost('dmc_post_Get_KKDayOrderBooking',this.freeMsg,res=>{
console.log("res",res);
this.BtnLoading=false;
if(res.data.data&&res.data.data.orderId) {
......@@ -417,10 +415,9 @@ export default {
if (res.data.resultCode === 1) {
this.DomainUrl=res.data.data.KkdayDomain;
let data = res.data.data;
// console.log(data)
this.dataDetail = data;
this.booking_field=data.booking_field;
this.picUrl=this.dataDetail.DomainUrl+this.dataDetail.ProductPic;
this.picUrl=this.dataDetail.prod.prod_img_url;
if(this.booking_field.custom&&this.booking_field.custom.cus_type&&this.booking_field.custom.cus_type.list_option.length>0){
let customObj=this.booking_field.custom;
let list_option=this.booking_field.custom.cus_type.list_option;
......@@ -442,7 +439,7 @@ export default {
birth:'',
nationality:'CN',
passport_no:'',
tel_country_code:'',
tel_country_code:'86',
tel_number:"",
};
this.listform.customNew.push(msg);
......@@ -460,7 +457,7 @@ export default {
birth:'',
nationality:'CN',
passport_no:'',
tel_country_code:'',
tel_country_code:'86',
tel_number:"",
};
this.listform.customNew.push(msg);
......@@ -481,13 +478,12 @@ export default {
birth:'',
nationality:'CN',
passport_no:'',
tel_country_code:'',
tel_country_code:'86',
tel_number:"",
};
this.listform.customNew.push(msg);
}
}
console.log("this.listform.customNew",this.listform.customNew)
});
......@@ -512,7 +508,6 @@ export default {
},
GetInfo(){
this.apipost('dmc_post_GetTelephoneCountryCode',{},res=>{
console.log("res",res);
if(res.data.resultCode == 1) {
this.tel_country_code=res.data.data.jo.CountryAreas;
this.payObj.type=res.data.data.paytype;
......
src/components/FreeTravel/payInfo.vue
View file @ 39d48253
......@@ -122,7 +122,7 @@
<p>第{{item.tour_day}}天</p>
<p style="padding:8px 0">说明{{item.tour_desc}}</p>
<div>
<img v-if="item.photo_url&&item.photo_url!=''" style="width:100;height: auto;display:block" :src="ConcatImg(item.photo_url)" alt="">
<img v-if="item.photo_url&&item.photo_url!=''" style="width:100%;height: auto;display:block" :src="ConcatImg(item.photo_url)" alt="">
</div>
</div>
<div v-if="dataDetail.meal_list">
......@@ -302,7 +302,7 @@ export default {
this.payInfoGo=res.data.data;
if(this.oldModel.OldContent){
this.oldModel.OldContent=JSON.parse(this.oldModel.OldContent)
this.ImgSrc=this.oldModel.OldContent.DomainUrl+this.oldModel.OldContent.ProductPic;
this.ImgSrc=this.oldModel.OldContent.ProductPic;
}
this.getDetails(this.oldModel.ProductNo);
......
src/components/newPersonalCenter/block/model/FreeOrder.vue
View file @ 39d48253
......@@ -128,7 +128,7 @@ export default {
this.getOrderMsg,
res => {
if (r.data.resultCode == 1) {
console.log(res);
} else {
this.$message.error(r.data.message);
}
......@@ -145,9 +145,9 @@ export default {
this.orderLoading = false;
if (res.data.resultCode == 1) {
console.log("reasfafs",res);
this.tableData=res.data.data.pageData;
console.log(" this.tableData", this.tableData);
console.log("this.tableData",this.tableData)
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
} else {
......@@ -158,7 +158,7 @@ export default {
);
},
handleClick(item) {
console.log(item);
this.activeName = item.ID;
this.getOrderMsg.B2BSelectOrderState = item.ID;
this.gerOrderList();
......
src/components/newPersonalCenter/block/model/OrderInfoModel/FreeTable.vue
View file @ 39d48253
......@@ -228,8 +228,8 @@
<p>实付金额 ¥{{item.Income | priceFormat}}</p>
<!-- <p class="__cp pay_no" v-if="!item.payShow" @click="item.payShow = true">已付总额 ¥{{item.customerPayMoney | priceFormat}} <i class="iconfont icon-xia"></i></p> -->
<!-- <p class="__cp pay_no" v-if="item.payShow" @click="item.payShow = false">已付总额 ¥{{item.customerPayMoney | priceFormat}} <i class="iconfont icon-xia shang"></i></p> -->
<!-- <p style="color:#999999">优惠金额 ¥{{item.DiscountMoney | priceFormat}}</!--> -->
<p style="color:#999999">取消产生的费用 ¥{{item.CancelFee | priceFormat}}</p>
<!-- <p style="color:#999999">优惠金额 ¥{{item.DiscountMoney | priceFormat}}</!-->
<p v-if="item.CancelFee>0" style="color:#999999">取消产生的费用 ¥{{item.CancelFee | priceFormat}}</p>
<!-- :class="{height_aotu: item.payShow}" -->
<!-- <div class="pay_list" v-if="item.payShow">
......@@ -239,10 +239,10 @@
</div> -->
</td>
<td class="color333 font-size14">
<span>{{item.OrderStatus}}</span>
<span>{{item.OrderStateStr}}</span>
</td>
<td>
<p style="margin-bottom:6px" v-if="item.Income!=item.TotalPrice">
<p style="margin-bottom:6px" v-if="item.Income!=item.TotalPrice &&item.OrderStatus!=2">
<el-button @click="Pay(item)" size="mini" type="danger">立即支付</el-button>
</p>
......@@ -338,7 +338,6 @@ export default {
"dmc_post_Get_KKDayOrderCancel",
this.exitMsg,
res => {
// console.log("res",res);
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.$emit('queryDays')
......
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