Skip to content

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

提交修改

parent 486c33b1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3283 additions and 13 deletions
src/App.vue
View file @ f0902eb4
...@@ -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_lbsx2a06sr.css'; @import '//at.alicdn.com/t/font_863923_adaetrmddt6.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 0 → 100644
View file @ f0902eb4
.top_info{
padding: 20px;
background:rgba(255,255,255,1);
border:1px solid rgba(230,230,230,1);
}
.top_info_left{
display: flex;
border-right: 1px dashed rgba(230,230,230,1);
}
.top_info ._head_icon{
flex: 2;
padding-left: 10px;
}
.top_info ._head_icon p ._name{
font-family: "PingFangR";
padding-right: 5px;
}
.top_info ._head_icon p ._vip_log{
padding-right: 5px;
}
.top_info ._head_icon p ._vip_level{
font-size: 12px;
padding-right: 5px;
font-weight:400;
color:rgba(197,163,87,1);
}
.top_info ._head_icon p .icon-shimingrenzheng{
color: #999999;
}
.top_info ._head_icon p .icon-shimingrenzheng.yes_vip{
color: #30CDB9;
}
.top_info ._head_icon ._exp{
display: flex;
align-items: center;
margin-top: 5px;
padding-top: 25px;
}
.top_info ._head_icon ._exp ._vip_level{
font-size:12px;
font-weight:400;
color:rgba(152,124,83,1);
display: inline-block;
padding: 0 8px 0 5px;
border-radius: 8px;
background-color: #F4DCB8;
}
.top_info ._head_icon ._exp ._vip_level_gray{
background-color: #CCCCCC;
color: #999999
}
.top_info ._head_icon ._progress{
width: 100px;
position: relative;
}
.top_info ._head_icon ._exp ._value{
font-size: 14px;
padding-left: 5px;
color: #666666
}
.top_info ._head_icon ._exp ._number{
font-size: 14px;
padding-left: 5px;
color: #BB9B6D
}
.top_info ._head_icon ._exp ._pointer{
position: absolute;
top: -35px;
left: 29%;
}
.top_info ._head_icon ._exp ._pointer ._pointer_num{
background-color: #EFD7AC;
font-size: 12px;
color: #987C53;
padding: 0 2px;
border-radius:2px;
}
.top_info ._head_icon ._exp ._pointer ._line{
display: inline-block;
height: 12px;
width: 1px;
border-left: 1px solid #E7C588;
position: absolute;
bottom: -12px;
left: 50%;
}
.top_info .cro{
position: relative;
}
.cro_left_top,.cro_right_top,.cro_left_bottom,.cro_right_bottom{
position: absolute;
width: 20px;
height: 20px;
border: 1px solid #fff;
z-index: 1;
background: #fff;
}
.cro_left_top{
top: -1px;
left: 50%;
border-radius:0px 0px 20px 0px;
border-bottom: 1px solid rgba(230,230,230,1);
border-right: 1px solid rgba(230,230,230,1);
}
.cro_right_top{
top: -21px;
right: -1px;
border-radius:0px 0px 0px 20px;
border-bottom: 1px solid rgba(230,230,230,1);
border-left: 1px solid rgba(230,230,230,1);
}
.cro_left_bottom{
left: 50%;
bottom: -1px;
border-radius:0px 20px 0px 0px;
border-top: 1px solid rgba(230,230,230,1);
border-right: 1px solid rgba(230,230,230,1);
}
.cro_right_bottom{
right: -1px;
bottom: -21px;
border-radius:20px 0px 0px 0px;
border-top: 1px solid rgba(230,230,230,1);
border-left: 1px solid rgba(230,230,230,1);
}
.top_info ._head_icon ._addr{
margin-top: 10px;
line-height: 28px;
}
.top_info ._head_icon ._addr .iconfont{
padding-right: 8px;
font-size: 12px;
}
.top_info ._head_icon ._addr p{
padding-right: 8px;
font-size: 14px;
}
.top_info ._head_icon ._addr p ._no_phone{
color: #2299EE;
}
.top_info ._addr ._managers{
display: flex;
}
.top_info .top_info_right{
display: flex;
height: 168px;
}
.top_info .top_info_right ._business{
width: 100%;
height: 100%;
}
.top_info .top_info_right ._business ._business_ite{
margin: 8% 0;
height: 80%;
}
.top_info .top_info_right ._business ._business_ite p{
text-align: center;
}
.top_info .top_info_right ._business ._business_ite ._top span{
border-radius: 50%;
display: inline-block;
width: 32px;
height: 32px;
line-height: 32px;
font-size: 20px;
color: white;
background:rgba(254,113,94,1);
text-align: center;
margin-bottom: 10px;
}
.top_info .top_info_right ._business ._business_ite ._top span._bg_color_org{
background-color: #FEAD5E;
}
.top_info .top_info_right ._business ._business_ite ._text{
color: #666666;
font-size: 14px;
margin-bottom: 10px;
}
.top_info .top_info_right ._business ._business_ite ._money{
color: #FFA835;
font-size: 18px;
font-family: 'PingFangR';
font-weight: 800;
}
/* 订单信息 */
.order_info{
margin-top: 20px;
background:rgba(255,255,255,1);
border:1px solid rgba(230,230,230,1);
}
.order_info ._top_tit,.guoqi_coupon .guoqi_coupon_tit{
display: flex;
align-items: center;
border-bottom:1px solid rgba(230,230,230,1);
padding: 20px;
}
.order_info ._top_tit p._one,.guoqi_coupon p._one {
font-size:16px;
font-family: 'PingFangR';
font-weight:bold;
color:rgba(51,51,51,1);
}
.order_info ._top_tit p._one i.iconfont,.guoqi_coupon p._one i.iconfont{
color: #2CC392;
padding-right: 10px;
}
.order_info ._top_tit div._drop{
margin-left: 80px;
color: #333333;
min-width: 110px;
}
.order_info ._top_tit ._more_order,.guoqi_coupon ._more_coupon{
color: #EE4454;
font-size: 12px;
flex: 2;
text-align: right;
}
.order_info ._top_tit ._more_order .iconfont{
font-size: 12px;
font-weight: bold;
}
.order_info .el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #FFF0F0 !important;
}
/* 分页样式 */
.order_info ._pagination{
height: 45px;
background-color: #EBEBEB;
display: flex;
align-items: center;
justify-content: flex-end;
}
.order_info .el-pagination .btn-next,.order_info .el-pagination .btn-prev{
width:40px !important;
height:20px !important;
border:1px solid rgba(238,68,84,1);
border-radius:10px;
color: #f56c6c;
}
.order_info .el-pagination{
display: flex;
align-items: center;
}
.order_info .el-pager li{
background: transparent;
font-weight: initial;
}
.order_info .el-pager li:hover{
color: #f56c6c;
}
.order_info .el-pager li.active{
color: #f56c6c;
}
/* 活动图片跳转 */
.active .huodong_img{
width: 100%;
margin: 20px 0;
cursor: pointer;
}
.guoqi_coupon{
background:rgba(255,255,255,1);
border:1px solid rgba(230,230,230,1);
margin-bottom: 20px;
}
.HomePage ._my_coupon{
display: flex;
justify-content: center;
padding-top: 10px;
margin-bottom: 10px;
}
.HomePage ._my_coupon ._item{
width: 220px;
position: relative;
transition: all linear .5s;
overflow: hidden;
margin: 5px 4px;
}
.HomePage ._my_coupon ._item:hover{
box-shadow: 0px 1px 13px 0px rgb(189, 189, 189);
}
.HomePage ._my_coupon ._top{
background-color: #F1BC69;
}
.HomePage ._my_coupon ._top ._time{
color: #A7711C;
}
.HomePage ._my_coupon ._top._blue{
background-color: #8794E2;
}
.HomePage ._my_coupon ._top._blue ._time{
color: #4C58A4;
}
.HomePage ._my_coupon div._top._gray{
background-color: #C3C3C3 !important;
}
.HomePage ._my_coupon div._top._gray ._overdue,.HomePage ._my_coupon div._top._gray ._info_bottom{
display: none
}
.HomePage ._my_coupon div._top._gray ._info_sale{
color: #FFFFFF !important;
}
.HomePage ._my_coupon div._top._gray ._time{
color: #777777 !important;
}
.HomePage ._my_coupon ._top_raduis{
display: flex;
justify-content: space-between;
}
.HomePage ._my_coupon ._top_raduis span{
display: inline-block;
width: 8px;
height: 8px;
margin: 3px;
border-radius: 50%;
background-color: white;
margin-top: -4px;
}
.HomePage ._my_coupon ._item ._top ._overdue{
background-color: #E9F026;
color: #666666;
padding: 4px 6px;
position: absolute;
left: 0;
top: 0;
font-size: 12px;
}
.HomePage ._my_coupon ._item ._top ._info_details{
padding: 15px 10px;
}
.HomePage ._my_coupon ._item ._top ._info_details ._info_sale{
font-size: 30px;
color: white;
}
.HomePage ._my_coupon ._item ._top ._info_details ._info_sale span{
font-size: 20px;
color: white;
}
.HomePage ._my_coupon ._item ._top ._info_details ._info_full{
color: #FFFFFF;
font-size: 12px;
padding: 5px 0;
}
.HomePage ._my_coupon ._item ._top ._info_details ._info_time{
font-size: 12px;
}
.HomePage ._my_coupon ._item ._top ._info_details ._info_bottom{
padding: 1px 5px;
color: #A7711C;
font-size: 12px;
position: absolute;
border: 1px solid #A7711C;
border-radius: 4px;
right: 13px;
top: 24px;
cursor: pointer;
}
.HomePage ._my_coupon ._item ._bottom{
padding: 15px 10px;
background-color: #F9F9F9;
}
.HomePage ._my_coupon ._item ._bottom p{
font-size: 12px;
color: #333333;
font-weight: bold;
margin-bottom: 13px;
}
.HomePage ._my_coupon ._item ._bottom p._bottom_info{
color: #666666;
font-weight: 300;
}
.HomePage ._my_coupon ._item ._bottom p._margin_bt0{
margin-bottom: 0 !important;
}
.HomePage ._my_coupon p._info_coupon_name{
font-size: 18px !important;
max-width: 140px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: white;
}
\ No newline at end of file
src/assets/css/newPersonalCenter/block/Information.css 0 → 100644
View file @ f0902eb4
.PsSystem{padding-top: 20px; background-color: #F5F5F5;}
.PsSystem ._left{
min-height: 600px;
background-color: #ffffff;
}
.PsSystem ._left ul{padding: 0;}
.PsSystem ._left ul li{list-style: none;}
.PsSystem ._left ul li:hover{color: #E73828 ;}
.PsSystem ._left ul li._active{color: #E73828 ;}
.PsSystem ._left ul li:hover i{color: #E73828 ;}
.PsSystem ._left ul li._active i{color: #E73828 ;}
.PsSystem ._left ul li{
color: #333333;
font-size: 14px;
cursor: pointer;
display: flex;
align-items: center;
padding:15px 20px;
justify-content: space-between;
}
.PsSystem ._left ul li i{
font-size: 16px;
color: #666666;
}
.PsSystem ._left ul li div i{
display: inline-block;
margin-right: 12px;
}
.PsSystem ._edit_box{text-align: right;}
.PsSystem ._edit_box button{
border-radius: 0;
width: 100px;
}
.PsSystem ._right_item{
padding: 30px;
font-size: 12px;
color: #333333;
}
.PsSystem ._right_item .el-col-18{color: #999999}
.PsSystem ._right_line{
height: 1px;
background-color: #f5f5f5;
}
.PsSystem ._right_item input{
border: none;
outline: none;
border-bottom: 1px solid #cfcfcf;
transition: all linear .2s;
color: #999999;
width: 255px;
}
.PsSystem ._right_item input:focus{border-bottom: 1px solid red;}
.PsSystem ._cancel{
background-color: white;
color: #EF4455;
}
.PsSystem ._cancel:hover{
background: white;
border-color: rgb(242, 105, 119);
color: #EF4455;
}
.PsSystem ._right_item ._input_style .el-input--mini{
width: 77px;
}
.PsSystem ._right_item ._input_style .el-input__inner{
border: none !important;
font-size: 14px;
padding: 0 5px;
width: 100% !important;
}
.PsSystem .el-tag {margin-right: 10px;}
.PsSystem ._input_style ._tags{margin-right: 10px;}
.PsSystem .Authentication ._real_name {
height: 70px;
}
.PsSystem .Authentication ._real_name ._rn_tit{
height: 58px;
font-size: 18px;
color: #5079ED;
background-color: white;
border:1px solid rgba(80,121,237,1);
text-align: center;
line-height: 58px;
cursor: pointer;
}
.PsSystem .Authentication ._real_name ._rn_tit._active{
background-color: #5079ED;
color: white;
font-weight: bold;
}
.kailong{
width:0;
height:0;
border-right: 10px solid transparent;
border-left: 10px solid transparent;
border-top: 10px solid #5079ed;
margin: 0 auto;
}
.Authentication ._at_tips{
height: 100px;
padding: 20px 100px;
background-color: white;
margin:20px 0px;
}
.Authentication ._at_tips p{
font-size: 12px;
color: #666666;
margin: 0;
}
.Authentication ._at_tips p._at_tips_tit{
font-size: 16px;
font-weight: bold;
color: #333333;
margin-bottom: 5px;
}
._up_box{
padding: 20px 100px 20px 100px;
background-color: white;
border-bottom: 1px solid #E6E6E6
}
.upload-demo{
height: 360px;
}
.upload-demo .el-upload-dragger{
height: 360px;
width: 260px;
}
.upload-demo_img{
height: 358px;
width: 258px;
}
._up_box_left,._up_box_right{
text-align: center;
}
._up_box_right img{
height: 358px;
width: 258px;
}
._up_box_left_tips,._up_box_right_tips{
font-size: 18px;
color: #666666;
margin: 10px;
}
._up_box_left_tips span,._up_box_right_tips span{
font-size: 18px;
color: #5079ED;
font-weight: bold
}
._up_box_right_tips span{
color: #666666;
}
._op_btn{
display: inline-block;
width: 100px;
height: 100px;
border-radius: 50%;
background-color: #5079ED;
color: white;
font-size: 54px;
font-weight: bolder;
line-height: 90px;
text-align: center;
position: absolute;
top: 130px;
left: 80px;
}
._op_btn:hover{
background-color: #2853CC;
}
.w215{
width: 215px;
}
.text_a_center{
text-align: center;
}
.upload-demo2 .el-upload-dragger{
width: 243px;
height: 152px;
}
.upload-demo_img2{
height: 150px;
}
._op_btn2{
left: 95px;
top: 45px;
width: 60px;
height: 60px;
line-height: 52px;
}
._up_box2{
padding-bottom: 0;
border: none;
}
._id_card .text_a_center{
background-color: white;
padding: 10px;
}
._link{
color: #47A5FF !important;
cursor: pointer;
font-weight: 700;
}
.Authentication_tips{
background-color: white;
text-align: center;
padding: 0px 0;
color: #999;
font-size: 14px;
padding: 40px;
}
.Authentication_tips p{
font-size: 18px;
padding:20px;
}
.Authentication_tips i.iconfont {
font-size: 120px;
color: #ccc;
}
._status_str_y{
color: #E6A23C !important;
}
._status_str_g{
color: #67C23A !important;
}
._status_str_r{
color: #F56C6C !important;
}
\ No newline at end of file
src/assets/css/newPersonalCenter/block/MemberCenter.css 0 → 100644
View file @ f0902eb4
.MemberCenter .level_info{
background:rgba(255,255,255,1);
border:1px solid rgba(230,230,230,1);
padding: 20px;
display: flex;
}
/* 左边css */
.MemberCenter .level_info .info{
width: 160px;
padding: 20px;
background:linear-gradient(0deg,rgba(216,236,229,1),rgba(199,243,252,1));
}
.MemberCenter .level_info .info .head_img{
text-align: center;
}
.MemberCenter .level_info .info .head_img img{
width: 88px;
}
.MemberCenter .level_info .info .name{
text-align: center;
}
.MemberCenter .level_info .info ._exp{
display: flex;
align-items: center;
margin-top: 5px;
padding-top: 25px;
}
.MemberCenter .level_info .info ._exp ._vip_level{
font-size:12px;
font-weight:bold;
color:rgba(152,124,83,1);
display: inline-block;
padding: 0 8px 0 5px;
border-radius: 8px;
background-color: #F4DCB8;
font-family: "PingFangR";
}
.MemberCenter .level_info .info ._exp ._vip_level_gray{
background-color: #CCCCCC;
color: #999999
}
.MemberCenter .level_info .info ._exp ._progress{
width: 100px;
position: relative;
}
.MemberCenter .level_info .info .value_number{
margin-top: 5px;
}
.MemberCenter .level_info .info ._value{
font-size: 12px;
color: #585858
}
.MemberCenter .level_info .info ._number{
font-size: 12px;
padding-left: 5px;
color: #BB9B6D
}
.MemberCenter .level_info .info .start{
margin-top: 10px;
color: #585858;
font-size: 12px;
line-height: 20px;
}
.MemberCenter .level_info .info .start p span{
color: #333333;
}
.MemberCenter .level_info .info ._exp ._pointer{
position: absolute;
top: -35px;
left: 29%;
}
.MemberCenter .level_info .info ._exp ._pointer ._pointer_num{
background-color: #EFD7AC;
font-size: 12px;
color: #987C53;
padding: 0 2px;
border-radius:2px;
}
.MemberCenter .level_info .info ._exp ._pointer ._line{
display: inline-block;
height: 12px;
width: 1px;
border-left: 1px solid #E7C588;
position: absolute;
bottom: -12px;
left: 50%;
}
/* 右 右上css */
.MemberCenter .level_info .level{
flex: 2;
margin-left: 40px;
padding: 10px 20px 0 0;
}
.level .level_top>p,.level .level_bottom>p{
font-size: 12px;
}
.level .level_top .level_list{
display: flex;
justify-content: space-between;
position: relative;
z-index: 2;
}
.level .level_top .level_list p{
text-align: center;
font-size: 12px;
color: #666666;
}
.level .level_top .level_list li{
margin: 20px 0 10px 0;
}
.level .level_top .level_list li ._raduis{
position: relative;
width: 52px;
height: 52px;
background: rgba(248,176,75,1);
border-radius: 50%;
color: white;
line-height: 40px;
text-align: center;
margin: 0 auto;
margin-bottom: 8px;
overflow: hidden;
}
.level .level_top .level_list li ._raduis .iconfont {
font-size: 30px;
}
.level .level_top .level_list li ._raduis ._dot{
border-radius: 50%;
position: absolute;
display: inline-block;
background-color: rgba(255,255,255,.6);
}
.level .level_top .level_list li ._raduis ._dot._dot_m{
width: 4px;
height: 4px;
bottom: 18px;
right: 3px
}
.level .level_top .level_list li ._raduis ._dot._dot_l{
width: 5px;
height: 5px;
bottom: 20px;
left: 5px;
background-color: rgba(255,255,255,.3);
}
.level .level_top .level_list li ._raduis ._dot._dot_xl{
width: 6px;
height: 6px;
bottom: 4px;
left: 50%;
background-color: rgba(255,255,255,.4);
}
.level .level_top .level_list li ._raduis .number{
font-size: 30px;
position: absolute;
z-index: 2;
left: 30%;
}
.level .level_top .level_list li ._raduis ._dot_xxl{
width: 80px;
height: 80px;
border-radius: 100%;
background-color: #CF8230;
display: inline-block;
position: absolute;
bottom: -62px;
left: -14px;
}
.level .level_top .level_list li ._raduis ._vip{
width: 52px;
text-align: center;
position: absolute;
bottom: -11px;
left: 0;
font-size: 12px;
color: #FFFFFF
}
.level .level_top .level_list li ._raduis.no_color ._vip{
color: #989898
}
.level .level_top .level_list li ._raduis.no_color{
background-color: #CECECE;
}
.level .level_top .level_list li ._raduis.no_color ._dot_xxl{
background-color: #BFBFBF;
}
.level .level_top .level_list li ._raduis ._dot_m._dot_m_t{
bottom: 9px;
right: 10px;
z-index: 2;
}
.level .level_top .line{
height: 2px;
width: 97%;
background-color: #E6E6E6;
position: absolute;
top: 62px;
z-index: 1;
}
/* 右 右下css */
.level .level_bottom>p{
margin-bottom: 15px;
}
.level .level_bottom {
margin-top: 15px;
padding-top: 15px;
}
.level .level_bottom ._icon_list {
padding: 0 65px;
height: 70px;
line-height: 70px;
}
.level .level_bottom ._icon_list i{
font-size: 50px;
color: #F8B04B;
padding-right: 25px;
}
/* 等级权益 */
.level_equity{
margin: 20px 0;
}
.level_equity>p,.level_rule>p,.level_question>p{
font-size: 16px;
color: #333333;
font-family: "PingFangR";
font-weight: bold;
padding: 22px;
border:1px solid rgba(230,230,230,1);
border-bottom: 0;
}
.level_equity>p span,.level_rule>p span,.level_question>p span{
display: inline-block;
height: 14px;
width: 4px;
background-color: #DBA261;
margin-right: 5px;
}
.MemberCenter .info_box table{
border-collapse: collapse;
border-spacing: 0;
width: 100%;
}
.MemberCenter .info_box table thead th{
color: #909399;
}
.MemberCenter .info_box table tbody th{
font-weight: normal;
}
.MemberCenter .info_box table tbody tr:hover{
background-color: #FFF0F0 !important;
}
.MemberCenter .info_box th{
background-color: #fff1f1
}
.MemberCenter .info_box th, .MemberCenter .info_box td {
height: 38px;
border: 1px solid #e8e8e8;
text-align: center;
color: #666;
font-size: 14px;
}
.MemberCenter .info_box td i.icon-xuanzhong2{
font-size: 12px;
width: 18px;
height: 18px;
border-radius: 50%;
display: inline-block;
background-color: #67c93c;
text-align: center;
line-height: 18px;
color: white
}
.level_rule{
margin-bottom: 20px;
}
.level_rule td{
text-align: left !important;
padding:5px 20px;
}
.level_question{
margin-bottom: 20px;
}
.level_question>p{
border-bottom: 1px solid rgba(230,230,230,1);
}
.level_question .modu_con {
width: auto;
padding: 0 20px 0 22px;
color: #666;
border: 1px solid rgba(230,230,230,1);
border-top: none;
}
.level_question .modu_con p {
padding: 16px 0 12px 0;
}
\ No newline at end of file
src/assets/css/newPersonalCenter/block/OrderCenter.css 0 → 100644
View file @ f0902eb4
.OrderCenter .el-tabs--card>.el-tabs__header .el-tabs__item.is-active{
color: #E73828;
}
.OrderCenter .el-tabs--card>.el-tabs__header .el-tabs__item{
border-left:1px solid #F2DADA
}
.OrderCenter .el-tabs--card>.el-tabs__header .el-tabs__nav{
border: 1px solid #f2dada;
border-bottom: none;
}
.OrderCenter .el-tabs--card>.el-tabs__header{
border-bottom: 1px solid #f2dada;
}
.OrderCenter .table_box{
border: 1px solid rgba(230,230,230,1);
}
.OrderCenter .el-tabs__item:hover{
color: #E73828;
}
.OrderCenter .el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: #FFF0F0 !important;
}
/* 分页样式 */
.OrderCenter ._pagination{
height: 45px;
background-color: #EBEBEB;
display: flex;
align-items: center;
justify-content: flex-end;
}
.OrderCenter .el-pagination .btn-next,.OrderCenter .el-pagination .btn-prev{
width:40px !important;
height:20px !important;
border:1px solid rgba(238,68,84,1);
border-radius:10px;
color: #f56c6c;
}
.OrderCenter .el-pagination{
display: flex;
align-items: center;
}
.OrderCenter .el-pager li{
background: transparent;
font-weight: initial;
}
.OrderCenter .el-pager li:hover{
color: #f56c6c;
}
.OrderCenter .el-pager li.active{
color: #f56c6c;
}
src/assets/mall/newHead.css 0 → 100644
View file @ f0902eb4
ul,li,p,h1,h2,h3,h4,h5,h6,ol,li{
margin: 0;
padding: 0;
}
ul,li{list-style: none;}
.__float_l{float: left;}
.__float_r{float: right;}
.__cp{
cursor: pointer;
}
.w1180{
width: 1180px !important;
margin: 0 auto;
}
.w85{
width: 85px !important;
}
.w100{
width: 100px !important;
}
.wb60{
width: 60% !important;
}
._flex_center{
display: flex;
align-items: center;
}
/* 一级样式 */
.new_header .new_header_nav{
line-height: 30px;
background-color: #EBEBEB;
color: #666666;
font-size: 12px;
}
.new_header .new_header_nav .nav_left{
float: left;
}
.new_header .new_header_nav .nav_left .el-dropdown{
font-size: 12px;
margin-left: 40px;
}
.new_header .new_header_nav .nav_left .el-dropdown .iconfont.icon-duoyuyan{
font-size: 14px;
padding-right: 5px;
}
.iconfont.icon-xia{
font-size: 12px;
}
.new_header .new_header_nav .nav_right{
float: right;
}
.new_header .new_header_nav .nav_right ul li{
float: left;
}
.new_header .new_header_nav .nav_right ul li .nav_right_register{
color: #EE4454;
padding-left: 2px;
}
.new_header .new_header_nav .nav_right ul li .__splice{
color: #D9D9D9;
padding: 0 20px;
}
.new_header .new_header_nav .nav_right ul li .icon-weixin1{
color:#999999;
}
.new_header_nav .nav_right .nav_right_login ._name{
color: #EE4454
}
/* 二级样式 */
.new_header_nav_two{
padding: 25px 0;
height: 100px;
}
.new_header_nav_two .logo{
height: 50px;
display: inline-block;
}
.new_header_nav_two ._search_box{
border: solid 3px #EE4454;
border-radius: 6px;
height: 34px;
position: relative;
}
.new_header_nav_two ._search_box input{
border: none;
font-size: 12px;
}
.new_header_nav_two ._search_box ._city{
font-size: 12px;
padding-left: 5px;
}
.new_header_nav_two ._search_box ._splice{
display: inline-block;
height: 100%;
width: 1px;
border-left: 1px solid #E6E6E6;
}
.new_header_nav_two ._search_box ._search_btn{
position: absolute;
right: 0;
top: 0;
width: 60px;
height: 100%;
background-color: #EE4454;
color: white;
text-align: center;
line-height: 34px;
}
.new_header_nav_two ._phone{
padding: 0 25px;
height: 54px;
background: #f9f9f9 url('../img/tele-bg.png') no-repeat bottom left/100% auto;
justify-content: center;
}
.new_header_nav_two ._phone .icon-dianhua1{
font-size: 30px;
color: #FFA835;
}
.new_header_nav_two ._phone>div:nth-child(2){
padding-left: 10px;
}
.new_header_nav_two ._phone ._phone_text{
font-size: 12px;
color: #999999;
}
.new_header_nav_two ._phone ._phone_text .icon-xia{
color: #FFA835;
}
.new_header_nav_two ._phone ._phone_num{
color: #FFA835;
font-family: 'PingFangR';
}
/* 三级样式 */
.new_header_nav_three{
height: 40px;
background-color: #EE4454;
}
.new_header_nav_three ul._t_nav_box{
height: 40px;
}
.new_header_nav_three ul._t_nav_box li{
float: left;
height: 100%;
width: 100px;
line-height: 40px;
}
.new_header_nav_three ul._t_nav_box li:hover{
background-color: #DF3343
}
.new_header_nav_three ul._t_nav_box li._active{
background-color: #DF3343
}
.new_header_nav_three ul._t_nav_box li>div{
text-align: center;
color: white;
font-size: 14px;
cursor: pointer;
}
.new_header_nav_three ul._t_nav_box li>div .el-dropdown{
width: 95%;
text-align: center;
color: white;
font-size: 14px;
cursor: pointer;
}
.new_header_nav_three ul._t_nav_box li div span.__splice{
float: right;
}
.new_header_nav_three ul._t_nav_box li div .icon-xia{
padding-left: 2px;
}
\ No newline at end of file
src/components/global/newHead.vue 0 → 100644
View file @ f0902eb4
This diff is collapsed.
src/components/mall/swiper.vue
View file @ f0902eb4
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<img src='../../assets/img/10.jpg'> <img src='../../assets/img/10.jpg'>
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
<div class="search-box" :style="{'width':searchBoxWidth,'left':searchBoxLeft}"> <!-- <div class="search-box" :style="{'width':searchBoxWidth,'left':searchBoxLeft}">
<div class="chosen-item">旅游</div> <div class="chosen-item">旅游</div>
<div class="search-content"> <div class="search-content">
<el-row> <el-row>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</div> </div> -->
</div> </div>
</template> </template>
<script> <script>
......
src/components/newPersonalCenter/block/HomePage.vue 0 → 100644
View file @ f0902eb4
This diff is collapsed.
src/components/newPersonalCenter/block/Information.vue 0 → 100644
View file @ f0902eb4
This diff is collapsed.
src/components/newPersonalCenter/block/MemberCenter.vue 0 → 100644
View file @ f0902eb4
This diff is collapsed.
src/components/newPersonalCenter/block/OrderCenter.vue 0 → 100644
View file @ f0902eb4
<style>
@import "../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style>
<template>
<el-row class="OrderCenter">
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="全部订单" name="1"></el-tab-pane>
<el-tab-pane label="待付定金" name="2"></el-tab-pane>
<el-tab-pane label="待付尾款" name="3"></el-tab-pane>
<el-tab-pane label="交易成功" name="4"></el-tab-pane>
<el-tab-pane label="取消" name="5"></el-tab-pane>
<el-tab-pane label="等待商家确认" name="6"></el-tab-pane>
<el-tab-pane label="退款中" name="7"></el-tab-pane>
<el-tab-pane label="退款成功" name="8"></el-tab-pane>
<el-tab-pane label="交易完成" name="9"></el-tab-pane>
</el-tabs>
<el-row class="table_box">
<el-table
:data="tableData"
style="width: 100%">
<el-table-column
prop="OrderId"
label="订单号"
width="80">
</el-table-column>
<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
prop="OrderStatus"
label="订单状态"
width="100">
<template slot-scope="scope">
<span v-if="scope.row.OrderStatus === 1">待付定金</span>
<span v-if="scope.row.OrderStatus === 2">已取消</span>
</template>
</el-table-column>
<!-- 操作按钮 -->
<el-table-column
align="left"
label="操作">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="handlePay(scope.$index, scope.row)">立即付款</el-button>
<el-button
size="mini"
@click="handleCancle(scope.$index, scope.row)">取消订单</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
<!-- 分页 -->
<el-row class="_pagination">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
:page-size="100"
layout="total, prev, pager, next"
:total="1000">
</el-pagination>
</el-row>
</el-row>
</template>
<script>
export default {
components: {
},
data(){
return {
activeName: '1',
currentPage: 1,
tableData: [
{
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,
}, {
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: {
},
created(){
},
mounted() {
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
},
handlePay(index, row) {
console.log(index, row);
},
handleCancle(index, row) {
console.log(index, row);
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
}
}
}
</script>
\ No newline at end of file
src/components/newPersonalCenter/newPersonalCenter.vue 0 → 100644
View file @ f0902eb4
<style>
.new_personal_center{
padding-top: 25px;
}
.w1180{
width: 1180px !important;
margin: 0 auto;
}
.npc_menu{
overflow: hidden;
}
.new_personal_center .el-menu-item.is-active{
background-color: #FAE1E1 !important;
color: #DF3343 ;
}
.new_personal_center .el-menu-item i,.new_personal_center .el-submenu__title i{
padding-right: 8px;
}
.new_personal_center .el-submenu__title:hover {
background-color: #fdf1f1;
}
.new_personal_center .el-menu-item:hover{
background-color: #fdf1f1;
}
.new_personal_center .el-submenu__title span,.new_personal_center .el-menu-item span{
font-family: 'PingFangR';
font-weight: bold
}
.new_personal_center .el-menu{
border: none;
}
</style>
<template>
<div class="new_personal_center">
<el-row>
<div class="w1180">
<el-row class="">
<!-- 左边菜单板块 -->
<el-col :span="4" class="npc_menu">
<el-menu
:unique-opened="true"
:default-active="active"
class="el-menu-vertical-demo">
<el-menu-item index="1" @click="clickMenu('1')">
<i class="iconfont icon-gerenzhongxin"></i>
<span slot="title">个人中心首页</span>
</el-menu-item>
<el-menu-item index="2" @click="clickMenu('2')">
<i class="iconfont icon-huiyuanicon"></i>
<span slot="title">会员中心</span>
</el-menu-item>
<el-submenu index="8">
<template slot="title">
<i class="iconfont icon-dingdanicon"></i>
<span>订单中心</span>
</template>
<el-menu-item index="8-1" @click="clickMenu('8-1')">跟团游订单</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-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-6" @click="clickMenu('8-6')">酒店订单</el-menu-item>
</el-submenu>
<el-submenu index="3">
<template slot="title">
<i class="iconfont icon-gerenxinxiicon"></i>
<span>个人信息</span>
</template>
<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-3" @click="clickMenu('3-3')">实名认证</el-menu-item>
</el-submenu>
<el-submenu index="4">
<template slot="title">
<i class="iconfont icon-gerenxinxiicon"></i>
<span>我的积分</span>
</template>
<el-menu-item index="4-1" @click="clickMenu('4-1')">选项1</el-menu-item>
<el-menu-item index="4-2" @click="clickMenu('4-2')">选项2</el-menu-item>
</el-submenu>
<el-submenu index="5">
<template slot="title">
<i class="iconfont icon-youhuiquanicon"></i>
<span>我的优惠券</span>
</template>
<el-menu-item index="5-1" @click="clickMenu('5-1')">选项1</el-menu-item>
<el-menu-item index="5-2" @click="clickMenu('5-2')">选项2</el-menu-item>
</el-submenu>
<el-menu-item index="6" @click="clickMenu('6')">
<i class="iconfont icon-youhuiquanicon"></i>
<span slot="title">我的奖品</span>
</el-menu-item>
<el-menu-item index="7" @click="clickMenu('7')">
<i class="iconfont icon-huodongicon"></i>
<span slot="title">活动中心</span>
</el-menu-item>
</el-menu>
</el-col>
<!-- 右边内容板块 -->
<el-col :span="19" :offset="1">
<!-- 个人中心首页 -->
<HomePage v-if="active === '1'"/>
<!-- 会员中心 -->
<MemberCenter v-else-if="active === '2'" :data="active"/>
<!-- 个人信息 -->
<Information v-else-if="active.indexOf('3-') !== -1" :data="active"/>
<!-- 订单中心 -->
<OrderCenter v-else-if="active.indexOf('8-') !== -1" :data="active"/>
</el-col>
</el-row>
</div>
</el-row>
</div>
</template>
<script>
import HomePage from '@/components/newPersonalCenter/block/HomePage'
import Information from '@/components/newPersonalCenter/block/Information'
import MemberCenter from '@/components/newPersonalCenter/block/MemberCenter'
import OrderCenter from '@/components/newPersonalCenter/block/OrderCenter'
export default {
components: {
HomePage,
Information,
MemberCenter,
OrderCenter
},
data () {
return {
active: '1',
}
},
methods: {
handleOpen(key, keyPath) {
console.log(key, keyPath);
},
handleClose(key, keyPath) {
console.log(key, keyPath);
},
clickMenu: function (key) {
this.active = key
console.log(key)
}
},
mounted() {
},
created() {
}
}
</script>
src/components/visa/Visalist.vue
View file @ f0902eb4
...@@ -345,7 +345,7 @@ export default { ...@@ -345,7 +345,7 @@ export default {
.visaList .select_ul_height{ .visaList .select_ul_height{
height: 22px; height: 22px;
} }
.el-pagination .btn-next, .el-pagination .btn-prev{ .visaList .el-pagination .btn-next,.visaList .el-pagination .btn-prev{
width: 28px!important; width: 28px!important;
height: 28px!important; height: 28px!important;
......
src/plugins/index.js
View file @ f0902eb4
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
DomainUrl: domainUrl, DomainUrl: domainUrl,
//常用提交数据URL //常用提交数据URL
PostUrl: domainUrl + "/api/common/post", PostUrl: domainUrl + "/api/common/post",
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000", javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.106:9000",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130', ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi", LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
...@@ -76,6 +76,19 @@ export default { ...@@ -76,6 +76,19 @@ export default {
successCall(res); successCall(res);
}).catch(function (res) {}); }).catch(function (res) {});
}, },
//价钱格式化，三位数逗号分隔，保留两位小数 duanjun
Vue.prototype.moneyFormat = function (value) {
let nStr = Number(value).toFixed(2)
nStr += '';
let x = nStr.split('.');
let x1 = x[0];
let x2 = x.length > 1 ? '.' + x[1] : '';
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, '$1' + ',' + '$2');
}
return x1 + x2;
},
//消息成功提示 //消息成功提示
Vue.prototype.Success = function (msg) { Vue.prototype.Success = function (msg) {
this.$message({ this.$message({
...@@ -182,11 +195,12 @@ export default { ...@@ -182,11 +195,12 @@ export default {
} }
}) })
.then(res => { .then(res => {
if (res.resultCode == 10000 || res.resultCode == 10001) { console.log(res,'123')
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
this.$router.push({ this.$router.push({
path: '/login' path: '/login'
}) })
} else if (res.resultCode == 10005) { } else if (res.data.resultCode == 10005) {
this.$router.go(-1) this.$router.go(-1)
} else { } else {
successCall(res) successCall(res)
...@@ -227,11 +241,11 @@ export default { ...@@ -227,11 +241,11 @@ export default {
} }
}) })
.then(res => { .then(res => {
if (res.resultCode == 10000 || res.resultCode == 10001) { if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
this.$router.push({ this.$router.push({
path: '/login' path: '/login'
}) })
} else if (res.resultCode == 10005) { } else if (res.data.resultCode == 10005) {
this.$router.go(-1) this.$router.go(-1)
} else { } else {
successCall(res) successCall(res)
......
src/router.js
View file @ f0902eb4
...@@ -316,7 +316,15 @@ export default new Router({ ...@@ -316,7 +316,15 @@ export default new Router({
title: "签证预定" title: "签证预定"
} }
}, },
{
path: "/newPersonalCenter",
name: "newPersonalCenter",
component: resolve =>
require(["@/components/newPersonalCenter/newPersonalCenter"], resolve),
meta: {
title: "个人中心"
}
},
{ {
path: "/IndependentTravel", path: "/IndependentTravel",
name: "IndependentTravel", name: "IndependentTravel",
......
src/views/index.vue
View file @ f0902eb4
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
<template> <template>
<div class="home-box" v-if="isPhone"> <div class="home-box" v-if="isPhone">
<mallHead msg="" @forword='goUrl("2-1")' @siteCity="siteCity"/> <!-- <mallHead msg="" @forword='goUrl("2-1")' @siteCity="siteCity"/> -->
<newHead/>
<div :style='{"min-height":minHeight+"px"}'> <div :style='{"min-height":minHeight+"px"}'>
<transition name="slide"> <transition name="slide">
<router-view :changeCity='changeCity'></router-view> <router-view :changeCity='changeCity'></router-view>
...@@ -18,11 +19,13 @@ ...@@ -18,11 +19,13 @@
</template> </template>
<script> <script>
import mallHead from '@/components/global/head.vue' import mallHead from '@/components/global/head.vue'
import newHead from '@/components/global/newHead.vue'
import foot from '@/components/global/foot.vue' import foot from '@/components/global/foot.vue'
export default { export default {
components: { components: {
mallHead, mallHead,
foot, foot,
newHead,
}, },
data () { data () {
return { return {
......
src/views/login.vue
View file @ f0902eb4
...@@ -195,7 +195,7 @@ export default { ...@@ -195,7 +195,7 @@ export default {
show:true, show:true,
count:'', count:'',
mobileCodeType: 1, mobileCodeType: 1,
type:'', type: 1,
registerMsg:{ registerMsg:{
} }
...@@ -203,7 +203,7 @@ export default { ...@@ -203,7 +203,7 @@ export default {
},mounted () { },mounted () {
this.w = screen.availWidth; this.w = screen.availWidth;
this.h = window.innerHeight; this.h = window.innerHeight;
this.type = this.$route.query.type; this.type = this.$route.query.type ? this.$route.query.type : 1;
this.activeShow = this.$route.query.type === 4 ? true : false; this.activeShow = this.$route.query.type === 4 ? true : false;
}, },
methods: { methods: {
......
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