From 9a3603c778bb8e45a5ba5cc03c262fa96cbe32a8 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 2 Sep 2016 16:11:14 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=9F=BA=E6=9C=AC=E8=B5=84=E6=96=99=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=BA=AB=E4=BB=BD=E4=B8=BA=E4=BB=8E=E4=B8=9A?=
 =?UTF-8?q?=E8=80=85=E6=97=B6=EF=BC=8C=E7=9B=B4=E6=8E=A5=E7=82=B9=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=E6=8A=A5=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98=202.?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E4=BF=AE=E6=94=B9=E5=9F=BA=E6=9C=AC=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99=E6=8C=89?=
 =?UTF-8?q?=E9=94=AE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header_show.html.erb |  2 +-
 app/views/layouts/new_base_user_show.html.erb   |  6 +++---
 app/views/my/account.html.erb                   | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/_logined_header_show.html.erb b/app/views/layouts/_logined_header_show.html.erb
index 7a2dd6ced..df694db11 100644
--- a/app/views/layouts/_logined_header_show.html.erb
+++ b/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>
diff --git a/app/views/layouts/new_base_user_show.html.erb b/app/views/layouts/new_base_user_show.html.erb
index b49df8829..fd93a604d 100644
--- a/app/views/layouts/new_base_user_show.html.erb
+++ b/app/views/layouts/new_base_user_show.html.erb
@@ -103,7 +103,7 @@
     <div class="homepageLeft mt10" id="LSide">
       <div class="user_leftinfo mb10">
         <% if User.current.logged?%>
-            <a href ="javascript:void(0);" disabled="true" class="user_leftinfo_img"><%= image_tag(url_to_avatar(@user),width:"74", height: "74", :id=>'nh_user_tx')%></a>
+            <a href ="javascript:void(0);" disabled="true" class="user_leftinfo_img"><%= image_tag(url_to_avatar(@user), width:"74", height: "74", :id=>'nh_user_tx')%></a>
         <% else %>
             <img src="images/user/male.jpg" width="74" height="74" />
         <% end %>
@@ -112,7 +112,7 @@
         <% end %>
         <div class="user_info_inner">
           <div class=" user_leftinfo_namebox" >
-            <a href="javascript:void(0);" class="user_leftinfo_name"><%=@user.show_name %></a>
+            <a href="javascript:void(0);" class="user_leftinfo_name"><%= @user.show_name %></a>
             <% if @user.user_extensions && @user.user_extensions.identity %>
                 <span class="user_cirbtn_yellow" ><%= get_user_roll @user %></span>
             <% end%>
@@ -123,7 +123,7 @@
                 <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
               </div>
             </div>
-            <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id)%>');"><%= @user.user_extensions.brief_introduction %></textarea>
+            <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id) %>');"><%= @user.user_extensions.brief_introduction %></textarea>
           </div>
           <ul class="user_atten clear">
             <li>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index e58beb8d6..0591c4e6f 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -70,15 +70,15 @@
             </select>
             <span nhname="tag" nh_tag_1="true" style='display:none;'>
               <% if !User.current.user_extensions.nil? && !User.current.user_extensions.student_id.nil? %>
-                <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => l(:label_account_identity_studentID),:style=>"width:127px;" %>
+                <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => l(:label_account_identity_studentID),:style => "width:127px;" %>
               <% else %>
-                <%= text_field_tag :no, nil, :placeholder => l(:label_account_identity_studentID),:style=>"60px" %></span>
+                <%= text_field_tag :no, nil, :placeholder => l(:label_account_identity_studentID), :style => "60px" %></span>
               <% end %>
             </span>
             <span id="identity_hint" style="display: none"></span>
           </li>
 
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= text_field_tag :lastname,@user.lastname+@user.firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %><span id="last_name_notice" class="none c_red">姓名不能为空</span>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= text_field_tag :lastname, @user.lastname+@user.firstname, :no_label => true, :required => true, :nh_required => "1",:class => "w210" %><span id="last_name_notice" class="none c_red">姓名不能为空</span>
 
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
             <% if User.current.user_extensions && User.current.user_extensions.gender && User.current.user_extensions.gender == 1 %>
@@ -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();