Browse Source

买卖家账户验收反馈处理

hulh 8 years ago
parent
commit
cd7226a01b

+ 4 - 4
src/main/resources/spring/context.xml

@@ -11,13 +11,13 @@
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 	http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-3.1.xsd">
 
-	<context:property-placeholder location="classpath*:dev/*.properties" />
+	<context:property-placeholder location="classpath*:${profile}/*.properties" />
 	<!-- 系统运行参数注入 -->
 	<util:properties id="sys"
-		location="classpath:dev/sys.properties" />
+		location="classpath:${profile}/sys.properties" />
 	<!-- 消息参数 -->
 	<util:properties id="message"
-		location="classpath:dev/message.properties" />
+		location="classpath:${profile}/message.properties" />
 	<!-- 注册spring上下文对象 -->
 	<bean class="com.uas.platform.b2c.core.support.ApplicationContextRegister" />
 	<!-- 容器启动完成之后执行 -->
@@ -185,7 +185,7 @@
 	<!-- 账户中心配置 -->
 	<bean id="accountConfigurer" class="com.uas.account.web.AccountConfigurer"
 		init-method="init">
-		<property name="configPath" value="classpath:dev/account.properties" />
+		<property name="configPath" value="classpath:${profile}/account.properties" />
 	</bean>
 
 	<import resource="classpath:spring/ehcache.xml"/>

+ 2 - 2
src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_pay_ctrl.js

@@ -11,13 +11,13 @@ define(['app/app'], function(app) {
 		//历史记录的状态
 		var hiStatus= SessionService.get('buyCenter');
 
-		$scope.status = hiStatus == null ? 'pay-info' : hiStatus;
+		$scope.status = hiStatus == null ? 'pay-history' : hiStatus;
 
 		//切换银行账户信息,历史记录的的的状态
 		$scope.toggleStatus = function(status) {
 			if($scope.status != status) {
 				$scope.status = status;
-				SessionService.set('paycenter', status);
+				SessionService.set('buyCenter', status);
 				loadData();
 			}
 		};

+ 2 - 2
src/main/webapp/resources/view/admin/bankInfo/auditBankInfo.html

@@ -267,7 +267,7 @@
     </div>
     <!--表格-->
     <div class="application-tab">
-        <table class="table table-bordered" ng-table="storeTableParams">
+        <table class="table table-bordered" ng-table="bankInfoTableParams">
             <thead>
             <tr>
                 <th width="140">序号</th>
@@ -310,7 +310,7 @@
                     <div class="audit-fail" ng-if="$$auditBankInfo.openDiv">
                         <div class="title">审核不通过的原因</div>
                         <div class="content col-md-12">
-                            <textarea spellcheck="false" ng-model="$$auditBankInfo.reason" placeholder="请输入审核不通过原因" maxlength="100" class="form-control"></textarea>
+                            <textarea spellcheck="false" ng-model="$$auditBankInfo.reason" placeholder="请输入审核不通过原因" maxlength="50" class="form-control"></textarea>
                         </div>
                         <button class="btn btn-sm btn-primary" ng-click="confirm()" ng-disabled="!$$auditBankInfo.reason">确定</button><button class="btn btn-sm btn-default" ng-click="cancle()">取消</button>
                     </div>

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

@@ -79,7 +79,7 @@
 						<!--<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" placeholder="请选择开户银行" required style="width:216px;border-right:transparent;border-radius:3px 0 0 3px;">
+		    		<input name="bankname" ng-model="account.bankname" ng-change="checkAccount(1)" autocomplete="off" 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;position:absolute;right:-25px;top:0;border-radius:0 3px 3px 0;border-left:transparent" ng-click="showList()"></i>
 					<ul class="select-down" ng-if="showBankFrame && matchData">
 						<li ng-click="fitBankToAccount(bank)" ng-repeat="bank in resultList">{{bank}}</li>
@@ -91,7 +91,7 @@
 			<div class="form-group">
 				<label class="margin15"><b class="text-inverse">*&nbsp;</b>开户支行</label>
 				<div class="divinline">
-					<input name="branchname" type="text" class="form-control" ng-model="account.branchname" ng-change="checkAccount(2)"
+					<input name="branchname" type="text" class="form-control" ng-model="account.branchname" ng-change="checkAccount(2)" autocomplete="off"
 						   placeholder="例如:侨香支行" ng-required="true">
 				</div>
 				<span class="warn-message" ng-if="account.branchname && branchPattError">请填写正确的开户支行</span>
@@ -113,7 +113,7 @@
 				<label class="margin15"><b class="text-inverse">*&nbsp;</b>开户名称</label>
 				<div class="divinline">
 					<input name="accountname" type="text" class="form-control" ng-model="account.accountname"
-						   placeholder="请填写开户人姓名或企业名称" ng-required="true" ng-change="checkAccount(4)">
+						   placeholder="请填写开户人姓名或企业名称" ng-required="true" ng-change="checkAccount(4)" autocomplete="off">
 				</div>
 				<span class="warn-message" ng-if="account.accountname && nameError">请勿超过50个字</span>
 				<span class="warn-message" ng-if="myForm.accountname.$touched && myForm.accountname.$invalid">开户名称不能为空</span>

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

@@ -803,7 +803,7 @@
             <div class="row">
                 <div class="col-md-3"><em class="colorRed">*</em>开户银行</div>
                 <div class="col-md-5" style="position:relative;">
-                    <input ng-model="account.bankname" ng-change="checkAccount(1)" class="form-control" autocomplete="true" type="text" placeholder="例如:中国工商银行侨香支行" required style="padding:12px 6px;width:91%;border-right:transparent;border-radius:3px 0 0 3px;">
+                    <input ng-model="account.bankname" ng-change="checkAccount(1)" class="form-control" autocomplete="off" type="text" placeholder="例如:中国工商银行侨香支行" required style="padding:12px 6px;width:91%;border-right:transparent;border-radius:3px 0 0 3px;">
                     <i class="select-adder" ng-click="showList()" 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" ng-if="showBankFrame && matchData">
                         <li ng-click="fitBankToAccount(bank)" ng-repeat="bank in resultList">{{bank}}</li>
@@ -817,7 +817,7 @@
             <div class="row">
                 <div class="col-md-3"><em class="colorRed">*</em>开户支行</div>
                 <div class="col-md-5">
-                    <input name="branchname" ng-model="account.branchname" ng-change="checkAccount(2)" class="form-control" type="text" placeholder="例如:侨香支行" required>
+                    <input name="branchname" ng-model="account.branchname" ng-change="checkAccount(2)" class="form-control" autocomplete="off" type="text" placeholder="例如:侨香支行" required>
                 </div>
                 <div class="col-md-4">
                     <p ng-if="account.branchname && branchPattError">请填写正确的开户支行</p>
@@ -828,7 +828,7 @@
             <div class="row">
                 <div class="col-md-3"><em class="colorRed">*</em>银行账号</div>
                 <div class="col-md-5">
-                    <input name="number" ng-model="account.number" ng-change="checkAccount(3)" class="form-control" type="text" placeholder="请填写银行账号" required>
+                    <input name="number" ng-model="account.number" ng-change="checkAccount(3)" class="form-control" autocomplete="off" type="text" placeholder="请填写银行账号" required>
                 </div>
                 <div class="col-md-4">
                     <p ng-if="account.number && numberPattError">请填写正确的银行账号</p>
@@ -840,7 +840,7 @@
             <div class="row">
                 <div class="col-md-3"><em class="colorRed">*</em>开户名称</div>
                 <div class="col-md-5">
-                    <input name="accountname" ng-model="account.accountname" ng-change="checkAccount(4)" class="form-control" type="text" placeholder="请填写开户人姓名或企业名称" required>
+                    <input name="accountname" ng-model="account.accountname" ng-change="checkAccount(4)" class="form-control" autocomplete="off" type="text" placeholder="请填写开户人姓名或企业名称" required>
                 </div>
                 <div class="col-md-4">
                     <p ng-if="account.accountname && nameError">请勿超过50个字</p>