Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -157,9 +157,9 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
             if (user != null) {
                 user.setIp(AgentUtils.getIp(request));
                 request.getSession().setAttribute("user", user);
-                setGrantedAuthorities(user);
             }
         }
+        setGrantedAuthorities(user);
         if (user != null) {
             SystemSession.setUser(user);
             accessDecision(request, user);
@@ -176,7 +176,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
         }
         Iterator<ConfigAttribute> iterator = configAttributes.iterator();
         String needPermission = null;
-        if (!authorities.containsKey(user.getUserUU())) {
+        if (null == authorities || !authorities.containsKey(user.getUserUU())) {
             setGrantedAuthorities(user);
         }
         Collection<GrantedAuthority> userAuthorities = authorities.get(user.getUserUU());

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

@@ -62,16 +62,19 @@ define(['app/app'], function(app) {
 			} else {
 				if (!$scope.isShow) {
 					Installment.validationCount({purchaseId : $scope.purchase.id}, null, function (data) {
-						if (data.code == 3) {
-							$scope.setShowNoAccountBox(true);
-							$scope.isShow = false;
-						} else if (data.code) {
-							toaster.pop('error', error.data.message);
+						if (!data.success) {
+							// code==3,表示未设置账户
+							if (data.code == 3) {
+								$scope.setShowNoAccountBox(true);
+							} else {
+								toaster.pop('error', data.message);
+							}
 							$scope.isShow = false;
 						} else {
 							$scope.isShow = true;
 						}
 					}, function (error) {
+						toaster.pop('error', '系统错误');
 					});
 				} else {
 					$scope.isShow = false;

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

@@ -523,6 +523,16 @@
 		/*width: 200px;*/
 		/*margin-left: -10px;*/
 	/*}*/
+	.com-del-box {
+		top: 101%!important ;
+		left: 24%!important ;
+	}
+	.com-del-box .title{
+		width: 100%!important ;
+	}
+	.com-del-box .title i{
+		background: none;
+	}
 </style>
 <div class="user_right fr" id="buyer_cart">
 	<!--订单中心-->

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html

@@ -498,7 +498,7 @@
 						<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>
 						<td>
 							<!--<a ng-if="material.cmpUuId" ng-href="product/component/{{material.cmpUuId}}/" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}" style="color: #333;"></a>-->
-							<span -bind="material.pcmpcode" title="{{material.pcmpcode}}"></span>
+							<span ng-bind="material.pcmpcode" title="{{material.pcmpcode}}"></span>
 						</td>
 						<td>
 							<a ng-show="!material.selected" ng-click="showShelfArea(material)"><span>去上架</span></a>

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_unstandard_erp.html

@@ -109,7 +109,6 @@
 	.public-tab.table>tbody>tr>td{
 		border-top: none;
 		border-bottom: #e8e8e8 1px solid;
-        overflow: inherit;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;

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

@@ -86,6 +86,7 @@
         overflow-x: hidden;
         border-radius: 0;
         box-shadow: none;
+        margin-top: -1px;
     }
     .sell_oder .sure_oder .oder_xq_list dl span .dropdown-menu li{
         font-size: 14px;