Skip to content

A
Athena
Commit 5f9c9a50 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

合并代码

parents 5de07880 276caf6b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1038 additions and 401 deletions
src/assets/css/LocalCuisine.css
View file @ 5f9c9a50
......@@ -65,6 +65,7 @@
height: 12px;
position: relative;
top: 2px;
cursor: pointer;
}
.LocalCuisine .pxDiv{
padding: 15px 0;
......
src/assets/css/common.css
View file @ 5f9c9a50
......@@ -13,6 +13,9 @@
.commonF .f20{
font-size: 20px;
}
.commonF .f32{
font-size:32px;
}
.commonF .pfR{
font-family: "PingFangR";
}
......
src/assets/css/groupTour/index.css
View file @ 5f9c9a50
......@@ -11,4 +11,104 @@
font-weight: 400;
text-align: center;
margin: 45px auto;
}
.GroupTour .GroupTour_top_bg{
position: relative;
height: 522px;
color:#333;
font-family: "PingFang";
}
.GroupTour .GroupTour_top_bg .bg{
width: 1180px;
margin:0 auto;
min-height: 50px;
z-index: 1000;
position: relative;
}
.GroupTour .GroupTour_top_bg img{
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.GroupTour .GroupTour_top_bg .alltype{
width:200px;
height:40px;
background:rgba(240,93,107,1)!important;
color: #fff;
box-sizing: border-box;
font-size:14px;
text-align: center;
line-height: 40px;
padding:0!important;
}
.GroupTour .GroupTour_top_bg .typeLi>li{
padding:10px 30px 10px 35px;
box-sizing: border-box;
background: #ffffff;
position: relative;
width:200px;
border-bottom:1px solid #E9E9E9;
cursor: pointer;
}
.GroupTour .GroupTour_top_bg .typeLi>li:last-child{
border-bottom: none;
}
.GroupTour .GroupTour_top_bg .typeLi>li .jumpHover{
position: absolute;
top: -1px;
left: 200px;
width: 500px;
background: #fff;
padding:10px 20px;
box-sizing: border-box;
border: 1px solid #E9E9E9;
}
.GroupTour .GroupTour_top_bg .typeLi>li .typeTile{
font-family: "PingFangR";
}
.GroupTour .GroupTour_top_bg .typeLi>li .typeAdress{
color:#666666;
font-size: 12px;
margin-top:8px;
}
.GroupTour .GroupTour_top_bg .typeLi>li .typeAdress span{
margin-right: 5px;
}
.GroupTour .GroupTour_top_bg .jumpTitle{
font-family: "PingFangR";
border-bottom:1px solid #E9E9E9;
height: 30px;
line-height: 28px;
}
.GroupTour .GroupTour_top_bg .jumpTitle .jumpTitleSpan{
display: inline-block;
border-bottom: 3px solid #EE4454;
}
.GroupTour .GroupTour_top_bg .jumpHover{
display: none;
transition: all .5s ease;
}
.GroupTour .GroupTour_top_bg .jumpHover li{
color:#888888;
}
.GroupTour .GroupTour_top_bg .typeLi>li .right_border{
position: absolute;
top: 0;
right: -3px;
z-index: 3;
width: 4px;
height: 100%;
background: #fff;
display: none;
}
.GroupTour .GroupTour_top_bg .typeLi>li:hover .jumpHover{
display: block;
}
.GroupTour .GroupTour_top_bg .typeLi>li:hover .right_border{
display: block;
}
\ No newline at end of file
src/assets/css/home.css
View file @ 5f9c9a50
......@@ -40,6 +40,13 @@
margin-bottom: 8px;
cursor: pointer;
}
.Home .Home_top .el-radio__input.is-checked .el-radio__inner{
border-color: #FD6473;
background: #FD6473;
}
.Home .Home_top .el-radio__input.is-checked+.el-radio__label{
color: #FD6473;
}
.Home .green_span {
display: inline-block;
width: 3px;
......@@ -56,7 +63,8 @@
text-align: center;
font-size: 14px;
float: right;
font-family: "PingFangR"
font-family: "PingFangR";
cursor: pointer;
}
.Home .Home_top .tag_right .el-form-item__label {
color: #666666;
......@@ -71,7 +79,7 @@
border:1px solid rgba(216,218,220,1);
margin-bottom:10px;
}
.Home .Home_top .tag_right .chooseticketul li span:nth-child(1){
.Home .Home_top .tag_right .chooseticketul li>span:nth-child(1){
padding-left: 10px;
color:#666666;
}
......
src/components/DependentTravel/DesignScheme.vue
View file @ 5f9c9a50
......@@ -150,7 +150,7 @@
<div v-if="im==0" v-for="(img,im) in Scen.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<!-- <img :onerror="defaultImg" :src="img.url" style="width:200px;height:133px;float:left;" alt=""> -->
<img v-if="!img.url" src="../../assets/img/default.png" style="width:200px;height:133px;float:left;" alt="">
<img v-else :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<img v-else :src='compressImg(img.url, "filt", 245, "")' style="width:200px;height:133px;float:left;" alt="">
<div style="float:left;margin-left:20px;width:719px">
<p><span style="color:#5F95E8;font-size:16px;margin-bottom:13px">{{Scen.childItem.couponsName}}</span></p>
......@@ -171,7 +171,7 @@
<p style="font-size:16px;"><span>餐饮</span><span style="color:#5F95E8;margin-left:5px">一{{Res.childItem.dinnerName}}</span></p>
<div v-if="im==0" v-for="(img,im) in Res.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<img :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<img :src='compressImg(img.url, "filt", 245, "")' style="width:200px;height:133px;float:left;" alt="">
<div v-if="Res.childItem.description" style="float:left;margin-left:20px;width:719px">
<p v-html="Res.childItem.description"></p>
</div>
......
src/components/DependentTravel/IndependentList.vue
View file @ 5f9c9a50
......@@ -124,7 +124,7 @@
<div class="content_list" v-if="datalist.length>0">
<el-row class="row_content" v-for="item in datalist" :key="item.id">
<el-col :span="3">
<img :src="item.imgCover[0].Url" alt="" :onerror="errorImg">
<img :src='compressImg(item.imgCover[0].Url, "filt", 245, "")' alt="" :onerror="errorImg">
</el-col>
<el-col class="div_2" :span="14" style="font-size:12px">
<p @click="goUrl('detail',item.id,item.tcid)" class="visa_title" style="font-size:16px;color:#000000">
......
src/components/DependentTravel/IndependentTravel.vue
View file @ 5f9c9a50
......@@ -3,7 +3,7 @@
<div class="top_img">
<el-carousel class="carousel" arrow="always" style="height:100%" :interval="10000" trigger="click">
<el-carousel-item v-for="item in slideList" :key="item.url">
<img :src='item.url'>
<img :src='compressImg(item.url, "filt", 245, "")'>
</el-carousel-item>
</el-carousel>
<div class="box">
......
src/components/GroupTour/index.vue
View file @ 5f9c9a50
......@@ -5,6 +5,75 @@
<el-row class="GroupTour">
<!-- 顶部图片 -->
<el-row class="GroupTour_top_bg">
<div class="bg">
<ul class="typeLi">
<li class="alltype">所有分类</li>
<li>
<span class="right_border"></span>
<p class="typeTile">日本线</p>
<p class="typeAdress">
<span>东京</span>
<span>高雄</span>
<span>北海道</span>
</p>
<div class="jumpHover">
<p class="jumpTitle"><span class="jumpTitleSpan">日本线</span></p>
<ul style="font-size:12px">
<li style="margin-top:15px;">
<p style="color:#111111;font-family:'PingFangR'">热门目的地</p>
<div style="margin-top:6px">
<span>东京<span style="padding:0 6px">|</span></span>
<span>高雄<span style="padding:0 6px">|</span></span>
<span>北海道 <span style="padding:0 6px">|</span></span>
<span>东京<span style="padding:0 6px">|</span></span>
</div>
</li>
<li style="margin-top:15px;">
<p style="color:#111111;font-family:'PingFangR'">热门目的地</p>
<div style="margin-top:6px">
<span>东京 <span> | </span></span>
<span>高雄 <span> | </span></span>
<span>北海道 <span> | </span></span>
</div>
</li>
</ul>
</div>
</li>
<li>
<span class="right_border"></span>
<p class="typeTile">日本线</p>
<p class="typeAdress">
<span>东京</span>
<span>高雄</span>
<span>北海道</span>
</p>
<div class="jumpHover">
<p class="jumpTitle"><span class="jumpTitleSpan">日本线</span></p>
<ul style="font-size:12px">
<li style="margin-top:15px;">
<p style="color:#111111;font-family:'PingFangR'">热门目的地</p>
<div style="margin-top:6px">
<span>东京<span style="padding:0 6px">|</span></span>
<span>高雄<span style="padding:0 6px">|</span></span>
<span>北海道 <span style="padding:0 6px">|</span></span>
<span>东京<span style="padding:0 6px">|</span></span>
</div>
</li>
<li style="margin-top:15px;">
<p style="color:#111111;font-family:'PingFangR'">热门目的地</p>
<div style="margin-top:6px">
<span>东京 <span> | </span></span>
<span>高雄 <span> | </span></span>
<span>北海道 <span> | </span></span>
</div>
</li>
</ul>
</div>
</li>
</ul>
</div>
<img src="../../assets/img/groupTour/top_bg.png" alt="">
</el-row>
<el-row class="_list" v-loading="loading">
......
src/components/Home.vue
View file @ 5f9c9a50
This diff is collapsed.
src/components/IntegralMall/IntegralMall.vue
View file @ 5f9c9a50
......@@ -28,14 +28,14 @@
<el-row class="IntegralMall">
<el-row class="w1180">
<IntegralHead/>
<div class="_block">
<div class="_block" v-for="item in dataList" v-if="item.activityId==1">
<el-row class="tit">
<div>
<img src="../../assets/img/ps/jifendui.png" alt="">
<p>热门精品推荐</p>
<img :src="item.activityImg" alt="">
<p>{{item.activityName}}</p>
</div>
</el-row>
<commodity v-bind:message="dataList[0].list"/>
<commodity v-bind:message="item.list"/>
</div>
<div class="_block">
<el-row class="tit">
......
src/components/IntegralMall/OrderCompleted.vue
View file @ 5f9c9a50
......@@ -75,7 +75,7 @@
margin-top:10px;
}
.OrderCompleted .OC_btmList{
width:320px;
width:380px;
margin-top:63px;
font-size:12px;
color:#333333;
......@@ -87,7 +87,7 @@
border-bottom:1px solid #DDDDDD;
}
.OrderCompleted .OC_jishu{
width:58%;
width:50%;
}
.OrderCompleted .OC_jifen{
display: inline-block;
......@@ -135,28 +135,28 @@
<img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/>
<div class="OC_riContent">
<div class="OC_paySuccsss">支付成功！</div>
<div class="OC_dianhua">如有任何疑问可致电028-56540254，点击 <span class="Order_more">查看订单>></span></div>
<div class="OC_dianhua">如有任何疑问可致电028-56540254，点击 <span class="Order_more" @click="goUrl('myPointOrder')">查看订单>></span></div>
</div>
</div>
<div class="OC_btmList">
<div>
<div class="OC_jifen OC_jishu">
支付积分：￥9900
支付积分：￥{{pay}}
</div>
<div class="OC_jifen">
剩余积分：￥190010
剩余积分：￥{{residue}}
</div>
</div>
<div>
<div class="OC_jifen OC_jishu">
订单编号：45612312321
订单编号：{{orderNum}}
</div>
<div class="OC_jifen">
下单时间：2019-02-21
下单时间：{{createTime | YMDHMS}}
</div>
</div>
</div>
<input type="button" value="返回积分商城" class="OC_backBtn"/>
<input type="button" value="返回积分商城" @click="goUrl('IntegralMall')" class="OC_backBtn"/>
</div>
<div class="OC_rightImg">
<img src="../../assets/img/ticket/back.png" alt=""/>
......@@ -173,10 +173,20 @@ export default {
props:{},
data(){
return{
createTime:'',
orderNum:'',
pay:'',
residue:''
}
},methods: {
goUrl: function (path) {
this.$router.push({name: path});
}
},mounted() {
this.createTime = this.$route.query.createTime;
this.orderNum = this.$route.query.orderNum;
this.pay = this.$route.query.pay;
this.residue = this.$route.query.residue;
}
}
</script>
src/components/IntegralMall/OrderdetailsCompleted.vue
View file @ 5f9c9a50
......@@ -157,10 +157,7 @@
<span>完成</span>
</div>
<div class="Order_jifen">
支付积分：￥9900
</div>
<div>
剩余积分：￥190010
支付积分：￥{{dataList.goodsPrice*dataList.buyNum}}
</div>
</div>
<div class="Order_Top_right">
......@@ -179,15 +176,15 @@
<img src="../../assets/img/orderLins.png" alt=""/>
</div>
<div class="Submit_Orders">
<i class="iconfont icon-gerenzhongxindingdandaishouhuo"/>
确认兑换
<i class="iconfont icon-gerenzhongxindingdandaishouhuo"></i>
等待收货
</div>
<div class="SubmitComLine">
<img src="../../assets/img/orderLins.png" alt=""/>
</div>
<div class="Submit_Orders">
<!-- <div><img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/></div> -->
<div><img src="../../assets/img/ticket/huigou.png" alt=""/></div>
<div v-if="dataList.orderStatus==3"><img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/></div>
<div v-else><img src="../../assets/img/ticket/huigou.png" alt=""/></div>
订单完成
</div>
</div>
......@@ -195,23 +192,23 @@
<table class="myPointTable">
<tr>
<td colspan="3">
<span class="pointOrderTime">2019-04-28 08:25:23</span>
<span class="pointOrderTitle">订单号：</span><span class="pointOrderNum">451648</span>
<span class="pointOrderTime">{{dataList.crateTime | YMDHMS}}</span>
<span class="pointOrderTitle">订单号：</span><span class="pointOrderNum">{{dataList.orderNum}}</span>
</td>
</tr>
<tr>
<td width="325px">
<div class="po_info">
<div class="po_left">
<img :src="dataList.goodsImg" alt=""/>
</div>
<div class="po_right">
天空大容量抽绳化妆包+防水防潮+便携耐用 暗兜设计
{{dataList.goodsName}}
</div>
</div>
</td>
<td>
<div class="OrderShouContent" v-if="index<num" v-for="(item,index) in data">
<!-- <div class="OrderShouContent" v-if="index<num" v-for="(item,index) in data">
<div class="Order_left">
{{item.time}}
</div>
......@@ -222,10 +219,15 @@
<span @click="DataLength(2)" v-if="num>1&&index==data.length-1&&subIndex==item.list.length-1" class="Order_more">收起>></span>
</div>
</div>
</div> -->
<div>
<span v-if="dataList.orderStatus==1">待发货</span>
<span v-if="dataList.orderStatus==2">待收货</span>
<span v-if="dataList.orderStatus==3">交易成功</span>
</div>
</td>
<td width="132px" style="text-align:center;">
<input type="button" class="pointCancelBtn" value="取消订单">
<input type="button" class="pointCancelBtn" @click="goUrl('integral')" value="再次兑换">
</td>
</tr>
</table>
......@@ -238,6 +240,11 @@ export default {
data(){
return {
num:1,
id:0,
dataList:[],
//标题
orderTitle:'',
score:'',
data:[
{
time:"2019-08-08",
......@@ -264,14 +271,39 @@ export default {
if(num==2){
this.num=1;
}else{
this.num=this.data.length;
console.log("this.num",this.num)
this.num=this.data.length;
}
},
getInfo(){
let msg = {
id:this.id
}
this.apiJavaPost('/api/orderForm/getOrderDetail',msg,res=>{
if(res.data.resultCode==1){
this.dataList = res.data.data;
}else{
this.Error(res.data.message);
}
});
},
//获取积分
getScore(){
this.apiJavaPost('/api/orderForm/getTotalIntegrals',{},res=>{
if(res.data.resultCode==1){
this.score = res.data.data;
}else{
this.Error(res.data.message);
}
});
},
goUrl: function (path) {
this.$router.push({name: path});
}
},mounted(){
this.getInfo();
this.getScore();
},created(){
this.id = this.$route.query.id;
}
}
</script>
src/components/IntegralMall/block/IntegralHead.vue
View file @ 5f9c9a50
......@@ -25,6 +25,7 @@
}
.IntegralHead .bottom_class ._class p{
margin-top: 5px;
color:#222222;
}
</style>
<template>
......@@ -33,13 +34,13 @@
<img src="../../../assets/img/ps/IntegralHead.png" alt="">
</div>
<el-row class="bottom_class">
<template v-for="item in list">
<router-link :to="{path: '/productDetail/1'}">
<template v-for="item in dataList">
<el-col :span="3" class="_class">
<img src="../../../assets/img/img-01.png" alt="">
<p>家纺家饰</p>
<div @click="goList(item.id)">
<img :src="item.icon" alt=""/>
<p>{{item.name}}</p>
</div>
</el-col>
</router-link>
</template>
</el-row>
</el-row>
......@@ -52,12 +53,28 @@ export default {
},
data(){
return{
list:[1,2,3,4,5,6,7,8]
dataList:[]
}
},methods:{
getList(){
this.apiJavaPost("/api/IntegralManager/goodsTypeManager",
{reqType: 'find'},
res => {
if (res.data.resultCode === 1) {
console.log(res,'ressssssss');
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
goList: function (type) {
this.$router.push({path: 'productList', query: {type: type}})
}
},mounted(){
this.getList();
}
}
</script>
src/components/IntegralMall/confirOrder.vue
View file @ 5f9c9a50
This diff is collapsed.
src/components/IntegralMall/myPointOrder.vue
View file @ 5f9c9a50
......@@ -296,7 +296,7 @@
<span v-if="item.orderStatus==3">交易成功</span>
</td>
<td width="150px">
<input type="button" class="pointDetailBtn" @click="goUrl('OrderdetailsCompleted')" value="查看详情">
<input type="button" class="pointDetailBtn" @click="goUrl('OrderdetailsCompleted',item.id)" value="查看详情">
<!-- <div><input type="button" class="pointCancelBtn" value="取消订单"></div> -->
</td>
</tr>
......@@ -375,8 +375,13 @@ export default {
this.msg.pageIndex = parseInt(val);
this.getList();
},
goUrl: function (path) {
this.$router.push({name: path});
goUrl: function (path,id) {
this.$router.push({
name: path,
query:{
id:id
}
});
},
handleCommandTwo(command) {
this.orderTime = command.Day;
......
src/components/IntegralMall/productDetail.vue
View file @ 5f9c9a50
......@@ -194,14 +194,7 @@
<el-col :span="14" class="pd_top_info_right">
<p class="_tit">{{detail.name}}</p>
<p class="_sub_tit">{{detail.packing}}</p>
<p class="_price">售价<span class="jifen">¥ <span>{{detail.price}}</span> {{detail.priceUnit === 1 ? '现金' : '积分'}}</span> <span class="yishou">已售 <span>99</span></span></p>
<div class="_colors">
<span class="_colors_name">颜色</span>
<!-- <template v-for="(item, index) in colors">
<span class="_colors_item" :class="{'_active': colorsIndex === index}" @click="colorsIndex = index">{{item}}</span>
</template> -->
<span class="">无</span>
</div>
<p class="_price">售价<span class="jifen">¥ <span>{{detail.price}}</span> {{detail.priceUnit === 1 ? '现金' : '积分'}}</span></p>
<div class="_numbers">
<span class="_numbers_name">数量</span>
<el-input-number v-model="numbers" :min="1" :max="detail.quota === 0 ? '' : detail.quota" size="mini"></el-input-number>
......@@ -217,7 +210,7 @@
<p><i class="iconfont icon-tixing"></i>这里是相关的一些比较重要一点的提示说明，比如平台的一些简单规则等等。。。</p>
</div>
<div class="_btn_dui">
<span @click="PlacingOrder(1)">立即兑换</span>
<span @click="PlacingOrder()">立即兑换</span>
</div>
</el-col>
</el-row>
......@@ -304,8 +297,8 @@ export default {
null
);
},
PlacingOrder: function (id) {
this.$router.push({name: 'confirOrder', query: { id: id, num: this.numbers}})
PlacingOrder: function () {
this.$router.push({name: 'confirOrder', query: { id: this.id, num: this.numbers}})
}
},mounted(){
this.getDetail()
......
src/components/IntegralMall/productList.vue
View file @ 5f9c9a50
......@@ -166,7 +166,7 @@
</template>
</div>
</el-row>
<el-row class="tabs">
<!-- <el-row class="tabs">
<span class="_name">品牌</span>
<div class="tabs_box">
<template v-for="(item, index) in brandList">
......@@ -184,7 +184,7 @@
</span>
</span>
</div>
</el-row>
</el-row> -->
</div>
<div class="list_item" >
<div class="list_item_box" v-for="item in dataList" :key="item.id" @click="goDetail(item.id)">
......
src/components/LocalTour/AdmissionTicket.vue
View file @ 5f9c9a50
......@@ -5,7 +5,7 @@
<div v-for="(item,index) in dataList" :key="index+5000" style="margin-bottom:20px">
<li>
<div>
<img style="width:143px;height:106px;" :src="item.coverImgs[0]" alt="">
<img style="width:143px;height:106px;" :src='compressImg(item.coverImgs[0], "filt", 245, "")' alt="">
</div>
<div class="secondDiv">
<p @click="GoUrl(item)" style="font-size:16px;color:#2A5532;cursor:pointer">{{item.name}}</p>
......@@ -49,7 +49,7 @@
<ul class="hottour_ul">
<p class="pfR font14" style="margin-bottom:8px">热门景点</p>
<li @click="GoUrl(item)" v-for="(item,index) in hotList" :key="index+2000">
<img :src="item.coverImgs[0]" alt="">
<img :src='compressImg(item.coverImgs[0], "filt", 245, "")' alt="">
<div class="hotcontent">
<span style="color:#fff;width:125px;" class="textHidden font12">{{item.name}}</span>
<span style="width:75px;color:#FDAC11;text-align:right">
......
src/components/LocalTour/LocalCuisine.vue
View file @ 5f9c9a50
This diff is collapsed.
src/components/LocalTour/LocalTourList.vue
View file @ 5f9c9a50
......@@ -283,6 +283,9 @@ export default {
}
}
if(this.$route.query.id){
this.msg.countryId=Number(this.$route.query.id);
}
},
mounted() {
......
src/components/LocalTour/Localtourhome.vue
View file @ 5f9c9a50
......@@ -20,7 +20,9 @@
<div class="sidenav_right">
<el-carousel class="carousel" arrow="always" style="height:100%" :interval="10000" trigger="click">
<el-carousel-item v-for="item in slideList" :key="item.url">
<img :src='item.url'>
<!-- <img :src='item.url'> -->
<img :src='compressImg(item.url, "filt", 245, "")' alt="">
</el-carousel-item>
</el-carousel>
</div>
......@@ -71,10 +73,10 @@
</div>
</div>
</div>
<div class="basefix dayContent" style="margin-top:17px">
<div v-loading="dayLoad" class="basefix dayContent" style="margin-top:17px">
<div class="dayConDiv1">
<div @click="goOneDayDetail(item)" v-if="index<2" v-for="(item,index) in abroadList" :key="index+300">
<img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src="img.url" alt="">
<img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src='compressImg(img.url, "filt", 245, "")' alt="">
<span class="daydes">{{item.title}}</span>
<span class="price">￥<span class="pfR font18">{{item.b2BPrice}}</span>起</span>
</div>
......@@ -83,7 +85,7 @@
<ul>
<li @click="goOneDayDetail(item)" v-if="index>1" v-for="(item,index) in abroadList" :key="index+200">
<div class="imgDiv">
<img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src="img.url" alt="">
<img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src='compressImg(img.url, "filt", 245, "")' alt="">
<span class="country">{{item.lineShortName}}</span>
<p class="price">
<span>￥<span class="font18 pfR">{{item.b2BPrice}}</span>起</span>
......@@ -104,7 +106,7 @@
</div>
<ul class="hottour_ul">
<li @click="goOneDayDetail(item)" v-for="(item,index) in abroadhotList" :key="index+100">
<img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src="img.url" alt="">
<img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src='compressImg(img.url, "filt", 245, "")' alt="">
<div class="hotcontent">
<span class="textHidden font12">{{item.title}}</span>
<p class="font12" style="color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px">￥<span class="pfR font14">{{item.b2BPrice}}</span>起</p>
......@@ -140,9 +142,10 @@
<span>大阪环球影城</span>
</div>
</div>
<ul class="ticketRight basefix">
<ul v-loading="ticketLoad" class="ticketRight basefix">
<li @click="GoTicket(item)" v-for="item in ticketList" :key="item.id">
<img :src="item.coverImgs[0]" alt="">
<!-- <img :src="item.coverImgs[0]" alt=""> -->
<img :src='compressImg(item.coverImgs[0], "filt", 245, "")' alt="">
<!-- <div class="title">
<img src="../../assets/img/localtour/ticket1.png" alt="">
<p style="margin-top:3px;">电影</p>
......@@ -289,7 +292,7 @@
</div>
<div class="outone_top_right">
<div class="content">
<span @click="SelectCountry(item.countryId)" :class="ticketmsg.countryId==item.countryId?'outone_active':''" v-for="item in countryticketList" :key="item.countryId">
<span @click="SelectFood(item.countryId)" :class="foodmsg.countryId==item.countryId?'outone_active':''" v-for="item in foodcountryList" :key="item.countryId">
{{item.countryName}}</span>
<a @click="GoCuisine()">更多美食</a>
......@@ -300,9 +303,10 @@
<div class="ticketLeft">
<img style="width:100%;height:100%" src="../../assets/img/localtour/meishi.png" alt="">
</div>
<ul class="ticketRight basefix">
<li @click="GoTicket(item)" v-for="item in ticketList" :key="item.id">
<img :src="item.coverImgs[0]" alt="">
<ul v-loading="foodLoad" class="ticketRight basefix">
<li @click="GoTicket(item)" v-for="item in foodList" :key="item.id">
<!-- <img :src="item.coverImgs[0]" alt=""> -->
<img :src='compressImg(item.coverImgs[0], "filt", 245, "")' alt="">
<div class="bottom">
<span>{{item.name}}</span>
<span class="font12 textHidden1">¥<a class="font14">{{item.b2bPrice | NoDesnum}}</a>起/人</span>
......@@ -345,6 +349,17 @@ export default {
countryId:-1,
},
ticketList:[],
foodcountryList:[],
foodmsg:{
countryId:0,
pageIndex:1,
pageSize:8,
},
foodList:[],
foodLoad:false,
dayLoad:false,
ticketLoad:false,
}
},
mounted() {
......@@ -353,8 +368,39 @@ export default {
this.GetAbroad();
this.GetHotAbroad();
this.GetCuntryTicket();
this.getFoodCountryItem();
},
methods: {
SelectFood(countryId){
this.foodmsg.countryId=countryId;
this.FoodCountryList();
},
FoodCountryList(){
this.foodLoad=true;
this.apiJavaPost('/api/b2b/food/getHomeFoodList',this.foodmsg,res=>{
this.foodLoad=false;
if(res.data.resultCode==1){
this.foodList=res.data.data.pageData;
}else{
this.Error(res.data.message);
}
},null)
},
getFoodCountryItem(){
this.apiJavaPost('/api/b2b/food/getFoodCountryItem',{},res=>{
// console.log(res);
if(res.data.resultCode==1){
this.foodcountryList=res.data.data;
if(this.foodcountryList.length>0){
this.foodmsg.countryId= this.foodcountryList[0].countryId;
this.FoodCountryList();
}
}else{
this.Error(res.data.message);
}
},null)
},
GoCuisine(){
this.$router.push({ path:'/LocalCuisine'})
},
......@@ -379,7 +425,9 @@ export default {
},
// 门票列表
GetTicketList(){
this.ticketLoad=true;
this.apiJavaPost('/api/b2b/scenic/getHomeTicketList',this.ticketmsg,res=>{
this.ticketLoad=false;
if(res.data.resultCode==1){
this.ticketList=res.data.data.pageData;
}else{
......@@ -423,7 +471,9 @@ export default {
},
// 获取境外一日游推荐产品
GetAbroad(){
this.dayLoad=true;
this.apiJavaPost('/api/b2b/dayTrip/getHomeRecommendProduct',this.abroadMsg,res=>{
this.dayLoad=false;
if(res.data.resultCode==1){
this.abroadList=res.data.data.pageData;
// console.log("this.abroadList",this.abroadList);
......
src/components/LocalTour/OnedayList.vue
View file @ 5f9c9a50
......@@ -3,7 +3,7 @@
<ul class="oneList">
<li @click="goOneDayDetail(item)" v-for="(item,index) in dataList" :key="index+200">
<div>
<img style="width:199px;height:148px;" :src="item.imgCover[0].url" alt="">
<img style="width:199px;height:148px;" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
</div>
<div class="secondDiv">
<p style="font-size:16px;color:#2A5532;cursor:pointer">{{item.title}}</p>
......@@ -36,7 +36,7 @@
<ul class="hottour_ul">
<p class="pfR font14" style="margin-bottom:8px">历史浏览</p>
<li @click="goOneDayDetail(item)" v-for="(item,index) in Historylist" :key="index+2000">
<img :src="item.imgCover[0].url" alt="">
<img :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
<div class="hotcontent">
<span class="textHidden font12">{{item.title}}</span>
<p class="font12" style="color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px">￥<span class="pfR font14">{{item.b2BPrice | NoDesnum}}</span>起</p>
......
src/components/LocalTour/TicketDetails.vue
View file @ 5f9c9a50
......@@ -4,7 +4,7 @@
<!-- 头部 -->
<div class="TicketHead">
<div class="TicketHeadLeft">
<img style="width:499px;height:281px;display:inline-block" :src="imgHoverSrc" alt="">
<img style="width:499px;height:281px;display:inline-block" :src='compressImg(imgHoverSrc, "filt", 245, "")' alt="">
<div class="block">
<i @click="ImgBefore" :class="ImgIndex==0?'green':''" class="ChangeImgTab" style="margin-left:0">
<span class="iconfont icon-xiangzuo"></span>
......@@ -14,7 +14,7 @@
<li v-if="index<10" @mouseover="LiHover(item,index)" :class="imgHover==index?'liActive':''" v-for="(item,index) in dataDes.coverImgs" :key="index" >
<a href="#">
<img :src="item" :onerror="defaultImg" alt="">
<img :src='compressImg(item, "filt", 245, "")' :onerror="defaultImg" alt="">
</a>
</li>
......
src/components/Ticket/TicketHome.vue
View file @ 5f9c9a50
......@@ -396,7 +396,6 @@ export default {
} else {
this.endcity = true;
}
console
},
// 出发地城市信息
CityInfo(val) {
......
src/components/Ticket/TicketList.vue
View file @ 5f9c9a50
......@@ -13,14 +13,14 @@
<el-form class="choose_form" ref="form" :model="choose_info" label-width="100px">
<el-form-item class="form_big" label="出发地">
<el-popover
<el-popover v-model="startcity" :visible-arrow="false"
placement="bottom"
trigger="click">
<div v-show="startcity" class="citycompent">
<div class="citycompent">
<v-city @CityInfo="CityInfo" @CityCompClose="CityCompClose"></v-city>
</div>
<span slot="reference">
<el-input size="small" clearable @focus="CityCompStatus('start')" class="ChooseCity" v-model="choose_info.departure_cityname" placeholder="城市">
<el-input size="small" clearable class="ChooseCity" v-model="choose_info.departure_cityname" placeholder="城市">
</el-input>
</span>
</el-popover>
......@@ -48,14 +48,14 @@
<el-input-number size="mini" v-model="choose_info.lr" :min="0" :max="10" label="描述文字"></el-input-number>
</el-form-item>
<el-form-item class="form_big" label="目的地">
<el-popover
<el-popover v-model="endcity" :visible-arrow="false"
placement="bottom"
trigger="click">
<div v-show="endcity" class="citycompent">
<div class="citycompent">
<v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
</div>
<span slot="reference">
<el-input size="mini" clearable @focus="CityCompStatus('end')" class="ChooseCity" v-model="choose_info.arrival_cityname" placeholder="城市">
<el-input size="mini" clearable class="ChooseCity" v-model="choose_info.arrival_cityname" placeholder="城市">
</el-input>
</span>
</el-popover>
......
src/components/global/newHead.vue
View file @ 5f9c9a50
......@@ -138,7 +138,13 @@
<span class="__splice">|</span>
</div>
</li>
<li :class="{_active: navActive === 1}" class="__tour">
<li :class="{_active: navActive ===1}">
<div @click="handleSelect('/heel', 1), navActive = 1">
<span>跟团游</span>
<span class="__splice">|</span>
</div>
</li>
<!-- <li :class="{_active: navActive === 1}" class="__tour">
<el-menu class="el-menu-demo" mode="horizontal">
<el-submenu index="2" popper-class="new_header_nav_three_select">
<template slot="title" ><span @click="handleSelect('/heel', 1), navActive = 1">跟团游</span></template>
......@@ -184,24 +190,7 @@
</el-submenu>
</el-menu>
<span class="__splice">|</span>
<!-- <div @click="handleSelect('/heel', 1), navActive = 1">
<span>跟团游</span>
<span class="__splice">|</span>
</div> -->
<!-- <div>
<el-dropdown trigger="click" placement="bottom-start">
<span class="el-dropdown-link">
<span class="__cp">跟团游<i class="iconfont icon-xia"></i></span>
</span>
<el-dropdown-menu class="changelanguage" slot="dropdown">
<el-dropdown-item @click.native="handleSelect('/heel',1)">跟团游</el-dropdown-item>
<el-dropdown-item @click.native="">跟团游2</el-dropdown-item>
<el-dropdown-item @click.native="">跟团游3</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span class="__splice">|</span>
</div> -->
</li>
</li> -->
<!-- 自由行 -->
<li :class="{_active: navActive === 2}">
<div @click="handleSelect('/IndependentTravel', 2), navActive = 2">
......@@ -221,21 +210,6 @@
<span class="__splice">|</span>
</div> -->
</li>
<!-- <li :class="{_active: navActive === 3}" class="__tour">
<el-menu class="el-menu-demo" mode="horizontal">
<el-submenu index="2" popper-class="new_header_nav_three_select">
<template slot="title" ><span @click="handleSelect('/Localtourhome', 3), navActive = 3">当地游</span></template>
<el-menu-item index="2-1">
<p @click="handleSelect('/LocalCuisine', 3), navActive = 3" style="padding:6px 0">当地美食</p>
</el-menu-item>
</el-submenu>
</el-menu>
<span class="__splice">|</span>
</li> -->
<!-- 当地游 -->
......
src/components/newPersonalCenter/integral/model/commodity.vue
View file @ 5f9c9a50
......@@ -77,7 +77,7 @@
<template>
<el-row class="commodity">
<el-col :span="10" class="com_BigDiv">
<div class="info" v-if="index==0" v-for="(item,index) in message" :key="index">
<div @click="goDetail(item.Id)" class="info" v-if="index==0" v-for="(item,index) in message">
<div>
<img class="com_bigImg" :src="getImgUrl(message[0].Images)" alt>
</div>
......@@ -87,7 +87,7 @@
</el-col>
<el-col :span="14">
<el-row>
<el-col :span="8" class="small" v-if="index>0&&index<4" v-for="(item,index) in message" :key="index">
<el-col :span="8" class="small" v-if="index>0&&index<4" v-for="(item,index) in message">
<div @click="goDetail(item.Id)">
<div class="r_item_img_box">
<img :src="getImgUrl(item.Images)" alt>
......@@ -98,7 +98,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12" class="medium f" v-if="index>3" v-for="(item,index) in message" :key="index">
<el-col :span="12" class="medium f" v-if="index>3" v-for="(item,index) in message">
<div @click="goDetail(item.Id)">
<div class="r_item_btmBox">
<img :src="getImgUrl(item.Images)" alt>
......
src/components/newPersonalCenter/integral/model/integralHomeV2.vue
View file @ 5f9c9a50
......@@ -108,6 +108,10 @@
color:rgba(255,1,1,1);
margin-top: 12px;
}
.font_bla:hover{
text-decoration: underline;
cursor: pointer;
}
</style>
<template>
......@@ -122,7 +126,7 @@
<img v-else src="../../../../assets/img/head_normal1.png" alt="">
</div>
<p class="_tit">我的积分</p>
<p class="_number">1288</p>
<p class="_number">{{score}}</p>
</el-col>
<el-col :span="20" class="head_ban">
<img src="../../../../assets/img/ps/jifenban.png" alt="">
......@@ -155,7 +159,7 @@
<el-col :span="6">
<div>
<div>
<p class="font_bla">积分商城任你选</p>
<p class="font_bla" @click="goUrl('IntegralMall')">积分商城任你选</p>
<p>大牌随心兑</p>
</div>
<div>
......@@ -232,6 +236,7 @@ export default {
StorageInfo: {},
list: [1,2,3,4,5,6,7,8,9,10],
dataList:[],
score:0,
}
},
created(){
......@@ -277,9 +282,12 @@ export default {
//获取积分
getScore(){
this.apiJavaPost('/api/orderForm/getTotalIntegrals',{},res=>{
console.log(res,'ressss');
if(res.data.resultCode==1){
this.score = res.data.data;
}else{
this.Error(res.data.message);
}
});
}
},mounted(){
this.getScore();
......
src/main.js
View file @ 5f9c9a50
......@@ -118,7 +118,7 @@ Vue.filter('priceFormat', function (value) {
if (value == null) {
return 0.00;
}
let nStr = value.toFixed(0)+".00"
let nStr = value.toFixed(0)
nStr += '';
let x = nStr.split('.');
let x1 = x[0];
......
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