Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/java/com/uas/platform/b2c/prod/store/model/StoreApply.java

@@ -44,7 +44,7 @@ public class StoreApply {
 	/**
 	 * 主营产品
 	 */
-	@Column(name = "apply_description")
+	@Column(name = "apply_description", length = 1000)
 	private String applyDescription;
 
 	/**

src/main/webapp/WEB-INF/views/normal/adminWithNav.html

@@ -138,6 +138,10 @@
 
 
 			<li class="nav-header">审批</li>
+			<li class="nav-node"><a href="/vendor#/brand/apply"><i
+					class="fa fa-bullhorn"></i><span> 品牌申请</span></a></li>
+			<li class="nav-node"><a href="/vendor#/component/apply"><i
+					class="fa fa-bullhorn"></i><span> 器件申请</span></a></li>
 			<li class="nav-node"><a href="#audit/brand"><i
 					class="fa fa-bullhorn"></i><span> 品牌</span></a></li>
 			<li class="nav-node"><a href="#supplierSubmitList"><i

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

@@ -793,7 +793,7 @@ define(['app/app'], function(app) {
         };
 
         var validateRepeat = function (number) {
-            bankInfoService.getCountByNumber({type:1061, number:number}, {}, function (data) {
+            bankInfoService.getCountByNumber({type:1061, number:number, accountType: 'PAY_TYPE'}, {}, function (data) {
                 if (data.success){
                     if (data.data != 0){
                         $scope.repeatError = true;

src/main/webapp/resources/js/vendor/controllers/forstore/pay_center_ctrl.js

@@ -433,7 +433,7 @@ define(['app/app'], function(app) {
         };
 
         var validateRepeat = function (number) {
-            bankInfoService.getCountByNumber({type:1063,number:number}, {}, function (data) {
+            bankInfoService.getCountByNumber({type:1063,number:number,accountType: 'RECEIVE_TYPE'}, {}, function (data) {
                 if (data.success){
                     if (data.data != 0){
                         $scope.repeatError = true;