1.基本资料页面，身份为从业者时，直接点确定报提示问题

2.强制修改基本资料，修改资料按键错误

app/views/layouts/_logined_header_show.html.erb

@@ -36,7 +36,7 @@
         <a href ="javascript:void(0);" disabled="true"><%= image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:alt=>"头像", :id => "nh_user_logo", :class => "portraitRadius") %></a>
         <ul class="topnav_login_list none" id="topnav_login_list">
           <li>
-            <%= link_to "添加成员", my_account_path(:tip => 1), :class => "menuGrey"%>
+            <%= link_to "修改资料", my_account_path(:tip => 1), :class => "menuGrey"%>
           </li>
           <li>
             <a href ="javascript:void(0);" class="menuGrey" disabled="true">我的组织</a>

app/views/my/account.html.erb

@@ -90,6 +90,7 @@
           </li>
 
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
+            <!-- 基本资料页面单位审核显示 -->
             <% if User.current.user_extensions.nil? %>
                 <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                 <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210" type="text" value="" placeholder="     --请选择您所属的单位--"/>
@@ -98,13 +99,14 @@
                   <span id="hint" style="color: #7f7f7f;display: none"><a id="school_num" href="javascript:void(0)" style="color: red" ></a><a id="search_condition" href="javascript:void(0)"></a></span>
                 </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
+            <!-- 从业者选择单位名称 -->
             <% elsif User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %>
                 <% if User.current.user_extensions.school_id.nil? %>
                     <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                     <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
                 <% else %>
                     <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text"value="<%= User.current.user_extensions.school %>" >
-                    <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
+                    <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.school.id %>" /> <!-- 单位名称的test框选中下拉列表框的id -->
                 <% end %>
                 <p class="fl ml10">
                   <!-- <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span> -->
@@ -605,12 +607,15 @@
     });
   });
 
+// 基本资料页面提交表单时，判断身份与单位是否合法
 function my_account_form_submit(){
     if($("#userIdentity").val() == -1 ) {
         $("#identity_hint").html('<span style="color:red">请选择身份</span>').show();
-        e.stopImmediatePropagation();
+        e.stopImmediatePropagation(); // 阻止事件冒泡
         return;
     }
+
+    // 单位或高校必须从下拉列表中选择
     if( $("input[name='province']").val().trim() != '' && $("input[name='occupation']").val().trim() == ''){  //学校名字和id不对的话
         $("#hint").html('<span style="color:red">单位名称必须是从下拉列表中选择的,不能手动修改</span>').show();
         e.stopImmediatePropagation();