Browse Source

买家-支付记录

yangc 8 years ago
parent
commit
18a03ef1bd

+ 0 - 1
src/main/webapp/WEB-INF/views/normal/user_center.html

@@ -20,7 +20,6 @@
 <link rel="stylesheet" href="static/css/user/base.css" />
 <link rel="stylesheet" href="static/css/user/user.css" />
 <link rel="stylesheet" href="static/lib/calendar/calendar.css">
-<link rel="stylesheet" href="static/css/commonComponent.css">
 </head>
 <body>
 

+ 0 - 609
src/main/webapp/resources/css/commonComponent.css

@@ -1,609 +0,0 @@
-/*---------------------提示框样式 start---------------------*/
-/*示例:
-<div class="com-del-box">
-    <div class="title">
-        <i></i>
-    </div>
-    <div class="content">
-        <p><i class="fa fa-exclamation-circle"></i>是否要删除此发票?</p>
-        <div>
-            <a>取消</a>
-            <a>确认</a>
-        </div>
-    </div>
-</div>
-*/
-.com-del-box{
-    position: fixed;
-    z-index: 10;
-    height: 152px;
-    opacity: 1;
-    background-color: white;
-    width: 310px;
-    -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
-    box-shadow: 0 5px 15px rgba(0,0,0,.5);
-    margin: -155px 0 0 -75px;
-    top: 55%;
-    left: 50%;
-}
-.com-del-box .title{
-    height: 30px;
-    background-color: #5078cb;
-    text-align: right;
-    padding-right: 15px;
-    line-height: 30px;
-}
-.com-del-box .title i{
-    background: url(../img/icon/close.png) no-repeat;
-    display: inline-block;
-    width: 9px;
-    height: 9px;
-    cursor: pointer;
-    margin: 0;
-}
-.com-del-box .content{
-    width: 100%;
-    text-align: center;
-    margin: 0 auto;
-}
-.com-del-box .content p{
-    line-height: 50px;
-    font-size: 14px;
-    padding-top: 10px;
-}
-.com-del-box .content p i{
-    color: #5078cb;
-    font-size: 16px;
-    margin-right: 10px;
-}
-.com-del-box .content div{
-    width: 100%;
-    text-align: center;
-    margin: 0 auto;
-}
-.com-del-box .content div a{
-    width: 55px;
-    height: 26px;
-    line-height: 26px;
-    display: inline-block;
-    text-align: center;
-    font-size: 14px;
-    cursor: pointer;
-}
-.com-del-box .content div a:first-child{
-    background: #b4b5b9;
-    color: #333;
-    margin-right: 10px;
-}
-.com-del-box .content div a:last-child{
-    background: #5078cb;
-    color: #fff;
-}
-.com-del-box .content div a:hover{
-    background: #3f7ae3;
-    color: #fff;
-}
-/*---------------------提示框样式 end---------------------*/
-
-/*---------------------btn样式 start---------------------*/
-/*示例(size+type):
-<span class="com-btn-level1 com-btn-submit"></span>
-*/
-/*btnSize*/
-.com-btn-level1 {
-    display: inline-block;
-    padding: 7px 19px;
-    font-size: 14px;
-    cursor: pointer;
-}
-.com-btn-level2 {
-    display: inline-block;
-    padding: 5px 11px;
-    border-radius: 2px;
-    font-size: 12px;
-    cursor: pointer;
-}
-.com-btn-level3 {
-    display: inline-block;
-    padding: 5px 12px;
-    font-size: 12px;
-    cursor: pointer;
-}
-/*btnType*/
-.com-btn-submit {
-    color: #fff;
-    background: #5078cb;
-}
-.com-btn-cancel {
-    background: #c8c6c6;
-    color: #fff;
-}
-.com-btn-detail {
-    color: #fff;
-    background: #ff8522;
-}
-.com-btn-detail-border {
-    color: #ff8522;
-    background: #fff;
-    border: 1px solid #ff8522;
-}
-.com-btn-red {
-    background: #f15601;
-    color: #fff;
-}
-.com-btn-green {
-    background: #33b401;
-    color: #fff;
-}
-.com-btn-submit-border {
-    border: 1px solid #5078cb;
-    background: #fff;
-    color: #5078cb;
-}
-/*---------------------btn样式 end-----------------------*/
-
-/*---------------------标准控件-新增start---------------------*/
-i.fa-plus-circle{
-    font-size: 16px!important;
-    color: #33b401!important;
-}
-/*---------------------标准控件-新增end---------------------*/
-
-/*---------------------标准控件-删除start---------------------*/
-i.fa-minus-circle{
-    font-size: 16px!important;
-    color: #f51c24!important;
-}
-/*---------------------标准控件-删除end---------------------*/
-
-/*---------------------标准控件-单选框start---------------------*/
-/** html代码
-    <label class="com-check-radio">
-        <input type="radio" id="effect" name="radio">
-        <label for="effect"></label>
-        生效
-    </label>
-    <label class="com-check-radio">
-        <input type="radio" id="no-effect" name="radio" checked="checked">
-        <label for="no-effect"></label>
-        暂不生效
-    </label>
-**/
-.com-check-radio input[type='radio']{
-    display: none!important;
-    margin: 7px 8px 0!important;
-}
-.com-check-radio input[type='radio'] + label{
-    position: relative!important;
-    top: 7px!important;
-    margin-right: 5px!important;
-    display: inline-block!important;
-    width: 12px!important;
-    height: 12px!important;
-    font-weight: normal!important;
-    background: url(../img/icon/check-rule.png) no-repeat;
-}
-.com-check-radio label{
-    background-position: 0 0!important;
-}
-.com-check-radio input:checked + label{
-    background-position: -15px 0!important;
-}
-/*---------------------标准控件-单选框end---------------------*/
-
-/*---------------------标准控件-复选框start---------------------*/
-/** html代码
-    <label class="com-check-box">
-        <input type="checkbox" id="1">
-        <label for="1"></label>
-    </label>
-**/
-.com-check-box input {
-    display: none!important;
-}
-.com-check-box input[type="checkbox"] + label{
-    display: inline-block!important ;
-    position: relative!important ;
-    top: 2px!important ;
-    width: 12px!important ;
-    height: 12px!important ;
-    background: url(../img/icon/check-rule.png) no-repeat ;
-    background-position: -48px 0;
-}
-.com-check-box input:checked + label {
-    background-position: -31px 0;
-}
-/*---------------------标准控件-复选框end---------------------*/
-
-/*---------------------标准控件-开关(蓝色)start---------------------*/
-/** html代码
-    <div class="com-switch-blue">
-        <span class="checkbox">
-            <span><em></em></span>
-        </span>
-        <span class="checkbox active">
-            <span><em></em></span>
-        </span>
-	</div>
-**/
-div.com-switch-blue .checkbox {
-    margin: 0 auto;
-    text-align: center;
-    position: relative;
-    display: block;
-}
-div.com-switch-blue .checkbox span {
-    width: 46px;
-    height: 12px;
-    display: inline-block;
-    border-radius: 18px;
-    border: #e4e4e4 1px solid;
-    cursor: pointer;
-    position: relative;
-    box-shadow: 1px 1px 5px #eee;
-    background: -webkit-gradient(linear,0% 0%, 0% 100%, from(#E0E0E0), to(#E8E8E8), color-stop(0.5,#F2F2F2));
-    transition: background-color .1s ease-out;
-}
-div.com-switch-blue .checkbox.active span{
-    background: #b9cffa;
-}
-div.com-switch-blue .checkbox.active span em{
-    left: 34px;
-}
-div.com-switch-blue .checkbox span em{
-    position: absolute;
-    width: 16px;
-    top: -5px;
-    left: 0;
-    height: 16px;
-    line-height: 16px;
-    background-color: #fff;
-    border: #eee 1px solid;
-    border-radius: 50%;
-    box-shadow: -1px 2px 1px #999;
-    transition: background-color .1s ease-out;
-    color: #666;
-    font-size: 12px;
-}
-div.com-switch-blue .checkbox span em:after{
-    content: '';
-    width: 6px;
-    height: 6px;
-    display: inline-block;
-    background: #dedcdc;
-    border-radius: 100%;
-    position: absolute;
-    top: 4px;
-    left: 4px;
-}
-/*---------------------标准控件-开关(蓝色)end---------------------*/
-
-/*---------------------标准控件-开关(绿色)start---------------------*/
-/** html代码
-    <div class="com-switch-green">
-        <span class="checkbox">
-            <span><em></em></span>
-        </span>
-        <span class="checkbox active">
-            <span><em></em></span>
-        </span>
-	</div>
-**/
-div.com-switch-green .checkbox {
-    margin: 0 auto;
-    text-align: center;
-    position: relative;
-    display: block;
-}
-div.com-switch-green .checkbox span {
-    width: 34px;
-    height: 18px;
-    display: inline-block;
-    border-radius: 18px;
-    border: #e4e4e4 1px solid;
-    cursor: pointer;
-    position: relative;
-    box-shadow: 1px 1px 5px #eee;
-    background: -webkit-gradient(linear,0% 0%, 0% 100%, from(#bbbcba), to(#bfc1be), color-stop(0.5,#c5c7c4));
-    transition: background-color .1s ease-out;
-}
-div.com-switch-green .checkbox.active span{
-    background: #3acb14;
-}
-div.com-switch-green .checkbox.active span em{
-    left: 18px;
-}
-div.com-switch-green .checkbox span em{
-    position: absolute;
-    top: -2px;
-    left: -3px;
-    width: 18px;
-    height: 18px;
-    line-height: 18px;
-    background-color: #fff;
-    border: #eee 1px solid;
-    border-radius: 50%;
-    box-shadow: -1px 2px 1px #999;
-    transition: background-color .1s ease-out;
-    color: #666;
-    font-size: 12px;
-}
-div.com-switch-green .checkbox span em:after{
-    content: '';
-    width: 6px;
-    height: 6px;
-    display: inline-block;
-    background: #dedcdc;
-    border-radius: 100%;
-    position: absolute;
-    top: 5px;
-    left: 5px;
-}
-/*---------------------标准控件-开关(绿色)end---------------------*/
-
-/*---------------------信息提示框 start---------------------*/
-/** html代码
-    <div class="tip">
-        XXXX
-	</div>
-**/
-div.tip{
-    display: none;
-    padding: 13px 10px;
-    font-size: 12px;
-    color: #333;
-    background-color: #fff;
-    border: 1px solid #89aefa;
-    border-radius: 2px;
-    box-shadow: 2px 2px 5px #dedede;
-    -webkit-box-shadow: 2px 2px 5px #dedede;
-    -moz-box-shadow: 2px 2px 5px #dedede;
-    -o-box-shadow: 2px 2px 5px #dedede;
-}
-/*---------------------信息提示框 end---------------------*/
-
-
-/*---------------------提示浮层 start---------------------*/
-.com-supernatant-box{
-    max-width:360px;
-    opacity:.6;
-    border-radius:5px;
-}
-.com-supernatant-box div{
-    position:fixed;
-    top:59%;
-    left:50%;
-    width:100%;
-    transform:translate(-50%,-50%);
-    color: #333;
-}
-.com-supernatant-box .success{
-    background: #f00000;
-}
-.com-supernatant-box .defeat{
-    background: #5078cb;
-}
-/*-------------------------提示浮层 end--------------------*/
-
-/*------下拉选框的使用样式方法------------------------------*/
-/*
-<div class='com-select-option'>
-    <input id="classesType" ng-blur="onBlur()"  ng-click="changeShowLogistics()" type="text" class="form-control" ng-model="message.classes"  placeholder="请选择消息类型" readonly="true" >
-    <ul id="ulContent" ng-if="matchData && showContent" class="dropdown-menu">
-     <li ng-click="showText(classes)" ng-repeat="classes in resultList" ng-class="{'active': $index==selectIndex}" ng-bind="classes" ng-bind="message.classes"></li>
-    </ul>
- </div>
-*/
-/*-------------------------下拉选框 start-------------- --*/
-.com-select-option {
-    position: relative;
-}
-.com-select-option>input {
-    vertical-align: middle;
-    width: 190px;
-    margin-top: -2px;
-    background-color: white !important;
-    height: 30px;
-    background: url(static/img/index/xiala.png) no-repeat 167px 11px;
-    cursor: pointer;
-}
-.com-select-option .dropdown-menu{
-    top: 90%;
-    left: unset;
-    line-height: 30px;
-    max-height: 300px;
-    overflow-y: auto;
-    width: 190px;
-    display: block;
-    overflow-x: hidden;
-    border-radius: 2px;
-}
-.com-select-option .dropdown-menu li{
-    font-size: 14px;
-    cursor: pointer;
-    padding-left:10px;
-    height: 30px;
-}
-.com-select-option .dropdown-menu li:hover, .dropdown-menu li.active{
-    color: #fff;
-    background: #5078cb;
-}
-/*-------------------------下拉选框 end--------------------*/
-/*-------------------------分页 start--------------------*/
-/*主要分页table(使用tableParams即可)*/
-
-/*主要分页非table代码示例*/
-/*
-<div class="ng-cloak ng-table-pager com-sup-pager">
-    <ul class="pagination ng-table-pagination">
-        <li ng-class="{'disabled': !page.active && !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type">
-            <a ng-switch-when="prev" ng-click="setPage(page.type, -1)" href="">&laquo;</a>
-            <a ng-switch-when="first" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-            <a ng-switch-when="page" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-            <a ng-switch-when="more" ng-click="setPage(page.type, -1)" href="">&#8230;</a>
-            <a ng-switch-when="last" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-            <a ng-switch-when="next" ng-click="setPage(page.type, -1)" href="">&raquo;</a>
-        </li>
-    </ul>
-    <div class="page-go-block">
-        <input class="page-number" type="text" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
-        <a class="page-a" ng-click="setPage('page', param.currentPage)">GO</a>
-    </div>
-</div>
-*/
-.com-sup-pager .pagination{
-    margin-bottom: 0;
-}
-.com-sup-pager .pagination.ng-table-pagination > li > a > span {
-    height: 17px;
-    line-height: 17px;
-}
-.com-sup-pager .pagination>.active>a, .pagination>.active>a:focus, .pagination>.active>a:hover, .pagination>.active>span, .pagination>.active>span:focus, .pagination>.active>span:hover{
-    z-index: 2;
-    color: #fff;
-    cursor: default;
-    background-color: #5078cb;
-    border-color: #5078cb;
-}
-.com-sup-pager .pagination.ng-table-pagination > li > a{
-    font-size: 12px;
-}
-.com-sup-pager.ng-table-pager  input.page-number {
-    vertical-align: inherit;
-    display: inline-block;
-    width: 40px;
-    height: 31px;
-    padding: 6px 6px;
-    font-size: 14px;
-    line-height: 1.42857143;
-    color: #9B9792;
-    text-align: center;
-    background-color: #F6F5F4;
-    background-image: none;
-    border: 1px solid #ccc;
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-}
-.com-sup-pager.ng-table-pager{
-    margin-right: 0 !important;
-    background: #fff;
-}
-.com-sup-pager.ng-table-pager a.page-a {
-    color: #fff;
-    cursor: pointer;
-    background-color: #5078cb;
-    border-color: #5078cb;
-    padding: 7px 6px;
-    font-size: 14px;
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-    text-decoration: none;
-    height: 31px;
-}
-
-.com-sup-pager.ng-table-pager div.page-go-block {
-    float: right;
-    margin-left: 20px;
-    font-size: 0px;
-    height: 31px;
-    line-height: 31px;
-}
-
-/*次要分页代码示例*/
-/*
- <div class="ng-cloak ng-table-pager com-sub-pager text-center">
-        <ul class="pagination ng-table-pagination">
-            <li ng-class="{'disabled': !page.active && !page.current, 'active': params.page == page.number}" ng-repeat="page in pages" ng-switch="page.type">
-                <a ng-switch-when="prev" ng-click="setPage(page.type, -1)">&laquo;</a>
-                <a ng-switch-when="first" ng-click="setPage(page.type, page.number)"><span ng-bind="page.number"></span></a>
-                <a ng-switch-when="page" ng-click="setPage(page.type, page.number)"><span ng-bind="page.number"></span></a>
-                <a ng-switch-when="more" ng-click="setPage(page.type, -1)">&#8230;</a>
-                <a ng-switch-when="last" ng-click="setPage(page.type, page.number)"><span ng-bind="page.number"></span></a>
-                <a ng-switch-when="next" ng-click="setPage(page.type, -1)">&raquo;</a>
-            </li>
-        </ul>
-        <div class="page-go-block" ng-if="rolesData.length>6">
-            <input class="page-number" type="text" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
-            <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
-        </div>
-    </div>
-*/
-.com-sub-pager .ng-table-pagination a {
-    border: none;
-    font-size: 12px;
-    cursor: pointer;
-}
-.com-sub-pager .pagination li:first-child a, .pagination li:last-child a{
-    font-size: 20px;
-}
-.com-sub-pager ul.pagination.ng-table-pagination > li > a > span {
-    height: 17px;
-    line-height: 17px;
-    color: #666;
-}
-.com-sub-pager.ng-table-pager {
-    background: #f4f4f4;
-    margin: 0!important;
-    padding-right: 29px;
-}
-.com-sub-pager.ng-table-pager  input.page-number {
-    vertical-align: inherit;
-    display: inline-block;
-    width: 37px;
-    height: 28px;
-    padding: 6px 6px;
-    font-size: 12px;
-    line-height: 1.42857143;
-    color: #9B9792;
-    text-align: center;
-    background-color: #F6F5F4;
-    background-image: none;
-    border: 1px solid #ccc;
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-}
-
-.com-sub-pager.ng-table-pager a.page-a {
-    color: #fff;
-    cursor: pointer;
-    padding: 5.55px 6px;
-    font-size: 12px;
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-    text-decoration: none;
-    height: 31px;
-}
-
-.com-sub-pager.ng-table-pager .page-go-block {
-    float: right;
-    font-size: 0px;
-    height: 31px;
-    margin-top: 20px;
-    line-height: 31px;
-}
-.com-sub-pager.ng-table-pager .ng-table-pagination{
-    text-align: center;
-    max-width: 460px;
-    margin: 0;
-}
-.com-sub-pager.ng-table-pager .ng-table-pagination a{
-    height: 29px;
-    line-height: 13px;
-}
-.com-sub-pager .pagination li.active a span{
-    color: white !important;
-}
-.com-sub-pager.ng-table-pager .ng-table-pagination li.active a {
-    background: none!important;
-}
-.com-sub-pager.ng-table-pager .ng-table-pagination li a {
-    background: none!important;
-}
-.com-sub-pager.ng-table-pager .ng-table-pagination li.active a span {
-    color: #5078cb!important;
-}
-/*-------------------------分页 end--------------------*/

+ 210 - 5
src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -101,6 +101,25 @@
 		overflow: hidden;
 		white-space: nowrap;
 		text-overflow: ellipsis;
+		width: 14.27%!important;
+
+	}
+	.pay_record .ticket_record_list dl dt span {
+		color: #fff;
+		font-weight: normal;
+		font-size: 14px;
+		background: #89aefa;
+	}
+	.pay_record .ticket_record_list dl dd:hover {
+		background: #f1f5ff;
+	}
+	.pay_record .ticket_record_list dl dd span:first-child{
+		border-left: 1px solid #dae5fd;
+	}
+	.pay_record .ticket_record_list dl dd span {
+		color: #666;
+		border-right: 1px solid #dae5fd;
+		border-bottom: 1px solid #dae5fd;
 	}
 	.ticket_record_list{
 		background: none;
@@ -175,6 +194,7 @@
 	}
 	#pay_center .tab {
 		background: #fff;
+		padding-bottom: 48px;
 	}
 	#pay_center .tab .user-account-table {
 		width: 999px;
@@ -190,6 +210,9 @@
 		color: #fff;
 		font-weight: normal;
 	}
+	#pay_center .tab .user-account-table tbody tr:hover {
+		background: #f1f5ff;
+	}
 	#pay_center .tab .user-account-table tbody tr td {
 		font-size: 14px;
 		color: #666;
@@ -197,10 +220,118 @@
 		height: 51px;
 		line-height: 51px;
 		border-left: 1px solid #dae5fd;
+		border-bottom: 1px solid #dae5fd;
 	}
 	#pay_center .tab .user-account-table tbody tr td.operate-area {
 		border-right: 1px solid #dae5fd;
 	}
+	#pay_center .mall-btn-submit {
+		height: 24px;
+		line-height: 24px;
+		background: #5078cb;
+		color: #fff;
+		padding: 0 9px;
+		display: inline-block;
+		margin-left: 20px;
+		cursor: pointer;
+	}
+	#pay_center .mall-btn-warn {
+		height: 24px;
+		line-height: 24px;
+		background: #fc4f03;
+		color: #fff;
+		padding: 0 9px;
+		display: inline-block;
+		margin-left: 20px;
+		cursor: pointer;
+	}
+	#pay_center .tab .tab-header {
+		width: 999px;
+		margin: 0 auto;
+		padding: 31px 0 11px 0;
+	}
+	#pay_center .tab .tab-header >span {
+		font-size: 14px;
+		position: relative;
+		bottom: 5px;
+	}
+	#pay_center .tab .tab-header >div {
+		width: auto;
+		text-align: center;
+		float: right;
+		font-size: 12px;
+		margin-right: 32px;
+		cursor: pointer;
+	}
+	#pay_center .tab .tab-header >div i {
+		background: white;
+		color: #32b500;
+		margin-right: 5px;
+		font-size: 14px;
+	}
+	/*搜索时间筛选*/
+	.screen {
+		background: #f5f8fe;
+		height: 40px;
+		margin-bottom: 15px;
+		margin-top: 5px;
+		padding-top: 4px;
+		padding-right: 11px;
+	}
+	.screen .sreach input{
+		border: #5078cb 1px solid;
+		height: 32px;
+		width: 330px;
+		box-shadow: none;
+	}
+	.screen .sreach .date{
+		margin-right: 6px;
+	}
+	.screen .sreach .date input{
+		width: 117px;
+		text-align: left;
+		border: 1px solid #5078cb;
+	}
+	.screen .sreach .date input:hover{
+		cursor: pointer;
+	}
+	.screen .sreach .date em{
+		float: left;
+		line-height: 32px;
+		color: #999;
+		margin: 0 5px;
+	}
+	.screen .sreach a.seek{
+		width: 58px;
+		height: 32px;
+		background: #5078cb;
+		color: #fff;
+		line-height: 32px;
+		float: none;
+	}
+	.screen .sreach a.seek:hover{
+		background: #3f7ae3;
+	}
+	.screen .sreach .form-control{
+		border-radius: 1px;
+	}
+	.data-input{
+		float: left;
+		position: relative;
+	}
+	.data-input button.open{
+		position: absolute;
+		right: 1px;
+		top: 1px;
+		width: 20px;
+		height: 30px;
+		background: url(static/img/user/images/xiala.png) right no-repeat #fff !important;
+		background-position-x: 100% !important;
+		border: none;
+	}
+	.screen .sreach .date input.form-control{
+		padding: 6px 6px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay_center">
@@ -216,6 +347,13 @@
 		<div class="ticket_record_list">
 			<!-- 支付信息-->
 			<div class="tab" ng-show="status == 'pay-info'" style="display: inline-block;">
+				<div class="tab-header">
+					<span>已设置的账户信息</span>
+					<div>
+						<i class="fa fa-plus-circle"></i>
+						<span>新增账户</span>
+					</div>
+				</div>
 				<table class="user-account-table">
 					<thead>
 						<th width="165">开户银行</th>
@@ -232,7 +370,19 @@
 							<td>优软*********有限公司</td>
 							<td class="operate-area">
 								<a>删除</a>
-								<span class="com-btn-level2 com-btn-submit">默认账户</span>
+								<span class="mall-btn-submit">默认账户</span>
+								<!--<span class="mall-btn-warn">设为默认</span>-->
+							</td>
+						</tr>
+						<tr>
+							<td>中国银行</td>
+							<td>南山支行</td>
+							<td>1256325*******************5621</td>
+							<td>优软*********有限公司</td>
+							<td class="operate-area">
+								<a>删除</a>
+								<!--<span class="mall-btn-submit">默认账户</span>-->
+								<span class="mall-btn-warn">设为默认</span>
 							</td>
 						</tr>
 					</tbody>
@@ -240,16 +390,70 @@
 			</div>
 			<!--支付记录-->
 			<div class="tab" ng-show="status == 'pay-history'" style="display: inline-block">
+				<!--搜索时间筛选-->
+				<div class="screen">
+					<div class="sreach fr">
+						<div class="date fl">
+							<div class="data-input">
+								<input type="text" ng-model="startDate"
+									   class="form-control select-adder" placeholder="起始时间"
+									   datepicker-popup="yyyy-MM-dd HH:mm:ss"
+									   is-open="condition.startDateOpen"
+									   max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
+									   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+									   ng-click="openDatePicker($event, condition, 'startDateOpen',1)"
+									   ng-change="onDateCondition(true)"/>
+								<button class="open" ng-click="openDatePicker($event, condition, 'startDateOpen')"></button>
+							</div>
+
+							<em>–</em>
+							<div class="data-input">
+								<input type="text" ng-model="endDate"
+									   class="form-control select-adder" placeholder="结束时间"
+									   datepicker-popup="yyyy-MM-dd HH:mm:ss"
+									   is-open="condition.endDateOpen"
+									   min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
+									   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+									   ng-click="openDatePicker($event, condition, 'endDateOpen',2)"
+									   ng-change="onDateCondition(false)"/>
+								<button class="open" ng-click="openDatePicker($event, condition, 'endDateOpen')"></button>
+							</div>
+						</div>
+						<div class="sreach-input fr">
+							<input type="search" placeholder="商家名称/订单号" class="form-control" ng-model="keyword" ng-search="search()"/>
+							<a class="seek" href="javascript:void(0)" ng-click="search()">搜索</a>
+							<a class="seek" href="javascript:void(0)" style="margin-left: 5px;">导出</a>
+						</div>
+					</div>
+				</div>
 				<dl>
 					<dt>
 						<span>时间</span>
 						<span>订单号</span>
+						<span>商家名称</span>
+						<span>
+							<select class="form-control select-adder">
+								<option>币种</option>
+								<option value="1">RMB</option>
+								<option value="2">USD</option>
+							</select>
+						</span>
 						<span>金额</span>
-						<span>方式</span>
-						<span>账号</span>
-						<span>状态</span>
+						<span>
+							<select class="form-control select-adder">
+								<option>交易方式</option>
+								<option value="1">RMB</option>
+								<option value="2">USD</option>
+							</select>
+						</span>
+						<span>
+							<select class="form-control select-adder">
+								<option>状态</option>
+								<option value="1">RMB</option>
+								<option value="2">USD</option>
+							</select>
+						</span>
 					</dt>
-					<p class="height16">&nbsp;</p>
 					<dd ng-repeat="tradeRecord in tradeRecordPage.content">
 						<span ng-bind="tradeRecord.paytime | date : 'yyyy.MM.dd'">2017.01.18</span>
 						<span><a ng-bind="tradeRecord.orderid" ng-href="user#/order/detail/{{tradeRecord.orderid | EncryptionFilter}}">20170116001</a></span>
@@ -263,6 +467,7 @@
 							<b ng-if="tradeRecord.paytype == 1103">优软商城线下账户</b>
 						</span>
 						<span><b>支付成功</b></span>
+						<span><b>支付成功</b></span>
 					</dd>
 					<!--<dd>
 						<span>2017.01.18</span>