Merge branch 'dev-mysql' into feature_release-tomysql

src/main/webapp/resources/js/common/module/store_recommend_product.js

@@ -39,7 +39,7 @@ define([ 'ngResource', 'common/query/commodity' ], function() {
 			 * @param uuid
 			 */
 			saveProductsWhenSellerUpdate: {
-				url: '/store-service/products//update_batch',
+				url: 'store-service/products//update_batch',
 				method: 'POST',
 				isArray: true
 			},
@@ -549,16 +549,7 @@ define([ 'ngResource', 'common/query/commodity' ], function() {
 			}
 			console.log(products);
 
-			return RecommendProduct.saveProductsWhenSellerUpdate({ uuid: uuid }, products).$promise.then(function (products) {
-				if (!products) {
-					return [];
-				}
-				productExist(products);
-				return products;
-			}, function (error) {
-				console.log(error);
-				return [];
-			});
+			return RecommendProduct.saveProductsWhenSellerUpdate({ uuid: uuid }, products).$promise;
 		}
 
 	}]);

src/main/webapp/resources/js/common/query/user.js

@@ -187,6 +187,10 @@ define(['angular', 'ui-bootstrap', 'ngResource'], function (angular) {
                 url: 'account/role',
                 method: 'GET',
                 isArray: true
+            },
+            findAuthority: {
+                url: 'account/resource/validateRes',
+                method: 'GET'
             }
         });
     }]);

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

@@ -557,12 +557,19 @@ define(['app/app'], function (app) {
             if (t === 'role' && $scope.rolesExcept) {
                 toaster.pop('error', '获取企业角色信息失败',$scope.rolesExcept);
             }
-            if (t === 'auth') {
-                $scope.keyword = '';
-                $scope.onSearch($scope.keyword,'all');
-            }
+            // if (t === 'auth') {
+            //     $scope.keyword = '';
+            //     $scope.onSearch($scope.keyword,'all');
+            // }
           };
 
+          /* 查询接口权限 */
+        // AccountRole.findAuthority({resUrl: encodeURIComponent('/account/role'), method: 'GET'}, function (data) {
+        //
+        // }, function (error) {
+        //
+        // })
+
           $scope.updatePassword = function () {
               AuthenticationService.redirectPassword();
           };

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

@@ -405,7 +405,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
                 window.location.replace('vendor#/component/applylist');
             }).error(function(response){
                 $scope.submitEnable = true;
-                toaster.pop('error', '提交失败', response.data);
+                toaster.pop('error', '提交失败', response);
             });
         };
     }]);

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

@@ -489,7 +489,7 @@ define([ 'app/app' ], function(app) {
                                 return;
                             }
                         },function (error) {
-                            toaster.pop('error', "保存配送规则失败 " + error);
+                            toaster.pop('error', "保存配送规则失败 " + error.data);
                         })
                     }
                 });
@@ -670,7 +670,7 @@ define([ 'app/app' ], function(app) {
                     $scope.ruleTableParams.reload();
                 }
             }, function (error) {
-                toaster.pop('error', error);
+                toaster.pop('error', error.data);
             })
         };
 
@@ -689,7 +689,7 @@ define([ 'app/app' ], function(app) {
                 toaster.pop('info', '删除配送规则成功');
                 $scope.loadDeliveryRule();
             }, function (res) {
-                toaster.pop('error', '删除配送规则失败 ' + res);
+                toaster.pop('error', '删除配送规则失败 ' + res.data);
             });
         };
 

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

@@ -643,16 +643,16 @@ define(['app/app'], function (app) {
 		}
 		
 		function saveProducts() {
-			console.log($scope.storeInfo.uuid);
+			// console.log($scope.storeInfo.uuid);
 			RecommendProductService.saveProductsWhenSellerUpdate($scope.storeInfo.uuid, $scope.recommendProducts).then(function (products) {
 				$scope.recommendProducts = products;
 				$scope.backupProducts = angular.copy(products);
 				cancleProductEdit('BATCH_OPERATION');
 				toaster.pop('success', '保存成功');
 			}, function (error) {
-				console.log(error);
-				$scope.recommendProducts = [];
-				$scope.backupProducts = [];
+				toaster.pop('error', error.data);
+				// $scope.recommendProducts = [];
+				// $scope.backupProducts = [];
 			});
 		}
 
@@ -707,9 +707,9 @@ define(['app/app'], function (app) {
 				cancleProductEdit('EDIT_PRODUCTS');
 				toaster.pop('success', '保存成功');
 			}, function (error) {
-				console.log(error);
-				$scope.recommendProducts = [];
-				$scope.backupProducts = [];
+				toaster.pop('error', error.data);
+				// $scope.recommendProducts = [];
+				// $scope.backupProducts = [];
 			});
 		}
 

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

@@ -1415,7 +1415,7 @@
                         </td>-->
                         <td class="edit-btn-area">
                             <!--<a class="operator-trigger" href="javascript:void(0);"><i class="fa fa-pencil fa-lg" ng-show="(userInfo.sys && enterprise.enAdminuu != user.userUU) || users.length == 1"></i></a>-->
-                            <div ng-show="(userInfo.sys) || users.length == 1">  <!--&& enterprise.enAdminuu != user.userUU-->
+                            <div>  <!--&& enterprise.enAdminuu != user.userUU-->
                                 <span ng-click="editUserRole(user)" ng-show="user.userUU != userInfo.userUU" title="编辑"><i></i>编辑 | </span>
                                 <span ng-click="setShowDelUserFlag(true, user)" ng-show="user.userUU != userInfo.userUU" title="删除"><i></i>删除</span>
                                 <span ng-show="user.userUU == userInfo.userUU" disabled="false" title="编辑" style="color: #606168; cursor: not-allowed;"><i></i>编辑 | </span>

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

@@ -309,7 +309,7 @@
 	/*防误删*/
 	.com-del-box{
 		position: fixed;
-		z-index: 22;
+		z-index: 9999;
 		height: 152px;
 		opacity: 1;
 		background-color: white;