Merge remote-tracking branch 'origin/develop' into develop

app/services/project_packages/save_service.rb

@@ -17,6 +17,11 @@ class ProjectPackages::SaveService
 
     raise Error, '竞标截止时间不能小于当前时间' if params[:deadline_at].present? && params[:deadline_at].to_time < Time.now
 
+    if params[:min_price].blank? && params[:max_price].present?
+      params[:min_price] = params[:max_price]
+      params[:max_price] = nil
+    end
+
     ActiveRecord::Base.transaction do
       package.assign_attributes(params)
       package.save!

app/views/layouts/_logined_header.html.erb

@@ -56,6 +56,7 @@
         <li><%= link_to '客户管理', partner_list_cooperate_path(User.current.partner) %></li>
       <% end %>
       <li><%= link_to '我的项目', user_path(User.current, :type => 'a_project') %></li>
+      <li><%= link_to '我的众包', user_path(User.current, :type => 'a_package') %></li>
 
       <% if User.current.department_members.count > 0 %>
         <li><%= link_to '学院统计', statistics_college_path(User.current.department_members.first.try(:department)) %></li>

app/views/users/show.js.erb

@@ -14,7 +14,7 @@
         $("#user_project").addClass("active");
       <% when "m_bank", "p_bank" %>
         $("#user_bank").addClass("active");
-      <% when "p_package", "l_package" %>
+      <% when "a_package", "p_package", "l_package" %>
         $("#user_package").addClass("active");
     <% end %>
     $(".white-panel").hide();