Skip to content

A
Athena
Commit 4b4fca4b authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 85182109 12ace2e5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1381 additions and 818 deletions
src/App.vue
View file @ 4b4fca4b
...@@ -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_efb26gusuoj.css'; @import '//at.alicdn.com/t/font_863923_z7sx0rhjxjt.css';
@import './assets/global/global.css'; @import './assets/global/global.css';
body,html{ body,html{
padding: 0px; padding: 0px;
......
src/assets/css/newPersonalCenter/block/HomePage.css
View file @ 4b4fca4b
...@@ -145,6 +145,9 @@ ...@@ -145,6 +145,9 @@
.top_info ._addr ._managers{ .top_info ._addr ._managers{
display: flex; display: flex;
} }
.top_info ._addr ._managers ._tit{
font-size: 14px;
}
.top_info .top_info_right{ .top_info .top_info_right{
display: flex; display: flex;
height: 168px; height: 168px;
...@@ -227,6 +230,23 @@ ...@@ -227,6 +230,23 @@
.order_info .el-table--enable-row-hover .el-table__body tr:hover>td{ .order_info .el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #FFF0F0 !important; background-color: #FFF0F0 !important;
} }
.order_info .order_table{
/* min-height: 315px; */
}
.order_info .order_table ._row_2{
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
word-break: break-all;
display: -webkit-box;
-webkit-box-orient: vertical;
}
.w180{
max-width: 180px;;
}
.order_info .el-table__empty-block{
display: none
}
/* 分页样式 */ /* 分页样式 */
.order_info ._pagination{ .order_info ._pagination{
height: 45px; height: 45px;
......
src/assets/css/newPersonalCenter/block/Information.css
View file @ 4b4fca4b
.PsSystem{padding-top: 20px; background-color: #F5F5F5;} .PsSystem{
border:1px solid rgba(230,230,230,1);
background-color: #F5F5F5;
margin-bottom: 15px;
}
.PsSystem ._left{ .PsSystem ._left{
min-height: 600px; min-height: 600px;
background-color: #ffffff; background-color: #ffffff;
...@@ -26,10 +31,35 @@ ...@@ -26,10 +31,35 @@
display: inline-block; display: inline-block;
margin-right: 12px; margin-right: 12px;
} }
.PsSystem ._edit_box{text-align: right;} .PsSystem ._edit_box{
padding: 30px;
padding-bottom: 15px;
border-bottom: 1px solid rgba(230,230,230,1);
}
.PsSystem ._edit_box ._edit_box_tit{
float: left;
font-size: 18px;
}
.PsSystem ._edit_box ._edit_box_tit i{
color: #91CFB6;
padding-right: 10px;
}
.PsSystem ._edit_box ._edit_box_tit i.icon-mima{
color: #8EAEDE;
}
.PsSystem ._edit_box ._edit_box_tit span{
font-family: 'PingFangR'
}
.PsSystem ._edit_box button{ .PsSystem ._edit_box button{
border-radius: 0; width:64px;
width: 100px; height:24px;
background:rgba(253,100,115,1);
border-radius:4px;
float: right;
line-height: 24px;
padding: initial;
border-color: rgba(253,100,115,1);
margin-left: 10px
} }
.PsSystem ._right_item{ .PsSystem ._right_item{
padding: 30px; padding: 30px;
...@@ -51,7 +81,7 @@ ...@@ -51,7 +81,7 @@
} }
.PsSystem ._right_item input:focus{border-bottom: 1px solid red;} .PsSystem ._right_item input:focus{border-bottom: 1px solid red;}
.PsSystem ._cancel{ .PsSystem ._cancel{
background-color: white; background-color: white !important;
color: #EF4455; color: #EF4455;
} }
.PsSystem ._cancel:hover{ .PsSystem ._cancel:hover{
...@@ -76,16 +106,16 @@ ...@@ -76,16 +106,16 @@
.PsSystem .Authentication ._real_name ._rn_tit{ .PsSystem .Authentication ._real_name ._rn_tit{
height: 58px; height: 58px;
font-size: 18px; font-size: 18px;
color: #5079ED; color: #333333;
background-color: white; background-color: white;
border:1px solid rgba(80,121,237,1); border:1px solid #FFBDBD;
text-align: center; text-align: center;
line-height: 58px; line-height: 58px;
cursor: pointer; cursor: pointer;
} }
.PsSystem .Authentication ._real_name ._rn_tit._active{ .PsSystem .Authentication ._real_name ._rn_tit._active{
background-color: #5079ED; background-color: rgba(250,225,225,1);
color: white; color: #FD6473;
font-weight: bold; font-weight: bold;
} }
.kailong{ .kailong{
...@@ -93,7 +123,7 @@ ...@@ -93,7 +123,7 @@
height:0; height:0;
border-right: 10px solid transparent; border-right: 10px solid transparent;
border-left: 10px solid transparent; border-left: 10px solid transparent;
border-top: 10px solid #5079ed; border-top: 10px solid #FFBDBD;
margin: 0 auto; margin: 0 auto;
} }
.Authentication ._at_tips{ .Authentication ._at_tips{
...@@ -154,7 +184,7 @@ ...@@ -154,7 +184,7 @@
width: 100px; width: 100px;
height: 100px; height: 100px;
border-radius: 50%; border-radius: 50%;
background-color: #5079ED; background-color: #FD6473;
color: white; color: white;
font-size: 54px; font-size: 54px;
font-weight: bolder; font-weight: bolder;
...@@ -165,7 +195,7 @@ ...@@ -165,7 +195,7 @@
left: 80px; left: 80px;
} }
._op_btn:hover{ ._op_btn:hover{
background-color: #2853CC; background-color: #FD6473;
} }
.w215{ .w215{
width: 215px; width: 215px;
...@@ -173,6 +203,10 @@ ...@@ -173,6 +203,10 @@
.text_a_center{ .text_a_center{
text-align: center; text-align: center;
} }
.text_a_center button{
background:rgba(253,100,115,1);
border-color: rgba(253,100,115,1);
}
.upload-demo2 .el-upload-dragger{ .upload-demo2 .el-upload-dragger{
width: 243px; width: 243px;
height: 152px; height: 152px;
...@@ -225,3 +259,10 @@ color: #67C23A !important; ...@@ -225,3 +259,10 @@ color: #67C23A !important;
._status_str_r{ ._status_str_r{
color: #F56C6C !important; color: #F56C6C !important;
} }
.top_head{
padding: 20px;
text-align: center;
}
.top_head p{
margin-top: 16px;
}
\ No newline at end of file
src/assets/css/newPersonalCenter/block/MemberCenter.css
View file @ 4b4fca4b
...@@ -264,6 +264,7 @@ ...@@ -264,6 +264,7 @@
/* 等级权益 */ /* 等级权益 */
.level_equity{ .level_equity{
margin: 20px 0; margin: 20px 0;
background-color: white;
} }
.level_equity>p,.level_rule>p,.level_question>p{ .level_equity>p,.level_rule>p,.level_question>p{
font-size: 16px; font-size: 16px;
...@@ -318,6 +319,7 @@ ...@@ -318,6 +319,7 @@
} }
.level_rule{ .level_rule{
margin-bottom: 20px; margin-bottom: 20px;
background-color: white;
} }
.level_rule td{ .level_rule td{
text-align: left !important; text-align: left !important;
...@@ -325,6 +327,7 @@ ...@@ -325,6 +327,7 @@
} }
.level_question{ .level_question{
margin-bottom: 20px; margin-bottom: 20px;
background-color: white;
} }
.level_question>p{ .level_question>p{
border-bottom: 1px solid rgba(230,230,230,1); border-bottom: 1px solid rgba(230,230,230,1);
......
src/assets/css/newPersonalCenter/block/MyCoupon.css
View file @ 4b4fca4b
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
} }
.MyCoupon ._content_item ._item{ .MyCoupon ._content_item ._item{
width: 220px; width: 220px;
height: 276px;
position: relative; position: relative;
transition: all linear .5s; transition: all linear .5s;
overflow: hidden; overflow: hidden;
......
src/assets/css/newPersonalCenter/block/OrderCenter.css
View file @ 4b4fca4b
.OrderCenter .el-tabs--card>.el-tabs__header .el-tabs__item.is-active{ .OrderCenter>ul{
color: #E73828; height: 40px;
line-height: 40px;
border-bottom: 1px solid #F2DADA;
} }
.OrderCenter .el-tabs--card>.el-tabs__header .el-tabs__item{ .OrderCenter>ul li{
border-left:1px solid #F2DADA float: left;
padding: 0 20px;
} }
.OrderCenter .el-tabs--card>.el-tabs__header .el-tabs__nav{ .OrderCenter>ul li.__cp{
border: 1px solid #f2dada; font-size: 14px;
border-bottom: none;
} }
.OrderCenter .el-tabs--card>.el-tabs__header{ .OrderCenter>ul li.__cp._active{
border-bottom: 1px solid #f2dada; color: #E73828
} }
.OrderCenter .table_box{ .OrderCenter .table_box{
margin-top: 20px;
border: 1px solid rgba(230,230,230,1); border: 1px solid rgba(230,230,230,1);
} }
.OrderCenter .table_box ._row_2{
.OrderCenter .el-tabs__item:hover{ overflow: hidden;
color: #E73828; text-overflow: ellipsis;
-webkit-line-clamp: 2;
word-break: break-all;
display: -webkit-box;
-webkit-box-orient: vertical;
}
.w180{
max-width: 180px;;
} }
.OrderCenter .el-table--enable-row-hover .el-table__body tr:hover>td{ .OrderCenter .el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #FFF0F0 !important; background-color: #FFF0F0 !important;
} }
.OrderCenter .el-table td,.OrderCenter .el-table th.is-leaf{
border: 1px solid #ebeef5;
}
.OrderCenter .el-table__empty-block{
display: none
}
/* 分页样式 */ /* 分页样式 */
.OrderCenter ._pagination{ .OrderCenter ._pagination{
height: 45px; height: 45px;
......
src/assets/css/newPersonalCenter/integral.css 0 → 100644
View file @ 4b4fca4b
/* 积分首页样式 */
.integral_home{
}
.integral_home .integral_banner{
height: 200px;
margin-bottom: 15px;
background-color: orange;
}
.integral_home .integral_banner img{
height: 100%;
display: inline-block;
}
.integral_home .integral_detail{
display: flex;
align-items: stretch;
margin-bottom: 20px;
}
.integral_home .integral_detail .integral_detail_left{
text-align: center;
}
.integral_home .integral_detail .integral_detail_left img{
width: 98px;
}
.integral_home .integral_detail .integral_detail_left ._tit{
font-size: 14px;
margin: 20px 0 30px 0;
}
.integral_home .integral_detail .integral_detail_left ._number{
font-size: 36px;
color: #F95355;
margin-bottom: 60px;
}
.integral_home .integral_detail .integral_detail_left ._bt{
width: 213px;
height: 32px;
line-height: 32px;
border: 1px solid #F95355;
color: #F95355;
border-radius:4px;
margin: 0 auto;
}
.integral_home .integral_detail .integral_detail_left,.integral_home .integral_detail .integral_detail_right{
border:1px solid rgba(236,236,236,1);
padding: 35px 20px;
}
.integral_home .integral_detail .integral_detail_right{
margin-left: 15px;
}
.integral_home .integral_detail .integral_detail_right .el-row p{
color: #FC5600;
font-size: 12px;
}
.integral_home .integral_detail .integral_detail_right .el-row ul{
font-size: 10px;
color: #666666;
margin-top: 15px;
line-height: 30px;
}
\ No newline at end of file
src/assets/mall/PsSystem.css
View file @ 4b4fca4b
.PsSystem{padding-top: 20px; background-color: #F5F5F5;} .PsSystem{background-color: #F5F5F5;}
.PsSystem ._left{ .PsSystem ._left{
min-height: 600px; min-height: 600px;
background-color: #ffffff; background-color: #ffffff;
......
src/components/PersonalCenter/PsOrder.vue
View file @ 4b4fca4b
...@@ -131,6 +131,7 @@ export default { ...@@ -131,6 +131,7 @@ export default {
MyOrderPageList:[], MyOrderPageList:[],
dateLoading:true, dateLoading:true,
currentPage: 1, currentPage: 1,
WaitDealOrderPageList: ''
} }
}, },
computed: { computed: {
......
src/components/global/newHead.vue
View file @ 4b4fca4b
...@@ -133,7 +133,11 @@ ...@@ -133,7 +133,11 @@
</div> </div>
</li> </li>
<li :class="{_active: navActive === 1}"> <li :class="{_active: navActive === 1}">
<div> <div @click="handleSelect('/heel', 1), navActive = 1">
<span>跟团游</span>
<span class="__splice">|</span>
</div>
<!-- <div>
<el-dropdown trigger="click" placement="bottom-start"> <el-dropdown trigger="click" placement="bottom-start">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<span class="__cp">跟团游<i class="iconfont icon-xia"></i></span> <span class="__cp">跟团游<i class="iconfont icon-xia"></i></span>
...@@ -145,11 +149,15 @@ ...@@ -145,11 +149,15 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<span class="__splice">|</span> <span class="__splice">|</span>
</div> </div> -->
</li> </li>
<!-- 自由行 --> <!-- 自由行 -->
<li :class="{_active: navActive === 2}"> <li :class="{_active: navActive === 2}">
<div> <div @click="handleSelect('/IndependentTravel', 2), navActive = 2">
<span>自由行</span>
<span class="__splice">|</span>
</div>
<!-- <div>
<el-dropdown trigger="click" placement="bottom-start"> <el-dropdown trigger="click" placement="bottom-start">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<span class="__cp">自由行<i class="iconfont icon-xia"></i></span> <span class="__cp">自由行<i class="iconfont icon-xia"></i></span>
...@@ -160,104 +168,55 @@ ...@@ -160,104 +168,55 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<span class="__splice">|</span> <span class="__splice">|</span>
</div> </div> -->
</li> </li>
<!-- 当地游 --> <!-- 当地游 -->
<li :class="{_active: navActive === 3}"> <li :class="{_active: navActive === 3}">
<div> <div @click="handleSelect('/OneDayTour', 3), navActive = 3">
<el-dropdown trigger="click" placement="bottom-start"> <span>当地游</span>
<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('/OneDayTour', 3)">当地游</el-dropdown-item>
<el-dropdown-item @click.native="">当地游2</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span class="__splice">|</span> <span class="__splice">|</span>
</div> </div>
</li> </li>
<!-- 酒店 --> <!-- 酒店 -->
<li :class="{_active: navActive === 4}"> <li :class="{_active: navActive === 4}">
<div> <div @click="handleSelect('/', 4), navActive = 4">
<el-dropdown trigger="click" placement="bottom-start"> <span>酒店</span>
<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('', 4)">酒店</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span class="__splice">|</span> <span class="__splice">|</span>
</div> </div>
</li> </li>
<!-- 签证 --> <!-- 签证 -->
<li :class="{_active: navActive === 5}"> <li :class="{_active: navActive === 5}">
<div> <div @click="handleSelect('/VisaHomePage', 5), navActive = 5">
<el-dropdown trigger="click" placement="bottom-start"> <span>签证</span>
<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('/VisaHomePage', 5)">签证</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span class="__splice">|</span> <span class="__splice">|</span>
</div> </div>
</li> </li>
<!-- 机票 --> <!-- 机票 -->
<li :class="{_active: navActive === 6}"> <li :class="{_active: navActive === 6}">
<div> <div @click="handleSelect('/TicketHome', 6), navActive = 6">
<el-dropdown trigger="click" placement="bottom-start"> <span>机票</span>
<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('/TicketHome', 6)">机票</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span class="__splice">|</span> <span class="__splice">|</span>
</div> </div>
</li> </li>
<!-- 景点门票 --> <!-- 景点门票 -->
<li :class="{_active: navActive === 7}"> <li :class="{_active: navActive === 7}">
<div> <div @click="handleSelect('/', 7), navActive = 7">
<el-dropdown trigger="click" placement="bottom-start"> <span>景点门票</span>
<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('', 7)">景点门票</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span class="__splice">|</span> <span class="__splice">|</span>
</div> </div>
</li> </li>
<!-- 积分商城 --> <!-- 积分商城 -->
<li :class="{_active: navActive === 8}"> <li :class="{_active: navActive === 8}">
<div> <div @click="handleSelect('/', 8), navActive = 8">
<el-dropdown trigger="click" placement="bottom-start"> <span>积分商城</span>
<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('', 8)">积分商城</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span class="__splice">|</span> <span class="__splice">|</span>
</div> </div>
</li> </li>
<!-- 活动中心 --> <!-- 活动中心 -->
<li :class="{_active: navActive === 9}"> <li :class="{_active: navActive === 9}">
<div> <div @click="handleSelect('/', 9), navActive = 9">
<el-dropdown trigger="click" placement="bottom-start"> <span>活动中心</span>
<span class="el-dropdown-link"> <span class="__splice">|</span>
<span class="__cp">活动中心<i class="iconfont icon-xia"></i></span>
</span>
<el-dropdown-menu class="changelanguage" slot="dropdown">
<el-dropdown-item @click.native="handleSelect('', 9)">活动中心</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div> </div>
</li> </li>
</ul> </ul>
......
src/components/global/pay.vue
View file @ 4b4fca4b
<template> <template>
<div class="templatePayURL" style="display: inline-block; float: right; margin-right: 10px;"> <div class="templatePayURL" style="display: inline-block; float: right; margin-right: 10px;">
<span class="deleteSpan" @click="deleteOrder(item)">删除订单</span>&nbsp;&nbsp;
<el-popover width="320" @hide='clearTimer'> <el-popover width="320" @hide='clearTimer'>
<div> <div>
<p style="margin:0 0 15px 0;">二维码收款</p> <p style="margin:0 0 15px 0;">二维码收款</p>
...@@ -29,8 +28,16 @@ ...@@ -29,8 +28,16 @@
<p style="color: #E95252; font-weight: bold; font-size: 12px; margin: 8px 0;" >{{descMin}}分{{descSecond}}秒</p> <p style="color: #E95252; font-weight: bold; font-size: 12px; margin: 8px 0;" >{{descMin}}分{{descSecond}}秒</p>
</div> </div>
</div> </div>
<span slot="reference" class="hgh_pay_money_bth" @click="isOpen(item,2)">支付团款</span> <el-button
slot="reference"
size="mini"
type="danger"
@click="isOpen(item,2)">立即付款</el-button>
</el-popover> </el-popover>
&nbsp;
<el-button
size="mini"
@click="deleteOrder(item)">取消订单</el-button>
</div> </div>
</template> </template>
......
src/components/newPersonalCenter/block/Information.vue
View file @ 4b4fca4b
...@@ -7,10 +7,21 @@ ...@@ -7,10 +7,21 @@
<el-row class="PsSystem" :style='{"min-height":minHeight+"px"}'> <el-row class="PsSystem" :style='{"min-height":minHeight+"px"}'>
<el-col :span="24" :style='{"min-height": (minHeight-20)+"px"}'> <el-col :span="24" :style='{"min-height": (minHeight-20)+"px"}'>
<el-row> <el-row>
<el-col class="top_head" v-if="data !== '3-3'">
<div>
<img v-if="StorageInfo.photo" :src="StorageInfo.photo" alt="">
<img v-else src="../../../assets/img/head_normal1.png" alt="">
</div>
<p>{{StorageInfo.name}}</p>
</el-col>
<el-col :span="24" class="_right"> <el-col :span="24" class="_right">
<!-- 基础信息管理 --> <!-- 基础信息管理 -->
<div v-if="data === '3-1'" style="background-color: white"> <div v-if="data === '3-1'" style="background-color: white">
<el-row class="_edit_box"> <el-row class="_edit_box clearfix">
<p class="_edit_box_tit">
<i class="iconfont icon-mendian1"></i>
<span>门店基本资料</span>
</p>
<el-button type="primary" v-if="!editInfo" size="mini" @click="editInfo=true" icon="el-icon-edit">编辑</el-button> <el-button type="primary" v-if="!editInfo" size="mini" @click="editInfo=true" icon="el-icon-edit">编辑</el-button>
<el-button type="primary" v-if="editInfo" size="mini" @click="userInfoSet" >保存</el-button> <el-button type="primary" v-if="editInfo" size="mini" @click="userInfoSet" >保存</el-button>
<el-button type="primary" v-if="editInfo" size="mini" @click="userInfoSetCancel(),editInfo=false" class="_cancel">取消</el-button> <el-button type="primary" v-if="editInfo" size="mini" @click="userInfoSetCancel(),editInfo=false" class="_cancel">取消</el-button>
...@@ -88,6 +99,10 @@ ...@@ -88,6 +99,10 @@
<!-- 修改密码 --> <!-- 修改密码 -->
<div v-if="data === '3-2'" style="background-color: white"> <div v-if="data === '3-2'" style="background-color: white">
<el-row class="_edit_box"> <el-row class="_edit_box">
<p class="_edit_box_tit">
<i class="iconfont icon-mima"></i>
<span>个人安全设置</span>
</p>
<el-button type="primary" size="mini" @click="editPwd" >保存</el-button> <el-button type="primary" size="mini" @click="editPwd" >保存</el-button>
</el-row> </el-row>
<el-row class="_right_item"> <el-row class="_right_item">
...@@ -133,7 +148,8 @@ ...@@ -133,7 +148,8 @@
</el-row> </el-row>
</div> </div>
<!-- 实名认证 --> <!-- 实名认证 -->
<div v-if="data === '3-3'" class="Authentication"> <Authentication v-if="data === '3-3'"/>
<!-- <div v-if="data === '3-3'" class="Authentication">
<div v-if="!againUpLoad"> <div v-if="!againUpLoad">
<el-row class="_real_name"> <el-row class="_real_name">
<el-col :span="12"> <el-col :span="12">
...@@ -260,19 +276,20 @@ ...@@ -260,19 +276,20 @@
<p class="_status_str_g">已认证。</p> <p class="_status_str_g">已认证。</p>
</el-row> </el-row>
</div> </div>
</div> </div> -->
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>
<script> <script>
import Authentication from './model/Authentication'
export default { export default {
props:{ props:{
data: '' data: ''
}, },
components: { components: {
Authentication: Authentication,
}, },
data(){ data(){
return { return {
...@@ -302,7 +319,7 @@ export default { ...@@ -302,7 +319,7 @@ export default {
oldPassword:'', oldPassword:'',
newPassword:'' newPassword:''
}, },
subTit: 1,
newPassword:'', newPassword:'',
brandList:[], brandList:[],
brand:'', brand:'',
...@@ -310,18 +327,7 @@ export default { ...@@ -310,18 +327,7 @@ export default {
tagsCopy:[], tagsCopy:[],
userAcc:'', userAcc:'',
minHeight: 0, minHeight: 0,
Verification: false, StorageInfo: {},
VerificationMsg: {
CertificationPics: [],
CustomerID: 0,
ApplyType: 0,
ID: 0,
},
showImg1: '',
showImg2: '',
showImg3: '',
showImg4: '',
againUpLoad: false,
} }
}, },
computed: { computed: {
...@@ -336,36 +342,14 @@ export default { ...@@ -336,36 +342,14 @@ export default {
} }
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage();
this.StorageInfo = userInfo
this.minHeight=document.documentElement.clientHeight-171 this.minHeight=document.documentElement.clientHeight-171
this.getInfo(); this.getInfo();
}, },
methods: { methods: {
subImg(){ // 提交审核
let userInfo = this.getLocalStorage();
this.VerificationMsg.CustomerID = userInfo.customerId;
this.VerificationMsg.ApplyType = this.subTit;
this.VerificationMsg.ID = this.Verification[0] ? this.Verification[0].ID : 0;
this.apipost("app_customer_SetCertification", this.VerificationMsg, res => {
if (res.data.resultCode == 1) {
console.log(res.data.data)
this.GetCertificationModel()
} else {
this.$message.error(res.data.message);
}
},err => {});
},
SelectionType(type){
this.subTit = type;
this.VerificationMsg.ApplyType = type;
this.VerificationMsg.CertificationPics = [];
this.showImg1 = '';
this.showImg2 = '';
this.showImg3 = '';
this.showImg4 = '';
},
GetCertificationModel(){ GetCertificationModel(){
let userInfo = this.getLocalStorage(); this.apipost("app_customer_GetCertificationModel", { CustomerID: this.StorageInfo.customerId }, res => {
this.apipost("app_customer_GetCertificationModel", { CustomerID: userInfo.customerId }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Verification = res.data.data this.Verification = res.data.data
if (!this.Verification || this.Verification.length === 0) { if (!this.Verification || this.Verification.length === 0) {
...@@ -379,54 +363,7 @@ export default { ...@@ -379,54 +363,7 @@ export default {
} }
},err => {}); },err => {});
}, },
uploadFileBtn1(file){
this.uploadFileBtn(file, 1)
},
uploadFileBtn2(file){
this.uploadFileBtn(file, 2)
},
uploadFileBtn3(file){
this.uploadFileBtn(file, 3)
},
uploadFileBtn4(file){
this.uploadFileBtn(file, 4)
},
uploadFileBtn(file, type) { //上传
console.log(type)
if(file.file.size > 1024 * 1024 * 1) {
this.$message.warning('最大不能超过1M')
return
}
// 1 文档 2 数据 3 图片
let typeArr=[
{stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
]
let ft=file.file.name.substring(file.file.name.lastIndexOf('.')+1,file.file.name.length).toUpperCase();
let typeOk = false;
typeArr.forEach(x=>{
if(x.stringArr.indexOf(ft)!='-1')
{
typeOk = true;
}
})
if (!typeOk) return this.$message.error('请上传图片！');
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中....')
this.UploadSelfFileT(path, newArr, x => {
if (type === 1) {
this.showImg1 = this.domainManager().ViittoFileUrl + x.data.FilePath
} else if (type === 2){
this.showImg2 = this.domainManager().ViittoFileUrl + x.data.FilePath
} else if (type === 3){
this.showImg3 = this.domainManager().ViittoFileUrl + x.data.FilePath
} else if (type === 4){
this.showImg4 = this.domainManager().ViittoFileUrl + x.data.FilePath
}
this.VerificationMsg.CertificationPics.push(this.domainManager().ViittoFileUrl + x.data.FilePath)
});
},
editPwd(){ // 修改密码 editPwd(){ // 修改密码
if(!this.editPwdMsg.oldPassword) return this.$message.error("请输入老密码"); if(!this.editPwdMsg.oldPassword) return this.$message.error("请输入老密码");
if(!this.editPwdMsg.newPassword) return this.$message.error("请输入新密码"); if(!this.editPwdMsg.newPassword) return this.$message.error("请输入新密码");
......
src/components/newPersonalCenter/block/MemberCenter.vue
View file @ 4b4fca4b
...@@ -340,25 +340,26 @@ ...@@ -340,25 +340,26 @@
</el-row> </el-row>
</template> </template>
<script> <script>
import payURL from "../../global/pay.vue";
export default { export default {
components: { components: {
payurlItem: payURL,
}, },
data(){ data(){
return { return {
userInfo: {}, userInfo: {},
iconList: [ iconList: [
{ {
list: ['icon-zhekouquan','icon-yuding','icon-qiandao'] list: ['icon-qiandaotequan','icon-dikoutequan','icon-yudingjiangli']
}, },
{ {
list: ['icon-zhekouquan','icon-yuding','icon-qiandao'] list: ['icon-qiandaotequan','icon-dikoutequan','icon-yudingjiangli']
}, },
{ {
list: ['icon-zhekouquan','icon-yuding','icon-qiandao'] list: ['icon-qiandaotequan','icon-dikoutequan','icon-yudingjiangli']
}, },
{ {
list: ['icon-zhekouquan','icon-yuding','icon-qiandao'] list: ['icon-qiandaotequan','icon-dikoutequan','icon-yudingjiangli']
}, },
], ],
} }
......
src/components/newPersonalCenter/block/MyCoupon.vue
View file @ 4b4fca4b
...@@ -145,7 +145,6 @@ export default { ...@@ -145,7 +145,6 @@ export default {
getList() { getList() {
// 获取数据 // 获取数据
this.dataLoading = true; this.dataLoading = true;
this.msg.orderType = this.active;
this.apiJavaPost( this.apiJavaPost(
"/api/b2b/user/getUserCouponAllotList", "/api/b2b/user/getUserCouponAllotList",
this.msg, this.msg,
......
src/components/newPersonalCenter/block/OrderCenter.vue
View file @ 4b4fca4b
...@@ -4,156 +4,191 @@ ...@@ -4,156 +4,191 @@
<template> <template>
<el-row class="OrderCenter"> <el-row class="OrderCenter">
<el-tabs v-model="activeName" type="card" @tab-click="handleClick"> <ul class="clearfix">
<el-tab-pane label="全部订单" name="1"></el-tab-pane> <template v-for="item in TitList">
<el-tab-pane label="待付定金" name="2"></el-tab-pane> <li
<el-tab-pane label="待付尾款" name="3"></el-tab-pane> class="__cp"
<el-tab-pane label="交易成功" name="4"></el-tab-pane> @click="handleClick(item)"
<el-tab-pane label="取消" name="5"></el-tab-pane> :class="{_active: activeName === item.ID}"
<el-tab-pane label="等待商家确认" name="6"></el-tab-pane> >{{item.Type}}</li>
<el-tab-pane label="退款中" name="7"></el-tab-pane> </template>
<el-tab-pane label="退款成功" name="8"></el-tab-pane> </ul>
<el-tab-pane label="交易完成" name="9"></el-tab-pane>
</el-tabs>
<el-row class="table_box"> <el-row class="table_box">
<el-table <el-table :data="tableData" style="width: 100%">
:data="tableData" <el-table-column prop="orderId" label="订单号" width="80"></el-table-column>
style="width: 100%"> <el-table-column prop="title" label="团名" width="180">
<el-table-column <template slot-scope="scope">
prop="OrderId" <el-tooltip class="item" popper-class="w180" effect="dark" :content="scope.row.title" placement="bottom-end">
label="订单号" <p class="_row_2">{{scope.row.title}}</p>
width="80"> </el-tooltip>
</el-table-column> </template>
<el-table-column
prop="TCName"
label="团名"
width="180">
</el-table-column>
<el-table-column
prop="TCTime"
label="团期">
</el-table-column>
<el-table-column
prop="Number"
label="人数"
width="80">
</el-table-column>
<el-table-column
prop="Money"
label="金额"
width="80">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="startDate" label="团期"></el-table-column>
prop="OrderStatus" <el-table-column prop="guestNum" label="人数" width="80"></el-table-column>
label="订单状态" <el-table-column prop="preferPrice" label="金额" width="80"></el-table-column>
width="100"> <el-table-column prop="orderState" label="订单状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.OrderStatus === 1">待付定金</span> <span v-if="scope.row.orderState === 1">待付定金</span>
<span v-if="scope.row.OrderStatus === 2">已取消</span> <span v-else-if="scope.row.orderState === 2">待付尾款</span>
<span v-else-if="scope.row.orderState === 3">待发团</span>
<span v-else-if="scope.row.orderState === 4">交易完成</span>
<span v-else-if="scope.row.orderState === 0">取消</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- 操作按钮 --> <!-- 操作按钮 -->
<el-table-column <el-table-column align="left" label="操作">
align="left"
label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <payurlItem
size="mini" v-if="scope.row.orderState !== 0 && scope.row.orderState !== 4"
type="danger" @b2b_get_GetWaitDealOrderPageList="b2b_get_GetWaitDealOrderPageList"
@click="handlePay(scope.$index, scope.row)">立即付款</el-button> :item="scope.row"
<el-button ></payurlItem>
size="mini"
@click="handleCancle(scope.$index, scope.row)">取消订单</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
</el-row> </el-row>
<!-- 分页 --> <!-- 分页 -->
<el-row class="_pagination"> <el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0">
<el-pagination <el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-size="100" :page-size="getOrderMsg.pageSize"
layout="total, prev, pager, next" layout="total, prev, pager, next"
:total="1000"> :total="Count"
</el-pagination> @current-change="handleCurrentChange"
></el-pagination>
</el-row> </el-row>
</el-row> </el-row>
</template> </template>
<script> <script>
import payURL from "../../global/pay.vue";
export default { export default {
components: { components: {
payurlItem: payURL
}, },
data(){ data() {
return { return {
activeName: '1', activeName: -1,
currentPage: 1, currentPage: 1,
tableData: [ rderLoading: false,
totalCount: 1,
Count: 1,
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
orderType: 1,
queryDays: 0,
orderState: -1,
CustomerId: ""
},
TitList: [
{ {
OrderId: 10088, Type: "全部",
TCName: '【日本6天5晚畅游】', ID: -1
TCTime: '2018-09-09',
Number: 12,
Money: 999,
OrderStatus: 1,
}, {
OrderId: 10088,
TCName: '【日本6天5晚畅游】',
TCTime: '2018-09-09',
Number: 12,
Money: 999,
OrderStatus: 2,
}, {
OrderId: 10088,
TCName: '【日本6天5晚畅游】',
TCTime: '2018-09-09',
Number: 12,
Money: 999,
OrderStatus: 1,
}, {
OrderId: 10088,
TCName: '【日本6天5晚畅游】',
TCTime: '2018-09-09',
Number: 12,
Money: 999,
OrderStatus: 2,
}, {
OrderId: 10088,
TCName: '【日本6天5晚畅游】',
TCTime: '2018-09-09',
Number: 12,
Money: 999,
OrderStatus: 1,
}
],
}
}, },
computed: { {
Type: "待付定金",
ID: 1
}, },
created(){ {
Type: "待付尾款",
ID: 2
},
{
Type: "待发团",
ID: 3
},
{
Type: "交易完成",
ID: 4
}, },
{
Type: "取消",
ID: 5
}
// {
// val: 6,
// lable: '等待商家确认'
// },
// {
// val: 7,
// lable: '退款中'
// },
// {
// val: 8,
// lable: '退款成功'
// },
// {
// val: 9,
// lable: '交易完成'
// },
],
tableData: []
};
},
computed: {},
created() {},
mounted() { mounted() {
let userInfo = localStorage.userInfo
? JSON.parse(localStorage.userInfo)
: "";
this.getOrderMsg.CustomerId = userInfo.customerId;
this.gerOrderList();
this.b2b_get_GetWaitDealOrderPageList();
}, },
methods: { methods: {
handleClick(tab, event) { b2b_get_GetWaitDealOrderPageList() {
console.log(tab, event); //获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
msg,
r => {
if (r.data.resultCode == 1) {
this.WaitDealOrderPageList = r.data.data.pageData;
} else {
this.$message.error(r.data.message);
}
},
null
);
}, },
handlePay(index, row) { gerOrderList: function() {
console.log(index, row); this.orderLoading = true;
this.apiJavaPost(
"/api/b2b/user/getrecentorder",
this.getOrderMsg,
res => {
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
this.orderLoading = false;
} else {
this.Error(res.data.message);
this.orderLoading = false;
}
}, },
handleCancle(index, row) { null
console.log(index, row); );
}, },
handleSizeChange(val) { handleClick(item) {
console.log(`每页 ${val} 条`); this.activeName = item.ID;
this.getOrderMsg.orderState = item.ID;
this.gerOrderList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); // 翻页
this.getOrderMsg.pageIndex = parseInt(val);
this.gerOrderList();
} }
} }
} };
</script> </script>
\ No newline at end of file
src/components/newPersonalCenter/block/model/Authentication.vue 0 → 100644
View file @ 4b4fca4b
<style>
</style>
<template>
<div class="Authentication">
<div v-if="!againUpLoad">
<el-row class="_real_name">
<el-col :span="12">
<div class="_rn_tit" :class="{'_active': subTit===1}" @click="SelectionType(1)">企业认证</div>
<div class="kailong" v-if="subTit == 1"></div>
</el-col>
<el-col :span="12">
<div class="_rn_tit" :class="{'_active': subTit===2}" @click="SelectionType(2)">个人认证</div>
<div class="kailong" v-if="subTit == 2"></div>
</el-col>
</el-row>
<div v-if="subTit == 1">
<el-row class="_at_tips">
<p class="_at_tips_tit">温馨提示：</p>
<p>1.照片要求：jpg/png格式，大小不超过1M；</p>
<p>2.请确保三证合一的营业执照照片边框完整，字体清晰，亮度均匀。</p>
</el-row>
<el-row class="_up_box">
<el-row>
<el-col :span="10" class="_up_box_left">
<el-upload
class="upload-demo"
drag
:http-request="uploadFileBtn1"
action
:multiple="false"
:show-file-list="false"
>
<span class="_op_btn">+</span>
<img
v-if="!showImg1"
class="upload-demo_img"
src="../../../../assets/img/ps/yyzzmoren.png"
alt
>
<img v-else class="upload-demo_img" :src="showImg1" alt>
</el-upload>
<p class="_up_box_left_tips">
上传三证合一的
<span>营业执照</span>
</p>
</el-col>
<el-col :span="4">&nbsp;</el-col>
<el-col :span="10" class="_up_box_right">
<img src="../../../../assets/img/ps/yyzzshiyi.png" alt>
<p class="_up_box_right_tips">
营业执照
<span>示例图</span>
</p>
</el-col>
</el-row>
<el-row class="text_a_center">
<el-button type="primary" class="w215" @click="subImg" size="small">提交</el-button>
</el-row>
</el-row>
</div>
<div v-else class="_id_card">
<el-row class="_at_tips">
<p class="_at_tips_tit">温馨提示：</p>
<p>1.照片要求：jpg/png格式，大小不超过1M；</p>
<p>2.请确保身份证照片边框完整，字体清晰，亮度均匀。</p>
</el-row>
<el-row class="_up_box">
<el-col :span="11" class="_up_box_left">
<el-upload
class="upload-demo2"
drag
:http-request="uploadFileBtn2"
action
:multiple="false"
:show-file-list="false"
>
<span class="_op_btn _op_btn2">+</span>
<img
v-if="!showImg2"
class="upload-demo_img2"
src="../../../../assets/img/ps/gshenfenzheng.png"
alt
>
<img v-else class="upload-demo_img" :src="showImg2" alt>
</el-upload>
<p class="_up_box_left_tips">
上传身份证
<span>人像面</span>
</p>
</el-col>
<el-col :span="2">&nbsp;</el-col>
<el-col :span="11" class="_up_box_left">
<el-upload
class="upload-demo2"
drag
:http-request="uploadFileBtn3"
action
:multiple="false"
:show-file-list="false"
>
<span class="_op_btn _op_btn2">+</span>
<img
v-if="!showImg3"
class="upload-demo_img2"
src="../../../../assets/img/ps/huohui.png"
alt
>
<img v-else class="upload-demo_img" :src="showImg3" alt>
</el-upload>
<p class="_up_box_left_tips">
上传身份证
<span>国徽面</span>
</p>
</el-col>
</el-row>
<el-row class="_up_box _up_box2">
<el-col :span="11" class="_up_box_left">
<el-upload
class="upload-demo2"
drag
:http-request="uploadFileBtn4"
action
:multiple="false"
:show-file-list="false"
>
<span class="_op_btn _op_btn2">+</span>
<img
v-if="!showImg4"
class="upload-demo_img2"
src="../../../../assets/img/ps/gmingpian.png"
alt
>
<img v-else class="upload-demo_img" :src="showImg4" alt>
</el-upload>
<p class="_up_box_left_tips">
上传
<span>名片</span>有姓名、联系方式的一面
</p>
</el-col>
</el-row>
<el-row class="text_a_center">
<el-button type="primary" class="w215" @click="subImg" size="small">提交</el-button>
</el-row>
</div>
</div>
<div v-else>
<el-row v-if="Verification[0].ApplyState === 0" class="Authentication_tips">
<div>
<i class="iconfont icon-dkw_shenhezhong _status_str_y"></i>
</div>
<p class="_status_str_y">您的认证资料正在审核中。</p>
</el-row>
<el-row v-else-if="Verification[0].ApplyState === 2" class="Authentication_tips">
<div>
<i class="iconfont icon-shenheshibai _status_str_r"></i>
</div>
<p class="_status_str_r">
您的认证审核已经被拒绝，请
<span class="_link" @click="againUpLoad = false">重新上传资料</span> 进行认证！
</p>
</el-row>
<el-row v-else-if="Verification[0].ApplyState === 1" class="Authentication_tips">
<div>
<i class="iconfont icon-dkw_shenhetongguo _status_str_g"></i>
</div>
<p class="_status_str_g">已认证。</p>
</el-row>
</div>
</div>
</template>
<script>
export default {
components: {},
data() {
return {
subTit: 1,
Verification: false,
VerificationMsg: {
CertificationPics: [],
CustomerID: 0,
ApplyType: 0,
ID: 0
},
showImg1: "",
showImg2: "",
showImg3: "",
showImg4: "",
againUpLoad: false
};
},
mounted() {},
methods: {
subImg() {
// 提交审核
this.VerificationMsg.CustomerID = StorageInfo.customerId;
this.VerificationMsg.ApplyType = this.subTit;
this.VerificationMsg.ID = this.Verification[0]
? this.Verification[0].ID
: 0;
this.apipost(
"app_customer_SetCertification",
this.VerificationMsg,
res => {
if (res.data.resultCode == 1) {
console.log(res.data.data);
this.GetCertificationModel();
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
SelectionType(type) {
this.subTit = type;
this.VerificationMsg.ApplyType = type;
this.VerificationMsg.CertificationPics = [];
this.showImg1 = "";
this.showImg2 = "";
this.showImg3 = "";
this.showImg4 = "";
},
uploadFileBtn1(file) {
this.uploadFileBtn(file, 1);
},
uploadFileBtn2(file) {
this.uploadFileBtn(file, 2);
},
uploadFileBtn3(file) {
this.uploadFileBtn(file, 3);
},
uploadFileBtn4(file) {
this.uploadFileBtn(file, 4);
},
uploadFileBtn(file, type) {
//上传
console.log(type);
if (file.file.size > 1024 * 1024 * 1) {
this.$message.warning("最大不能超过1M");
return;
}
// 1 文档 2 数据 3 图片
let typeArr = [{ stringArr: "GIF|JPG|JPEG|PNG|BMP", type: 3 }];
let ft = file.file.name
.substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length)
.toUpperCase();
let typeOk = false;
typeArr.forEach(x => {
if (x.stringArr.indexOf(ft) != "-1") {
typeOk = true;
}
});
if (!typeOk) return this.$message.error("请上传图片！");
let newArr = [];
newArr.push(file.file);
let path = "/Upload/Temporary/";
this.$message.info("上传中....");
this.UploadSelfFileT(path, newArr, x => {
if (type === 1) {
this.showImg1 = this.domainManager().ViittoFileUrl + x.data.FilePath;
} else if (type === 2) {
this.showImg2 = this.domainManager().ViittoFileUrl + x.data.FilePath;
} else if (type === 3) {
this.showImg3 = this.domainManager().ViittoFileUrl + x.data.FilePath;
} else if (type === 4) {
this.showImg4 = this.domainManager().ViittoFileUrl + x.data.FilePath;
}
this.VerificationMsg.CertificationPics.push(
this.domainManager().ViittoFileUrl + x.data.FilePath
);
});
}
}
};
</script>
src/components/newPersonalCenter/block/model/OrderInfo.vue 0 → 100644
View file @ 4b4fca4b
<style>
</style>
<template>
<el-row class="order_info">
<!-- 订单头部下拉条件 -->
<el-row class="_top_tit">
<p class="_one">
<i class="iconfont icon-icon-test6"></i>我的近期订单
</p>
<!-- 订单类型 -->
<div class="__cp _drop">
<el-dropdown trigger="click" @command="handleCommandOne">
<span class="el-dropdown-link">
{{dropTitOne}}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<template v-for="item in orderType">
<el-dropdown-item :command="item">{{item.Type}}</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
</div>
<!-- 下单日期 -->
<div class="__cp _drop">
<el-dropdown trigger="click" @command="handleCommandTwo">
<span class="el-dropdown-link">
{{dropTitTwo}}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<template v-for="item in dayList">
<el-dropdown-item :command="item">{{item.Day}}</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
</div>
<!-- 订单状态 -->
<div class="__cp _drop">
<el-dropdown trigger="click" @command="handleCommandThree">
<span class="el-dropdown-link">
{{dropTitThree}}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<template v-for="item in orderStatuList">
<el-dropdown-item :command="item">{{item.Type}}</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="_more_order __cp">
更多 &nbsp;
<i class="iconfont icon-ico_right"></i>
</div>
</el-row>
<!-- 订单表格 -->
<el-row class="order_table" v-loading="orderLoading">
<el-table :data="tableData" style="width: 100%">
<el-table-column prop="orderId" label="订单号" width="80"></el-table-column>
<el-table-column prop="title" label="团名" width="180">
<template slot-scope="scope">
<el-tooltip class="item" popper-class="w180" effect="dark" :content="scope.row.title" placement="bottom-end">
<p class="_row_2">{{scope.row.title}}</p>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="startDate" label="团期"></el-table-column>
<el-table-column prop="guestNum" label="人数" width="80"></el-table-column>
<el-table-column prop="preferPrice" label="金额" width="80"></el-table-column>
<el-table-column prop="orderState" label="订单状态" width="100">
<template slot-scope="scope">
<span v-if="scope.row.orderState === 1">待付定金</span>
<span v-else-if="scope.row.orderState === 2">待付尾款</span>
<span v-else-if="scope.row.orderState === 3">待发团</span>
<span v-else-if="scope.row.orderState === 4">交易完成</span>
<span v-else-if="scope.row.orderState === 0">取消</span>
</template>
</el-table-column>
<!-- 操作按钮 -->
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<payurlItem
v-if="scope.row.orderState !== 0 && scope.row.orderState !== 4"
@b2b_get_GetWaitDealOrderPageList="b2b_get_GetWaitDealOrderPageList"
:item="scope.row"
></payurlItem>
</template>
</el-table-column>
</el-table>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
</el-row>
<!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0">
<el-pagination
:current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize"
layout="total, prev, pager, next"
:total="Count"
@current-change="handleCurrentChange"
></el-pagination>
</el-row>
</el-row>
</template>
<script>
import payURL from "../../../global/pay.vue";
export default {
components: {
payurlItem: payURL
},
data() {
return {
dropTitOne: "跟团游订单",
dropTitTwo: "10天内",
dropTitThree: "交易成功",
orderLoading: false,
currentPage: 1,
totalCount: 1,
Count: 1,
pageSize: 1,
getOrderMsg: {
pageIndex: 1,
pageSize: 5,
orderType: 1,
queryDays: 10,
orderState: -1,
CustomerId: ''
},
orderType: [
{
Type: "跟团游",
ID: 1,
Hide: false
},
{
Type: "自由行",
ID: 2,
Hide: false
},
{
Type: "当地游",
ID: 3,
Hide: false
},
{
Type: "机票",
ID: 4,
Hide: true
},
{
Type: "签证",
ID: 5,
Hide: true
},
{
Type: "酒店",
ID: 5,
Hide: true
}
],
dayList: [
{
Day: "10天",
Number: 10,
ID: 1
},
{
Day: "30天",
Number: 30,
ID: 1
},
{
Day: "60天",
Number: 60,
ID: 1
}
],
orderStatuList: [
{
Type: "全部",
ID: -1
},
{
Type: "待付定金",
ID: 1
},
{
Type: "待付尾款",
ID: 2
},
{
Type: "待发团",
ID: 3
},
{
Type: "交易完成",
ID: 4
},
{
Type: "取消",
ID: 5
}
],
tableData: [],
WaitDealOrderPageList: ""
};
},
mounted() {
let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : ''
this.getOrderMsg.CustomerId = userInfo.customerId
this.gerOrderList()
},
methods: {
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
msg,
r => {
if (r.data.resultCode == 1) {
this.WaitDealOrderPageList = r.data.data.pageData;
} else {
this.$message.error(r.data.message);
}
},
null
);
},
// 获取列表
gerOrderList: function() {
this.orderLoading = true;
this.apiJavaPost(
"/api/b2b/user/getrecentorder",
this.getOrderMsg,
res => {
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
this.orderLoading = false;
} else {
this.Error(res.data.message);
this.orderLoading = false;
}
},
null
);
},
handleCurrentChange(val) {
// 翻页
this.getOrderMsg.pageIndex = parseInt(val);
this.gerOrderList();
},
// 订单类型
handleCommandOne(command) {
this.dropTitOne = command.Type;
this.getOrderMsg.orderType = command.ID;
this.gerOrderList();
},
// 下单日期
handleCommandTwo(command) {
this.dropTitTwo = command.Day;
this.getOrderMsg.queryDays = command.Number;
this.gerOrderList();
},
// 订单状态
handleCommandThree(command) {
this.dropTitThree = command.Type;
this.getOrderMsg.orderState = command.ID;
this.gerOrderList();
}
}
};
</script>
src/components/newPersonalCenter/block/model/OverCoupon.vue 0 → 100644
View file @ 4b4fca4b
<style>
</style>
<template>
<el-row class="guoqi_coupon">
<el-row class="guoqi_coupon_tit">
<p class="_one">
<i class="iconfont icon-icon-test6"></i>即将过期优惠券
</p>
<div class="_more_coupon __cp" @click="goCouponPage">
更多 &nbsp;
<i class="iconfont icon-ico_right"></i>
</div>
</el-row>
<el-row class="_my_coupon">
<div class="_item" v-for="(item, index) in couponList">
<div
class="_top"
:class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3,}"
>
<div class="_top_raduis">
<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>
</div>
<div class="_overdue" v-if="item.warning">即将过期</div>
<div class="_info_details">
<p class="_info_coupon_name" :title="item.couponsName">{{item.couponsName}}</p>
<p class="_info_sale" v-if="item.couponsType !== 1">
{{item.denomination}}
<span>折</span>
</p>
<p class="_info_sale" v-else>
<span>￥</span>
{{item.denomination}}
</p>
<p class="_info_full">满{{item.useCondition}}可用</p>
<p class="_info_time _time">有效时间：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}</p>
<p class="_info_bottom" @click="goUrl('heel',true)">去使用</p>
</div>
</div>
<div class="_bottom">
<p class="_bottom_tit">可用线路及系列</p>
<p
class="_bottom_info"
>{{item.lineName === '' ? '不限' : item.lineName}}-{{item.lineTeamName === '' ? '不限' : item.lineTeamName}}</p>
<p class="_bottom_tit">优惠券来源</p>
<p class="_bottom_info _margin_bt0">{{item.accessType === 1 ? '抽奖活动' : '其他'}}</p>
</div>
</div>
<div class="empty-data" v-if="couponList.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
</el-row>
</el-row>
</template>
<script>
export default {
components: {},
data() {
return {
getCouponMsg: {
pageIndex: 1,
pageSize: 4,
useState: 1,
lineId: 0,
lineteamId: 0,
couponsName: "",
couponsType: "",
couponStatus: 1,
couponEffectStatus: 1,
couponsUseScope: 1
},
couponList: []
};
},
mounted() {
this.getCouponList();
},
methods: {
goCouponPage: function() {
this.MsgBus.$emit("goCPage", "5");
},
// 获取优惠券
getCouponList: function() {
// 获取数据 =
this.apiJavaPost(
"/api/b2b/user/getUserCouponAllotList",
this.getCouponMsg,
res => {
let nowTime = this.getNowDate();
if (res.data.resultCode == 1) {
let data = res.data.data.pageData;
data.forEach((x, i) => {
let cha = this.DateDiff(nowTime, x.expirationDate);
if (cha < 10) {
x.warning = true;
} else {
x.warning = false;
}
});
this.couponList = data;
this.$forceUpdate();
} else {
this.Error(res.data.message);
}
},
null
);
},
goUrl(path) {
this.$router.push({ name: path });
}
}
};
</script>
src/components/newPersonalCenter/block/model/PersonalInfor.vue 0 → 100644
View file @ 4b4fca4b
<style>
</style>
<template>
<el-row class="top_info">
<!-- 左边 -->
<el-col :span="12" class="top_info_left cro">
<div class="_head">
<img v-if="userInfo.photo" :src="userInfo.photo" alt>
<img v-else src="../../../../assets/img/head_normal1.png" alt>
</div>
<div class="_head_icon">
<p>
<span class="_name">{{userInfo.name}}</span>
<img class="_vip_log" src="../../../../assets/img/king.png" alt>
<i class="_vip_level">V{{userInfo.vipRate}}</i>
<i class="iconfont icon-shimingrenzheng" :class="{yes_vip: IsVip}"></i>
</p>
<!-- vip 经验 -->
<div class="_exp">
<i class="_vip_level">V{{userInfo.vipRate}}</i>
<span class="_progress">
<!-- 指针 -->
<div
class="_pointer"
:style="{'left': ((userInfo.vipExperience/999)*100)-13 + '%'}"
v-if="(userInfo.vipExperience/999)*100>0"
>
<span class="_pointer_num">{{userInfo.vipExperience}}</span>
<span class="_line"></span>
</div>
<!-- 进度条 -->
<el-progress
:show-text="false"
:percentage="userInfo.vipExperience > 0 ? (userInfo.vipExperience/999)*100 : 0"
color="#E7C588"
></el-progress>
</span>
<i class="_vip_level _vip_level_gray">V{{userInfo.vipRate+1}}</i>
<span class="_value">成长值</span>
<span class="_number">{{userInfo.vipExperience}}/999</span>
</div>
<div class="_addr">
<p>
<i class="iconfont icon-mendian"></i>
{{userInfo.customerName}}
</p>
<p>
<i class="iconfont icon-dianhuaicon"></i>
<span v-if="userInfo.mobile">{{userInfo.mobile}}</span>
<span v-else>
手机未绑定
<span class="_no_phone __cp">绑定手机</span>
</span>
</p>
<div class="_managers">
<div class="_tit">
<i class="iconfont icon-kefuicon1"></i> 客服经理：
</div>
<div>
<p v-for="(item, index) in userInfo.managers">{{item.emName}}：{{item.mobile}}</p>
</div>
</div>
</div>
</div>
<div class="cro_right_top"></div>
<div class="cro_right_bottom"></div>
</el-col>
<!-- 右边 -->
<div class="cro_left_top"></div>
<div class="cro_left_bottom"></div>
<el-col :span="12" class="top_info_right cro">
<el-row class="_business">
<el-col :span="12" class="_business_ite">
<p class="_top">
<span>￥</span>
</p>
<p class="_text">本月交易额</p>
<p class="_money">¥{{moneyFormat(userInfo.monthTradeMoney)}}</p>
</el-col>
<el-col :span="12" class="_business_ite">
<p class="_top">
<span class="_bg_color_org">￥</span>
</p>
<p class="_text">累计交易额</p>
<p class="_money">¥{{moneyFormat(userInfo.sumTradeMoney)}}</p>
</el-col>
</el-row>
</el-col>
</el-row>
</template>
<script>
export default {
data() {
return {
IsVip: true,
userInfo: {}
};
},
mounted() {
let userInfo = this.getLocalStorage();
let account = userInfo.account;
this.getSimpleUser(account);
},
methods: {
getSimpleUser: function(account) {
this.apiJavaPost(
"/api/b2b/user/getSimpleUser",
{ account: account },
res => {
if (res.data.resultCode == 1) {
this.userInfo = res.data.data;
console.log(res.data.data);
} else {
this.Error(res.data.message);
}
},
null
);
}
}
};
</script>
src/components/newPersonalCenter/integral/index.vue 0 → 100644
View file @ 4b4fca4b
<style>
@import "../../../assets/css/newPersonalCenter/integral.css";
</style>
<template>
<div class="integral">
<!-- 积分首页 -->
<integralHome v-if="data === '4-1'"/>
<!-- 积分明细 -->
<integralDetail v-if="data === '4-2'"/>
<!-- 我的兑换 -->
<exchange v-if="data === '4-3'"/>
</div>
</template>
<script>
import exchange from '@/components/newPersonalCenter/integral/model/exchange'
import integralHome from '@/components/newPersonalCenter/integral/model/integralHome'
import integralDetail from '@/components/newPersonalCenter/integral/model/integralDetail'
export default {
components: {
exchange,
integralHome,
integralDetail,
},
props:{
data: ''
},
data(){
return{
}
}
}
</script>
src/components/newPersonalCenter/integral/model/exchange.vue 0 → 100644
View file @ 4b4fca4b
<style>
</style>
<template>
<div>
我的兑换
</div>
</template>
<script>
export default {
components: {
},
props:{},
data(){
return{
}
}
}
</script>
src/components/newPersonalCenter/integral/model/integralDetail.vue 0 → 100644
View file @ 4b4fca4b
<style>
</style>
<template>
<div>
积分详情
</div>
</template>
<script>
export default {
components: {
},
props:{},
data(){
return{
}
}
}
</script>
src/components/newPersonalCenter/integral/model/integralHome.vue 0 → 100644
View file @ 4b4fca4b
<template>
<div class="integral_home">
<el-row class="integral_banner">
</el-row>
<el-row class="integral_detail">
<el-col :span="8" class="integral_detail_left">
<div>
<img v-if="StorageInfo.photo" :src="StorageInfo.photo" alt="">
<img v-else src="../../../../assets/img/head_normal1.png" alt="">
</div>
<p class="_tit">我的积分</p>
<p class="_number">1288</p>
<p class="_bt __cp" @click="goExchange">兑换记录</p>
</el-col>
<el-col :span="16" class="integral_detail_right">
<el-row class="">
<el-col :span="12">
<p>兑换规则：</p>
<ul>
<li>1.商品周日补充库存；</li>
<li>2.商品哎呀呀于每周日补充库存；</li>
<li>3.商品哎呀呀哈将统一于每周日补充库存；</li>
<li>4.商品哎呀呀哈将统一于每周日补充东方闪电库存；</li>
<li>5.商品哎呀呀哈将统一于每防守周日补充库存；</li>
<li>6.商品哎呀呀哈将统一于每周日发鬼地方的补充库存；</li>
<li>7.商品哎呀呀哈将统一于每周日补充库存；</li>
<li>8.商品哎呀呀哈将统一于每周日补充大范甘迪库存。</li>
</ul>
</el-col>
<el-col :span="12">
<img src="../../../../assets/img/duihuan_rule.png" alt="">
</el-col>
</el-row>
</el-col>
</el-row>
</div>
</template>
<script>
export default {
components: {
},
props:{},
data(){
return{
StorageInfo: {}
}
},
created(){
let userInfo = this.getLocalStorage();
this.StorageInfo = userInfo
},methods:{
goExchange: function(){
this.MsgBus.$emit('goCPage', '4-3')
}
},mounted(){
}
}
</script>
src/components/newPersonalCenter/newPersonalCenter.vue
View file @ 4b4fca4b
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<el-menu-item index="8-2" @click="clickMenu('8-2')">定制游订单</el-menu-item> <el-menu-item index="8-2" @click="clickMenu('8-2')">定制游订单</el-menu-item>
<el-menu-item index="8-3" @click="clickMenu('8-3')">当地游订单</el-menu-item> <el-menu-item index="8-3" @click="clickMenu('8-3')">当地游订单</el-menu-item>
<el-menu-item index="8-4" @click="clickMenu('8-4')">签证订单</el-menu-item> <el-menu-item index="8-4" @click="clickMenu('8-4')">签证订单</el-menu-item>
<el-menu-item index="8-5" @click="clickMenu('8-5')">特价机票订单</el-menu-item> <el-menu-item index="8-5" @click="clickMenu('8-5')">机票订单</el-menu-item>
<el-menu-item index="8-6" @click="clickMenu('8-6')">酒店订单</el-menu-item> <el-menu-item index="8-6" @click="clickMenu('8-6')">酒店订单</el-menu-item>
</el-submenu> </el-submenu>
<el-submenu index="3"> <el-submenu index="3">
...@@ -67,17 +67,19 @@ ...@@ -67,17 +67,19 @@
<i class="iconfont icon-gerenxinxiicon"></i> <i class="iconfont icon-gerenxinxiicon"></i>
<span>个人信息</span> <span>个人信息</span>
</template> </template>
<el-menu-item index="3-1" @click="clickMenu('3-1')">基础信息管理</el-menu-item> <el-menu-item index="3-1" @click="clickMenu('3-1')">门店基本资料</el-menu-item>
<el-menu-item index="3-2" @click="clickMenu('3-2')">修改密码</el-menu-item> <el-menu-item index="3-2" @click="clickMenu('3-2')">个人安全设置</el-menu-item>
<el-menu-item index="3-3" @click="clickMenu('3-3')">实名认证</el-menu-item> <el-menu-item index="3-3" @click="clickMenu('3-3')">实名认证</el-menu-item>
<el-menu-item index="3-4" @click="clickMenu('3-4')">收货地址管理</el-menu-item>
</el-submenu> </el-submenu>
<el-submenu index="4"> <el-submenu index="4">
<template slot="title"> <template slot="title">
<i class="iconfont icon-gerenxinxiicon"></i> <i class="iconfont icon-gerenxinxiicon"></i>
<span>我的积分</span> <span>我的积分</span>
</template> </template>
<el-menu-item index="4-1" @click="clickMenu('4-1')">选项1</el-menu-item> <el-menu-item index="4-1" @click="clickMenu('4-1')">积分首页</el-menu-item>
<el-menu-item index="4-2" @click="clickMenu('4-2')">选项2</el-menu-item> <el-menu-item index="4-2" @click="clickMenu('4-2')">积分明细</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')">
<i class="iconfont icon-youhuiquanicon"></i> <i class="iconfont icon-youhuiquanicon"></i>
...@@ -105,6 +107,8 @@ ...@@ -105,6 +107,8 @@
<OrderCenter v-else-if="active.indexOf('8-') !== -1" :data="active"/> <OrderCenter v-else-if="active.indexOf('8-') !== -1" :data="active"/>
<!-- 优惠券 --> <!-- 优惠券 -->
<MyCoupon v-else-if="active === '5'" :data="active"/> <MyCoupon v-else-if="active === '5'" :data="active"/>
<!-- 我的积分 -->
<Integral v-else-if="active.indexOf('4-') !== -1" :data="active"/>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -117,13 +121,15 @@ import Information from '@/components/newPersonalCenter/block/Information' ...@@ -117,13 +121,15 @@ import Information from '@/components/newPersonalCenter/block/Information'
import MemberCenter from '@/components/newPersonalCenter/block/MemberCenter' import MemberCenter from '@/components/newPersonalCenter/block/MemberCenter'
import OrderCenter from '@/components/newPersonalCenter/block/OrderCenter' import OrderCenter from '@/components/newPersonalCenter/block/OrderCenter'
import MyCoupon from '@/components/newPersonalCenter/block/MyCoupon' import MyCoupon from '@/components/newPersonalCenter/block/MyCoupon'
import Integral from '@/components/newPersonalCenter/integral/index'
export default { export default {
components: { components: {
HomePage, HomePage,
Information, Information,
MemberCenter, MemberCenter,
OrderCenter, OrderCenter,
MyCoupon MyCoupon,
Integral
}, },
data () { data () {
return { return {
...@@ -141,15 +147,21 @@ export default { ...@@ -141,15 +147,21 @@ export default {
this.active = key this.active = key
console.log(key) console.log(key)
}, },
setActive: function(){ setActive: function(t){
if (t) {
this.active = t
} else if (!t){
this.active = this.$route.query.key ? this.$route.query.key : '1'; this.active = this.$route.query.key ? this.$route.query.key : '1';
} }
}
}, },
mounted() { mounted() {
this.active = this.$route.query.key ? this.$route.query.key : '1'; this.active = this.$route.query.key ? this.$route.query.key : '1';
}, },
created() { created() {
this.MsgBus.$on('newPersonalCenter', this.setActive) this.MsgBus.$on('newPersonalCenter', this.setActive)
this.MsgBus.$on('goCPage', this.setActive)
} }
} }
</script> </script>
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