Skip to content

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

合并代码

parents 5de07880 276caf6b
Show 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
......@@ -12,3 +12,103 @@
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
......@@ -58,7 +58,7 @@
<p style="margin:6px 0;display: flex;align-items: center;">
<span class="green_span"></span> 热门推荐
</p>
<li @click="TagGourl(item)" v-for="(item,index) in searchItemVisa.hotCountry" :key="index+350">
<li @click="TagGourl('Visalist',item)" v-for="(item,index) in searchItemVisa.hotCountry" :key="index+350">
{{item.name}}
</li>
</ul>
......@@ -110,8 +110,8 @@
<span class="form_btn" style="padding:6px 0">立即搜索</span>
</el-form> -->
<p style="margin-bottom:5px">
<el-radio v-model="ticket_form.radio" label="1">单程</el-radio>
<el-radio v-model="ticket_form.radio" label="2">往返</el-radio>
<el-radio v-model="choose_info.ticketType" :label=1>单程</el-radio>
<el-radio v-model="choose_info.ticketType" :label=2>往返</el-radio>
</p>
<div style="margin-top:15px;">
<ul class="chooseticketul">
......@@ -119,47 +119,43 @@
<span>出发地</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-input size="small" v-model="visa_form.name" placeholder="出发地"></el-input>
<el-popover v-model="startcity" :visible-arrow="false"
placement="bottom"
trigger="click">
<div class="citycompent">
<v-city @CityInfo="CityInfo" @CityCompClose="CityCompClose"></v-city>
</div>
<span slot="reference">
<el-input size="small" clearable class="ChooseCity" v-model="choose_info.departure_cityname" placeholder="城市">
</el-input>
</span>
</el-popover>
</span>
</li>
<span style="margin:0 3px;display:inline-block;width:20px;height:20px;background:#15B6A1;border-radius:50%;text-align:center;color:#fff">换</span>
<span @click="CityChange" style="cursor: pointer;margin:0 3px;display:inline-block;width:20px;height:20px;background:#15B6A1;border-radius:50%;text-align:center;color:#fff">换</span>
<li>
<span>目的地</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-input size="small" v-model="visa_form.name" placeholder="目的地"></el-input>
<el-popover v-model="endcity" :visible-arrow="false"
placement="bottom"
trigger="click">
<div v-show="endcity" class="citycompent">
<v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
</div>
<span slot="reference">
<el-input size="mini" clearable class="ChooseCity" v-model="choose_info.arrival_cityname" placeholder="城市">
</el-input>
</span>
</li>
<li>
<span>出发日期</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-date-picker prefix-icon=" " style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</span>
</li>
<li style="margin-left:26px;">
<span>返回日期</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-date-picker prefix-icon=" " style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-popover>
</span>
</li>
<li>
<span>成人</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-select size="small" v-model="ticket_form.value" placeholder="请选择">
<el-select size="small" v-model="choose_info.cr" placeholder="请选择">
<el-option
v-for="item in person"
:key="item"
......@@ -174,7 +170,7 @@
<span>儿童</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-select size="small" v-model="ticket_form.value" placeholder="请选择">
<el-select size="small" v-model="choose_info.child" placeholder="请选择">
<el-option
v-for="item in person"
:key="item"
......@@ -184,10 +180,37 @@
</el-select>
</span>
</li>
<li>
<span>出发日期</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-date-picker
size="small" prefix-icon=" " style="width:100%"
value-format="yyyy-MM-dd"
v-model="choose_info.qFlightDateStart"
type="date"
:picker-options="pickerOptions0"
placeholder="选择日期">
</el-date-picker>
</span>
</li>
<!-- <li style="margin-left:26px;">
<span>返回日期</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-date-picker prefix-icon=" " style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</span>
</li> -->
</ul>
</div>
<div style="overflow:auto;">
<span class="form_btn">立即搜索</span>
<span @click="SearchTicket" class="form_btn">立即搜索</span>
</div>
</el-tab-pane>
<el-tab-pane label="国内机票" name="second">国内机票</el-tab-pane>
......@@ -287,7 +310,7 @@
<p style="margin:6px 0;display: flex;align-items: center;">
<span class="green_span"></span> 热门国家
</p>
<li v-if="index<4" v-for="(item,index) in searchTicket.hotCountry" :key="index+400">
<li @click="TagGourl('LocalTourList',item,2)" v-if="index<4" v-for="(item,index) in searchTicket.hotCountry" :key="index+400">
{{item.name}}
</li>
</ul>
......@@ -295,7 +318,7 @@
<p style="margin:6px 0;display: flex;align-items: center;">
<span class="green_span"></span> 热门景点
</p>
<li class="text1" v-for="(item,index) in searchTicket.hotTicketCoupon" :key="index+450">
<li @click="TagGourl('TicketDetails',item,-1)" class="text1" v-for="(item,index) in searchTicket.hotTicketCoupon" :key="index+450">
<el-tooltip :content="item.name" placement="top">
<span>{{item.name}}</span>
</el-tooltip>
......@@ -312,7 +335,7 @@
<!-- 内容 -->
<div class="home_content" style="width:1180px;box-sizing:border-box;padding:20px 10px;margin:0 auto">
<!-- 超值特卖 -->
<div class="cztm">
<div class="cztm" style="height:199px">
<el-tabs v-model="activecontent1" @tab-click="handleClick">
<el-tab-pane label="超值特卖" name="first">
<div style="margin-left:-25px">
......@@ -701,7 +724,7 @@
<div style="position:absolute">
<p style="font-size:14px;font-weight:bold">热门推荐</p>
<ul>
<li v-if="index<7" v-for="(item,index) in hotRecommend" :key="index+500">
<li @click="GoMore('LocalTourList',item.type)" v-if="index<7" v-for="(item,index) in hotRecommend" :key="index+500">
<span class="button-content">{{index+1}}</span>
{{item.name}}
</li>
......@@ -710,8 +733,8 @@
</div>
<div v-loading="localload" @click="goLocalDetail(item)" v-for="(item,index) in localPriceList" :key="index+550" class="Localtour_item">
<!-- <img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
<img v-else src="../assets/img/home/tour_1.png" alt=""> -->
<img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
<img v-else src="../assets/img/home/tour_1.png" alt="">
<div style="color:#fff" class="city">
<!-- <p>dongjing</p> -->
......@@ -805,13 +828,50 @@
</div>
</template>
<script>
import ChooseCity from "@/components/Ticket/ChooseCity.vue";
import ChooseCity1 from "@/components/Ticket/ChooseCity1.vue";
import moment from "moment";
export default {
components: {
"v-city": ChooseCity,
"v-city1": ChooseCity1
},
data() {
return {
pickerOptions0: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
},
startcity:false,
endcity:false,
choose_info: {
pageIndex: 1,
pageSize: 10,
id: 0,
qFlightDateStart: moment().format("YYYY-MM-DD"),
qFlightDateEnd: "",
flight_number: "",
airLineID: 0,
ticketType: 2,
lineId: 0,
isPayOrder: 0,
departure_city: 0,
departure_cityname: "",
arrival_city: 0,
arrival_cityname: "",
freightSpace: 0,
airTicketScatterNum: 0,
cr: 0,
child: 0,
ye: 0,
lr: 0
},
banner_height: "0px",
visa_form: {},
ticket_form: {},
tag: "admticket",
tag: "ticket",
activecontent1: "first",
activeName: "first",
hotel_tab: "gjjd",
......@@ -879,15 +939,64 @@ export default {
this.InitData();
},
methods: {
TagGourl(item){
// 交换城市
CityChange(){
let tempcity=this.choose_info.departure_city;
let tempcityname=this.choose_info.departure_cityname;
this.choose_info.departure_city=this.choose_info.arrival_city;
this.choose_info.departure_cityname=this.choose_info.arrival_cityname;
this.choose_info.arrival_city = tempcity;
this.choose_info.arrival_cityname = tempcityname;
},
SearchTicket(){
sessionStorage.setItem("ChooseInfo", JSON.stringify(this.choose_info));
this.$router.push({
path: "TicketList"
});
},
// 出发城市
CityInfo(val) {
this.choose_info.departure_city = val.ID;
this.choose_info.departure_cityname = val.Name;
},
// 出发地关闭子组件
CityCompClose(val) {
this.startcity = false;
},
CityInfo1(val) {
this.choose_info.arrival_city = val.ID;
this.choose_info.arrival_cityname = val.Name;
},
// 目的地关闭子组件
CityCompClose1(val) {
this.endcity = false;
},
TagGourl(path,item,num){
if(num==-1){
this.$router.push({ name:path,
query:{idDes:encodeURIComponent(item.idDes)} })
}
else if(num==2){
this.$router.push({ name: path,
query:{tab:num,id:item.id} })
}else{
let id=item.id;
this.$router.push({path: `/Visalist?id=${id}`});
this.$router.push({path: `/${path}?id=${id}`});
}
},
GoMore(path,num){
if(num){
if(num==1 || num==2){
this.$router.push({ name: path,
query:{tab:num} })
}else{
}
else if(num==3){
this.$router.push({name: 'LocalCuisine'});
}
else{
this.$router.push({name: path});
}
......@@ -992,7 +1101,7 @@ export default {
InitData(){
this.PageLoad=true;
this.apiJavaPost('/api/b2b/home/getHomeInitData',{},res=>{
console.log(res);
// console.log(res);
this.PageLoad=false;
if(res.data.resultCode==1){
let data=res.data.data;
......@@ -1046,7 +1155,7 @@ export default {
},null)
},
handleClick(tab, event) {
console.log(tab, event);
// console.log(tab, event);
},
ChangeTab(str) {
this.tag = str;
......
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",
......@@ -265,13 +272,38 @@ export default {
this.num=1;
}else{
this.num=this.data.length;
console.log("this.num",this.num)
}
},
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
......@@ -182,7 +182,7 @@
}
</style>
<template>
<el-row class="confirOrder">
<el-row class="confirOrder" v-loading="loading">
<el-row class="w1180">
<!-- top -->
<el-row class="bar_box">
......@@ -210,19 +210,19 @@
<el-row :gutter="20">
<el-col
:span="6"
v-for="(item, index) in addList"
v-for="(item, index) in OrderAddList"
:key="index"
:class="{'_active': addListActive === index}"
>
<div class="address_info_item" @click="addListActive = index">
<p class="item_name">{{item.city}}（{{item.name}}）</p>
<p class="item_add">{{item.addr}}</p>
<p class="item_tel">{{item.tel}}</p>
<p class="item_name">{{item.city}}（{{item.uname}}）</p>
<p class="item_add">{{item.district}} {{item.address}}</p>
<p class="item_tel">{{item.uphone}}</p>
</div>
</el-col>
</el-row>
<div class="edit_addr">
<span class="edit_addr_btn" @click="addressShow = false">修改地址</span>
<span class="edit_addr_btn" v-if="OrderAddList.length>0" @click="addressShow = false,getUpAddress()">修改地址</span>
</div>
</div>
<div v-else class="form_box">
......@@ -246,7 +246,7 @@
<el-input v-model="form.tel" size="mini" :disabled="true"></el-input>
</el-form-item>
<div class="edit_addr">
<span class="edit_addr_btn edit_addr_btn2" @click="addressShow = true">确认修改</span>
<span class="edit_addr_btn edit_addr_btn2" @click="addressShow = true,sureUpdate()">确认修改</span>
</div>
</el-form>
</div>
......@@ -255,49 +255,49 @@
<!-- product -->
<el-row class="product_box">
<el-table :data="tableData" border style="width: 100%">
<el-table-column prop="date" label="商品信息">
<el-table-column prop="images" label="商品信息">
<template slot-scope="scope">
<div class="product_item">
<div class="img_box">
<img src="../../assets/img/img-01.png" alt="">
<img :src="scope.row.imgUrl" alt=""/>
</div>
<div>
<p class="product_name">{{scope.row.date}}</p>
<p class="product_color">颜色：{{scope.row.color}}</p>
<!-- <p class="product_color">颜色：{{scope.row.color}}</p> -->
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="name" label="单价" width="180">
<template slot-scope="scope">
<span style="margin-left: 10px">{{scope.row.name }} 积分</span>
<span style="margin-left: 10px">{{scope.row.score }} 积分</span>
</template>
</el-table-column>
<el-table-column prop="address" label="数量" width="80">
<el-table-column prop="num" label="数量" width="80">
<template slot-scope="scope">
<span style="margin-left: 10px">* {{scope.row.address }}</span>
<span style="margin-left: 10px">* {{scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column label="小计" width="180">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.name * scope.row.address }}</span>
<span style="margin-left: 10px">{{ scope.row.score * scope.row.num }}</span>
</template>
</el-table-column>
</el-table>
<div class="sunm">
<p>合计：<span class="small_s">￥ <span>9900</span>积分</span></p>
<p>合计：<span class="small_s">￥ <span>{{tableData[0].score*tableData[0].num}}</span>积分</span></p>
</div>
</el-row>
<!-- details -->
<el-row class="details_box">
<div class="details_box_info">
<p>商品金额 <span>¥ 9900积分</span></p>
<p>总积分 <span>¥ 229900积分</span></p>
<p>商品金额 <span>¥ {{tableData[0].score*tableData[0].num}}积分</span></p>
<p>总积分 <span>¥ {{score}}积分</span></p>
<p>运费 <span>0元</span></p>
<p>应付 <span class="_pay">¥ <span>9900</span> 积分</span></p>
<p>应付 <span class="_pay">¥ <span>{{tableData[0].score*tableData[0].num}}</span> 积分</span></p>
</div>
<div class="details_box_btn">
<span class="edit_addr_btn" @click="">确认并兑换</span>
<span class="edit_addr_btn" @click="exchangeGood()">确认并兑换</span>
</div>
</el-row>
</el-row>
......@@ -323,43 +323,12 @@ export default {
return {
addressShow: true,
addListActive: 0,
addList: [
{
name: "李瀚文",
city: "四川成都",
addr: "锦江区 阳光新业大厦2号楼 2302",
tel: "13800138000"
},
{
name: "王三",
city: "新疆乌鲁木齐",
addr: "新疆乌鲁木齐新平区北巷街250号",
tel: "13800138000"
},
{
name: "李吴",
city: "四川德阳",
addr: "旌阳区华山南路北段266号",
tel: "13800138000"
},
{
name: "郑秀儿",
city: "河南郑州",
addr: "管城回族区二胖大道666号",
tel: "13800138000"
},
{
name: "李瀚文",
city: "四川成都",
addr: "锦江区 阳光新业大厦2号楼 2302",
tel: "13800138000"
}
],
loading:false,
form: {
name: "张三四",
tel: "17602885454",
desc: "成华区光华路665号",
addr: "四川省 成都市 成华区"
name: "",
tel: "",
desc: "",
addr: ""
},
rule: {
name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
......@@ -369,13 +338,19 @@ export default {
},
tableData: [
{
date: "印象推荐款--大容量抽绳化妆包+防水防潮+便携耐用+暗兜设计",
name: 20,
address: 1,
color: '白色'
date: "",
imgUrl:'',
color: '白色',
score:0,
num:0
},
],
OrderAddList: [],
upAddressId:0,
addressObj:[],
id:0,
//个人总积分
score:0,
};
},
methods: {
......@@ -393,10 +368,116 @@ export default {
},
null
);
},
//获取当前收货地址详情
getUpAddress(){
this.addressObj = this.OrderAddList[this.addListActive];
this.form.addr = this.addressObj.province+" "+ this.addressObj.city+" "+ this.addressObj.district;
this.form.desc = this.addressObj.address;
this.form.name = this.addressObj.uname;
this.form.tel = this.addressObj.uphone;
this.upAddressId = this.addressObj.id;
},
//确认修改收货地址
sureUpdate(){
var msg = {
id:this.addressObj.id,
province:this.addressObj.province,
city:this.addressObj.city,
district:this.addressObj.district,
address:this.form.desc,
uname:this.addressObj.uname,
uphone:this.addressObj.uphone,
postcode:''
}
this.apiJavaPost(
"/api/orderForm/saveOrUpdateOrderAdd",msg,
res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.getOrderAdd();
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取详情
getDetail: function () {
this.loading = true;
this.apiJavaPost(
"/api/goodsMarket/getGoodsDetail",
{goodId: this.id},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
let detail = res.data.data;
console.log(res,'ressssss');
this.dataList = res.data.data;
this.tableData[0].date = res.data.data.name;
this.tableData[0].imgUrl = res.data.data.images.split(',')[0];
this.tableData[0].score = res.data.data.price;
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取积分
getScore(){
this.apiJavaPost('/api/orderForm/getTotalIntegrals',{},res=>{
if(res.data.resultCode==1){
this.score = res.data.data;
}else{
this.Error(res.data.message);
}
});
},
//兑换商品
exchangeGood(){
if(this.score<this.tableData[0].score){
this.Error("积分太少，无法兑换");
return;
}
var msg = {
goodsName:this.tableData[0].date,
goodsPrice:this.tableData[0].score,
goodsImg:this.tableData[0].imgUrl,
shippingAdd:this.OrderAddList[this.addListActive].id,
goodsInfoId:this.id,
buyNum:this.tableData[0].num,
orderTotalPrice:this.tableData[0].num*this.tableData[0].score,
}
this.apiJavaPost('/api/orderForm/confirmOrder',msg,res=>{
if(res.data.resultCode==1){
this.Success(res.data.message);
var dataList = res.data.data;
this.$router.push({
path:'/OrderCompleted',
query:{
createTime:dataList.createTime,
orderNum:dataList.orderNum,
pay:dataList.pay,
residue:dataList.residue
}
})
}else{
this.Error(res.data.message);
}
});
}
},
mounted() {
this.getOrderAdd()
this.getOrderAdd();
this.getDetail();
this.getScore();
},created(){
this.id = this.$route.query.id;
this.tableData[0].num = this.$route.query.num;
}
};
</script>
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
......@@ -11,31 +11,15 @@
<li style="padding-bottom:8px">
<div class="title pfR f14" style="position: absolute;top:18px;">目的地</div>
<div class="change spanMargin" style="padding-left:80px">
<span class="ChActive">全部</span>
<span>富士河口湖町</span>
<span>忍野村</span>
<span>曼谷</span><span>富士河口湖町</span>
<span>忍野村</span>
<span>曼谷</span><span>富士河口湖町</span>
<span>忍野村</span>
<span>曼谷</span><span>富士河口湖町</span>
<span>忍野村</span>
<span>曼谷</span><span>富士河口湖町</span>
<span>忍野村</span>
<span>曼谷</span><span>富士河口湖町</span>
<span>忍野村</span>
<span>曼谷</span><span>富士河口湖町</span>
<span>忍野村</span>
<span>曼谷</span><span>富士河口湖町</span>
<span>忍野村</span>
<span>曼谷</span>
<span @click="SelectCity(0)" :class="msg.cityId==0?'ChActive':''">全部</span>
<span @click="SelectCity(item.cityId)" :class="msg.cityId==item.cityId?'ChActive':''" v-for="(item,index) in cityList" :key="index">{{item.cityName}}</span>
</div>
</li>
<li>
<div class="title pfR f14">游玩日期</div>
<div class="change">
<el-date-picker style="width:160px;"
v-model="startDate"
v-model="msg.startDate"
type="date" :picker-options="pickerBeginDateBefore"
placeholder="选择日期" size="mini"
format="yyyy-MM-dd"
......@@ -43,7 +27,7 @@
</el-date-picker>
<span class="pfR" style="margin:0 10px;color:#000000">-</span>
<el-date-picker style="width:160px;"
v-model="endDate" @change="ChangeDate"
v-model="msg.endDate" @change="ChangeDate"
type="date" :picker-options="pickerBeginDateAfter"
placeholder="选择日期" size="mini"
format="yyyy-MM-dd"
......@@ -54,33 +38,33 @@
<li>
<div class="title pfR f14">价钱范围</div>
<div class="change spanPrice">
<span>全部</span>
<span>￥200以下</span>
<span>￥200-￥500</span>
<span>￥500-￥800</span>
<span>￥800以上</span>
<span>自定义价格：
<el-input v-model="minPrice" prefix-icon="iconfont icon-qian" placeholder="输入价格" style="width:100px" size="mini"></el-input>
<span :class="priceActive==0?'ChActive':''" @click="SelectPrice(0,200,0)">￥200以下</span>
<span :class="priceActive==1?'ChActive':''" @click="SelectPrice(200,500,1)">￥200-￥500</span>
<span :class="priceActive==2?'ChActive':''" @click="SelectPrice(500,800,2)">￥500-￥800</span>
<span :class="priceActive==3?'ChActive':''" @click="SelectPrice(800,'',3)">￥800以上</span>
<span>自定义价格:
<el-input style="width:100px" size="mini" v-model="minPrice" placeholder="输入价格"></el-input>
<span class="pfR" style="margin:0 10px;color:#000000">-</span>
<el-input v-model="maxPrice" prefix-icon="iconfont icon-qian" placeholder="输入价格" style="width:100px" size="mini"></el-input>
<el-input style="width:100px" size="mini" v-model="maxPrice" placeholder="输入价格"></el-input>
</span>
</div>
</li>
<div class="pxDiv">
<span>印象推荐</span>
<span class="px">价格排序
<img src="../../assets/img/localtour/pai1.png" alt="">
<!-- <img src="../../assets/img/localtour/pai2.png" alt="">
<img src="../../assets/img/localtour/pai3.png" alt=""> -->
<img @click="PaiXu('Price',0)" v-if="msg.orderByPrice==0" src="../../assets/img/localtour/pai1.png" alt="">
<img @click="PaiXu('Price',1)" v-if="msg.orderByPrice==1" src="../../assets/img/localtour/pai2.png" alt="">
<img @click="PaiXu('Price',2)" v-if="msg.orderByPrice==2" src="../../assets/img/localtour/pai3.png" alt="">
</span>
<span class="px">销量
<img src="../../assets/img/localtour/pai1.png" alt="">
<!-- <img src="../../assets/img/localtour/pai2.png" alt="">
<img src="../../assets/img/localtour/pai3.png" alt=""> -->
<img @click="PaiXu('Sales',0)" v-if="msg.orderBySales==0" src="../../assets/img/localtour/pai1.png" alt="">
<img @click="PaiXu('Sales',1)" v-if="msg.orderBySales==1" src="../../assets/img/localtour/pai2.png" alt="">
<img @click="PaiXu('Sales',2)" v-if="msg.orderBySales==2" src="../../assets/img/localtour/pai3.png" alt="">
</span>
<span class="f12" style="float:right">为您找到
<b style="color:#FF0101;font-size:16px;">3926</b>
<b style="color:#FF0101;font-size:16px;">{{Count}}</b>
份产品
</span>
</div>
......@@ -110,90 +94,32 @@
</div>
</div>
<div class="dataRight">
<div @click="Gourl" class="rightlist">
<el-row>
<el-col :span="7">
<img style="width:220px;height:125px;" src="../../assets/img/activy.jpg" alt="">
</el-col>
<el-col :span="12">
<p class="f18 pfR text1">香港迪士尼香港迪士尼乐园园内餐券券（三合一/二合一/士尼乐园园内餐券券（</p>
<p style="margin:10px 0" class="f12">
<span style="color:#999999">景点特色</span>
<span style="color:#666666">在香港迪士尼乐园多间特色餐厅尽享各种美食惊喜！</span>
</p>
<p class="f12 zhuti">
<span>主题公园</span>
<span>亲子旅游</span>
<span>当地美食</span>
</p>
<p class="f12">
<span></span>
<span style="color:#999999">景点地址</span>
<span style="color:#666666">香港大屿山香港迪士尼乐园度假区</span>
</p>
</el-col>
<el-col :span="5">
<p class="f12 pfR" style="text-align:right;">
<span style="font-size:22px;color:#FF0101">￥680</span>起
</p>
</el-col>
</el-row>
</div>
<div class="rightlist">
<div v-loading="Load" class="dataRight">
<div v-for="(item,index) in dataList" :key="index+50" @click="Gourl(item)" class="rightlist">
<el-row>
<el-col :span="7">
<img style="width:220px;height:125px;" src="../../assets/img/activy.jpg" alt="">
</el-col>
<el-col :span="12">
<p class="f18 pfR text1">香港迪士尼香港迪士尼乐园园内餐券券（三合一/二合一/士尼乐园园内餐券券（</p>
<p style="margin:10px 0" class="f12">
<span style="color:#999999">景点特色</span>
<span style="color:#666666">在香港迪士尼乐园多间特色餐厅尽享各种美食惊喜！</span>
</p>
<p class="f12 zhuti">
<span>主题公园</span>
<span>亲子旅游</span>
<span>当地美食</span>
</p>
<p class="f12">
<span></span>
<span style="color:#999999">景点地址</span>
<span style="color:#666666">香港大屿山香港迪士尼乐园度假区</span>
</p>
</el-col>
<el-col :span="5">
<p class="f12 pfR" style="text-align:right;">
<span style="font-size:22px;color:#FF0101">￥680</span>起
</p>
</el-col>
</el-row>
</div>
<div class="rightlist">
<el-row>
<el-col :span="7">
<img style="width:220px;height:125px;" src="../../assets/img/activy.jpg" alt="">
<el-col style="height:125px;" :span="7">
<img v-if="item.coverImgs[0]" style="width:220px;height:125px;" :src='compressImg(item.coverImgs[0], "filt", 245, "")' alt="">
<img style="width:220px;height:125px;" v-else src="../../assets/img/activy.jpg" alt="">
</el-col>
<el-col :span="12">
<p class="f18 pfR text1">香港迪士尼香港迪士尼乐园园内餐券券（三合一/二合一/士尼乐园园内餐券券（</p>
<p style="margin:10px 0" class="f12">
<p class="f18 pfR text1">{{item.name}}</p>
<p style="margin:10px 0" class="f12 text1">
<span style="color:#999999">景点特色</span>
<span style="color:#666666">在香港迪士尼乐园多间特色餐厅尽享各种美食惊喜！</span>
<span style="color:#666666;margin-left:10px">{{item.feature}}</span>
</p>
<p class="f12 zhuti">
<span>主题公园</span>
<span>亲子旅游</span>
<span>当地美食</span>
<span :key="index+500" v-for="(tag,index) in item.foodTagList">{{tag}}</span>
</p>
<p class="f12">
<span></span>
<span style="color:#999999">景点地址</span>
<span style="color:#666666">香港大屿山香港迪士尼乐园度假区</span>
<span style="color:#666666;margin-left:10px">{{item.address}}</span>
</p>
</el-col>
<el-col :span="5">
<p class="f12 pfR" style="text-align:right;">
<span style="font-size:22px;color:#FF0101">￥680</span>起
<span style="font-size:22px;color:#FF0101">￥{{item.b2bPrice | NoDesnum}}</span>起
</p>
</el-col>
</el-row>
......@@ -206,7 +132,7 @@
</div>
</div>
<div class="page">
<div v-if="dataList.length>0" class="page">
<div class="_pagination">
<el-pagination
:current-page.sync="currentPage"
......@@ -224,20 +150,30 @@
export default {
data(){
return{
priceActive:-1,
msg:{
pageSize:10,
cityId:0,
pageIndex:1,
startDate:'',
endDate:'',
minPrice:'',
maxPrice:'',
orderByPrice:0,
orderBySales:0,
searchKey:'',
},
currentPage: 1,
Count:0,
minPrice:0,
maxPrice:0,
minPrice:"",
maxPrice:"",
startDate:"",
endDate:"",
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.msg.endDate)
return endTime.getTime() < time.getTime()
}
return time.getTime() < Date.now() - 8.64e7
},
},
pickerBeginDateAfter: {
disabledDate: time => {
......@@ -246,22 +182,113 @@ export default {
}
},
dataList:[],
cityList:[],
Load:false,
}
},
mounted(){},
created(){
this.GetTicketList();
},
mounted(){
this.GetList();
},
methods:{
ChangeDate(){
PaiXu(str,num){
if(str=="Price"){
this.msg.orderBySales=0;
if(num==0){
this.msg.orderByPrice=1;
}
if(num==1){
this.msg.orderByPrice=2;
}
if(num==2){
this.msg.orderByPrice=0;
}
}else{
this.msg.orderByPrice=0;
if(num==0){
this.msg.orderBySales=1;
}
if(num==1){
this.msg.orderBySales=2;
}
if(num==2){
this.msg.orderBySales=0;
}
}
this.GetList();
},
SelectCity(num){
this.msg.cityId=num;
this.GetList();
},
GetList(){
if(this.minPrice==""){
this.msg.minPrice=-1;
}else{
this.msg.minPrice=this.minPrice;
}
if(this.maxPrice==""){
this.msg.maxPrice=-1;
}else{
this.msg.maxPrice=this.maxPrice;
}
if(!this.msg.startDate){
this.msg.startDate="";
}
if(!this.msg.endDate){
this.msg.endDate="";
}
this.Load=true;
this.apiJavaPost('/api/b2b/food/getFoodList',this.msg,res=>{
this.Load=false;
if(res.data.resultCode==1){
this.dataList=res.data.data.pageData;
console.log(this.dataList)
this.Count=res.data.data.count;
this.dataList.forEach(item=>{
if(item.foodTag){
item.foodTagList=item.foodTag.split(",");
}
})
}else{
this.Error(res.data.message);
}
},null)
},
SelectPrice(num1,num2,index){
this.minPrice=num1;
this.maxPrice=num2;
this.priceActive=index;
this.GetList();
},
GetTicketList(){
this.apiJavaPost('/api/b2b/food/getFoodCountryCityItem',{},res=>{
if(res.data.resultCode==1){
this.cityList=res.data.data;
}else{
this.Error(res.data.message);
}
},null)
},
ChangeDate(){
this.GetList();
},
Gourl(){
Gourl(item){
this.$router.push({
path: "LocalCuisineDetails",
// query: { path: this.$route.name }
query: { idDes:encodeURIComponent(item.idDes)}
});
},
handleCurrentChange(){
handleCurrentChange(val){
this.msg.pageIndex=val;
this.GetList()
},
ChangePrice(){
......
src/components/LocalTour/LocalCuisineDetails.vue
View file @ 5f9c9a50
<style>
@import "../../assets/css/common.css";
@import "../../assets/css/LocalCuisine.css";
.LocalCuisineDetails .el-tab-pane{
min-height: 400px;
}
.LocalCuisineDetails .ydDiv .usedate{
display: inline-block;
width: 120px;
height: 26px;
border:1px solid #dcdfe6;
}
</style>
<template>
<div class="LocalCuisine commonF LocalCuisineDetails">
<div class="w1200 basefix" style="margin-bottom:20px;">
<div v-loading="load" class="w1200 basefix" style="margin-bottom:20px;">
<p style="margin-top:14px" class="f12 pfR">当地游 > 当地美食 > 详情页</p>
<div class="Head basefix">
<div class="HeadLeft">
<img style="width:457px;height:259px;" src="../../assets/img/activy.jpg" alt="">
<div style="width:457px;height:259px;">
<img style="width:100%;height:100%;" v-if="imgHoverSrc!=''" :src='compressImg(imgHoverSrc, "filt", 245, "")' alt="">
<img style="width:100%;height:100%;" v-else src="../../assets/img/activy.jpg" alt="">
</div>
<ul class="Imglist">
<li class="activeLi">
<li @mouseover="LiHover(item,index)" v-if="index<5" :key="index" v-for="(item,index) in datadetails.coverImgs" :class="activeTab==index?'activeLi':''">
<a href="#">
<img src="../../assets/img/activy.jpg" alt="">
</a>
</li>
<li>
<a href="">
<img src="../../assets/img/activy.jpg" alt="">
</a>
</li>
<li>
<a href="">
<img src="../../assets/img/activy.jpg" alt="">
</a>
</li>
<li>
<a href="">
<img src="../../assets/img/activy.jpg" alt="">
</a>
</li>
<li>
<a href="">
<img src="../../assets/img/activy.jpg" alt="">
<img v-if="item" :src='compressImg(item, "filt", 245, "")' alt="">
<img v-else src="../../assets/img/activy.jpg" alt="">
</a>
</li>
</ul>
</div>
<div class="HeadRight">
<p class="f20 pfR">曼谷拜约克摩天塔Baiyoke Sky 彩虹云霄酒店自助餐</p>
<p class="f12" style="color:#888888;padding:12px 0">一览众山小的景观餐厅，沉醉璀璨夜色，尽情感受曼谷的风景人情！</p>
<p class="f20 pfR">{{datadetails.name}}</p>
<p class="f12 text1" style="color:#888888;margin:12px 0">{{datadetails.about}}</p>
<p class="f12 zhuti" style="padding-top:10px">
<span>主题公园</span>
<span>亲子旅游</span>
<span>当地美食</span>
<span v-for="(item,index) in datadetails.foodTagList" :key="index+50">{{item}}</span>
</p>
<p class="f12" style="color:#666666;padding-top:20px">
<span>景点地址</span>
<span style="margin-left:25px;">香港大屿山香港迪士尼乐园度假区</span>
<span style="margin-left:25px;">{{datadetails.address}}</span>
</p>
<div class="hr"></div>
<div class="tcDiv">
<span class="tcSpan">套餐</span>
<div class="tc">
<span class="Active">75楼泰式自助午餐</span>
<span>18楼水果自助餐（无限榴莲）</span>
<span>18楼水果自助餐（一份榴莲）</span>
<span>75楼泰式自助午餐</span>
<span>18楼水果自助餐（无限榴莲）</span>
<span v-for="(item,index) in datadetails.diningMealList" :key="index+200" class="Active">{{item.mealName}}</span>
</div>
</div>
</div>
......@@ -67,14 +56,29 @@
<el-row class="ydDiv">
<el-form ref="form" :model="form" label-width="80px">
<el-col :span="19">
<el-form-item label="使用日期">
<el-date-picker style="width:160px;"
v-model="startDate"
type="date"
placeholder="选择日期" size="mini"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd">
</el-date-picker>
<el-form-item style="position:relative;top:5px" label="使用日期">
<el-popover popper-class="calendarPopover"
placement="bottom"
trigger="click">
<div ref="otherdate" class="otherdate" style="width:400px">
<div style="font-size:16px;padding:10px;text-align:center">
<el-col :span="8"><span @click="ChangeMonth(1)" class="month_circle">
<i class="iconfont icon-xiangzuo"></i>
</span> </el-col>
<el-col :span="8">{{tomonth}}</el-col>
<el-col :span="8"><span @click="ChangeMonth(2)" class="month_circle">
<i class="iconfont icon-arrowright1"></i>
</span></el-col>
</div>
<div style="margin-top:22px">
<v-calendar ref="child" v-for="(item,index) in classArray" :key="index" v-bind:dateData="classArray" :day ="tomonth" v-on:SelectChild="SelectChild">
</v-calendar>
</div>
</div>
<span @click="Click()" class="usedate" slot="reference" style="cursor:pointer;position:relative;top:5px"></span>
</el-popover>
</el-form-item>
<el-form-item label="成人">
<el-input-number v-model="msg.num" size="mini" :min="1" :max="10" label="描述文字"></el-input-number>
......@@ -122,8 +126,31 @@
</div>
<div class="dataRight">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="图文详情" name="first">图文详情</el-tab-pane>
<el-tab-pane label="购买须知" name="second">购买须知</el-tab-pane>
<el-tab-pane label="图文详情" name="first">
<div style="padding:0 25px">
<div v-if="datadetails.openingHours">
<p style="text-align:center" class="pfR f32">营业时间</p>
<p style="margin:10px 0">{{datadetails.openingHours}}</p>
<p v-if="datadetails.dieLine">提前预定天数：{{datadetails.dieLine}}天</p>
</div>
<div v-if="datadetails.feature">
<p style="text-align:center" class="pfR f32">特色</p>
<p style="margin:10px 0">{{datadetails.feature}}</p>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="购买须知" name="second">
<div style="padding:0 25px">
<div v-if="datadetails.bookingInfo">
<p style="text-align:center" class="pfR f32">预定须知</p>
<p style="margin:10px 0">{{datadetails.bookingInfo}}</p>
</div>
</div>
</el-tab-pane>
</el-tabs>
</div>
......@@ -132,7 +159,12 @@
</div>
</template>
<script>
import moment from "moment"
import calendar from "@/components/mall/newcalendar.vue";
export default {
components: {
"v-calendar": calendar
},
data(){
return{
activeName:'first',
......@@ -140,11 +172,127 @@ export default {
},
startDate:"",
idDes:"",
form:{},
datadetails:{},
load:false,
activeTab:0,
imgHoverSrc:"",
classArray:[],
tomonth:moment().format("YYYY-MM")
}
},
mounted(){},
created(){
this.idDes=decodeURIComponent(this.$route.query.idDes);
},
mounted(){
this.GetIds();
this.Click();
},
methods:{
ChangeMonth(){},
SelectChild(){
},
Click(){
this.apiJavaPost('/api/b2b/food/getFoodMealPriceList',{idDes:this.idDes},res=>{
console.log("价格",res);
if(res.data.resultCode==1){
}else{
this.Error(res.data.message);
}
},null)
// this.creatCalendar(list);
},
creatCalendar(list) {
// 创建日历
let dateList = [];
if (list && list.length > 0) {
list.forEach((x, index) => {
// if(parseFloat(999) > 0){
let msg = {
dateStr: x.timeStr,
cDate: x.timeStr.replace("-", "年").replace("-", "月"),
price: x.price,
b2BMemberPrice: x.price,
b2BPrice: x.price,
b2CMemberPrice: x.price,
id: index,
dateStrS: x.timeStr.substring(0, x.timeStr.length - 3)
};
dateList.push(msg);
// }
});
}
let monthArray = [];
for (var i in dateList) {
var data = dateList[i];
var dateDict = {
mounth: data.dateStr.substring(0, data.dateStr.length - 3)
};
monthArray.push(dateDict);
}
console.log("monthArray",monthArray)
//数组去重,获取有几个月
var hash = {};
monthArray = monthArray.reduce(function(item, next) {
hash[next.mounth] ? "" : (hash[next.mounth] = true && item.push(next));
return item;
}, []);
//数据分组
let classArray = [];
for (var j in monthArray) {
var newArray = new Array();
for (var i in dateList) {
var data = dateList[i];
if (
data.dateStr.substring(0, data.dateStr.length - 3) ==
monthArray[j].mounth
) {
newArray.push(data);
}
}
classArray.push(newArray);
}
this.classArray = classArray;
var hash = {};
dateList = dateList.reduce(function(item, next) {
hash[next.dateStrS]
? ""
: (hash[next.dateStrS] = true && item.push(next));
return item;
}, []);
this.calendarTit = dateList;
this.$nextTick(() => {
this.$refs.child[0].getYearMonthDay(this.classArray);
});
},
LiHover(item,index){
this.activeTab=index;
this.imgHoverSrc=item;
},
GetIds(){
this.load=true;
this.apiJavaPost('/api/b2b/food/getFoodInfo',{idDes:this.idDes},res=>{
this.load=false;
if(res.data.resultCode==1){
this.datadetails=res.data.data;
this.imgHoverSrc=this.datadetails.coverImgs[0];
if(this.datadetails.foodTag){
datadetails.foodTagList=item.foodTag.split(",");
}
}else{
this.Error(res.data.message);
}
},null)
},
handleClick(){},
},
}
......
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">
......@@ -223,21 +212,6 @@
</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> -->
<!-- 当地游 -->
<li :class="{_active: navActive === 3}">
<div @click="handleSelect('/Localtourhome', 3), navActive = 3">
......
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