机构主要领域取消用数字代表

donate-console/src/main/webapp/resources/js/index/app.js

@@ -802,10 +802,10 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
             $rootScope.tree = 'user';
             $rootScope.thief = 'newOrg';
             // 主要领域
-            // $scope.areas = ['疾病援助', '扶贫/救灾', '教育/助学' , '环境/动物保护', '其他'];
-            $scope.org = {
-                majorArea: 1
-            };
+             $scope.defaultMajorAreas = ['疾病援助', '扶贫/救灾', '教育/助学' , '环境/动物保护', '其他'];
+            // $scope.org = {
+            //     majorArea: 1
+            // };
 
             var orgCopy;
             // 获取当前账户注册机构情况
@@ -815,6 +815,9 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
                     Organization.getByUuid({uuid : $scope.userUU}, {}, function(data) {//10041558
                         if (typeof data.id == 'undefined') {
+                            $scope.org = {
+                                majorArea: $scope.defaultMajorAreas[0]
+                            };
                             return;
                         }
 
@@ -840,8 +843,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
             });
 
             // 设置主要领域
-            $scope.selectMajorArea = function(index) {
-                $scope.org.majorArea = index;
+            $scope.setMajorArea = function(majorArea) {
+                $scope.org.majorArea = majorArea;
             };
 
             $scope.openDatePicker = function ($event, item, openParam) {

donate-console/src/main/webapp/resources/view/user/charityCertification1.html

@@ -573,12 +573,15 @@
                                     <div class="form-group clearfix">
                                         <label for="" class="fl control-label">主要领域</label>
                                         <div class="area fl" id="choose-major-area">
-                                        <input required type="text" ng-show="false" ng-model="org.majorArea">
-                                            <span ng-class="{'active': org.majorArea==1}" ng-click="selectMajorArea(1)">疾病援助</span>
-                                            <span ng-class="{'active': org.majorArea==2}" ng-click="selectMajorArea(2)">扶贫/救灾</span>
-                                            <span ng-class="{'active': org.majorArea==3}" ng-click="selectMajorArea(3)">教育/助学</span>
-                                            <span ng-class="{'active': org.majorArea==4}" ng-click="selectMajorArea(4)">环境/动物保护</span>
-                                            <span ng-class="{'active': org.majorArea==5}" ng-click="selectMajorArea(5)">其他</span>
+                                            <!--<input required type="text" ng-show="false" ng-model="org.majorArea">-->
+                                            <!--<span ng-class="{'active': org.majorArea==1}" ng-click="selectMajorArea(1)">疾病援助</span>-->
+                                            <!--<span ng-class="{'active': org.majorArea==2}" ng-click="selectMajorArea(2)">扶贫/救灾</span>-->
+                                            <!--<span ng-class="{'active': org.majorArea==3}" ng-click="selectMajorArea(3)">教育/助学</span>-->
+                                            <!--<span ng-class="{'active': org.majorArea==4}" ng-click="selectMajorArea(4)">环境/动物保护</span>-->
+                                            <!--<span ng-class="{'active': org.majorArea==5}" ng-click="selectMajorArea(5)">其他</span>-->
+
+                                            <span ng-repeat="majorArea in defaultMajorAreas" ng-class="{'active':org.majorArea == majorArea}"
+                                                  ng-click="setMajorArea(majorArea)" ng-bind="majorArea"></span>
                                         </div>
                                     </div>
                                     <div class="form-group clearfix">

donate-console/src/main/webapp/resources/view/user/publicOfferingCertification1.html

@@ -607,12 +607,15 @@
                             <div class="form-group clearfix">
                                 <label for="" class="fl control-label">主要领域</label>
                                 <div class="area fl" id="choose-major-area">
-                                    <input required type="text" ng-show="false" ng-model="org.majorArea">
-                                    <span ng-class="{'active': org.majorArea==1}" ng-click="selectMajorArea(1)">疾病援助</span>
-                                    <span ng-class="{'active': org.majorArea==2}" ng-click="selectMajorArea(2)">扶贫/救灾</span>
-                                    <span ng-class="{'active': org.majorArea==3}" ng-click="selectMajorArea(3)">教育/助学</span>
-                                    <span ng-class="{'active': org.majorArea==4}" ng-click="selectMajorArea(4)">环境/动物保护</span>
-                                    <span ng-class="{'active': org.majorArea==5}" ng-click="selectMajorArea(5)">其他</span>
+                                    <!--<input required type="text" ng-show="false" ng-model="org.majorArea">-->
+                                    <!--<span ng-class="{'active': org.majorArea==1}" ng-click="selectMajorArea(1)">疾病援助</span>-->
+                                    <!--<span ng-class="{'active': org.majorArea==2}" ng-click="selectMajorArea(2)">扶贫/救灾</span>-->
+                                    <!--<span ng-class="{'active': org.majorArea==3}" ng-click="selectMajorArea(3)">教育/助学</span>-->
+                                    <!--<span ng-class="{'active': org.majorArea==4}" ng-click="selectMajorArea(4)">环境/动物保护</span>-->
+                                    <!--<span ng-class="{'active': org.majorArea==5}" ng-click="selectMajorArea(5)">其他</span>-->
+
+                                    <span ng-repeat="majorArea in defaultMajorAreas" ng-class="{'active':org.majorArea == majorArea}"
+                                          ng-click="setMajorArea(majorArea)" ng-bind="majorArea"></span>
                                 </div>
                             </div>
                             <div class="form-group clearfix">