Browse Source

余额明细

yangc 8 years ago
parent
commit
17ebb5d66a

+ 1 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/pay_center_ctrl.js

@@ -14,7 +14,7 @@ define(['app/app'], function(app) {
 
 		// $scope.status = hiStatus == null ? 'pay-history' : hiStatus;
 
-		$scope.status = 'pay-wallet';
+		$scope.status = 'balance';
 
 		//切换银行账户信息,历史记录的状态
 		$scope.toggleStatus = function(status) {

+ 187 - 2
src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -707,18 +707,91 @@
 		color: #f51c24;
 	}
 	/*我的钱包 end*/
+	/*余额明细导航 start*/
+	.match-menu {
+		width: 100%;
+		border-top: #82d2fa 1px solid;
+		height: 0;
+	}
+	.match-menu span.active {
+		background: #fff;
+		border: #82d2fa 1px solid;
+		border-bottom: #fff 1px solid;
+	}
+	.match-menu span {
+		display: inline-block;
+		text-align: center;
+		width: 100px;
+		height: 20px;
+		background: #eee;
+		border-top-left-radius: 3px;
+		border-top-right-radius: 3px;
+		margin-left: 390px;
+		line-height: 19px;
+		position: relative;
+		bottom: 20px;
+	}
+	.match-menu span.active a {
+		color: #333;
+	}
+	.match-menu span a {
+		font-size: 12px;
+		color: #999;
+		display: inline-block;
+		height: 20px;
+		width: 78px;
+	}
+	.match-menu span i {
+		font-size: 14px;
+		color: #999;
+	}
+	.match-menu span i:hover, .match-menu span a:hover {
+		color: #5078cb;
+	}
+	/*余额明细导航 end*/
+	/*余额记录 start*/
+	.pay_record .ticket_record_list .wallet-money-record dl span:nth-child(2) {
+		width: 22.73%!important;
+	}
+	.pay_record .ticket_record_list .wallet-money-record dl span:nth-child(4) {
+		width: 14.6%!important;
+	}
+	.pay_record .ticket_record_list .wallet-money-record .record-title {
+		padding: 24px 0 16px 17px;
+	}
+	.pay_record .ticket_record_list .wallet-money-record .record-title p {
+		font-size: 16px;
+		color: #666;
+		font-weight: bold;
+		margin-bottom: 18px;
+	}
+	.pay_record .ticket_record_list .wallet-money-record .record-title a {
+		font-size: 14px;
+		color: #666;
+	}
+	.pay_record .ticket_record_list .wallet-money-record .record-title a.active {
+		color: #4290f7;
+	}
+	/*余额记录 end*/
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay_center">
 	<!--支付中心-->
 	<div class="pay_record oder">
-		<div class="oder01" style="margin-bottom: 16px;">
+		<div class="oder01">
 			<ul>
 				<li ng-class="{'active' : status=='pay-wallet'}" ng-click="toggleStatus('pay-wallet')"><a href="javascript:void(0)">我的钱包</a></li>
 				<li ng-class="{'active' : status=='pay-history'}" ng-click="toggleStatus('pay-history')"><a href="javascript:void(0)">交易记录</a></li>
 				<li ng-class="{'active' : status=='pay-info'}" ng-click="toggleStatus('pay-info')"><a href="javascript:void(0)">付款账户</a></li>
 			</ul>
 		</div>
+		<!--余额明细导航-->
+		<div class="match-menu" ng-show="status == 'balance'">
+                <span class="active">
+                    <a ng-bind="'余额明细'"></a>
+                        <i class="fa fa-remove" ng-click="toggleStatus('pay-wallet')"></i>
+                </span>
+		</div>
 		<!--支付中心列表-->
 		<div class="ticket_record_list">
 			<!--我的钱包-->
@@ -797,7 +870,7 @@
 					<div class="wallet-record-title">
 						<span>近期余额记录</span>
 						<a class="active">充值记录</a>&nbsp;|&nbsp;<a>提现记录</a>&nbsp;|&nbsp;<a>余额记录</a>
-						<a class="fr">查看余额明细</a>
+						<a class="fr" ng-click="toggleStatus('balance')">查看余额明细</a>
 					</div>
 					<ul>
 						<li>
@@ -838,6 +911,118 @@
 					</ul>
 				</div>
 			</div>
+			<!--余额明细-->
+			<div class="tab wallet-money-record" ng-show="status == 'balance'" style="display: inline-block">
+				<div class="record-title">
+					<p>余额明细</p>
+					<a class="active">充值记录</a>&nbsp;|&nbsp;<a>提现记录</a>&nbsp;|&nbsp;<a>交易记录</a>
+				</div>
+				<!--搜索时间筛选-->
+				<div class="screen">
+					<div class="sreach fr">
+						<div class="date fl">
+							<div class="data-input">
+								<input id="start" type="text" ng-model="startDate" readonly="readonly"
+									   class="form-control select-adder" placeholder="起始时间"
+									   datepicker-popup="yyyy-MM-dd"
+									   is-open="condition[0].open"
+									   current-text="今天" clear-text="清除" close-text="关闭"
+									   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+									   ng-click="openDatePicker($event, condition, 0,1)"
+									   ng-change="onDateCondition(1)"/>
+								<button class="open" ng-click="openDatePicker($event, condition, 0)"></button>
+							</div>
+
+							<em>–</em>
+							<div class="data-input">
+								<input id="end" type="text" ng-model="endDate" readonly="readonly"
+									   class="form-control select-adder" placeholder="结束时间"
+									   datepicker-popup="yyyy-MM-dd"
+									   is-open="condition[1].open"
+									   current-text="今天" clear-text="清除" close-text="关闭"
+									   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+									   ng-click="openDatePicker($event, condition, 1, 2)"
+									   ng-change="onDateCondition(2)"/>
+								<button class="open" ng-click="openDatePicker($event, condition, 1)"></button>
+							</div>
+						</div>
+						<div class="sreach-input fr">
+							<input type="search" placeholder="商家名称/订单号" class="form-control" ng-model="keyword" ng-search="search()"/>
+							<a class="seek" ng-click="search()">搜索</a>
+							<a class="seek" ng-click="exportToExcel()" style="margin-left: 5px;">导出</a>
+						</div>
+					</div>
+				</div>
+				<dl>
+					<dt>
+						<span>时间</span>
+						<span>订单号/流水号</span>
+						<span>商家名称</span>
+						<span>金额</span>
+						<span>
+							<select class="form-control select-adder" style="width: 90px">
+								<option value="ALL">交易方式</option>
+								<option value="1102">网银支付</option>
+								<option value="1103">线下转账</option>
+								<option value="1104">账户余额</option>
+							</select>
+						</span>
+						<span>
+							<select class="form-control select-adder" style="width: 90px">
+								<option>状态</option>
+								<option value="1">支付成功</option>
+								<option value="2">支付失败</option>
+								<option value="3">提现成功</option>
+								<option value="4">金额返还</option>
+							</select>
+						</span>
+					</dt>
+					<dd>
+						<span>2017-01-18 11:11:11</span>
+						<span>订单号:<a>201701160011213213</a></span>
+						<span>深圳市优软科技有限公司</span>
+						<span>
+							<!--<i class="fa fa-plus" style="color:#f51c24"></i>-->
+							<i class="fa fa-minus" style="color:#1da902"></i>
+                            <em style="color: #323232;">¥1212.22</em></span>
+						</span>
+						<span>
+							<b>线上支付</b>
+						</span>
+						<span><b>支付成功</b></span>
+					</dd>
+					<!--<dd ng-if="!tradeRecordPage || tradeRecordPage.length == 0" class="tab-dd" style="height: 125px; padding: 30px;">
+						<div class="col-xs-offset-3 col-xs-2">
+							<img src="static/img/all/empty-cart.png">
+						</div>
+						<div class="col-xs-4">
+							<p class="grey" style="font-size: 12px">暂无支付记录,请下单购买商品吧!</p>
+							<a href=".">马上去逛一逛</a>&nbsp;<i class="fa fa-arrow-right"></i>
+						</div>
+					</dd>-->
+				</dl>
+				<!--<div style="text-align: right;margin-right:20px;margin-top:10px;">
+					<span class="count-tip">显示 {{$$record.start}}-{{$$record.end}} 条,共 <em ng-bind="$$record.totalElements" style="color: #5078cb">2506</em> 条</span>
+				</div>-->
+				<!--<div style="background-color: white; width: 100%; height: 75px;">
+					<div class="ng-cloak ng-table-pager" ng-if="pages.length" style="float: right;margin-right: 60px;">
+						<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="" style="font-size: 12px;">&raquo;</a>
+							</li>
+						</ul>
+						<div class="page-go-block">
+							<input class="page-number" type="number" ng-model="tradeRecordPage.number" ng-keydown="listenEnter()"/>
+							<a class="page-a" ng-click="setPage('page', tradeRecordPage.number)" href="">GO</a>
+						</div>
+					</div>
+				</div>-->
+			</div>
 			<!-- 支付信息-->
 			<div class="tab" ng-show="status == 'pay-info'" style="display: inline-block;">
 				<div class="tab-header">