处理冲突

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1755,18 +1755,20 @@ define([ 'app/app' ], function(app) {
 	/**
 	 * 左侧导航栏控制器
 	 */
-	app.controller('leftNavCtrl', ["$scope", "toaster", '$modal', '$rootScope', function($scope, toaster, $modal, $rootScope){
-		//安全设置提醒框
-		$scope.openHomeCenterModel = function() {
-			var modalInstance = $modal.open({
-				animation: true,
-				templateUrl: $rootScope.rootPath + '/static/view/usercenter/modal/homeCenter_modal.html',
-				controller:'homeModalCtrl'
-			});
-			modalInstance.result.then(function(){
-			}, function(){
-			});
-		};
+	app.controller('leftNavCtrl', ["$scope", "toaster", '$modal', '$rootScope', function($scope, toaster, $modal, $rootScope) {
+        //安全设置提醒框
+        $scope.openHomeCenterModel = function () {
+            var modalInstance = $modal.open({
+                animation: true,
+                templateUrl: $rootScope.rootPath + '/static/view/usercenter/modal/homeCenter_modal.html',
+                controller: 'homeModalCtrl'
+            });
+            modalInstance.result.then(function () {
+            }, function () {
+            });
+        };
+    }]);
+
     function checkNullStr (str) {
         const NULL_ARR = ['空', '没', '无', '-', '—', 'null', '#N/A'];
         var flag = true;