Skip to content

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

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

parents 44a06396 8f037893
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2534 additions and 524 deletions
src/App.vue
View file @ a15f104f
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
<style> <style>
@import './assets/global/font.css'; @import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_8f4ml296bz3.css'; @import '//at.alicdn.com/t/font_863923_wzxnabnk91k.css';
@import './assets/global/global.css'; @import './assets/global/global.css';
body,html{ body,html{
padding: 0px; padding: 0px;
......
src/assets/css/LocalCuisine.css 0 → 100644
View file @ a15f104f
.LocalCuisine{
font-family: "PingFang";
color: #333333;
background: #f5f5f5;
}
.LocalCuisine .w1200{
margin:0 auto;
}
.LocalCuisine .chooseDiv{
padding:0 20px;
box-sizing: border-box;
width: 100%;
background: #ffffff;
margin-top:25px;
}
.LocalCuisine .chooseDiv li{
border-bottom:1px dashed rgba(233,233,233,1);
padding: 15px 0;
box-sizing: border-box;
position: relative;
}
.LocalCuisine .chooseDiv li div{
display: inline-block;
position: relative;
}
.LocalCuisine .chooseDiv li .title{
width: 80px;
}
.LocalCuisine .chooseDiv li .change{
width: 1080px;
color:#999999;
}
.LocalCuisine .chooseDiv li .el-icon-date{
color:#4CB960;
font-weight: 700;
}
.LocalCuisine .el-input__inner{
border-radius: 0;
}
.LocalCuisine .spanMargin{
word-break: break-all;
}
.LocalCuisine .spanMargin span{
display: inline-block;
font-size: 12px;
margin-right:18px;
padding-bottom:10px;
cursor: pointer;
}
.LocalCuisine .spanPrice span{
display: inline-block;
font-size: 12px;
margin-right:18px;
cursor: pointer;
}
.LocalCuisine .icon-qian{
color: #333333;
font-size: 12px;
}
.LocalCuisine .pxDiv .px img{
width: 8px;
height: 12px;
position: relative;
top: 2px;
}
.LocalCuisine .pxDiv{
padding: 15px 0;
text-align: center;
font-size: 12px;
}
.LocalCuisine .pxDiv span{
margin:0 10px;
}
.LocalCuisine .dataList{
margin-top:40px;
}
.LocalCuisine .dataList .dataLeft{
float: left;
width: 224px;
background:rgba(255,255,255,1);
border:1px solid rgba(236, 236, 236, 1);
box-sizing: border-box;
}
.LocalCuisine .dataList .dataRight{
float: right;
width: 954px;
background:rgba(255,255,255,1);
border:1px solid rgba(236, 236, 236, 1);
box-sizing: border-box;
/* margin-left: 20px; */
}
.LocalCuisine .dataList .leftList{
width: 188px;
margin: 0 auto;
margin-bottom:30px;
}
.LocalCuisine .dataList .dataRight .rightlist{
padding:0 20px;
box-sizing: border-box;
transition: all .5s ease;
cursor: pointer;
}
.LocalCuisine .dataList .dataRight .el-row{
padding:20px 0;
border-bottom: 1px solid #E9E9E9;
}
.LocalCuisine .dataList .dataRight .rightlist:hover{
box-shadow: 0px 1px 13px 0px rgb(189, 189, 189);
}
.LocalCuisine .dataList .dataRight .el-row .el-col{
box-sizing: border-box;
}
.LocalCuisine .dataList .dataRight .zhuti{
margin-bottom: 15px;
}
.LocalCuisine .dataList .dataRight .zhuti span{
display: inline-block;
color:#4E9F5D;
background:rgba(76,185,96,0.2);
padding:4px 10px;
margin-right: 10px;
/* opacity:0.2; */
}
.LocalCuisine .page{
background: #EBEBEB;
margin: 30px 0;
float: right;
width: 954px;
}
.LocalCuisine .page ._pagination{
height: 45px;
background-color: #EBEBEB;
display: flex;
align-items: center;
justify-content: center;
}
.LocalCuisine .page .el-pagination .btn-next,.LocalCuisine .page .el-pagination .btn-prev{
width:40px !important;
height:20px !important;
border:1px solid rgba(238,68,84,1);
border-radius:10px;
color: #f56c6c;
}
.LocalCuisine .page .el-pagination{
display: flex;
align-items: center;
}
.LocalCuisine .page .el-pager li{
background: transparent;
font-weight: initial;
}
.LocalCuisine .page .el-pager li:hover{
color: #f56c6c;
}
.LocalCuisine .page .el-pager li.active{
color: #f56c6c;
}
.LocalCuisine .ChActive{
color: #EE4454;
font-family: "PingFangR";
}
/* 当地美食详情页 */
.LocalCuisineDetails .Head{
margin-top: 15px;
}
.LocalCuisineDetails .Head .HeadLeft{
width: 460px;
float: left;
}
.LocalCuisineDetails .Head .HeadLeft .Imglist{
margin-left: -12px;
margin-top: 5px;
}
.LocalCuisineDetails .Head .HeadLeft .Imglist li{
display: inline-block;
margin-left: 12px;
}
.LocalCuisineDetails .Head .HeadLeft .Imglist li a{
display: inline-block;
width:82px;
height:47px;
box-sizing:border-box;
position: relative;
}
.LocalCuisineDetails .Head .HeadLeft .Imglist .activeLi{
/* border: 2px solid #EE4454; */
}
.LocalCuisineDetails .Head .HeadLeft .Imglist .activeLi a:before{
content: "";
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
border:2px solid #fff;
}
.LocalCuisineDetails .Head .HeadLeft .Imglist .activeLi a:after, .LocalCuisineDetails .Head .HeadLeft .Imglist .activeLi a:after{
content: "";
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding: 1px;
border: 2px solid #EE4454;
}
.LocalCuisineDetails .Head .HeadLeft .Imglist li img{
width: 100%;
height: 100%;
}
.LocalCuisineDetails .Head .HeadRight{
width: 720px;
float: right;
background: #fff;
padding: 30px 25px;
box-sizing: border-box;
}
.LocalCuisineDetails .Head .HeadRight .zhuti span{
display: inline-block;
color:#4E9F5D;
background:rgba(76,185,96,0.2);
padding:4px 10px;
margin-right: 10px;
/* opacity:0.2; */
}
.LocalCuisineDetails .Head .HeadRight .hr{
border-bottom: 1px dashed #E9E9E9;
margin:30px 0;
}
.LocalCuisineDetails .Head .HeadRight .tcDiv{
position: relative;
}
.LocalCuisineDetails .Head .HeadRight .tcDiv .tcSpan{
position: absolute;
color:#666666;
font-size: 12px;
}
.LocalCuisineDetails .Head .HeadRight .tcDiv .tc{
padding-left: 78px;
box-sizing: border-box;
}
.LocalCuisineDetails .Head .HeadRight .tcDiv .tc span{
display: inline-block;
border:1px solid rgba(204, 204, 204, 1);
border-radius:2px;
font-size:12px;
padding:4px 6px;
margin-right: 10px;
margin-bottom:10px;
}
.LocalCuisineDetails .Head .HeadRight .tcDiv .tc .Active{
border: 2px solid #EE4454;
color:#EE4454;
}
.LocalCuisineDetails .ydDiv{
margin-top:15px;
background:rgba(255,248,249,1);
border:1px solid rgba(249, 229, 232, 1);
height:80px;padding-top:15px;
box-sizing: border-box;
}
.LocalCuisineDetails .ydDiv .el-form-item{
display: inline-block;
margin-bottom: 0;
}
.LocalCuisineDetails .el-input-number__decrease,.LocalCuisineDetails .el-input-number__increase{
background: #fff;
outline: none;
}
.LocalCuisineDetails .ydDiv .el-icon-date{
color: #4CB960;
font-family: "PingFangR";
font-size: 16px;
}
/* .LocalCuisineDetails .ydDiv .el-input__prefix{
right:2px;
} */
.LocalCuisineDetails .ydDiv .el-form-item__label{
color:#666666;
font-size: 12px;
}
.LocalCuisineDetails .dataRight .el-tabs__nav{
float: none;
text-align: center;
}
.LocalCuisineDetails .dataRight .el-tabs__item{
height: 60px;
line-height: 60px;
}
.LocalCuisineDetails .dataRight .el-tabs__item.is-active{
color: #EE4454;
font-family: "PingFangR"
}
.LocalCuisineDetails .dataRight .el-tabs__active-bar{
left: 400px;
background-color: #EE4454;
}
.LocalCuisineDetails .dataRight .el-tabs__item:hover{
color: #EE4454;
}
.LocalCuisineDetails .dataRight .el-tabs__nav-wrap::after{
height: 1px;
}
\ No newline at end of file
src/assets/css/common.css 0 → 100644
View file @ a15f104f
.commonF{
font-family: "PingFang";
}
.commonF .f12{
font-size: 12px;
}
.commonF .f14{
font-size: 14px;
}
.commonF .f18{
font-size: 18px;
}
.commonF .f20{
font-size: 20px;
}
.commonF .pfR{
font-family: "PingFangR";
}
.commonF .w1200{
width: 1200px;
}
.commonF .basefix:after {
clear: both;
content: '.';
display: block;
height: 0;
overflow: hidden;
}
.commonF .text1{
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.commonF .text2{
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
\ No newline at end of file
src/assets/css/home.css
View file @ a15f104f
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
color: #fd6473 !important; color: #fd6473 !important;
} }
.Home .form_ul { .Home .form_ul {
overflow: auto; height: 60px;
overflow: hidden;
} }
.Home .form_ul li { .Home .form_ul li {
float: left; float: left;
...@@ -36,7 +37,8 @@ ...@@ -36,7 +37,8 @@
border-radius: 8px; border-radius: 8px;
padding: 3px 0; padding: 3px 0;
margin-right: 10px; margin-right: 10px;
margin-bottom: 13px; margin-bottom: 8px;
cursor: pointer;
} }
.Home .green_span { .Home .green_span {
display: inline-block; display: inline-block;
...@@ -154,6 +156,7 @@ p { ...@@ -154,6 +156,7 @@ p {
padding: 15px 20px 20px 90px; padding: 15px 20px 20px 90px;
height: 100%; height: 100%;
font-size: 14px; font-size: 14px;
overflow: hidden;
} }
.Home .Home_top { .Home .Home_top {
position: relative; position: relative;
...@@ -306,8 +309,10 @@ p { ...@@ -306,8 +309,10 @@ p {
} }
.Home .Grouptour .tour_left_content span{ .Home .Grouptour .tour_left_content span{
display: inline-block; display: inline-block;
width: 50%; /* width: 50%; */
font-size: 12px; font-size: 12px;
margin-right: 20px;
margin-bottom:10px;
} }
.Home .Grouptour .tour_right{ .Home .Grouptour .tour_right{
...@@ -441,7 +446,7 @@ p { ...@@ -441,7 +446,7 @@ p {
} }
.Ticket_right_content span{ .Ticket_right_content span{
display: inline-block; display: inline-block;
width: 50%; /* width: 50%; */
font-size: 12px; font-size: 12px;
} }
.Ticket_spots ._spots_item{ .Ticket_spots ._spots_item{
...@@ -680,6 +685,7 @@ p { ...@@ -680,6 +685,7 @@ p {
} }
.Home .home_footer{ .Home .home_footer{
margin:30px 0 15px 0; margin:30px 0 15px 0;
cursor: pointer;
} }
.Home .home_footer .float{ .Home .home_footer .float{
float: left; float: left;
......
src/assets/css/localtourhome.css
View file @ a15f104f
...@@ -209,6 +209,7 @@ ...@@ -209,6 +209,7 @@
color:#333333; color:#333333;
padding: 6px 10px; padding: 6px 10px;
box-sizing: border-box; box-sizing: border-box;
transition:all .5s ease;
} }
.Localtourhome .outoneday .dayContent .dayConDiv2 .conDes span{ .Localtourhome .outoneday .dayContent .dayConDiv2 .conDes span{
...@@ -269,6 +270,7 @@ ...@@ -269,6 +270,7 @@
width:212px; width:212px;
height:159px; height:159px;
margin-top:20px; margin-top:20px;
transition: all .5s ease;
} }
.AdmissionTicket .hottour_ul li img{ .AdmissionTicket .hottour_ul li img{
width: 100%; width: 100%;
...@@ -713,19 +715,42 @@ ...@@ -713,19 +715,42 @@
transition: left .4s; transition: left .4s;
} }
.TicketDetails .TicketHead .block li{ .TicketDetails .TicketHead .block li{
display: inline-block;
}
.TicketDetails .TicketHead .block li a{
display: inline-block; display: inline-block;
width:77px; width:77px;
height:58px; height:58px;
box-sizing: border-box; box-sizing: border-box;
margin:0 5px; margin:0 5px;
cursor: pointer; cursor: pointer;
position: relative;
}
.TicketDetails .TicketHead .block .liActive a:before, .TicketDetails .TicketHead .block .liActive a:hover:before {
content: "";
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
border: 3px solid #fff;
} }
.TicketDetails .TicketHead .block .liActive{ /* .TicketDetails .TicketHead .block .liActive{
border:2px solid rgba(76,185,96,1); border:2px solid rgba(76,185,96,1);
padding:1px; padding:1px;
position: relative;
top: -3px;
} */
.TicketDetails .TicketHead .block .liActive a:after, .TicketDetails .TicketHead .block .liActive a:after {
content: "";
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
padding: 1px;
border:2px solid rgba(76,185,96,1);
/* border: 2px solid #ff9e1c; */
} }
.TicketDetails .TicketHead .block img{ .TicketDetails .TicketHead .block img{
width: 100%; width: 100%;
......
src/assets/mall/newHead.css
View file @ a15f104f
...@@ -12,6 +12,11 @@ ul,li{list-style: none;} ...@@ -12,6 +12,11 @@ ul,li{list-style: none;}
width: 1180px !important; width: 1180px !important;
margin: 0 auto; margin: 0 auto;
} }
.w1200{
width: 1200px !important;
margin: 0 auto;
}
.w85{ .w85{
width: 85px !important; width: 85px !important;
} }
......
src/components/Home.vue
View file @ a15f104f
This diff is collapsed.
src/components/IntegralMall/IntegralDetail.vue 0 → 100644
View file @ a15f104f
<style>
.IntegralDetail{
background-color: #f5f5f5;
padding-bottom:20px;
}
.IntegralDetail .breadcrumb{
padding: 20px 0;
}
.IntegralDetail .pd_top_info{
height: 554px;
}
.IntegralDetail .Ingegra_Top{
width:100%;
height:70px;
line-height: 70px;
}
.IntegralDetail .Integra_Content{
width:100%;
height:auto;
background-color: #fff;
margin-left:20px;
}
.IntegralDetail .Integra_left{
float:left;
width:250px;
font-size:16px;
color:#333333;
font-weight: bold;
margin-left:20px;
}
.IntegralDetail .Integra_right{
float:right;
color:#FFA835;
font-size:12px;
margin-right: 20px;
}
.IntegralDetail .Integra_right img{
position: relative;
top:2px;
left:-5px;
width:14px;
}
.IntegralDetail .IngegraTable{
width: 96%;
border-collapse: collapse;
font-size:14px;
margin:auto;
}
.IntegralDetail .IngegraTable th{
background-color: #F8F8F8;
height:40px;
font-size:12px;
color:#666666;
}
.IntegralDetail .IngegraTable td{
padding:18px;
background-color: #fff;
text-align: center;
color:#666666;
border-bottom:1px solid #E9E9E9;
font-size:12px;
}
.IntegralDetail .IngegraTable tr:hover td{
background-color: #FFF0F0;
}
.IntegralDetail .pointOrderTime{
color:#999999;
}
.IntegralDetail .pointOrderNum{
color:#333333
}
.IntegralDetail .pointOrderTitle{
margin-left:30px;
color:#666666;
}
.IntegralDetail .pointDetailBtn{
width:64px;
height:24px;
color:#fff;
outline: none;
border:none;
background-color: #EE4454;
border-radius:4px;
margin-bottom:10px;
cursor: pointer;
font-size:12px;
}
.IntegralDetail .pointCancelBtn{
width:64px;
height:24px;
outline: none;
color:#666666;
background-color: transparent;
border:1px solid rgba(102,102,102,1);
border-radius:4px;
cursor: pointer;
font-size:12px;
}
.IntegralDetail .po_info{
display: flex;
align-items: center;
}
.IntegralDetail .po_left{
width: 70px;
height: 70px;
background-color: #fff;
margin-right: 10px;
border:1px solid #ECECEC;
display: inline-block;
}
.IntegralDetail .po_right{
color: #666666;
font-size: 14px;
display: inline-block;
width: 220px;
text-align: left;
}
.IntegralDetail .po_type{
width:80px;
text-align: left;
margin:auto;
color:#333333;
}
/* 分页样式 */
.IntegralDetail ._pagination{
height: 45px;
display: flex;
align-items: center;
justify-content: flex-end;
margin-right:15px;
}
.IntegralDetail .el-pagination .btn-next,.IntegralDetail .el-pagination .btn-prev{
width:40px !important;
height:20px !important;
border:1px solid rgba(238,68,84,1);
border-radius:10px;
color: #f56c6c;
}
.IntegralDetail .el-pagination{
display: flex;
align-items: center;
}
.IntegralDetail .el-pager li{
background: transparent;
font-weight: initial;
}
.IntegralDetail .el-pager li.active{
color: #f56c6c;
}
.IntegralDetail .Integral_InOut{
color:#FF0101!important;
}
</style>
<template>
<el-row class="IntegralDetail">
<div class="w1200">
<el-row>
<el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb">
<el-breadcrumb-item :to="{ path: '/IntegralMall' }">积分商城</el-breadcrumb-item>
<el-breadcrumb-item>积分明细</el-breadcrumb-item>
</el-breadcrumb>
</el-row>
<el-row class="pd_bottom_detail">
<el-col :span="5">
<detailsLeftHot/>
</el-col>
<el-col :span="19">
<el-row>
<div class="Integra_Content">
<div class="Ingegra_Top clearfix">
<div class="Integra_left">
积分明细
</div>
<div class="Integra_right">
<img src="../../assets/img/ticket/jfgz.png" alt=""/>查看积分规则
</div>
</div>
<table class="IngegraTable">
<tr>
<th>日期</th>
<th>收入/支出</th>
<th>详细说明</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.createTime | YMDHMS}}</td>
<td>
<span v-if="item.integralNum>0" class="Integral_InOut">+{{item.integralNum}}</span>
<span v-else>{{item.integralNum}}</span>
</td>
<td>{{item.integralDescri}}</td>
</tr>
</table>
<div class="empty-data" v-if="dataList.length==0">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
<!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && dataList.length>0">
<el-pagination
:current-page.sync="currentPage"
:page-size="msg.pageSize"
layout="total, prev, pager, next"
:total="Count"
@current-change="handleCurrentChange"
></el-pagination>
</el-row>
</div>
</el-row>
</el-col>
</el-row>
</div>
</el-row>
</template>
<script>
import detailsLeftHot from '@/components/IntegralMall/block/detailsLeftHot'
export default {
components:{
detailsLeftHot
},
data(){
return {
currentPage: 1,
totalCount: 0,
Count: 1,
msg: {
pageIndex: 1,
pageSize: 10,
},
dataList:[]
}
},methods:{
handleCurrentChange(val) {
// 翻页
this.msg.pageIndex = parseInt(val);
this.getList();
},
goUrl: function (path) {
this.$router.push({name: path});
},
getList(){
this.apiJavaPost('/api/orderForm/integralDetail',this.msg,res=>{
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
}else{
this.Error(res.data.message);
}
},null)
},
},mounted(){
this.getList();
}
}
</script>
src/components/IntegralMall/IntegralMall.vue
View file @ a15f104f
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<p>热门精品推荐</p> <p>热门精品推荐</p>
</div> </div>
</el-row> </el-row>
<commodity/> <commodity v-bind:message="dataList[0].list"/>
</div> </div>
<div class="_block"> <div class="_block">
<el-row class="tit"> <el-row class="tit">
...@@ -76,6 +76,7 @@ export default { ...@@ -76,6 +76,7 @@ export default {
data(){ data(){
return{ return{
ClassifyGoodsList: [], ClassifyGoodsList: [],
dataList:[]
} }
},methods: { },methods: {
getClassifyGoods: function () { getClassifyGoods: function () {
...@@ -91,10 +92,22 @@ export default { ...@@ -91,10 +92,22 @@ export default {
}, },
null null
); );
} },
//获取活动分类展示
getActivesList(){
this.apiJavaPost('/api/goodsMarket/getActivityClassifyGoods',{},res=>{
if(res.data.resultCode==1){
this.dataList = res.data.data;
}else{
this.Error(res.data.message);
}
},null)
},
}, },
mounted() { mounted() {
this.getClassifyGoods() this.getClassifyGoods();
this.getActivesList();
} }
} }
</script> </script>
src/components/IntegralMall/OrderCompleted.vue 0 → 100644
View file @ a15f104f
<style>
.OrderCompleted{
background-color: #f5f5f5;
padding-bottom: 20px;
}
.OrderCompleted .OC_top{
width:1090px;
height:auto;
font-size:12px;
margin: auto;
padding:30px 0;
position: relative;
}
.OrderCompleted .OC_TopLeft{
width:60px;
display: inline-block;
text-align: center;
}
.OrderCompleted .O_radius{
width:26px;
height:26px;
background-color: #EE4454;
border-radius: 50%;
color:#fff;
text-align: center;
line-height: 26px;
margin:9px auto;
}
.OrderCompleted .OC_Line{
width:1004px;
height:3px;
background-color: #EE4454;
display: inline-block;
position: relative;
top:-33px;
left:-17px;
}
.OrderCompleted .OC_TopRight{
width:60px;
position: absolute;
right:0;
top:30px;
text-align: center;
}
.OrderCompleted .OC_content{
width:100%;
height:400px;
border:1px solid #ECECEC;
background-color: #fff;
}
.OrderCompleted .OC_ConLeft{
display:inline-block;
margin:62px 0 0 200px;
width:378px;
}
.OrderCompleted .OC_ConTop img{
float:left;
}
.OrderCompleted .OC_riContent{
float:left;
margin-left:20px;
}
.OrderCompleted .OC_paySuccsss{
font-size:24px;
font-weight: bold;
color:#333333;
}
.OrderCompleted .Order_more{
color: #EE4454;
text-decoration: underline;
cursor: pointer;
}
.OrderCompleted .OC_dianhua{
font-size:12px;
margin-top:10px;
}
.OrderCompleted .OC_btmList{
width:320px;
margin-top:63px;
font-size:12px;
color:#333333;
}
.OrderCompleted .OC_btmList>div{
width:100%;
height:40px;
line-height: 40px;
border-bottom:1px solid #DDDDDD;
}
.OrderCompleted .OC_jishu{
width:58%;
}
.OrderCompleted .OC_jifen{
display: inline-block;
}
.OrderCompleted .OC_backBtn{
width: 87px;
height: 28px;
color: #fff;
outline: none;
border: none;
margin-top:45px;
background-color: #EE4454;
border-radius: 4px;
cursor: pointer;
font-size: 12px;
}
.OrderCompleted .OC_rightImg{
display:inline-block;
width:354px;
height:289px;
margin-left:70px;
}
.OrderCompleted .OC_rightImg img{
width:100%;
}
</style>
<template>
<!-- 积分明细 -->
<div class="OrderCompleted">
<div class="w1200">
<div class="OC_top">
<div class="OC_TopLeft">
<div class="O_radius">1</div>
确认订单
</div>
<div class="OC_Line"></div>
<div class="OC_TopRight">
<div class="O_radius">2</div>
订单完成
</div>
</div>
<div class="OC_content">
<div class="OC_ConLeft">
<div class="OC_ConTop clearfix">
<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>
</div>
<div class="OC_btmList">
<div>
<div class="OC_jifen OC_jishu">
支付积分：￥9900
</div>
<div class="OC_jifen">
剩余积分：￥190010
</div>
</div>
<div>
<div class="OC_jifen OC_jishu">
订单编号：45612312321
</div>
<div class="OC_jifen">
下单时间：2019-02-21
</div>
</div>
</div>
<input type="button" value="返回积分商城" class="OC_backBtn"/>
</div>
<div class="OC_rightImg">
<img src="../../assets/img/ticket/back.png" alt=""/>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
components: {
},
props:{},
data(){
return{
}
},methods: {
}
}
</script>
src/components/IntegralMall/OrderdetailsCompleted.vue 0 → 100644
View file @ a15f104f
<style>
.OrderdetailCompleted{
background-color: #f5f5f5
}
.OrderdetailCompleted .breadcrumb{
padding: 20px 0;
}
.Order_Top{
width:100%;
height:300px;
border:1px solid #ECECEC;
background-color: #fff;
border-top:4px solid #F2DADA;
}
.Order_Top_left{
display:inline-block;
width:326px;
height:100%;
border-right:1px solid #ECECEC;
text-align: center;
font-size:12px;
color:#666666;
}
.Order_Top_right{
font-size:12px;
color:#333333;
float:right;
margin:120px 25px 0 0;
}
.Order_Complate{
margin-top:109px;
}
.Order_Complate span{
position: relative;
top:-18px;
margin-left:20px;
color:#4CAF50;
font-size:24px;
font-weight: bold;
}
.Order_jifen{
margin:20px 0;
}
.Submit_Orders i{
display: block;
font-size:25px;
color:#4CAF50;
margin-bottom:10px;
}
.Submit_Orders{
width:80px;
display: inline-block;
text-align: center;
}
.SubmitComLine{
display:inline-block;
position: relative;
top:-28px;
}
.Submit_Orders img{
width:22px;
position: relative;
top:-8px;
}
.OrderdetailCompleted .myPointTable{
width: 100%;
border: solid 1px #EDEDED;
border-collapse: collapse;
font-size:14px;
margin:20px 0;
}
.OrderdetailCompleted .myPointTable td{
padding:17px 15px;
background-color: #fff;
color:#333333;
border:1px solid #ECECEC;
font-size:12px;
}
.OrderdetailCompleted .pointOrderTime{
color:#999999;
}
.OrderdetailCompleted .pointOrderNum{
color:#333333
}
.OrderdetailCompleted .pointOrderTitle{
margin-left:30px;
color:#666666;
}
.OrderdetailCompleted .po_info{
display: flex;
align-items: center;
}
.OrderdetailCompleted .po_left{
width: 70px;
height: 70px;
background-color: #fff;
margin-right: 10px;
border:1px solid #ECECEC;
display: inline-block;
}
.OrderdetailCompleted .po_right{
color: #666666;
font-size: 14px;
display: inline-block;
width: 220px;
text-align: left;
}
.OrderdetailCompleted .pointCancelBtn{
width:64px;
height:24px;
outline: none;
color:#666666;
background-color: transparent;
border:1px solid rgba(102,102,102,1);
border-radius:4px;
cursor: pointer;
font-size:12px;
}
.OrderShouContent{
font-size:12px;
color:#333333;
margin-left:20px;
}
.Order_left,.Order_right{
display:inline-block;
vertical-align:top;
}
.Order_right{
margin-left:20px;
text-align: left;
}
.Order_right div{
margin-bottom:5px;
}
.Order_more{
color:#EE4454;
text-decoration: underline;
cursor: pointer;
}
</style>
<template>
<el-row class="OrderdetailCompleted">
<div class="w1200">
<el-row>
<el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb">
<el-breadcrumb-item :to="{ path: '/IntegralMall' }">积分商城</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/myPointOrder' }">我的订单</el-breadcrumb-item>
<el-breadcrumb-item>订单详情</el-breadcrumb-item>
</el-breadcrumb>
</el-row>
<div class="OrderContent">
<div class="Order_Top">
<div class="Order_Top_left">
<div class="Order_Complate">
<img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/>
<span>完成</span>
</div>
<div class="Order_jifen">
支付积分：￥9900
</div>
<div>
剩余积分：￥190010
</div>
</div>
<div class="Order_Top_right">
<div class="Submit_Orders">
<i class="iconfont icon-order_icon"/>
提交订单
</div>
<div class="SubmitComLine">
<img src="../../assets/img/orderLins.png" alt=""/>
</div>
<div class="Submit_Orders">
<i class="iconfont icon-xunhuan"/>
确认兑换
</div>
<div class="SubmitComLine">
<img src="../../assets/img/orderLins.png" alt=""/>
</div>
<div class="Submit_Orders">
<i class="iconfont icon-gerenzhongxindingdandaishouhuo"/>
确认兑换
</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>
</div>
</div>
<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>
</td>
</tr>
<tr>
<td width="325px">
<div class="po_info">
<div class="po_left">
</div>
<div class="po_right">
天空大容量抽绳化妆包+防水防潮+便携耐用 暗兜设计
</div>
</div>
</td>
<td>
<div class="OrderShouContent" v-if="index<num" v-for="(item,index) in data">
<div class="Order_left">
{{item.time}}
</div>
<div class="Order_right">
<div v-for="(subItem,subIndex) in item.list">
{{subItem}}
<span @click="DataLength(1)" v-if="num==1&&data.length>1&&subIndex==item.list.length-1" class="Order_more">查看更多>></span>
<span @click="DataLength(2)" v-if="num>1&&index==data.length-1&&subIndex==item.list.length-1" class="Order_more">收起>></span>
</div>
</div>
</div>
</td>
<td width="132px" style="text-align:center;">
<input type="button" class="pointCancelBtn" value="取消订单">
</td>
</tr>
</table>
</div>
</div>
</el-row>
</template>
<script>
export default {
data(){
return {
num:1,
data:[
{
time:"2019-08-08",
list:[
"09:26:17包裹正在等待收货",
"09:26:17包裹正在等待收货",
"09:26:17包裹正在等待收货",
"09:26:17包裹正在等待收货",
]
},
{
time:"2019-08-09",
list:[
"09:26:17包裹正在等待收货",
"09:26:17包裹正在等待收货",
"09:26:17包裹正在等待收货",
"09:26:17包裹正在等待收货",
]
}
]
}
},methods:{
DataLength(num){
if(num==2){
this.num=1;
}else{
this.num=this.data.length;
console.log("this.num",this.num)
}
}
},mounted(){
}
}
</script>
src/components/IntegralMall/myPointOrder.vue 0 → 100644
View file @ a15f104f
This diff is collapsed.
src/components/LocalTour/AdmissionTicket.vue
View file @ a15f104f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<img style="width:143px;height:106px;" :src="item.coverImgs[0]" alt=""> <img style="width:143px;height:106px;" :src="item.coverImgs[0]" alt="">
</div> </div>
<div class="secondDiv"> <div class="secondDiv">
<p style="font-size:16px;color:#2A5532">{{item.name}}</p> <p @click="GoUrl(item)" style="font-size:16px;color:#2A5532;cursor:pointer">{{item.name}}</p>
<p style="margin-top:14px;" class="font12"> <p style="margin-top:14px;" class="font12">
<i class="iconfont icon-bb-chufadi"></i> <i class="iconfont icon-bb-chufadi"></i>
<span>景点地址：{{item.address}}</span> <span>景点地址：{{item.address}}</span>
......
src/components/LocalTour/LocalCuisine.vue 0 → 100644
View file @ a15f104f
This diff is collapsed.
src/components/LocalTour/LocalCuisineDetails.vue 0 → 100644
View file @ a15f104f
<style>
@import "../../assets/css/common.css";
@import "../../assets/css/LocalCuisine.css";
</style>
<template>
<div class="LocalCuisine commonF LocalCuisineDetails">
<div 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="">
<ul class="Imglist">
<li class="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="">
</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="f12 zhuti" style="padding-top:10px">
<span>主题公园</span>
<span>亲子旅游</span>
<span>当地美食</span>
</p>
<p class="f12" style="color:#666666;padding-top:20px">
<span>景点地址</span>
<span style="margin-left:25px;">香港大屿山香港迪士尼乐园度假区</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>
</div>
</div>
</div>
</div>
<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>
<el-form-item label="成人">
<el-input-number v-model="msg.num" size="mini" :min="1" :max="10" label="描述文字"></el-input-number>
</el-form-item>
<el-form-item label="儿童">
<el-input-number v-model="msg.num" size="mini" :min="1" :max="10" label="描述文字"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="5">
<span CLASS="f12" style="color:#999999">价格：</span>
<span class="f12">￥
<span class="pfR" style="color:#FF0101;font-size:28px;">99</span>
<span style="color:#FF0101;">起</span></span>
<el-button style="background:#EE4454;color:#fff;border-radius:0;border:none;margin-left:30px">立即预定</el-button>
</el-col>
</el-form>
<!-- <el-col :span="6">
</el-col> -->
</el-row>
<!-- -->
<div class="dataList basefix">
<div class="dataLeft">
<p class="pfR" style="padding:15px 19px">猜你喜欢</p>
<div class="leftList">
<img style="width:188px;height:106px;" src="../../assets/img/activy.jpg" alt="">
<div>
<p class="f12 text2">曼谷拜约克自助餐摩天塔 Baiyoke Sky Hotel高空餐厅国Baiyoke Sky Hotel高空餐厅国</p>
<p>
<span style="color:#FF0101">￥68</span>起
</p>
</div>
</div>
<div class="leftList">
<img style="width:188px;height:106px;" src="../../assets/img/activy.jpg" alt="">
<div>
<p class="f12 text2">曼谷拜约克自助餐摩天塔 Baiyoke Sky Hotel高空餐厅国Baiyoke Sky Hotel高空餐厅国</p>
<p>
<span style="color:#FF0101">￥68</span>起
</p>
</div>
</div>
</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-tabs>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data(){
return{
activeName:'first',
msg:{
},
startDate:"",
}
},
mounted(){},
methods:{
handleClick(){},
},
}
</script>
\ No newline at end of file
src/components/LocalTour/Localtourhome.vue
View file @ a15f104f
...@@ -280,6 +280,37 @@ ...@@ -280,6 +280,37 @@
</ul> </ul>
</div> </div>
</div> </div>
<!-- 当地美食 -->
<div class="PlayTicket">
<div class="outone_top commontitle">
<div class="outone_top_left">
<p style="color:#4CB960;font-size:24px">当地美食</p>
<p style="color:#666666;font-size:10px;margin-top: -2px;">Local cuisine</p>
</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">
{{item.countryName}}</span>
<a @click="GoCuisine()">更多美食</a>
</div>
</div>
</div>
<div class="ticketContent basefix" style="margin-top:24px;">
<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="">
<div class="bottom">
<span>{{item.name}}</span>
<span class="font12 textHidden1">¥<a class="font14">{{item.b2bPrice | NoDesnum}}</a>起/人</span>
</div>
</li>
</ul>
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -324,6 +355,9 @@ export default { ...@@ -324,6 +355,9 @@ export default {
this.GetCuntryTicket(); this.GetCuntryTicket();
}, },
methods: { methods: {
GoCuisine(){
this.$router.push({ path:'/LocalCuisine'})
},
goOneDayDetail(item){ goOneDayDetail(item){
let path = 'OneDayDetailTwo'; let path = 'OneDayDetailTwo';
path=`${path}/${encodeURIComponent(item.idDes)}/${item.tcid}`; path=`${path}/${encodeURIComponent(item.idDes)}/${item.tcid}`;
......
src/components/LocalTour/OnedayList.vue
View file @ a15f104f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<img style="width:199px;height:148px;" :src="item.imgCover[0].url" alt=""> <img style="width:199px;height:148px;" :src="item.imgCover[0].url" alt="">
</div> </div>
<div class="secondDiv"> <div class="secondDiv">
<p style="font-size:16px;color:#2A5532">{{item.title}}</p> <p style="font-size:16px;color:#2A5532;cursor:pointer">{{item.title}}</p>
<p class="taglist" style="margin-top:18px;"> <p class="taglist" style="margin-top:18px;">
<!-- <span>明日可订</span> <!-- <span>明日可订</span>
<span>明日可订</span> --> <span>明日可订</span> -->
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<img :src="item.imgCover[0].url" alt=""> <img :src="item.imgCover[0].url" alt="">
<div class="hotcontent"> <div class="hotcontent">
<span class="textHidden font12">{{item.title}}</span> <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> <p class="font12" style="color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px">￥<span class="pfR font14">{{item.b2BPrice | NoDesnum}}</span>起</p>
</div> </div>
</li> </li>
<img style="width:228px;height:100px;margin-top:25px" src="../../assets/img/localtour/guangg1.png" alt=""> <img style="width:228px;height:100px;margin-top:25px" src="../../assets/img/localtour/guangg1.png" alt="">
...@@ -170,12 +170,14 @@ export default { ...@@ -170,12 +170,14 @@ export default {
font-size: 12px; font-size: 12px;
} }
.OnedayList .oneList li{ .OnedayList .oneList li{
color:#333333; color:#333333;
height:170px; height:170px;
border:1px solid rgba(229,229,229,1);
padding: 11px 28px 11px 11px; padding: 11px 28px 11px 11px;
box-sizing: border-box; box-sizing: border-box;
border:1px solid rgba(229,229,229,1);
margin-bottom: 15px;
} }
.OnedayList .oneList{ .OnedayList .oneList{
width:950px; width:950px;
......
src/components/LocalTour/TicketDetails.vue
View file @ a15f104f
...@@ -12,7 +12,10 @@ ...@@ -12,7 +12,10 @@
<div class="imgUl"> <div class="imgUl">
<ul ref="Changeimg"> <ul ref="Changeimg">
<li v-if="index<10" @mouseover="LiHover(item,index)" :class="imgHover==index?'liActive':''" v-for="(item,index) in dataDes.coverImgs" :key="index" > <li v-if="index<10" @mouseover="LiHover(item,index)" :class="imgHover==index?'liActive':''" v-for="(item,index) in dataDes.coverImgs" :key="index" >
<img :src="item" :onerror="defaultImg" alt="">
<a href="#">
<img :src="item" :onerror="defaultImg" alt="">
</a>
</li> </li>
...@@ -149,16 +152,21 @@ ...@@ -149,16 +152,21 @@
<!-- 预定须知 --> <!-- 预定须知 -->
<div id="ydxz"> <div id="ydxz">
<p class="ydTitle"><span style="font-size:20px" class="iconfont icon-tongzhi-lingdang-copy"></span> 预定须知</p> <p class="ydTitle"><span style="font-size:20px" class="iconfont icon-tongzhi-lingdang-copy"></span> 预定须知</p>
<p class="explain">预订说明</p> <div v-if="dataDes.bookingInfo">
<div class="explainContent"> <p class="explain">预订说明</p>
{{dataDes.bookingInfo}} <div class="explainContent">
{{dataDes.bookingInfo}}
</div> </div>
<p class="explain">温馨提示</p> </div>
<div class="explainContent"> <div v-if="dataDes.about">
{{dataDes.about}} <p class="explain">温馨提示</p>
<div class="explainContent">
{{dataDes.about}}
</div>
</div> </div>
</div> </div>
<!-- 景点介绍 --> <!-- 景点介绍 -->
<div id="jdjs"> <div id="jdjs">
......
src/components/Ticket/TicketHome.vue
View file @ a15f104f
...@@ -13,28 +13,28 @@ ...@@ -13,28 +13,28 @@
<el-option :value=2 label="往返"></el-option> <el-option :value=2 label="往返"></el-option>
</el-select> </el-select>
<span class="sx"></span> <span class="sx"></span>
<el-popover <el-popover :visible-arrow="false" v-model="startcity"
placement="bottom" placement="bottom"
trigger="click"> trigger="click">
<div v-show="startcity" class="citycompent"> <div class="citycompent">
<v-city @CityInfo="CityInfo" @CityCompClose="CityCompClose"></v-city> <v-city @CityInfo="CityInfo" @CityCompClose="CityCompClose"></v-city>
</div> </div>
<span class="city_span" slot="reference"> <span class="city_span" slot="reference">
<span class="iconfont icon-mudedi"></span> <span class="iconfont icon-mudedi"></span>
<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> </el-input>
</span> </span>
</el-popover> </el-popover>
<span class="sx"></span> <span class="sx"></span>
<el-popover <el-popover :visible-arrow="false" v-model="endcity"
placement="bottom" placement="bottom"
trigger="click"> trigger="click">
<div v-show="endcity" class="citycompent"> <div class="citycompent">
<v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1> <v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
</div> </div>
<span class="city_span" slot="reference"> <span class="city_span" slot="reference">
<span class="iconfont icon-mudedi"></span> <span class="iconfont icon-mudedi"></span>
<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> </el-input>
</span> </span>
</el-popover> </el-popover>
...@@ -389,13 +389,14 @@ export default { ...@@ -389,13 +389,14 @@ export default {
}, },
// 城市组件状态 // 城市组件状态
CityCompStatus(str) { CityCompStatus(str) {
this.startcity = false; // this.startcity = false;
this.endcity = false; // this.endcity = false;
if (str == "start") { if (str == "start") {
this.startcity = true; this.startcity = true;
} else { } else {
this.endcity = true; this.endcity = true;
} }
console
}, },
// 出发地城市信息 // 出发地城市信息
CityInfo(val) { CityInfo(val) {
......
src/components/global/head.vue
View file @ a15f104f
...@@ -40,6 +40,9 @@ font-family:MicrosoftYaHei-Bold; ...@@ -40,6 +40,9 @@ font-family:MicrosoftYaHei-Bold;
font-weight:bold; font-weight:bold;
color:rgba(51,51,51,1); color:rgba(51,51,51,1);
} }
.header .el-menu--horizontal>.el-submenu.is-active .el-submenu__title{
color:#fff!important;
}
</style> </style>
<template> <template>
......
src/components/global/newHead.vue
View file @ a15f104f
<style> <style>
@import "../../assets/mall/newHead.css"; @import "../../assets/mall/newHead.css";
.new_header .el-menu--horizontal>.el-submenu.is-active .el-submenu__title{
color:#fff!important;
border-bottom: 2px solid #DF3343!important;
}
</style> </style>
<template> <template>
<!-- 头部 --> <!-- 头部 -->
...@@ -216,6 +221,23 @@ ...@@ -216,6 +221,23 @@
<span class="__splice">|</span> <span class="__splice">|</span>
</div> --> </div> -->
</li> </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}"> <li :class="{_active: navActive === 3}">
<div @click="handleSelect('/Localtourhome', 3), navActive = 3"> <div @click="handleSelect('/Localtourhome', 3), navActive = 3">
...@@ -290,6 +312,7 @@ export default { ...@@ -290,6 +312,7 @@ export default {
city: 0, city: 0,
} }
},methods:{ },methods:{
changeSite(){ changeSite(){
window.localStorage.site=this.city window.localStorage.site=this.city
this.$emit('siteCity',this.city==0?-1:this.city) this.$emit('siteCity',this.city==0?-1:this.city)
......
src/components/newPersonalCenter/block/model/OrderInfoModel/ScenTable.vue
View file @ a15f104f
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
<span v-else-if="item.status === 3">待付款</span> <span v-else-if="item.status === 3">待付款</span>
</td> </td>
<td> <td>
<p v-if="item.status === 1 || item.status === 3" style="margin-bottom:10px;"> <p v-if="item.status === 3" style="margin-bottom:10px;">
<el-button @click="Pay(item)" size="mini" type="danger">支付</el-button> <el-button @click="Pay(item)" size="mini" type="danger">支付</el-button>
</p> </p>
......
src/components/newPersonalCenter/block/model/TDDOrder.vue
View file @ a15f104f
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
很抱歉，你想要的信息我们真的找不到了 很抱歉，你想要的信息我们真的找不到了
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0"> <el-row class="_pagination" v-if="tableData.length>0">
<el-pagination <el-pagination
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize" :page-size="getOrderMsg.pageSize"
......
src/components/newPersonalCenter/block/model/TcOrder.vue
View file @ a15f104f
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
很抱歉，你想要的信息我们真的找不到了 很抱歉，你想要的信息我们真的找不到了
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0"> <el-row class="_pagination" v-if="tableData.length>0">
<el-pagination <el-pagination
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize" :page-size="getOrderMsg.pageSize"
......
src/components/newPersonalCenter/block/model/TdOrder.vue
View file @ a15f104f
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
很抱歉，你想要的信息我们真的找不到了 很抱歉，你想要的信息我们真的找不到了
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0"> <el-row class="_pagination" v-if="tableData.length>0">
<el-pagination <el-pagination
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize" :page-size="getOrderMsg.pageSize"
......
src/components/newPersonalCenter/block/model/TkOrder.vue
View file @ a15f104f
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
很抱歉，你想要的信息我们真的找不到了 很抱歉，你想要的信息我们真的找不到了
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0"> <el-row class="_pagination" v-if="tableData.length>0">
<el-pagination <el-pagination
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize" :page-size="getOrderMsg.pageSize"
......
src/components/newPersonalCenter/block/model/TzOrder.vue
View file @ a15f104f
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
很抱歉，你想要的信息我们真的找不到了 很抱歉，你想要的信息我们真的找不到了
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0"> <el-row class="_pagination" v-if="tableData.length>0">
<el-pagination <el-pagination
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize" :page-size="getOrderMsg.pageSize"
......
src/components/newPersonalCenter/integral/model/commodity.vue
View file @ a15f104f
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
padding: 26px; padding: 26px;
text-align: center; text-align: center;
border-left: 1px solid rgba(236, 236, 236, 1); border-left: 1px solid rgba(236, 236, 236, 1);
border-right: 1px solid rgba(236, 236, 236, 1);
font-size:14px; font-size:14px;
color: #333333; color: #333333;
} }
...@@ -19,17 +18,23 @@ ...@@ -19,17 +18,23 @@
} }
.commodity .small{ .commodity .small{
text-align: center; text-align: center;
padding: 20px 10px;
border-right: 1px solid rgba(236, 236, 236, 1); border-right: 1px solid rgba(236, 236, 236, 1);
border-bottom: 1px solid rgba(236, 236, 236, 1); border-bottom: 1px solid rgba(236, 236, 236, 1);
font-size:14px; font-size:14px;
color: #333333; color: #333333;
width:229px;
height:241px;
cursor: pointer;
}
.commodity .small:last-child{
width:230px;
} }
.commodity .small img{ .commodity .small img{
max-height: 110px; max-height: 110px;
margin:15px 0;
} }
.commodity .small ._name{ .commodity .small ._name{
margin: 5px 0 15px 0; margin: 5px 0 10px 0;
} }
.commodity .small ._detais{ .commodity .small ._detais{
color: #999999; color: #999999;
...@@ -51,56 +56,56 @@ ...@@ -51,56 +56,56 @@
.commodity .medium ._detais{ .commodity .medium ._detais{
color: #999999; color: #999999;
} }
.com_bigImg{
max-width: 357px;
}
.medium{
width:344px;
height:240px;
cursor: pointer;
}
.com_BigDiv{
min-height:480px;border-right:1px solid #ECECEC;
}
.commodity .r_item_img_box{
min-height: 175px;
}
.r_item_btmBox{
min-height: 135px;
}
</style> </style>
<template> <template>
<el-row class="commodity"> <el-row class="commodity">
<el-col :span="10"> <el-col :span="10" class="com_BigDiv">
<div class="info"> <div class="info" v-if="index==0" v-for="(item,index) in message">
<div> <div>
<img src="../../../../assets/img/img-01.png" alt> <img class="com_bigImg" :src="getImgUrl(message[0].Images)" alt>
</div> </div>
<p class="_name">出行必备物品</p> <p class="_name">{{message[0].name}}</p>
<p class="_detais">699积分抢兑</p> <p class="_detais">{{message[0].Price}}积分抢兑</p>
</div> </div>
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-row> <el-row>
<el-col :span="8" class="small"> <el-col :span="8" class="small" v-if="index>0&&index<4" v-for="(item,index) in message">
<div> <div @click="goDetail(item.Id)">
<img src="../../../../assets/img/img-01.png" alt> <div class="r_item_img_box">
<img :src="getImgUrl(item.Images)" alt>
</div>
<p class="_name">{{item.name}}</p>
<p class="_detais" v-if="item.Price!=''">{{item.Price}}积分抢兑</p>
</div> </div>
<p class="_name">出行必备物品</p>
<p class="_detais">699积分抢兑</p>
</el-col>
<el-col :span="8" class="small">
<div>
<img src="../../../../assets/img/img-01.png" alt>
</div>
<p class="_name">出行必备物品</p>
<p class="_detais">699积分抢兑</p>
</el-col>
<el-col :span="8" class="small">
<div>
<img src="../../../../assets/img/img-01.png" alt>
</div>
<p class="_name">出行必备物品</p>
<p class="_detais">699积分抢兑</p>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" class="medium f"> <el-col :span="12" class="medium f" v-if="index>3" v-for="(item,index) in message">
<div> <div @click="goDetail(item.Id)">
<img src="../../../../assets/img/img-01.png" alt> <div class="r_item_btmBox">
<img :src="getImgUrl(item.Images)" alt>
</div>
<p class="_name">{{item.name}}</p>
<p class="_detais" v-if="item.Price!=''">{{item.Price}}积分抢兑</p>
</div> </div>
<p class="_name">出行必备物品</p>
<p class="_detais">699积分抢兑</p>
</el-col>
<el-col :span="12" class="medium">
<div>
<img src="../../../../assets/img/img-01.png" alt>
</div>
<p class="_name">出行必备物品</p>
<p class="_detais">699积分抢兑</p>
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
...@@ -108,5 +113,24 @@ ...@@ -108,5 +113,24 @@
</template> </template>
<script> <script>
export default {}; export default {
props:["message"],
data(){
return {
}
},methods:{
getImgUrl(imgUrl){
var url= imgUrl.split(",")[0];
return url;
},
//跳转详情页面
goDetail: function (id) {
this.$router.push({ path: 'productDetail', query: {id: id}})
},
},mounted(){
console.log(this.message,'messagess');
}
};
</script> </script>
src/components/newPersonalCenter/integral/model/integralHomeV2.vue
View file @ a15f104f
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<el-col :span="6"> <el-col :span="6">
<div> <div>
<div> <div>
<p class="font_bla">我的积分订单</p> <p class="font_bla" @click="goUrl('myPointOrder')">我的积分订单</p>
<p>会员积分兑</p> <p>会员积分兑</p>
</div> </div>
<div> <div>
...@@ -176,32 +176,15 @@ ...@@ -176,32 +176,15 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- class --> <!-- class -->
<el-row class="class"> <el-row class="class" v-for="item in dataList">
<el-row class="tit">
<div>
<img src="../../../../assets/img/ps/jifenhot.png" alt="">
<p>热门精品推荐</p>
</div>
</el-row>
<Vcommodity/>
</el-row>
<el-row class="class">
<el-row class="tit"> <el-row class="tit">
<div> <div>
<img src="../../../../assets/img/ps/jifenchou.png" alt=""> <!-- <img src="../../../../assets/img/ps/jifenhot.png" alt=""> -->
<p>积分抽大奖</p> <img :src="item.activityImg" alt="">
<p>{{item.activityName}}</p>
</div> </div>
</el-row> </el-row>
<Vcommodity/> <Vcommodity v-bind:message="item.list"/>
</el-row>
<el-row class="class">
<el-row class="tit">
<div>
<img src="../../../../assets/img/ps/jifenli.png" alt="">
<p>999积分享好礼</p>
</div>
</el-row>
<Vcommodity/>
</el-row> </el-row>
<el-row class="advert" :gutter="20"> <el-row class="advert" :gutter="20">
<el-col :span="12"> <el-col :span="12">
...@@ -247,7 +230,8 @@ export default { ...@@ -247,7 +230,8 @@ export default {
data(){ data(){
return{ return{
StorageInfo: {}, StorageInfo: {},
list: [1,2,3,4,5,6,7,8,9,10] list: [1,2,3,4,5,6,7,8,9,10],
dataList:[],
} }
}, },
created(){ created(){
...@@ -256,9 +240,50 @@ export default { ...@@ -256,9 +240,50 @@ export default {
},methods:{ },methods:{
goExchange: function(){ goExchange: function(){
this.MsgBus.$emit('goCPage', '4-3') this.MsgBus.$emit('goCPage', '4-3')
},
goUrl: function (path) {
this.$router.push({name: path});
},
//获取活动分类展示
getActivesList(){
this.apiJavaPost('/api/goodsMarket/getActivityClassifyGoods',{},res=>{
if(res.data.resultCode==1){
this.dataList = res.data.data;
console.log(this.dataList,'sssssss');
var num=0;
this.dataList.forEach(x=>{
if(x.list.length<6){
num=6-x.list.length;
}
var obj = {
Description:'',
Id:'',
Images:'',
Price:'',
activityId:'',
activityImg:'',
activityName:'',
name:''
}
for(var i=0;i<num;i++){
x.list.push(obj);
}
})
}else{
this.Error(res.data.message);
}
},null)
},
//获取积分
getScore(){
this.apiJavaPost('/api/orderForm/getTotalIntegrals',{},res=>{
console.log(res,'ressss');
});
} }
},mounted(){ },mounted(){
this.getScore();
this.getActivesList();
} }
} }
</script> </script>
src/components/newPersonalCenter/newPersonalCenter.vue
View file @ a15f104f
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<span>我的积分</span> <span>我的积分</span>
</template> </template>
<el-menu-item index="4-1" @click="goUrl('integral')">积分首页</el-menu-item> <el-menu-item index="4-1" @click="goUrl('integral')">积分首页</el-menu-item>
<el-menu-item index="4-2" @click="clickMenu('4-2')">积分明细</el-menu-item> <el-menu-item index="4-2" @click="goUrl('IntegralDetail')">积分明细</el-menu-item>
<el-menu-item index="4-3" @click="clickMenu('4-3')">我的兑换</el-menu-item> <el-menu-item index="4-3" @click="clickMenu('4-3')">我的兑换</el-menu-item>
</el-submenu> </el-submenu>
<el-menu-item index="5" @click="clickMenu('5')"> <el-menu-item index="5" @click="clickMenu('5')">
......
src/main.js
View file @ a15f104f
...@@ -118,7 +118,7 @@ Vue.filter('priceFormat', function (value) { ...@@ -118,7 +118,7 @@ Vue.filter('priceFormat', function (value) {
if (value == null) { if (value == null) {
return 0.00; return 0.00;
} }
let nStr = value.toFixed(0) let nStr = value.toFixed(0)+".00"
nStr += ''; nStr += '';
let x = nStr.split('.'); let x = nStr.split('.');
let x1 = x[0]; let x1 = x[0];
...@@ -137,6 +137,9 @@ Vue.filter("YMD", function (date) { ...@@ -137,6 +137,9 @@ Vue.filter("YMD", function (date) {
Vue.filter("MD", function (date) { Vue.filter("MD", function (date) {
return moment(date).format("MM月DD日"); return moment(date).format("MM月DD日");
}) })
Vue.filter("YMDHMS", function (date) {
return moment(date).format("YYYY-MM-DD HH:mm:ss");
})
Vue.prototype.random_string = function (len) { Vue.prototype.random_string = function (len) {
len = len || 32; len = len || 32;
var chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; var chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
......
src/router.js
View file @ a15f104f
...@@ -192,6 +192,38 @@ export default new Router({ ...@@ -192,6 +192,38 @@ export default new Router({
title: "订单确认-印象之旅~感动与世界同步" title: "订单确认-印象之旅~感动与世界同步"
} }
}, },
{
path: "/myPointOrder", //个人中心-我的积分订单
name: "myPointOrder",
component: resolve => require(["@/components/IntegralMall/myPointOrder"], resolve),
meta: {
title: "订单确认-印象之旅~感动与世界同步"
}
},
{
path: "/OrderdetailsCompleted", //个人中心-订单完成详情
name: "OrderdetailsCompleted",
component: resolve => require(["@/components/IntegralMall/OrderdetailsCompleted"], resolve),
meta: {
title: "订单确认-印象之旅~感动与世界同步"
}
},
{
path: "/IntegralDetail", //个人中心-积分明细
name: "IntegralDetail",
component: resolve => require(["@/components/IntegralMall/IntegralDetail"], resolve),
meta: {
title: "订单确认-印象之旅~感动与世界同步"
}
},
{
path: "/OrderCompleted", //个人中心-订单完成
name: "OrderCompleted",
component: resolve => require(["@/components/IntegralMall/OrderCompleted"], resolve),
meta: {
title: "订单确认-印象之旅~感动与世界同步"
}
},
{ {
path: "/integral", path: "/integral",
name: "integral", name: "integral",
...@@ -498,6 +530,24 @@ export default new Router({ ...@@ -498,6 +530,24 @@ export default new Router({
title: "预约" title: "预约"
} }
}, },
{
path: "/LocalCuisine",
name: "LocalCuisine",
component: resolve =>
require(["@/components/LocalTour/LocalCuisine.vue"], resolve),
meta: {
title: "当地美食"
}
},
{
path: "/LocalCuisineDetails",
name: "LocalCuisineDetails",
component: resolve =>
require(["@/components/LocalTour/LocalCuisineDetails.vue"], resolve),
meta: {
title: "当地美食详情"
}
},
] ]
}, },
......
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