Merge branch 'feature-wangcz-offline-pay-1103' into yc-payCenter

# Conflicts:
#	src/main/java/com/uas/platform/b2c/fa/payment/dao/BankInfoDao.java
#	src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankInfoServiceImpl.java

src/main/java/com/uas/platform/b2c/fa/payment/dao/BankInfoDao.java

@@ -30,7 +30,26 @@ public interface BankInfoDao extends CrudRepository<BankInfo, Long>, JpaSpecific
 	List<BankInfo> findSupBankList(@Param("enuu") Long enuu, @Param("opraterUserType") Integer opraterUserType, @Param("status") List<Integer> status);
 
 	/**
-	 * 返回买家账户信息列表  --有enuu
+	 * 返回账户信息，兼容type版本
+	 * @param enuu
+	 * @param status
+	 * @param opraterUserType
+	 * @return
+	 */
+	List<BankInfo> findByEnuuAndStatusAndOpraterUserTypeOrderByNumAsc(Long enuu, Integer status, Integer opraterUserType);
+
+	/**
+	 * 根据下面参数获取企业账户信息
+	 * @param enuu 企业的enuu
+	 * @param type 企业的类型
+	 * @param opraterUserType 所属类型 买家 卖家，平台
+	 * @return list
+	 */
+	@Query(value = "select b from BankInfo b where b.enuu =:enuu and b.type =:type and b.opraterUserType=:opraterUserType order by num")
+	List<BankInfo> findByEnuuAndTypeAndOpraterUserTypeOrderByNumAsc(@Param("enuu") Long enuu, @Param("type") Short type, @Param("opraterUserType") Integer opraterUserType);
+
+	/**
+	 * 根据下面参数获取企业账户信息
 	 *
 	 * @param useruu 个人uu
 	 * @param enuu 企业enuu

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankTransferServiceImpl.java

@@ -270,6 +270,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 		bankTransfer.setCollectenuu(sysConf.getEnUU()); // 收款方设置为B2C的uu
 		bankTransfer.setBanktranssn(EncodingRulesConstant.BANKTRANSFER.replace("_TIMESTAP_NUMBER", createNumberService.getTimeNumber("trade$bank_transfer", 8)));
 		bankTransfer.setTranferCreateTime(new Date());
+		bankTransfer.setTransferTime(new Date());
 		bankTransfer.setOperateType(Type.MALL.value());
 
 		BankTransfer saveBankTransfer = bankTransferDao.save(bankTransfer);

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_transfer_ctrl.js

@@ -22,8 +22,6 @@ define([ 'app/app' ], function(app) {
 			$state.go('buyer_order');
 		}
 
-		$scope.purKind = $rootScope.userInfo.enterprises ? false : true;//应付账户的类别, 默认是企业
-		$scope.saleKind = false;//应收账户的类别，默认是企业
 		var ids=SessionService.get("ids");
 		
 		var page = Number(SessionService.get("page")) || 1;
@@ -169,27 +167,28 @@ define([ 'app/app' ], function(app) {
 		
 		//根据单选框的状态，提取不同的数据
 		var getBuyAccount = function() {
-			if(!$scope.purKind) {
-				bankInfoService.getBuyEnterpriseBank('', function(data) {
-					$scope.buyAccountInfos = resolveData(data);
-					angular.forEach($scope.buyAccountInfos, function(buyAccountInfo) {
-						buyAccountInfo.filterAccount = hideBankFilter(buyAccountInfo.number);
-					});
-					$scope.buyAccount = getOriginalData($scope.buyAccountInfos);
-				}, function(error) {
-					toaster.pop('error', '错误', '提取企业账户信息失败');
-				});
-			}else {
-				bankInfoService.getBuyPersonalBank('', function(data) {
-					$scope.buyAccountInfos = resolveData(data);
-					angular.forEach($scope.buyAccountInfos, function(buyAccountInfo) {
-						buyAccountInfo.filterAccount = hideBankFilter(buyAccountInfo.number);
-					});
-					$scope.buyAccount = getOriginalData($scope.buyAccountInfos);
-				}, function(error) {
-					toaster.pop('error', '错误', '提取个人账户信息失败');
+			bankInfoService.getBuyEnterpriseBank('', function(data) {
+				$scope.buyAccountInfos = resolveData(data);
+				angular.forEach($scope.buyAccountInfos, function(buyAccountInfo) {
+					buyAccountInfo.filterAccount = hideBankFilter(buyAccountInfo.number);
 				});
-			}
+				$scope.buyAccount = getOriginalData($scope.buyAccountInfos);
+			}, function(error) {
+				toaster.pop('error', '错误', '提取企业账户信息失败');
+			});
+			// if(!$scope.purKind) {
+
+			// }else {
+			// 	bankInfoService.getBuyPersonalBank('', function(data) {
+			// 		$scope.buyAccountInfos = resolveData(data);
+			// 		angular.forEach($scope.buyAccountInfos, function(buyAccountInfo) {
+			// 			buyAccountInfo.filterAccount = hideBankFilter(buyAccountInfo.number);
+			// 		});
+			// 		$scope.buyAccount = getOriginalData($scope.buyAccountInfos);
+			// 	}, function(error) {
+			// 		toaster.pop('error', '错误', '提取个人账户信息失败');
+			// 	});
+			// }
 		};
 		
 		//开始时，就获取账户信息
@@ -197,45 +196,46 @@ define([ 'app/app' ], function(app) {
 		
 		//获取管理平台账户信息
 		var getSellerAccount = function() {
-			if(!$scope.saleKind) {
-				bankInfoService.getAdminEnterAccount('', function(data) {
-					$scope.saleAccountInfos = resolveData(data);
-					angular.forEach($scope.saleAccountInfos, function(saleAccountInfo) {
-						saleAccountInfo.filterAccount = hideBankFilter(saleAccountInfo.number);
-					});
-					$scope.saleAccount = getOriginalData($scope.saleAccountInfos);
-				}, function(res) {
-					toaster.pop('error', '错误', '获取卖家企业账户信息失败');
+			bankInfoService.getAdminEnterAccount('', function(data) {
+				$scope.saleAccountInfos = resolveData(data);
+				angular.forEach($scope.saleAccountInfos, function(saleAccountInfo) {
+					saleAccountInfo.filterAccount = hideBankFilter(saleAccountInfo.number);
 				});
-			}else {
-				bankInfoService.getAdminPersAccount('', function(data) {
-					$scope.saleAccountInfos = resolveData(data);
-					angular.forEach($scope.saleAccountInfos, function(saleAccountInfo) {
-						saleAccountInfo.filterAccount = hideBankFilter(saleAccountInfo.number);
-					});
-					$scope.saleAccount = getOriginalData($scope.saleAccountInfos);
-				}, function(res) {
-					toaster.pop('error', '错误', '获取卖家个人账户信息失败');
-				});
-			}
+				$scope.saleAccount = getOriginalData($scope.saleAccountInfos);
+			}, function(res) {
+				toaster.pop('error', '错误', '获取卖家企业账户信息失败');
+			});
+			// if(!$scope.saleKind) {
+
+			// }else {
+			// 	bankInfoService.getAdminPersAccount('', function(data) {
+			// 		$scope.saleAccountInfos = resolveData(data);
+			// 		angular.forEach($scope.saleAccountInfos, function(saleAccountInfo) {
+			// 			saleAccountInfo.filterAccount = hideBankFilter(saleAccountInfo.number);
+			// 		});
+			// 		$scope.saleAccount = getOriginalData($scope.saleAccountInfos);
+			// 	}, function(res) {
+			// 		toaster.pop('error', '错误', '获取卖家个人账户信息失败');
+			// 	});
+			// }
 		}
 		
 		getSellerAccount();
 
-		$scope.set = function(data, isBuy) {
-			if(isBuy) {
-				if(!angular.equals($scope.purKind, data)) {
-					$scope.purKind = data;
-					getBuyAccount();
-				}
-			}else {
-				if(!angular.equals($scope.saleKind, data)) {
-					$scope.saleKind = data;
-					getSellerAccount();
-				}
-			}
-
-		};
+		// $scope.set = function(data, isBuy) {
+		// 	if(isBuy) {
+		// 		if(!angular.equals($scope.purKind, data)) {
+		// 			$scope.purKind = data;
+		// 			getBuyAccount();
+		// 		}
+		// 	}else {
+		// 		if(!angular.equals($scope.saleKind, data)) {
+		// 			$scope.saleKind = data;
+		// 			getSellerAccount();
+		// 		}
+		// 	}
+        //
+		// };
 		
 		// 搜索框内容转换成大写
 		var t;
@@ -393,10 +393,10 @@ define([ 'app/app' ], function(app) {
 				toaster.pop('info', '提示', '请选择卖家账户');
 				return ;
 			}
-			if(!$scope.transferTime) {
-				toaster.pop('info', '提示', '请选择付款日期');
-				return ;
-			}
+			// if(!$scope.transferTime) {
+			// 	toaster.pop('info', '提示', '请选择付款日期');
+			// 	return ;
+			// }
 			if(!$scope.imageUrl){
                 toaster.pop('info', '提示', '请选择付款截图');
                 return ;
@@ -443,6 +443,23 @@ define([ 'app/app' ], function(app) {
             $scope.imageUrl = $data.path;
         };
 
+		$scope.deleteImg =function () {
+			$scope.imageUrl = null;
+		};
+
+		// 查看水单
+		$scope.showImg = function(imgUrl) {
+			var src = imgUrl, box = $('#image-box'), modal = $('.modal-content');
+			box.show();
+			box.find('img').attr('src', src);
+			box.find('a').click(function(){
+				box.hide();
+			});
+			box.dblclick(function(){
+				box.hide();
+			});
+		};
+
 		$scope.select = function(account, isBuy) {
 			if(isBuy) {
 				$scope.buyAccount = account;

src/main/webapp/resources/view/usercenter/forstore/buyer_transfer.html

@@ -277,173 +277,92 @@ table>tbody>tr>td .btn-primary {
 	font-weight: bold;
 	border-radius: inherit;
 }
+.hover-show{
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    top: 0;
+    left: 0;
+    background: rgba(0,0,0,.4);
+    display: none;
+}
+ .uploadImages:hover .hover-show{
+    display: block;
+}
+ .uploadImages {
+     position:relative;
+	 width:100px;
+	 height:100px;
+ }
+ .delete{
+    position: absolute;
+    right: 7px;
+    top: 0;
+    display: inline-block;
+    padding: 0;
+    margin-top: 6px;
+    font-size: 18px;
+    color: #fff;
+}
+.hover-show a{
+    color: #fff;
+    text-decoration: none;
+    position: absolute;
+    top: 40%;
+    left: 25%;
+}
+.hover-show span{
+    color: #fff;
+    cursor:pointer;
+}
+.hover-show a:hover, .hover-show a:active, .hover-show a:focus{
+    color: #fff;
+    text-decoration: none;
+}
+
+/*查看大图*/
+#image-box .x-floating-wrap,.image-box .x-floating-wrap {
+    position: fixed;
+    z-index: 99998;
+    background: #000;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 0.5;
+}
+#image-box,.image-box{
+    display:table; overflow:hidden; margin-left:50px; _position:relative;  width: 1200px;height: 700px;
+    position: fixed;
+    top: 50%;
+    margin-top: -350px;
+    left: 50%;
+    margin-left: -600px;
+    z-index: 2000;
+}
+#image-box .x-floating,.image-box .x-floating {
+    vertical-align:middle !important;
+    display:table-cell;
+    text-align:center;
+    _position:absolute;
+    _top:50%; _left:50%;
+    top: inherit !important;
+    left: inherit !important;
+}
+#image-box .x-floating img ,.image-box .x-floating img {
+    margin: auto auto;
+    max-width: 970px !important;
+    max-height: 600px !important;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+#image-box .x-floating-wrap,.image-box .x-floating-wrap{
+    z-index: 1000000 !important;
+}
 </style>
-<!--<div class="location ng-scope">-->
-	<!--<ul class="list-unstyled list-inline">-->
-		<!--<li class="text-bold">您当前的位置：</li>-->
-		<!--<li>买家中心 <i class="fa fa-angle-double-right"></i></li>-->
-		<!--<li>交易信息<i class="fa fa-angle-double-right"></i></li>-->
-		<!--<li>填写银行转账信息</li>-->
-	<!--</ul>-->
-<!--</div>-->
 <div>
-<!--	<div>
-		<div class="row searchGroup">
-			<div class="col-xs-3">
-				<h4>未付款，填写转账信息</h4>
-			</div>
-			<div class="col-xs-6">
-				<div class="input-group">
-					<input type="search"
-						class="form-control ng-pristine ng-untouched ng-valid"
-						ng-search="searchFor()" ng-change="upper()" ng-model="keyword"
-						placeholder="请输入订单号查询"> <span class="input-group-btn">
-						<button ng-click="searchFor()" class="btn btn-primary"
-							type="button">搜索</button>
-					</span>
-				</div>
-			</div>
-		</div>
-		<div>
-			<div class="col-xs-1">
-				<p style="margin-top: 8px; font-weight: bold;">
-					共<span class="totalNum">{{tobePaidTableParams.total()}}</span>条
-				</p>
-			</div>
-		</div>
-		</br>
-		<table ng-table="tobePaidTableParams"
-			class="table table-bordered table-striped">
-			<thead>
-				<tr class="tr-default">
-					<th width="70" class="text-center">
-						<div>序号</div> <input type="checkBox" ng-checked="isSelectAll"
-						ng-click="selectAll()" ng-disabled="showMe">
-					</th>
-					<th width="auto" class="text-center">订单详情</th>
-					<th width="114" class="text-center">单价</th>
-					<th width="114" class="text-center">金额</th>
-					<th width="100" class="text-center">税金</th>
-					<th width="100" class="text-center">价税合计</th>
-					<th width="80" class="text-center">订单状态</th>
-					<th width="60" class="text-center">操作</th>
-				</tr>
-			</thead>
-			<tbody ng-repeat="order in $data">
-				<tr>
-					<td rowspan="2" class="tdcenter">
-						<div>{{$index+1}}</div>
-						<div>
-							<input type="checkBox" ng-checked="order.isSelect"
-								ng-model="order.isSelect" ng-disabled="showMe"
-								ng-click="doSelect(order)">
-						</div>
-					</td>
-					<td colspan="8">
-						<div class="row">
-							<div class="col-sm-8 text-muted">
-								<span> <i class="fa fa-clock-o"></i> <span
-									ng-bind="order.creattime | date: 'yyyy-MM-dd HH:mm'"
-									class="text-num"></span>
-								</span> <span>订单号： <a
-									ng-href="user/home/order/{{order.orderid | EncryptionFilter}}"
-									ng-bind="order.orderid"></a>
-								</span> <span class="text-inverse">过期时间： <span
-									ng-bind="order.availabletime | date: 'yyyy-MM-dd HH:mm'"></span>
-								</span>
-							</div>
-							<div class="col-sm-4 text-muted text-num text-right">
-								<span class="price">币别：<span ng-bind="order.currency"></span></span>
-								&nbsp;产品总数：<span ng-bind="order.qty"></span>
-							</div>
-						</div>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						<div class="row cmp-item"
-							ng-repeat="orderDetail in order.orderDetails">
-							<div class="col-sm-6">
-								<div class="p-img">
-									<a href="product/component/{{orderDetail.uuid}}/"> <img
-										src="" lazy-load="{{orderDetail.img}}" height="78px"
-										width="78px">
-									</a>
-								</div>
-								<div>
-									<div>
-										<a class="f16 text-bold" style="display: block;"
-											href="product/component/{{orderDetail.uuid}}/"
-											ng-bind="orderDetail.cmpCode"></a> <span
-											ng-bind="orderDetail.brName"></span>
-									</div>
-									<div>
-										<i class="iconfont icon-kind f14"></i><span
-											ng-bind="orderDetail.kiName"></span>
-									</div>
-									<div ng-if="orderDetail.returnInWeek">
-	        							<img class="detail-icon" alt="支持7天无理由退货" src="static/img/product/seven-day-back.jpg" title="支持7天无理由退货">&nbsp;
-	        						</div>
-								</div>
-							</div>
-							<div class="col-sm-3 text-num text-center">
-								<div class="text-num text-bold f16">
-									<span ng-bind="orderDetail.taxUnitprice | number:6"></span>
-								</div>
-								<div class="text-num text-muted">
-									×<span ng-bind="orderDetail.number"></span>
-								</div>
-								<div>
-									<span ng-if="orderDetail.tax">单价含税<span ng-bind="orderDetail.tax"></span>%</span>
-								</div>
-							</div>
-							<div>
-							</div>
-							<div class="col-sm-3 text-num price text-center">
-								<div>
-									<span ng-bind="orderDetail.price | number"></span>
-								</div>
-							</div>
-						</div>
-					</td>
-					<td class="text-center tdcenter">
-						<div class="text-theme f14 text-num">
-							<span ng-bind="order.taxes | number"></span>
-						</div>
-					</td>
-					<td class="text-center tdcenter">
-						<div class="text-inverse text-bold f16 text-num">
-							<span ng-bind="order.price | number"></span>
-						</div>
-					</td>
-					<td class="text-center tdcenter">
-						<div>
-							<span ng-bind="order.status | statusAndTypeFilter"
-								class="text-muted"></span>
-						</div>
-					</td>
-					<td class="tdcenter"
-						ng-hide="active=='paid'|| active=='unavailable'">
-						<button ng-show="!(order.availabletime < nowTime)"
-							class="btn btn-primary btn-sm" ng-click="pay(order)"
-							ng-disabled="showMe">付款</button>
-					</td>
-				</tr>
-				<tr ng-if="!order" class="text-center">
-					<td colspan="5" class="text-center"
-						style="line-height: 40px; font-size: 20px;"><i
-						class="fa fa-smile-o fa-lg"></i> 当前没有对应的订单信息</td>
-				</tr>
-			</tbody>
-		</table>
-		<div  id="O">
-			<button class="btn btn-primary" ng-click="batchPay()"
-				ng-disabled="!orderNum" ng-show="!showMe">批量付款</button>
-			<button class="btn btn-primary" ng-show="showMe"
-				ng-click="alterPay()">重新勾选</button>
-		</div>
-		<a id="anchorScroll" style="color: white;"></a>
-	</div>-->
 	<div class="user_right fr block">
 		<div class="fill-info">
 			<div class="orderDiv" id="O">
@@ -451,18 +370,11 @@ table>tbody>tr>td .btn-primary {
 					<div class="minTitle">订单号</div>
 					<div class="margin-left-37" ng-bind="orderNum"></div>
 				</div>
-				<div class="marginbot30">
-					<div class="minTitle">买家应付账户</div>
-					<div class="margin-left-37">
-						<label class="radio-inline" ng-click="set(true, true)"> <input
-							type="radio" name="inlineRadioOptions" id="inlineRadio1"
-							value="option1" ng-checked="purKind"> 个人账户
-						</label> <label ng-if="userInfo.enterprises" class="radio-inline" ng-click="set(false, true)"
-							style="margin-left: 30px;"> <input type="radio"
-							name="inlineRadioOptions" id="inlineRadio2" value="option2"
-							ng-checked="!purKind"> 企业账户
-						</label> <span role="button" class="pull-right action-tag"
-							ng-click="newAccount()" style="padding-top: 0px;"><i
+				<div class="marginbot30" style="position:relative;">
+					<div class="minTitle">买家付款账户</div>
+					<div class="margin-left-37" style="position: absolute;right:0;top:-5px;">
+						<span role="button" class="pull-right action-tag"
+							ng-click="newAccount()"><i
 							class="fa fa-plus-square"></i>&nbsp;新增账户</span>
 					</div>
 					<div class="border-account">
@@ -478,10 +390,16 @@ table>tbody>tr>td .btn-primary {
 										for="{{accountInfo.id}}"></label> &nbsp;<span
 										ng-bind="accountInfo.accountname"></span>
 								</div>
-								<div class="col-md-5">
-									<span ng-bind="accountInfo.filterAccount"></span>&nbsp; &nbsp;
-									<span ng-bind="accountInfo.bankname"></span>&nbsp;&nbsp;<i
-										class="fa fa-credit-card"></i>
+								<div class="col-md-5 text-center">
+									<div class="row">
+										<div class="col-md-6 text-right">
+											<span ng-bind="accountInfo.filterAccount"></span>
+										</div>
+										<div class="col-md-6 text-left">
+											<span ng-bind="accountInfo.bankname"></span>&nbsp;&nbsp;<i
+												class="fa fa-credit-card"></i>
+										</div>
+									</div>
 								</div>
 								<div class="text-right col-md-3">
 									<span role="button" class="modify-account"
@@ -500,10 +418,16 @@ table>tbody>tr>td .btn-primary {
 										id="{{buyAccount.id}}"><label for="{{buyAccount.id}}"></label>
 									&nbsp;<span ng-bind="buyAccount.accountname"></span>
 								</div>
-								<div class="col-md-5">
-									<span ng-bind="buyAccount.filterAccount"></span>&nbsp; &nbsp; <span
-										ng-bind="buyAccount.bankname"></span>&nbsp;&nbsp;<i
-										class="fa fa-credit-card"></i>
+								<div class="col-md-5 text-center">
+									<div class="row">
+										<div class="col-md-6 text-right">
+											<span ng-bind="buyAccount.filterAccount"></span>
+										</div>
+										<div class="col-md-6 text-left">
+											<span ng-bind="buyAccount.bankname"></span>&nbsp;&nbsp;<i
+												class="fa fa-credit-card"></i>
+										</div>
+									</div>
 								</div>
 								<div class="text-right col-md-3">
 									<span role="button" class="modify-account"
@@ -518,27 +442,20 @@ table>tbody>tr>td .btn-primary {
 							<div ng-if="!buyAccount"
 								class="row paddingzero marginleftrightzero text-center account-line account-info-line notice">没有对应的账户信息，请新增相应的账户信息
 							</div>
-						</div>
-						<div ng-if="buyAccountInfos.length>1"
-							class="pull-right action-tag">
+                            <div ng-if="buyAccountInfos.length>1"
+                                 class="pull-right action-tag">
 							<span role="button" ng-if="!buyExpose"
-								ng-click="doExpose(true, true)"><i
-								class="fa fa-angle-double-down"></i>&nbsp;展开列表</span> <span
-								role="button" ng-if="buyExpose" ng-click="doExpose(false, true)"><i
-								class="fa fa-angle-double-up"></i>&nbsp;收起列表</span>
+                                  ng-click="doExpose(true, true)"><i
+                                    class="fa fa-angle-double-down"></i>&nbsp;展开列表</span> <span
+                                    role="button" ng-if="buyExpose" ng-click="doExpose(false, true)"><i
+                                    class="fa fa-angle-double-up"></i>&nbsp;收起列表</span>
+                            </div>
 						</div>
+
 					</div>
 				</div>
 				<div class="marginbot30">
-					<div class="minTitle">商城应收帐户</div>
-					<div class="margin-left-37 margintop15">
-						<label class="radio-inline"> 
-							<input type="radio" name="saleAccounts" ng-checked="saleKind" ng-click="set(true, false)"> 对私账户
-						</label> 
-						<label class="radio-inline" style="margin-left: 30px;"> 
-							<input type="radio" name="saleAccounts" ng-checked="!saleKind" ng-click="set(false, false)"> 对公账户
-						</label>
-					</div>
+					<div class="minTitle">商城收款帐户</div>
 					<div class="border-account">
 						<div class="containerrow">
 							<div ng-if="salexpose"
@@ -552,10 +469,16 @@ table>tbody>tr>td .btn-primary {
 										for="{{saleAccountInfo.id}}"></label> &nbsp;<span
 										ng-bind="saleAccountInfo.accountname"></span>
 								</div>
-								<div class="col-md-8">
-									<span ng-bind="saleAccountInfo.filterAccount"></span> &nbsp;
-									&nbsp; <span ng-bind="saleAccountInfo.bankname"></span>&nbsp;
-									&nbsp;<i class="fa fa-credit-card"></i>
+								<div class="col-md-5 text-center">
+									<div class="row">
+										<div class="col-md-6 text-right">
+											<span ng-bind="saleAccountInfo.filterAccount"></span>
+										</div>
+										<div class="col-md-6 text-left">
+											<span ng-bind="saleAccountInfo.bankname"></span>&nbsp;
+											&nbsp;<i class="fa fa-credit-card"></i>
+										</div>
+									</div>
 								</div>
 							</div>
 							<div ng-if="!salexpose"
@@ -567,39 +490,61 @@ table>tbody>tr>td .btn-primary {
 										for="{{saleAccount.id}}"></label> &nbsp;<span
 										ng-bind="saleAccount.accountname"></span>
 								</div>
-								<div class="col-md-8">
-									<span ng-bind="saleAccount.number"></span> &nbsp; &nbsp;
-									<span ng-bind="saleAccount.bankname"></span>&nbsp; &nbsp;<i
-										class="fa fa-credit-card"></i>
+								<div class="col-md-5 text-center">
+									<div class="row">
+										<div class="col-md-6 text-right">
+											<span ng-bind="saleAccount.number"></span>
+										</div>
+										<div class="col-md-6 text-left">
+											<span ng-bind="saleAccount.bankname"></span>&nbsp; &nbsp;<i
+												class="fa fa-credit-card"></i>
+										</div>
+									</div>
 								</div>
 							</div>
+                            <div ng-if="buyAccountInfos.length>1"
+                                 class="pull-right action-tag">
+							<span role="button" ng-if="!salexpose"
+                                  ng-click="doExpose(true, false)"><i
+                                    class="fa fa-angle-double-down"></i>&nbsp;展开列表</span> <span
+                                    role="button" ng-if="salexpose" ng-click="doExpose(false, false)"><i
+                                    class="fa fa-angle-double-up"></i>&nbsp;收起列表</span>
+                            </div>
 						</div>
 					</div>
 				</div>
-				<div class="row marginbot30">
-					<div class="minTitle col-md-2 margin-top-5">转账日期</div>
-					<div class="col-md-10">
-						<datetrigger name="transferTime" model="transferTime"
-							format="yyyy年MM月dd日" class="col-md-5" max-date="maxDate"
-							style="line-height: 28px; border-radius: 5px; width: 70%; font-size: 15px;"></datetrigger>
-					</div>
-				</div>
 				<div class="marginbot30">
 					<div class="minTitle marginbot15">交易图片</div>
 					<div class="marginltb">
 						<label>付款截图：</label>
-						<div>
-							<div  image-upload data-src="static/img/vendor/images/upload.png" on-success="onUploadPayment($data)"></div>
-							<span class="help-block font-size-12 text-inverse">建议图片大小在3M以内，支持图片格式jpg、png、gif</span>
+						<div class="uploadImages">
+							<input type="file"  image-upload data-src="static/img/vendor/images/upload.png" on-success="onUploadPayment($data)" non-preview="true" ng-if="!imageUrl"/>
+							<div ng-if="imageUrl">
+								<img ng-src="{{imageUrl}}" alt="" style="width: 100px;height: 100px;">
+							</div>
+							<div class="hover-show" ng-if="imageUrl">
+								<span class="delete" ng-click="deleteImg()" title="删除"><i class="fa fa-trash"></i></span>
+								<a ng-click="showImg(imageUrl)"><i class="fa fa-search"></i>查看</a>
+                            </div>
 						</div>
+						<span class="help-block font-size-12 text-inverse">建议图片大小在3M以内，支持图片格式jpg、png、gif</span>
 					</div>
 				</div>
 			</div>
 		</div>
 		<div class="text-right marginbot15 margintop15">
 			<span class="total">总价：&nbsp;<span style="color: #e64040">{{$$bankTransfer.total | number : 2 | currencySysmbol : $$bankTransfer.currency}}</span></span>
-			<button class="ok-btn btn btn-primary btn-lg" ng-click="confirm()"
-				ng-disabled="!$$bankTransfer.total||!buyAccount||!saleAccount||!transferTime||!imageUrl">确认</button>
+			<button class="ok-btn btn btn-lg" ng-click="confirm()"
+				ng-disabled="!$$bankTransfer.total||!buyAccount||!saleAccount||!imageUrl" style="background: #5078cb;">确认</button>
 		</div>
 	</div>
+</div>
+<div id="image-box" style="display: none">
+    <div class="x-floating-wrap"></div>
+    <div class="x-floating">
+        <div id="item-content">
+            <div class="x-close-wrap"><a href="javascript:void(0);">&times;</a></div>
+            <div class="img"><img/></div>
+        </div>
+    </div>
 </div>