Explorar o código

Merge remote-tracking branch 'origin/feature/yc-payCenter-1031' into yc-payCenter

# Conflicts:
#	src/main/webapp/resources/view/vendor/forstore/pay_center.html
hulh %!s(int64=8) %!d(string=hai) anos
pai
achega
bcca0dc658

+ 65 - 3
src/main/webapp/WEB-INF/views/normal/default/404.html

@@ -1,10 +1,72 @@
 <!DOCTYPE HTML>
 <html lang="zh-CN">
 <head>
-<meta charset="utf-8">
-<title>找不到页面</title>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+	<meta name="renderer" content="webkit">
+	<title>404-优软商城</title>
+	<meta name="description" content="404" />
+	<meta name="keywords"
+		  content="优软商城,B2B,B2C,行业门户,网上贸易,电子商务,网上贸易,网上交易,交易市场,在线交易,供求信息,采购,求购信息,供应信息" />
+	<link href="static/img/all/u.png" rel="icon" type="image/x-icon" />
+	<link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
+	<link rel="stylesheet" href="static/lib/angular/ng-table.css" />
+	<link rel="stylesheet" href="static/lib/fontawesome/css/font-awesome.min.css" />
+	<link rel="stylesheet" href="static/lib/iconfont/css/iconfont.css" />
+	<link rel="stylesheet" href="static/lib/jquery/themes/summernote/css/summernote.css" />
+	<link rel="stylesheet" href="static/lib/jquery/themes/uploadify/uploadify.css" />
+	<link rel="stylesheet" href="static/css/vendor/base.css" />
+	<style>
+		.section{
+			background: #ebfdff url('static/img/user/images/404.png')no-repeat center center;
+			height:978px;
+			margin-top:-65px;
+			position:relative;
+		}
+		.section .btn-click{
+			position:absolute;
+			top:54%;
+			left:50%;
+			margin-left:-150px;
+		}
+		.section .btn-click a{
+			display:inline-block;
+			width:130px;
+			height:33px;
+			font-size: 16px;
+			line-height: 33px;
+			color:#fff;
+			background: #f87c29;
+			text-align: center;
+			margin:0 10px;
+			border-radius: 2px;
+			text-decoration: none;
+		}
+	</style>
 </head>
 <body>
-	很遗憾,找不到您请求的页面!
+	<div class="head-top">
+		<div class="container">
+			<div class="wrap">
+				<div class="head-top-left fl"><img src="static/img/user/images/head_top_logo.png" /><a href="http://www.ubtob.com/">进入优软云</a> </div>
+				<div class="head-top-right fr">
+					<a href="/platform-b2c/vendor#/index">卖家中心</a>
+					<a href="/platform-b2c/user#/home">买家中心</a>
+					<a href="#">加入收藏</a>
+					<a href="/platform-b2c/help#/home" target="_blank">帮助中心</a>
+					<a href="http://wpa.qq.com/msgrd?v=3&uin=3432892085&site=www.ubtoc.com&menu=yes">在线客服</a>
+					<span>服务电话:800-830-1818</span>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="section">
+		<div class="container">
+			<div class="btn-click">
+				<a href="/"><i class="fa fa-home" style="margin-right:5px;"></i>返回首页</a>
+				<a href="javascript:history.go(-1)"><i class="fa fa-reply" style="margin-right:5px;"></i>返回上一页</a>
+			</div>
+		</div>
+	</div>
 </body>
 </html>

BIN=BIN
src/main/webapp/resources/img/user/images/404.png


+ 3 - 2
src/main/webapp/resources/view/common/bankInfoModal.html

@@ -72,13 +72,14 @@
 	<div class="modal-body">
 			<div class="form-group">
 		    	<label class="margin15"><b class="text-inverse">*&nbsp;</b>开户银行</label>
-		    	<div class="divinline">
+		    	<div class="divinline" style="position:relative;margin-right:25px;">
 					<!--<select class="form-control select-adder">-->
 						<!--<option>请选择开户银行</option>-->
 						<!--<option value="1">1</option>-->
 						<!--<option value="2">2</option>-->
 					<!--</select>-->
-		    		<input name="bankname" ng-model="account.bankname" ng-change="checkAccount(1)" type="text" class="form-control select-adder" placeholder="请选择开户银行" required>
+		    		<input name="bankname" ng-model="account.bankname" ng-change="checkAccount(1)" type="text" class="form-control" placeholder="请选择开户银行" required style="width:216px;border-right:transparent;border-radius:3px 0 0 3px;">
+					<i class="select-adder" style="display:inline-block;width:25px;height:34px;border:1px solid #ddd;border-radius:3px;position:absolute;right:-25px;top:0;border-radius:0 3px 3px 0;border-left:transparent"></i>
 					<ul class="select-down" ng-if="showBankFrame && matchData">
 						<li ng-click="fitBankToAccount(bank)" ng-repeat="bank in resultList">{{bank}}</li>
 					</ul>

+ 22 - 1
src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -101,9 +101,30 @@
 		overflow: hidden;
 		white-space: nowrap;
 		text-overflow: ellipsis;
-		width: 14.27%!important;
+		/*width: 14.27%!important;*/
 
 	}
+	.pay_record .ticket_record_list dl span:nth-child(1){
+		width:17.03%!important;
+	}
+	.pay_record .ticket_record_list dl span:nth-child(2){
+		width:15.73%!important;
+	}
+	.pay_record .ticket_record_list dl span:nth-child(3){
+		width:23.84%!important;
+	}
+	.pay_record .ticket_record_list dl span:nth-child(4){
+		width:8%!important;
+	}
+	.pay_record .ticket_record_list dl span:nth-child(5){
+		width:9.65%!important;
+	}
+	.pay_record .ticket_record_list dl span:nth-child(6){
+		width:12.12%!important;
+	}
+	.pay_record .ticket_record_list dl span:nth-child(7){
+		width:13.52%!important;
+	}
 	.pay_record .ticket_record_list dl span .select-adder {
 		opacity: 1;
 		width: 64px;

+ 61 - 11
src/main/webapp/resources/view/vendor/forstore/pay_center.html

@@ -431,9 +431,30 @@
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
-        width: 14.27%!important;
+        /*width: 14.27%!important;*/
 
     }
+    .pay_record .ticket_record_list dl span:nth-child(1){
+        width:17.03%;
+    }
+    .pay_record .ticket_record_list dl span:nth-child(2){
+        width:15.73%;
+    }
+    .pay_record .ticket_record_list dl span:nth-child(3){
+        width:23.84%;
+    }
+    .pay_record .ticket_record_list dl span:nth-child(4){
+        width:8%;
+    }
+    .pay_record .ticket_record_list dl span:nth-child(5){
+        width:9.65%;
+    }
+    .pay_record .ticket_record_list dl span:nth-child(6){
+        width:12.12%;
+    }
+    .pay_record .ticket_record_list dl span:nth-child(7){
+        width:13.52%;
+    }
     .pay_record .ticket_record_list dl span .select-adder {
         opacity: 1;
         width: 64px;
@@ -449,6 +470,9 @@
         font-weight: normal;
         font-size: 14px;
         background: #89aefa;
+        text-overflow: ellipsis;
+        white-space:nowrap;
+        overflow: hidden;
     }
     .pay_record .ticket_record_list dl dd:hover {
         background: #f1f5ff;
@@ -550,6 +574,7 @@
     #pay_center .tab .user-account-table tbody tr td.operate-area {
         border-right: 1px solid #dae5fd;
         color:#5f82cf;
+        text-align: center;
     }
 </style>
 <!--右侧主体部分-->
@@ -617,8 +642,8 @@
 								<option value="1103">线下支付</option>
 							</select>
 						</span>
-                        <span>
-							<select class="form-control select-adder" style="width: 90px">
+                        <span style="width:13.52%">
+							<select class="form-control select-adder">
 								<option>状态</option>
 								<option value="1">收款成功</option>
 							</select>
@@ -636,7 +661,6 @@
                         <span>线上付款</span>
                         <span>收款成功</span>
                     </dd>
-
                     <div class="total">
                         <span>收入总计&nbsp;  <em>111111112</em></span><b>|</b>
                         <span>支出总计&nbsp;  <em>2222222222</em></span><b>|</b>
@@ -699,12 +723,13 @@
                         <td ng-bind="account.branchname">南山支行</td>
                         <td ng-bind="account.number | hideBankFilter">1256325*******************5621</td>
                         <td ng-bind="account.accountname">优软*********有限公司</td>
-                        <td ng-bind="account.status | bankStatusFilter">待审核
-                            <i class="fa fa-exclamation-circle" style="position:relative;">
-                                <span style="display:block;width:130px;padding:5px;font-size: 12px;line-height:15px;color:#666;position:absolute;top:0px;left:20px;background: #fff;border:1px solid #89aefa;">
-                                    审核通过后,原账户将自动失效
-                                </span>
-                            </i>
+                        <td >
+                            <span ng-bind="account.status | bankStatusFilter"></span>
+                            <span style="position:relative">
+                                <i class="fa fa-exclamation-circle"></i>
+                                <b style="display:block;width:130px;padding:5px;font-size: 12px;line-height:15px;color:#666;position:absolute;top:3px;left:20px;background: #fff;border:1px solid #89aefa;">开户名称余上传的附件 名称不一致,请删除此 记录重新申请</b>
+                            </span>
+
                         </td>
                         <td class="operate-area">
                             <span ng-if="account.status == 105">重新使用</span>
@@ -739,7 +764,13 @@
             <div class="row">
                 <div class="col-md-3"><em class="colorRed">*</em>开户银行</div>
                 <div class="col-md-5">
-                    <input ng-model="account.bankname" ng-change="checkAccount(1)" class="form-control" type="text" placeholder="例如:中国工商银行侨香支行" required>
+                    <input ng-model="account.bankname" ng-change="checkAccount(1)" class="form-control" type="text" placeholder="例如:中国工商银行侨香支行" required style="padding:12px 6px;width:91%;border-right:transparent;border-radius:3px 0 0 3px;">
+                    <i class="select-adder" style="display:inline-block;width:25px;height:34px;position:absolute;top:0;right:0;z-index:10;border:1px solid #ddd;border-radius:0 3px 3px 0;border-left:transparent"></i>
+                    <ul class="select-down" >
+                        <li>{bank}</li>
+                        <li>{bank}</li>
+                        <li>{bank}</li>
+                    </ul>
                 </div>
                 <div class="col-md-4">
                     <p ng-if="account.bankname && !matchData">请填写正确的开户银行</p>
@@ -845,6 +876,25 @@
     .add-count{
         font-size: 14px;
         width: 100%;
+        position:relative;
+    }
+    .add-count .select-down{
+        width:100%;
+        border:1px solid #89aefa;
+        border-radius:3px;
+        background: #fff;
+        position:absolute;
+        top:34px;
+        z-index:100;
+    }
+    .add-count .select-down li{
+        line-height: 32px;
+        padding:6px;
+        padding-left:12px;
+
+    }
+    .add-count .select-down li:hover{
+        background: #89aefa;
     }
     .add-count h2{
         width: 100%;