权限bug

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

@@ -38,8 +38,8 @@ define(['app/app'], function(app) {
                 if ($scope.history.length == 0){
                     $scope.isBatch = false;
                 }
-            },function () {
-                toaster.pop("error", "获取浏览历史记录失败");
+            },function (err) {
+                toaster.pop("error", err.data || "获取浏览历史记录失败");
             })
         }
         loadData();
@@ -202,8 +202,8 @@ define(['app/app'], function(app) {
                         loadData();
                         toaster.pop("success", "删除成功");
                     }
-                },function () {
-                    toaster.pop("error", "删除失败");
+                },function (err) {
+                    toaster.pop("error", err.data || "删除失败");
                 })
             }
         };

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

@@ -275,7 +275,7 @@ define(['app/app'], function(app) {
                 toaster.pop('success', '删除发票成功')
                 $state.reload();
             }, function (error) {
-                toaster.pop('error', '删除发票失败')
+                toaster.pop('error', error.data || '删除发票失败')
             })
         }
     }]);

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

@@ -293,11 +293,11 @@ define(['app/app', 'calendar'], function(app) {
 						$scope.logisticsInfo = [];
 						toaster.pop('info', '查询物流信息失败,请核对物流公司和运单号');
 					});
-				}, function(){
-					toaster.pop('info', '根据快递ID查询跟订单相关联的物流信息失败');
+				}, function(err){
+					toaster.pop('info', err.data || '根据快递ID查询跟订单相关联的物流信息失败');
 				});
-			}, function() {
-				toaster.pop('warning', '获取订单信心失败。');
+			}, function(err) {
+				toaster.pop('warning', err.data || '获取订单信息失败。');
 			});
 		}
 	}]);

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

@@ -208,7 +208,7 @@ define([ 'app/app' ], function(app) {
                 $scope.closeModal();
                 $state.reload();
             },function (error) {
-                toaster.pop('error', '申请发票失败');
+                toaster.pop('error', error.data || '申请发票失败');
             })
         }
 

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

@@ -160,8 +160,8 @@ define(['app/app'], function(app) {
 						}
 					}, function(){
 					});
-				}, function(){
-					toaster.pop('info', '根据快递ID查询跟订单相关联的物流信息失败');
+				}, function(err){
+					toaster.pop('info', err.data || '根据快递ID查询跟订单相关联的物流信息失败');
 				});
 			}
 		};

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

@@ -377,6 +377,18 @@ define(['app/app'], function(app) {
 			$('body').append(form);  //将表单放置在web中
 			form.submit();
 
+			form.submit(function() {
+				$(this).ajaxSubmit({
+					beforeSubmit: function () {
+					},
+					success: function () {
+					},
+					error: function (err) {
+						toaster.pop('error', err);
+					}
+				});
+			});
+
 			$scope.$$record.clockID = setInterval(function() {
 				getDownLoadStatus();
 			}, 500);
@@ -798,8 +810,8 @@ define(['app/app'], function(app) {
 			bankInfoService[method].call(null, null, $scope.account, function(data) {
 				toaster.pop('success', '保存成功');
 				$modalInstance.close(data)
-			},function (response) {
-				toaster.pop('warning', '保存信息失败');
+			},function (err) {
+				toaster.pop('error', err.data || '保存信息失败');
 			});
 		};
 

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

@@ -56,11 +56,11 @@ define(['app/app', 'calendar'], function(app) {
                         $scope.logisticsInfo = [];
                         toaster.pop('info', '查询物流信息失败,请核对物流公司和运单号');
                     });
-                }, function(){
-                    toaster.pop('info', '根据快递ID查询跟订单相关联的物流信息失败');
+                }, function(err){
+                    toaster.pop('info', err.data || '根据快递ID查询跟订单相关联的物流信息失败');
                 });
-            }, function() {
-                toaster.pop('warning', '获取订单信心失败。');
+            }, function(err) {
+                toaster.pop('warning', err.data || '获取订单信息失败。');
             });
         }
 

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

@@ -448,8 +448,8 @@ define(['app/app'], function(app) {
                     toaster.pop('success', '保存成功');
                     loadAccountData();
                 }
-            }).error(function(){
-                toaster.pop('error', "保存账户信息失败");
+            }).error(function(err){
+                toaster.pop('error', err.data || "保存账户信息失败");
             });
         };
 

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

@@ -55,13 +55,13 @@ define(['app/app', 'calendar'], function(app) {
                             $scope.logisticsInfo = [];
                             toaster.pop('info', '查询物流信息失败,请核对物流公司和运单号');
                         });
-                    }, function(){
-                        toaster.pop('info', '根据快递ID查询跟订单相关联的物流信息失败');
+                    }, function(err){
+                        toaster.pop('info', err.data || '根据快递ID查询跟订单相关联的物流信息失败');
                     });
                 }
 
-            }, function() {
-                toaster.pop('warning', '获取订单信息失败。');
+            }, function(err) {
+                toaster.pop('warning', err.data || '获取订单信息失败。');
             });
         }
 

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

@@ -1882,6 +1882,7 @@ define(['app/app'], function (app) {
                     getCheckRoleResource(data2, rs);
                 })
                 $scope.resourceItems = data[0].items;
+                $scope.activeResource = data[0];
                 data[0].$active = true;
             }
             $scope.resources = data;
@@ -1909,7 +1910,7 @@ define(['app/app'], function (app) {
         $scope.onItemClick = function (resource) {
             if (resource.items.length > 0) {
                 $scope.resourceItems = resource.items;
-                $scope.activeResource = resource
+                $scope.activeResource = resource;
             } else {
                 $scope.resourceItems = [];
                 if (!resource.activeLevel) {
@@ -1988,6 +1989,7 @@ define(['app/app'], function (app) {
         $scope.onItemChange = function () {
             var activeCount = 0;
             var resourceItems = $scope.resourceItems;
+            // debugger;
             // console.log(resourceItems);
             angular.forEach(resourceItems, function (item) {
                 if (item.$checked) {

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

@@ -166,7 +166,7 @@ define([ 'app/app' ], function(app) {
                 toaster.pop('success','开票成功');
                 $scope.setShowSubmitBox(false);
             },function (error) {
-                toaster.pop('error','开票失败');
+                toaster.pop('error',error.data || '开票失败');
             })
         }
 

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

@@ -339,13 +339,13 @@ define(['app/app', 'calendar'], function (app) {
 							$scope.logisticsInfo = [];
 							toaster.pop('info', '查询物流信息失败,请核对物流公司和运单号');
 						});
-					}, function(){
-						toaster.pop('info', '根据快递ID查询跟订单相关联的物流信息失败');
+					}, function(err){
+						toaster.pop('info', err.data || '根据快递ID查询跟订单相关联的物流信息失败');
 					});
 				}
 
-			}, function() {
-				toaster.pop('warning', '获取订单信息失败。');
+			}, function(err) {
+				toaster.pop('warning', err.data || '获取订单信息失败。');
 			});
 		}
 	}]);

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

@@ -479,8 +479,8 @@ define([ 'app/app' ], function(app) {
                     } else {
                         toaster.pop('error', map.message);
                     }
-                }, function(){
-                    toaster.pop('error', '下架失败');
+                }, function(err){
+                    toaster.pop('error', err.data || '下架失败');
                 });
             }
         };
@@ -494,8 +494,8 @@ define([ 'app/app' ], function(app) {
                 } else {
                     toaster.pop('error', map.message);
                 }
-            }, function(){
-                toaster.pop('error', '下架失败');
+            }, function(err){
+                toaster.pop('error', err.data || '下架失败');
             });
         };
 

src/main/webapp/resources/view/vendor/modal/role_detail.html

@@ -448,6 +448,8 @@
 		</div>
 	</div>
 	<div class="modal-footer" ng-if="role.issys != 1 && role.desc != '普通用户'">
+		{{roleForm.$invalid}}
+		{{!isChanged(role)}}
 		<button class="mall-default-btn mall-btn-cancel" ng-click="cancel()" type="button">取消</button>
 		<button class="mall-default-btn mall-btn-delete"
 			ng-show="role.id && role.isdefault == 0" ng-click="del()" type="button">删除角色</button>