Merge branch 'dev-mysql' into dev-mysql-1227

src/main/java/com/uas/platform/b2c/external/erp/order/service/impl/B2cOrderServiceImpl.java

@@ -133,7 +133,7 @@ public class B2cOrderServiceImpl implements B2cOrderService {
     }
 
     @Override
-    public void ensuryPay(Payment payment) {
+    public boolean ensuryPay(Payment payment) {
         BankTransfer bankTransfer = ModelConverter.convert(payment);
         List<BankInfo> mallBankInfos = bankInfoService.getEnterpriseBankInfoContainsStatus(Type.MALL.value(), Status.ALLOW.value(), sysConf.getEnUU());
         if (!CollectionUtils.isEmpty(mallBankInfos)) {
@@ -141,6 +141,7 @@ public class B2cOrderServiceImpl implements B2cOrderService {
         }
 
         bankTransferService.save(bankTransfer, payment.getOrderid());
+        return true;
     }
 
     @Override

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

@@ -310,8 +310,6 @@
 		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;

src/main/webapp/resources/view/admin/store_qualification_maintenance.html

@@ -92,6 +92,7 @@
 		border-bottom: #fff 1px solid;
 	}
 	.open-web{
+		margin-left: 13%;
 		width: 150px;
 		height: 40px;
 		display: inline-block;
@@ -100,12 +101,26 @@
 		text-align: center;
 		color: #fff;
 		border-radius: 5px;
-		margin-left: 35%;
 	}
 	.open-web:hover{
 		background: #5078cb;
 		color: #fff;
 	}
+	.open-img{
+		margin-left: 2%;
+		width: 150px;
+		height: 40px;
+		display: inline-block;
+		line-height: 40px;
+		background: #3ba9e9;
+		text-align: center;
+		color: #fff;
+		border-radius: 5px;
+	}
+	.open-img:hover{
+		background: #5078cb;
+		color: #fff;
+	}
 	.comon-row{
 		margin-top: 20px;
 	}
@@ -282,8 +297,8 @@
 	.image-box .x-floating {
 		position: fixed;
 		z-index: 99999;
-		top: 60px;
-		left: 0;
+		top: 60px !important ;
+		left: 0 !important ;
 		width: 100%;
 		height: 100%;
 		text-align: center;
@@ -336,7 +351,6 @@
 		font-weight: normal;
 	}
 	/* 预览框 end */
-
 </style>
 <div class="row-fluid sortable" id="store-qualification">
 	<div class="title-top row">
@@ -593,7 +607,7 @@
 											<div class="x-close-wrap" title="关闭">
 												<a href="javascript:void(0);" ng-click="showBrandInfo(brand, false)">×</a>
 											</div>
-											<div class="x-floating-wrap"></div>
+											<div class="x-floating-wrap" style="z-index: 10 !important;"></div>
 											<div class="x-floating">
 												<img ng-src="{{brand.url}}"/>
 											</div>
@@ -616,6 +630,7 @@
 								</div>
 							</div>
 						</div>
+						<a ng-href="{{brand.url}}" class="open-img" target="_blank">查看大图</a>
 						<a href="http://sbj.saic.gov.cn/sbcx/" class="open-web" target="_blank" ng-if="brand.certificate === '大陆商标注册证' && application.type === 'ORIGINAL_FACTORY'">打开认证网站</a>
 						<a href="http://ipsearch.ipd.gov.hk/trademark/index.html" class="open-web" target="_blank" ng-if="brand.certificate === '香港注册证明书' && application.type === 'ORIGINAL_FACTORY'">打开认证网站</a>
 					</div>
@@ -679,7 +694,7 @@
 											<div class="x-close-wrap" title="关闭">
 												<a href="javascript:void(0);" ng-click="showBrandInfo(brand, false)">×</a>
 											</div>
-											<div class="x-floating-wrap"></div>
+											<div class="x-floating-wrap" style="z-index: 10 !important;"></div>
 											<div class="x-floating">
 												<img ng-src="{{brand.url}}"/>
 											</div>