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

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

@@ -58,7 +58,7 @@ define(['app/app'], function(app) {
 		 */
 		$scope.tradeRecordTableParams = new ngTableParams({
 			page : 1,
-			count : 30,
+			count : 10,
 			sorting : {
 				paytime : 'DESC'
 			}

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

@@ -44,7 +44,7 @@ define(['app/app'], function(app) {
         var getTradeRecordInfo = function () {
             $scope.tradeRecordTableParams = new ngTableParams({
                 page : 1,
-                count : 30,
+                count : 10,
                 sorting : {
                     transferTime : 'DESC'
                 }
@@ -499,23 +499,23 @@ define(['app/app'], function(app) {
                 return ;
             }
             if (!account.bankname || !account.branchname || !account.number ||
-                !account.accountname || !account.attachUrl){
+                !account.accountname){
                 toaster.pop('error', '请按要求填写正确的信息');
                 return ;
             }
             if (!$scope.matchData || $scope.branchError || $scope.branchPattError || $scope.numberError || $scope.numberPattError ||
-                $scope.nameError || $scope.repeatError || $scope.fileError || $scope.fileLegError){
+                $scope.nameError || $scope.repeatError){
                 toaster.pop('error', '请按要求填写正确的信息');
                 return ;
             }
 
-            var file = null;
-            if($scope.account.files && $scope.account.files[0]) {
-                file = $scope.account.files[0];
-            }
+            // var file = null;
+            // if($scope.account.files && $scope.account.files[0]) {
+            //     file = $scope.account.files[0];
+            // }
             $upload.upload({
                 url: 'trade/bankInfo/save/enterprise',
-                file: file,
+                // file: file,
                 method: 'POST',
                 params : {type : 'sup'},
                 data: {

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

@@ -360,6 +360,7 @@
 		line-height: 32px;
 		float: none;
 		border-radius: 2px;
+		vertical-align: unset;
 	}
 	.screen .sreach a.seek:hover{
 		background: #3f7ae3;
@@ -548,7 +549,7 @@
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-9 col-sm-offset-2" style="position: relative;left: -10px;"><em class="colorRed">*</em>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</div>
+							<div class="col-sm-9 col-sm-offset-2" style="position: relative;left: -10px;font-size: 12px;"><em class="colorRed">*声明：</em>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</div>
 						</div>
 					</form>
 					<div class="row">
@@ -833,7 +834,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-sm-10 col-sm-offset-2" style="position: relative;left: -43px;"><em class="colorRed">*</em>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</div>
+					<div class="col-sm-10 col-sm-offset-2" style="position: relative;left: -43px;font-size: 12px;"><em class="colorRed">*声明：</em>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</div>
 				</div>
 			</form>
 			<div class="row">

src/main/webapp/resources/view/vendor/forstore/pay_center.html

@@ -399,6 +399,7 @@
         line-height: 32px;
         float: none;
         broder-radius: 2px;
+        vertical-align: unset;
     }
     .screen .sreach a.seek:hover{
         background: #3f7ae3;
@@ -934,7 +935,7 @@
                                 <p ng-if="myForm.accountname.$touched && !account.accountname">开户名称不能为空</p>
                             </div>
                         </div>
-                        <div class="row">
+                        <!--<div class="row">
                             <div class="col-sm-3"><em class="colorRed">*</em>上传开户许可证</div>
                             <div class="col-sm-5 upload">
                                 <input type="text" readonly ng-model="account.attachUrl" class="form-control" style="width:70%;margin-right:10px;"/>
@@ -945,7 +946,7 @@
                                 <p ng-if="fileError">请上传可支持的格式</p>
                                 <p ng-if="!fileError && fileLegError">请勿超过3M</p>
                             </div>
-                        </div>
+                        </div>-->
                     </form>
                     <div class="row">
                         <button style="width:0;height:0;background: transparent;border:0;"></button>
@@ -954,14 +955,14 @@
                             <button class="btn" type="submit" ng-click="ensureAddAccount()" style="background: #5078cb;color:#fff">确定</button>
                         </div>
                     </div>
-                    <div class="beizhu row">
+                    <div class="beizhu row" style="margin: 15px auto; width: 843px;">
                         <div class="col-sm-1" style="color: #f00;line-height: 20px;">*声明：</div>
                         <div class="col-sm-10">
                             1. 此账户为卖家收款账户，请仔细核对信息内容，若由信息错误造成的损失，优软商城不承担赔偿责任。<br/>
                             2. 卖家只能有唯一一个“使用中”的收款账户，新增账户审核通过后，原账户将自动失效。<br/>
                             3. 如您的企业名称、开户银行及账号变更，您须在优软商城开展资金结算前进行更正，否则发生转账错误优软商城不承担赔偿责任。<br/>
                             4. 更多的条款请阅读<a href="help/helpDetail/51" style="color: #5078cb;" target="_blank">《优软商城代收代付协议》</a> 。<br/>
-                            5. 附件仅支持JPG、PNG、PDF格式，大小超过3M。
+                            <!--5. 附件仅支持JPG、PNG、PDF格式，大小超过3M。-->
                         </div>
                     </div>
                 </div>
@@ -1037,7 +1038,7 @@
                         <p ng-if="myForm.accountname.$touched && !account.accountname">开户名称不能为空</p>
                     </div>
                 </div>
-                <div class="row">
+               <!-- <div class="row">
                     <div class="col-sm-3"><em class="colorRed">*</em>上传开户许可证</div>
                     <div class="col-sm-5 upload">
                         <input type="text" readonly ng-model="account.attachUrl" class="form-control" style="width:70%;margin-right:10px;"/>
@@ -1048,7 +1049,7 @@
                         <p ng-if="fileError">请上传可支持的格式</p>
                         <p ng-if="!fileError && fileLegError">请勿超过3M</p>
                     </div>
-                </div>
+                </div>-->
             </form>
             <div class="row">
                 <button style="width:0;height:0;background: transparent;border:0;"></button>
@@ -1064,7 +1065,7 @@
                     2. 卖家只能有唯一一个“使用中”的收款账户，新增账户审核通过后，原账户将自动失效。<br/>
                     3. 如您的企业名称、开户银行及账号变更，您须在优软商城开展资金结算前进行更正，否则发生转账错误优软商城不承担赔偿责任。<br/>
                     4. 更多的条款请阅读<a href="help/helpDetail/51" style="color: #5078cb;" target="_blank">《优软商城代收代付协议》</a> 。<br/>
-                    5. 附件仅支持JPG、PNG、PDF格式，大小超过3M。
+                    <!--5. 附件仅支持JPG、PNG、PDF格式，大小超过3M。-->
                 </div>
             </div>
         </div>