From 05bd1ca0c82eb124373e097acf291a0bbe18cc50 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Wed, 10 Jul 2019 14:25:52 +0800
Subject: [PATCH] user center project package list

---
 .../project_packages_controller.rb            |   4 +
 app/controllers/users_controller.rb           |  50 ++++++++++
 app/models/bidding_user.rb                    |   4 +
 app/models/user.rb                            |   2 +
 app/views/users/_project_package.html.erb     |  82 ++++++++++++++++
 app/views/users/show.html.erb                 |  16 +++
 app/views/users/show.js.erb                   |   4 +
 config/locales/bidding_users/zh.yml           |   6 ++
 config/routes.rb                              |   4 +-
 .../images/educoder/project_packages/ai.png   | Bin 0 -> 1459 bytes
 .../educoder/project_packages/backend.png     | Bin 0 -> 1404 bytes
 .../cloud_compute_and_big_data.png            | Bin 0 -> 1506 bytes
 .../educoder/project_packages/database.png    | Bin 0 -> 1627 bytes
 .../project_packages/devops_and_test.png      | Bin 0 -> 1312 bytes
 .../educoder/project_packages/front.png       | Bin 0 -> 1322 bytes
 .../educoder/project_packages/mobile.png      | Bin 0 -> 1367 bytes
 .../educoder/project_packages/other.png       | Bin 0 -> 1107 bytes
 public/stylesheets/educoder/edu-main.css      |  91 ++++++++++++++++++
 18 files changed, 262 insertions(+), 1 deletion(-)
 create mode 100644 app/views/users/_project_package.html.erb
 create mode 100644 config/locales/bidding_users/zh.yml
 create mode 100755 public/images/educoder/project_packages/ai.png
 create mode 100755 public/images/educoder/project_packages/backend.png
 create mode 100755 public/images/educoder/project_packages/cloud_compute_and_big_data.png
 create mode 100755 public/images/educoder/project_packages/database.png
 create mode 100755 public/images/educoder/project_packages/devops_and_test.png
 create mode 100755 public/images/educoder/project_packages/front.png
 create mode 100755 public/images/educoder/project_packages/mobile.png
 create mode 100755 public/images/educoder/project_packages/other.png

diff --git a/app/controllers/project_packages_controller.rb b/app/controllers/project_packages_controller.rb
index cdedea9e..3945f978 100644
--- a/app/controllers/project_packages_controller.rb
+++ b/app/controllers/project_packages_controller.rb
@@ -21,6 +21,10 @@ class ProjectPackagesController < ApplicationController
     render_react
   end
 
+  def apply_success
+    render_react
+  end
+
   private
   def render_react
     render file: 'public/react/build/index.html', :layout => false
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4fae7ff7..3306326e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2558,6 +2558,56 @@ class UsersController < ApplicationController
           @tag = params[:tag]
           @objects = @objects.where(:course_list_id => params[:tag]).order("#{@sort} #{order}")
         end
+      when 'a_package'
+        bidding_packages = @user.bidding_project_packages
+        bidding_packages = bidding_packages.none if @show_all && params[:q] == 0 # 参与的不存在未发布的
+        packages = @user.project_packages
+
+        if @show_all
+          status =
+            case params[:q]
+            when '0' then %w(pending applying refused)
+            when '1' then %w(published)
+            when '2' then %w(bidding_ended bidding_finished)
+            end
+          if status.present?
+            packages = packages.where(status: status)
+            bidding_packages = bidding_packages.where(status: status)
+          end
+        else
+          packages = packages.where(status: %w(published bidding_ended bidding_finished))
+        end
+
+        ids = bidding_packages.pluck(:id) + packages.pluck(:id)
+        @objects = ProjectPackage.where(id: ids).order("published_at #{order}")
+      when 'p_package'
+        packages = @user.project_packages
+        if @show_all
+          status =
+            case params[:q]
+            when '0' then %w(pending applying refused)
+            when '1' then %w(published)
+            when '2' then %w(bidding_ended bidding_finished)
+            end
+          if status.present?
+            packages = packages.where(status: status)
+          end
+        else
+          packages = packages.where(status: %w(published bidding_ended bidding_finished))
+        end
+        @objects = packages.order("published_at #{order}")
+      when 'l_package'
+        packages = @user.bidding_project_packages
+        if @show_all
+          status =
+            case params[:q]
+            when '0' then %w(bidding_lost)
+            when '1' then %w(bidding_won)
+            end
+
+          packages = packages.where(bidding_users: { status: status }) if status.present?
+        end
+        @objects = packages.order("published_at #{order}")
     end
     @objects_count = @objects.size
 
diff --git a/app/models/bidding_user.rb b/app/models/bidding_user.rb
index 5869b6d4..9f368b2a 100644
--- a/app/models/bidding_user.rb
+++ b/app/models/bidding_user.rb
@@ -17,4 +17,8 @@ class BiddingUser < ActiveRecord::Base
       transitions from: [:pending], to: :bid_lost
     end
   end
+
+  def status_text
+    I18n.t("bidding_user.status.#{status}")
+  end
 end
\ No newline at end of file
diff --git a/app/models/user.rb b/app/models/user.rb
index b5545206..0e034d32 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -276,6 +276,8 @@ class User < Principal
 
   # 众包
   has_many :project_packages, foreign_key: :creator_id, dependent: :destroy
+  has_many :bidding_users, dependent: :destroy
+  has_many :bidding_project_packages, through: :bidding_users, source: :project_package
 
   ## end
 
diff --git a/app/views/users/_project_package.html.erb b/app/views/users/_project_package.html.erb
new file mode 100644
index 00000000..d8ca475e
--- /dev/null
+++ b/app/views/users/_project_package.html.erb
@@ -0,0 +1,82 @@
+<% if @type == 'p_package' && User.current == @user %>
+  <div class="edu-back-white padding20-30 clearfix secondNav educontent bor-top-greyE">
+    <li class="<%= @p == 'a' ? 'active' : '' %>"><%= link_to "全部", user_path(@user, :type => @type), :remote => true %></li>
+    <li class="<%= @p == '0' ? 'active' : '' %>"><%= link_to "未发布", user_path(@user, :type => @type, :p => "0"), :remote => true %></li>
+    <li class="<%= @p == '1' ? 'active' : '' %>"><%= link_to "竞标中", user_path(@user, :type => @type, :p => "1"), :remote => true %></li>
+    <li class="<%= @p == '2' ? 'active' : '' %>"><%= link_to "已完成", user_path(@user, :type => @type, :p => "2"), :remote => true %></li>
+  </div>
+<% elsif @type == 'l_package' && User.current == @user %>
+  <div class="edu-back-white padding20-30 clearfix secondNav educontent bor-top-greyE">
+    <li class="<%= @p == 'a' ? 'active' : '' %>"><%= link_to "全部", user_path(@user, :type => @type, :p => "a"), :remote => true %></li>
+    <li class="<%= @p == '0' ? 'active' : '' %>"><%= link_to "未中标", user_path(@user, :type => @type, :p => "0"), :remote => true %></li>
+    <li class="<%= @p == '1' ? 'active' : '' %>"><%= link_to "已中标", user_path(@user, :type => @type, :p => "1"), :remote => true %></li>
+  </div>
+<% end %>
+
+<div class="pl25 pr25 clearfix font-12 mt20 mb20 educontent">
+  <span class="fl color-grey-9">共<%= @objects_count %>个</span>
+  <div class="fr edu-menu-panel">
+    <%= link_to '发布时间', user_path(@user, :order => @new_order, :sort => @sort, :type => @type), :class => "fl color-grey-9", :remote => true %>
+  </div>
+</div>
+
+<% if @objects_count > 0 %>
+  <div class="educontent project-packages-list">
+    <% @objects.each do |object| %>
+      <div class="project-package-item">
+        <div class="item-image">
+          <%= image_tag("educoder/project_packages/#{object.category}.png") %>
+        </div>
+        <div class="item-body">
+          <div class="item-head">
+            <div class="item-head-title">
+              <%= link_to object.title, project_package_path(object) %>
+            </div>
+            <div class="item-head-tags">
+              <% if object.creator_id != @user.id %>
+                <% bidding_user = object.bidding_users.find_by_user_id(@user.id) %>
+                <%= raw content_tag(:span, bidding_user.status_text, class: bidding_user.status) %>
+              <% end %>
+            </div>
+            <div class="item-head-blank"></div>
+            <div class="item-head-price">
+              <span>￥</span><%= object.min_price %>
+              <% if object.max_price && object.max_price != object.min_price %>
+                ~<span>￥</span><%= object.max_price %>
+              <% end %>
+            </div>
+          </div>
+          <div class="item-category">
+            <div class="item-category-item">人工智能</div>
+          </div>
+          <div class="item-other">
+            <div class="item-group item-other-visit">
+              <span class="item-group-icon"><i class="fa fa-eye"></i></span>
+              <span class="item-group-text"><%= object.visit_count %>人浏览</span>
+            </div>
+            <div class="item-group item-other-deadline">
+              <% if object.published? %>
+                <span class="item-group-icon"><i class="fa fa-clock-o"></i></span>
+                <span class="item-group-text">内竞标截止</span>
+              <% end %>
+            </div>
+            <div class="item-group item-other-bidding">
+              <% if object.bidding_users_count > 0 %>
+                <span class="item-group-icon"><i class="fa fa-user-o"></i></span>
+                <span class="item-group-text"><%= object.bidding_users_count %>人竞标</span>
+              <% end %>
+            </div>
+            <div class="item-other-blank"></div>
+            <div class="item-group item-other-publish-at">
+              <% if object.published_at.present? %>
+                <span class="item-group-text">发布日期：<%= object.published_at.try(:strftime, '%Y-%m-%d') %></span>
+              <% end %>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% else %>
+  <%= render :partial => "welcome/no_data" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 6d42f201..fb459160 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,6 +1,8 @@
 <% current_user = @user == User.current %>
 <% str = current_user ? '我' : 'TA' %>
 
+<% show_package = @user.project_packages.count.nonzero? || @user.bidding_project_packages.count.nonzero? %>
+
 <script>
     function showedit_headphoto() {
         var html = "<%= escape_javascript(render :partial => "users/upload_avatar") %>";
@@ -170,6 +172,9 @@
           <% if @user.user_extensions.try(:identity) == 0 && current_user %>
             <li class="<%= @type == 'm_bank' ? 'active' : '' %>" id="user_bank"><%= link_to "题库", user_path(@user, :type => "m_bank"), :remote => true %></li>
           <% end %>
+          <% if show_package %>
+            <li class="<%= %w(a_package p_package l_package).include?(@type) ? 'active' : '' %>" id="user_package"><%= link_to "众包", user_path(@user, :type => "a_package"), :remote => true %></li>
+          <% end %>
         </div>
       </div>
     </div>
@@ -235,6 +240,15 @@
       <li class="<%= @type == 'p_bank' ? 'active' : '' %>" id="p_bank"><%= link_to "公共题库", user_path(@user, :type => "p_bank"), :remote => true %></li>
     </div>
   <% end %>
+
+  <% if show_package %>
+    <!-- 众包 -->
+    <div class="white-panel edu-back-white pt25 pb25 clearfix <%= %w(a_package p_package l_package).include?(@type) ? '' : 'none' %>">
+      <li class="active" id="a_package"><%= link_to "全部", user_path(@user, :type => "a_package"), :remote => true %></li>
+      <li id="p_package"><%= link_to str + "管理的", user_path(@user, :type => "p_package"), :remote => true %></li>
+      <li id="l_package"><%= link_to str + "参与的", user_path(@user, :type => "l_package"), :remote => true %></li>
+    </div>
+  <% end %>
 </div>
 
 <div id="user_object_list">
@@ -248,6 +262,8 @@
     <%= render :partial => "users/l_shixun" %>
   <% elsif @type == 'a_path' || @type == 'l_path' || @type == "p_path" %>
     <%= render :partial => "users/p_path" %>
+  <% elsif %w(a_package p_package l_package).include?(@type) %>
+    <%= render :partial => "users/project_package" %>
   <% end %>
 </div>
 
diff --git a/app/views/users/show.js.erb b/app/views/users/show.js.erb
index 10bc1b8b..92c372e1 100644
--- a/app/views/users/show.js.erb
+++ b/app/views/users/show.js.erb
@@ -14,6 +14,8 @@
         $("#user_project").addClass("active");
       <% when "m_bank", "p_bank" %>
         $("#user_bank").addClass("active");
+      <% when "p_package", "l_package" %>
+        $("#user_package").addClass("active");
     <% end %>
     $(".white-panel").hide();
     $("#<%= @type %>").parent().show();
@@ -29,5 +31,7 @@
   $("#user_object_list").html("<%= j (render :partial => "p_path") %>");
   <% when "m_bank", "p_bank" %>
   $("#user_object_list").html("<%= j (render :partial => "m_bank") %>");
+  <% when "a_package", "p_package", 'l_package' %>
+  $("#user_object_list").html("<%= j (render :partial => "project_package") %>");
   <% end %>
 <% end %>
\ No newline at end of file
diff --git a/config/locales/bidding_users/zh.yml b/config/locales/bidding_users/zh.yml
new file mode 100644
index 00000000..c3f3a4f9
--- /dev/null
+++ b/config/locales/bidding_users/zh.yml
@@ -0,0 +1,6 @@
+'zh':
+  bidding_user:
+    status:
+      pending: 竞标中
+      bidding_won: 已中标
+      bidding_lost: 未中标
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 762096f0..d0108fe1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -57,7 +57,9 @@ RedmineApp::Application.routes.draw do ## oauth相关
     get :publish_success, on: :collection
   end
 
-  resources :project_packages, only: [:index, :show, :new, :edit]
+  resources :project_packages, only: [:index, :show, :new, :edit] do
+    get :apply_success, on: :member
+  end
 
   resources :ec_course_evaluations do
     member do
diff --git a/public/images/educoder/project_packages/ai.png b/public/images/educoder/project_packages/ai.png
new file mode 100755
index 0000000000000000000000000000000000000000..825e75165dc6b016037d6cef82573728f69ffa65
GIT binary patch
literal 1459
zcmV;k1x)&hP)<h;3K|Lk000e1NJLTq005Q%003?T0{{R3H}3bP0000dP)t-s!glk+
zb@IV>^3;I;z;*A!cJjS*?EnA&`0xG3h40<C_0pg6>(%-7b#?v#000DZQchF$yhsKO
z8Az=F00lQmL_t(&-tC&pP9r%KK+}ufxB3r8^9S<{wk0$hMsl?jdX|=@BD1ejEBmS>
zEFprBB_a=4GAO_nDS_mp=Gv}@?JCzJWHrL8Ad$nl*VorB7o9)8bq+JW{NDNPt9O`j
z{JrzdJJk5A^Yvh?&H-7+pR7;TC+m~-|7B4G10RBgaQEu!>f(ap53_Lh<$e>#yXBLI
zKFGq?_i-Rb7;i7=$5@k1kdAP8@gdfAf(qjxu7_2!x~bK0GMq#~IHLQr=4pH*PI?jO
zE%s)CiW+AN&e;Zj>i@eZ>nPO<Z@B-&{TY1R?#aru!dpI%AGtt>5Bss^A;2VW<VV44
zPkluDuzp6v=b-;A2!ou}ALI5cIt?HF&6ckqFo-X__17}sSB~3z!PmJ@_$7S*fnVQo
zK1<4jwPtlA(1EcMHF3+izf@DvCr+4?b+Q{0!8(nBG2pzH%&PbctR0I^&&OPjComgL
zwpoRMBS-DLCScXOhcxkjKxPwW4Pzkw0B*%vg4SF{bQ&0A#9c5KtGjvSzRJ|xWDU6s
z=3*VK2mCY=7HQJc@k>q#XSlgnG?2j+S$)MSnM|iwd?P6XC#wi^dJV^%tz`vF9jroS
zIK4!QCovF3O_b!TB>zsYvoU<<O4RG6*f+F!%vo0conFyyD}TSYT!(k@``W56F$ghX
zPOmkzD!H~p`0)IAS;FGXG;`Ni5K7i82>UY70*e94$iH(90b}ehMVB8gM5w!RFN7Mf
zR<IjRgVCSs0Cpi@`e~W<$ElV;F^1|{5ESek&>q4!K8;2>OSQ-prytFntf{t`S0FRB
z6GmVNFP6dFeKpEi(0j&t@-;CeyfRotzfZsW29r3HO+yzGT8JP$O!q#t&UfwJZjt9p
z6C=_~j2hM|{p$M@OuqlDwTm~Ib}&l4lvu@Hn;!^4VH#(o_^jw9VO3{<tTXUyvdSY|
zoTpmSD~DB_O=elgdWjdaoCS?7t%}@Bq^yFKSAjUK8oiL^UL=QAuuiPzZ1*o>dQn`#
z>aI&!qolZmkO8Y=X+c^nnJ=brnHH@)`%cSHVd{mL>4j-)ud@f`1%;}6VO*JeTFQb$
zHB)JqURq65daX+H1t$zr@WL2Z=WFipBBDz3ichqv^EE4-Mk2igiRCy-YrNLwCBayU
z7q0dyuhn1D3z{?1(gnp;y|#~{a+dHy%<=+Q<r<2dULsjYYhD=Fc>Oe4VI0L_91ldk
zgp}b0s7f!3_5O0Vd|tks^UO=rs`ENAgS%le=|pxe%L~_e{cVPLo3^c_xR5!Em0r|r
z6X`}qm?~2vNLu4%Ep2sz66;zWBbd=5>by*rI^M9{%V-gGUaPX>v+y$8jcgHh^SCNL
zx-jWwFGeqcRXw}M`glwB9&VFli|}f^#JyKO#!9QCd5IQ5Ywi>%FAO3=G)bbkfJAHV
zU~CxUszq2Uh&J#l!bs6e6<3q{FJy~BK@=LjXk8fB-^<xr(o5TblHzJ~$EQar`+TA1
zWxv6=$vr00BUFbaJ@Ygvt!DSDKk^X8lLoSS1WX}q>g9PvOFU0byypJX;tpB&V#r=W
zauRV<7EMv|L4z^l6yec!_vAmaS(M>vFsM_RuoidjByIHa*+8E~+W!8Y$cJkq?MaKE
zw569wnMfBiy<|1Cf3JXKLp4&RT7;L)V)J(tNN54dINa>#<x!a~%ga+<t>2wcvH$2^
zszvPMC88vjmsHYd$IaiBOO)LrbgwVX-{DiU<W-B%*7ouD&H?|o;6H<yHW#|R&B_1(
N002ovPDHLkV1kdA*1!M&

literal 0
HcmV?d00001

diff --git a/public/images/educoder/project_packages/backend.png b/public/images/educoder/project_packages/backend.png
new file mode 100755
index 0000000000000000000000000000000000000000..359bca7466ea56f8e7da7b1bead77f401379ab95
GIT binary patch
literal 1404
zcmV-?1%vvDP)<h;3K|Lk000e1NJLTq005Q%003?X0{{R3@*Wzb0000sP)t-s`n7!j
z|Ns5Aef6??|EhrhxPJPyeE+$A|G9quw|@EM)c*JK@~(FH)VB4yiuT5y|GtU)?ci{_
zI9vb#019+cPE-8<|NjR6|Mt8{$K)~g000E*Nkl<Zc-rlp+qR=142D}6XtyZV_kY<z
z<Pc5@npQ82b`R4vYy0(22!X;p{{6jQ7qj=@zlWk?*RmIR|2^J>UC-W+*9ED_>ylXP
z#=5a?tQ+gby0LDo8|%ipvDOP&6hp`QpcpdNXXuo<A4B|?N*jg`Cf1mF^wjOL4<gp!
zKW?#6D;Oe{{hgx{&NMzzqh2n8ghf8~lhVGYL)?&USPTuzsx?Rj5zy?w!dFXi$sufv
zwoz>aT`d%o99=C8qm-awO=#B1ew(WjOFWf{`4;X^5xi4r;yEcSP7twhOeieMuZgwA
zbr#kJ*J)VmT<2k}cE?sM0nNQrXslzcakXKIZWxDQe(AfLbHgyI#xvJgk1e{ECfcy(
zoYVL7OW#sGT#V`|gD{WtjS96^xZ1F~846gZpVIe+rl-D9gH;auX0@QnE}?0{;zh2;
z*ivBwY%sAk+K^frqiJkm@iNz;o+#WqN#j}NM9K@{bz<JqY8Ar%tfAW6C9Y#m%ozA*
zd51!^7Rd;5$meYC20rRD;qTI^zO)hC1d%g2JwcApjT{zVv@&c2H=SloLpZD{&0)@o
z3lYug)js&pe&wQ0Eh-naD3v9(IB@0Bp?b@@B?gsEw$T-{Jm-b*I;SUcpq7z~T%>5$
zYPsNwxX!`iKHe9qSg*4OA1D|(fCVS6>Fuwr!G{M4BIatunuc2I#HtfbWVy~rk6=xb
zu3qMr^Up!7PG6l^F61E>dX{%KigmSs2WjHQMl4xPMc1&BXpgyCD+pO@#j@F`<)DBQ
z$$aezc~Ng0OCxz7s+(LWoyJ_J70pS`T71aKE-bOzLM)K8pbzy$zEIedZ30eAgB=9D
z;@YtWk+1(YOfi`Js<2!hP2n^ZA>T`<F|*CDGgdBR8KssRcZvZ)5)~bmpYzOgsS6bt
z`h=`JQ**IpGXqVuTCjL4){&m*GP0y$`De#z@5NRp;^ZyLlavL;YIh<Q7UgNwdk?DX
ze6<Knr01&zwF13xPl7;GD{`O9q(&`rnp)YxkP{=?S+TX!4eMizb$D2vq-pV|shAsk
zYB#2j6BgApLMRgW(1bjz#$sb9Fl_3^v>>&G18`&8jwC$+1QS9tEu^*cj*ld{R2r$(
zgf(yAQoo|#W8B<!ZV^Y7Rm(u_IrN}D??!RsOByh@u`ro<hlQ4oEVAn?261Fyagr8G
z)ZWZ<`gC3q*I5p1=ib1XjJhxIs9909^&gE^-u=2?TF)eEk-ch#WRA(b!WtfaWf2tb
zFq1A)F@D5}un(kQpjHM;?*UV;ECo_Aa`>DN(9C);)r;rms~~AvskqUKARIr^ngJK~
zF;TddMPY^~>2NrcA)SgUgVE?)0nW4i(4}~`=!LdRcTTklkSB6#`L9!g^v<JQvxu9A
zGh~h}D;CTRF28HNkoPn%WH2*?X)815aY6;*g}&7qkh#@l$_vXzRxIvQ1H%jXBAJ&9
z&hJ+$2fH8pOB>S-nHDLx8VM9*90t~+*BAH8Ycd|IMH4R)HxcuB>$}_d4VjND8q8S1
z3XMxyTCwk+F3_c8e%OHl&x0iYn?nzTr+qOQazeR&bQXieI`Jq&Fk8~F`gM5>u7!-2
z)ncwMYOLQK_a;`S%<P`Q$YQVePY=f%&3s*&3$2;z?{UrlO5i`rgj%#@wM@AH0000<
KMNUMnLSTYtg0yh}

literal 0
HcmV?d00001

diff --git a/public/images/educoder/project_packages/cloud_compute_and_big_data.png b/public/images/educoder/project_packages/cloud_compute_and_big_data.png
new file mode 100755
index 0000000000000000000000000000000000000000..42e64da3bd7b6d728a0d40fa15207268c85bea8b
GIT binary patch
literal 1506
zcmV<81s(c{P)<h;3K|Lk000e1NJLTq005Q%003?T0{{R3H}3bP0000dP)t-sfbHLa
z?%;m!-+=Ak|NsAf=-Pnl-F@ZP@BI3D;?<b#;=A(e+4%JB*7pPe000AYQchF$yfVv}
zdx!u41!qY_K~!ko?V8PQ+eQ?H732kiyg~B>DFhAzI!i5xT04Ox;%o{GID(rlvY`no
zU1}ki+NQ*~OTl&$dFR+Q<m_TJf|7^oy)#3Kq=tX8x+vhWy)obq=bkzD&X`o^*^|z0
z)}v>gpB{I2v*^>#lkTq8&z;9RWBs~A*7FC}1M7kHz<OZ)&smgo=`L6VeoV950M<a4
zdHZ8B`Efg|rPZ-WcfK6=U|G|}y>-n630Ezwj<uJf0CssVmbvU@Ry4a0>q9TMR`+0K
zE5y~GZO<ym>h+GdW|`w6t5R4c>!OJ2SzothecoX8qAgi_<4u+|+lobA_B5=^?R4E}
zSXDb&#k$k6_P1i0V;!p^6&0*K9jeOw3f4<4t9Q8#>w}*4b%(6uZCE!uWPSecS--Sq
z!QooQBI3ww%p!2QnkB4gHk;{BUOmhFvYbqMmOiW#IC&RMbrDk>uhZL-orE=6HDsBR
zaUG1xVb-D<OOEFKkn=xES-KwAu+)4w=A565OIcAPmg=2vz>4q6P}5VN*0apJ46Dqr
z$#oDqw3emDmi0G}Ie#-QaXtu-ZoOKTD)AVs2Voal)aq66{$g_O)UjlV)<;Bz{A8(N
zeILd#+{>;CmTj=qE=FPeY4~Qr`Mb?3qw_e%;*WisR<h&)3vQi28%@tS->7nW9`gf~
z8@YB4w#iC@dLiZUlfqv1uQ`_uu|KqJr-~&{j4S^BPHtGSN^24FBZ=<=D+}9TiEZp3
zChgNNRB5dMbs^~%vTRn)dLizTJWi$;RQcykHVu#yB~-H3mT7hMKduY2R@o|}A&=Ai
zDps2RBFlIo+B(xbs!EuRm<G-d(jHZ;6sGeYa{5=s?+D7enJ(r_NCS^Y>+lNiZO>z@
zoCWQZJ7=NF5d`7&<SI#ny7DMp2~3k!%xOLb=UnvWr;x{AviWzhK*wQB!ZbY;g~hB#
zhg^1Nx`nd+eQ6iMsJ6G4Agee6p~^Uh!7<P2z4nz|O4ufAe#n2{7&0(5!kE7<l&<WO
zI30^<CbRX8hhaF%&mUpEvWrouQZw&gz1y5v|3HmJxvRu3Sb$<WmZKT+5qh8hy>)75
z>;h#}ccy6$AB@E)KNVLh^kA1q4EU-zYYW0o3x|0B)K>+v!N8$|fmT;?2gnPXE(>EU
zP`a4o5eg(d3t;8vwK^XcuCMHJJmwjMF;aGCx`kn1vA!>ceqtA64uulo@>g;%G#NX}
zElknKJ3H{seq(2h1%b+g%^a``HgP~o@0gy;%U2L6RWPAJ79$4iBBiBwUoy=8HKZO8
zaTti@CM3**XLyG2zUm%56g?=uaRtfpaoNc(GKL&*o{*~l`G$Bq5#J%|N>l;Nc3ou`
zHuhjJsM95tVIwBGB+PYPH)9v10gR{R`<U#2&?SrHYgvBQF3$kx8D7$Bp1}xM-Y-C<
zx`bT=3<R#a=S&_B`b3uCxv4HGix~zE9NOUdmlsOw0Tibt`dPbh8@sfDE&<EdxK0F&
z2xXT+NF!Yc6D!$8OhjUrIDs&z-O@Qxgaw&R4AMm4NOiCqQ5R|YeAP>3xdOG$1n4rl
zI3v1sS<Na_y4<W?4mLJ}bhXfhFewa6OfoM<Jq~)b3t>&4M|;XGKix-+mWPoSZqYW+
zw!JhFsV*o`l!&vdjV_#y(t2Ccgk27f2uMXsU2tV|lLqqBQ4g-m5-Dx>{2pNI#uj#A
z>WLwpZ}~33a5LK|Dx~-&;??@S0?F8gS4%i%v9-w-x&UUUb}=ZCP?$Kli|W4G?p--i
zB+tWr^u$C>USK?G`wpMvM=BiH$rG99Pdn{DTk!U6$!81x1%NO)4o_@-MF0Q*07*qo
IM6N<$f*J$d*#H0l

literal 0
HcmV?d00001

diff --git a/public/images/educoder/project_packages/database.png b/public/images/educoder/project_packages/database.png
new file mode 100755
index 0000000000000000000000000000000000000000..2b668e774b5d16b7725469f70309ee0ea285f08e
GIT binary patch
literal 1627
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
Z!GGbk(Twpgt_lDE002ovPDHLkV1jIHA!q;q

literal 0
HcmV?d00001

diff --git a/public/images/educoder/project_packages/devops_and_test.png b/public/images/educoder/project_packages/devops_and_test.png
new file mode 100755
index 0000000000000000000000000000000000000000..77b8e6f3b1b9b4b7ea21c6384e1c9638504151fe
GIT binary patch
literal 1312
zcmV+*1>gFKP)<h;3K|Lk000e1NJLTq005Q%003?T0{{R3H}3bP0000mP)t-sahd;d
zng4K_|A2u1ahd;enfw3$|8$x5?ehMEr1*1}@L`4H&f58HkL8)N@U+JAyaOII00004
zbW%=J_Pj_24H-zS000D=Nkl<ZXx{Cb!AcxS7=S0>14!N=<PGu!yD)X|5^|`b@CBMa
z49O)$k$Qk30oS>>7)NnWp|d?Jdp6DJZHSPV`?l!Cpds<NBD)CtS65YcRXa0X-S%Z+
zenbbskMIBcufJ+)>^xcSv=a{=cOETu+li%zo#k#@@pEUXHCCrZ)=vx8g0)~RSPRzw
zkF~O~b@ywd5$oy4*HdB*H(^}{)1vq5Y6I3}I%~LdUYoVjpTT;&-XbeJubtyeRxoJK
zD+vE?j};6y+GB-Bt<?*@Z?xtW1V=5hdS6>%?PTln2)9wM-*<O+x4vDlHoW%Yy;#P}
zd$YoCui~K?auIWUUska8DT^<|nBBKtV5VXiMYy@wYlk?D1#8S2{ML6^Q53yw%KAK>
zl)S{9^8427-x4bV7Hj4ee*fU+$fM|vSS2e|-_wJB5Ej223h*kIzmoOkChM#8EC`N&
z*j`-lQkGTq8jQ~5kLSrr5N?le9IuGGSyp(3x5=S=`6huuznz@+T`yOxf_0oGJE|o>
z=_nch$i1NWWwH6Jo>94#Ez!G5K72G@(n^MJy&ywXBHa>$G&$=RUKx&gdab9)pXzT%
z2iebmlJR9;FCEy66@E|lRk!!jGn4av-{h!i#EZ3-j`h)Lke;X)>*@H~<Y-{nr(Q3V
zgl-8XHcGDD94TWyUN3U5Uy@7HBiR}URvt9ZvZ7w6s$RExO011kk7PLtMPiI$zvuXe
zf{sf)Qg~7DA~pKUw1i<hIWk5m_UU_-lWqy<h=WP7hO`zGUyD_*$G7q!oY<Y}cmau0
z1*@79SIHsdmb{m*xAh7tSd2?8@FLiEeyNrSul6VQEL5;eOJ!L(SC4Px#JMg;tn0;;
zRwm}NcR))_tl4kZ3!JF(BA%@6{qnXn)OF`ZOTv8i$1pvd&H^u@%O$h)@*16#Pbiyu
zS=(O3i*<Z6l_i%o0V_j$=Cf~y!E`T9^8{s%&uX5(Y!;*_r6{T6HI>EWya7(7mj_Fh
z-71!6?Pqz(aZ`BV=3XqD5X90#O}&_!Tt($EzDJHct2`~VW_hhvva;4HDvxJ-p~+lU
zZ<A*AvO0pGns*&0*7IpoXwCGRaR+0rVlGtSt%r!`cy(8{<^)lVN*K)xkMX=aD<t+H
z;=k0JJQMJS<J~*C6y2W3WG)L}HY1i>q8wR}pWJ?|b^tAeD(=!GOsJ4&O8AQM!;MVR
zYA%c`@8!5wibN!YeNN)mLzF#_s_*y^hXP5I$fP2*k#Ri&t>(fW_k{q9g?h&#ifupB
zvYU%|-8~{2D;hV|f)NPwlsFI3^Bxn^7^)RnUQ~~HRy3EN7X*cR$+sEYoCGtPQ+n_F
zRYX-&2&2WEWevTBYuwdReLBsLBlccKFs^m)O9eMtj8kV-qncg{mbW~020g0j)$J0~
z_0o$LJ)wKP-rY9QS{h~Lh-<SDGAC5xY(JPZxpPOlBkYY|dNsPgN3v6SY5T#r5evFj
z&l+ma`G%h>0F2pQ2w~im1u%Oh607o(Rr9lQMBJrVq}Y8>`!jsxOfEachn*Jxx8OfK
WhLDY%N|dYs0000<MNUMnLSTZjx`_q=

literal 0
HcmV?d00001

diff --git a/public/images/educoder/project_packages/front.png b/public/images/educoder/project_packages/front.png
new file mode 100755
index 0000000000000000000000000000000000000000..23ba2a755d4a96fd9f789133d0b9b0fe4f02eb6d
GIT binary patch
literal 1322
zcmV+_1=aeAP)<h;3K|Lk000e1NJLTq005Q%003_U0{{R3{IVnf0000XP)t-skHqti
z!|{#9^N-8;i^1@Z#PWx}?f?J(@b~@6;`gM^^9U4#7ytkO1awkPQ}){`1{X@4EdT%n
zv`IukRA}DqnN4mRIS_^AMfRE8V8%Cau0RsWtTF)GP_!-)V_(2Z_JO3V{Ud1|1(r`4
zR<Vj?+v;vo=%u&_5C{42>hZCPO;4`gPsUjnmy^HWHRG(whspb9taUMYHyZ1|5m{f(
ztTXG(I<wBKZkAQuOV{e!zszR)<9}4@veQ-f`l0J|P4Bwbn5>6N*4G}^{g^BmjkUOU
zdNf^+4yst6m)*L4J6FY;^|R(9vY>|bFR_+y7P7A0QDOb8)#3Ge5*AdjG_t-K*Ix6;
zIueWSK5>)<$ofVssL=J)%?dx&<$k4Va#p4m%4<Bzayd&E_voXnTV$>IFU73pnOQfR
zd|~K*3b~Hu6aN33+((wKW!-eMpwus9-FepA=JUfH7dF6pJf<tLps>bi=%Br<wy<tp
zG>AOwHlK{tJRVq-b4Hcv`pT^NOSYc*heB)Rb%2HCK)OhnX^Z7dOIQIbU!T}S<TwLu
z_j_2&BdjTJF3SRdc?pXe{?At|32;;fFb)d<VY-y{J-gDGoaMI=b(!4#0oEeR7HZsN
zjR;jCO%Jnf!+=cFZ0&_*O^uX!S)hhlIt<9Wg&ZAhff<WLdGAfUzV_UssmASg`;=PE
zJdPnlzGGM+3hU7o{-1&8#LCAI!2nUitT2d7*gIj#=rCdz3Dbi$iZ|2LYSKuHAcJuk
zta0;}HBVzG7#22?-S5#Qx%?Euv3TH-hP483BFQo=tblcU@GWq$+Fd6Wdyig`t{|*{
z<zTj5?S2`Tu}pLe(ic)UD-I%>5g`XR+=s9|Q;9wiCc=hTkF7Rw!+Q{7N}_=LQUf(k
zQxBE(S+e2Sc!&+WUl(Ozz0a;-vrQO7;6U=lACy#Nk1lHXe*c8#ci@gkN6>{e%06l}
z%)$%suED8#Sn)0WK1K^nl%;GD%NM$9B8e<aC9+>$m+obyuZ6{Gxy-(-OvtHG;+OB_
z*7mVFzC0GcTjv@GrBT=^EIB@Dpj+=)a}o<cY9wXa>$13!C$O$VP-PQ?F28KwyUFS(
z3fne^i)j{B^?Tn)IP<mI?!_*Z`9;e5-*a9zZQ5$Rw=NVI@(!UsugVU+4QchV$x^m{
zQGC526tw*s(A5~w2c|97J4@$MNxR88S`WWj89s^rj9Z#NGGOrl88Hi;AJo+})FBSs
zqp_ia1OgO?i|n!mZ)rB~(bVYMJurYgsX$kge~tq1E-Hza4n>yf3RPw|XC4_6EOB02
zTfnlJEFKwo8}#RzPEgs~qj@bWG%nyq?>mHUiuN&w8AC9XW~4d$!>ABcsH;(;DMnrj
z)a+NeF18Ff5y>r-MQ5>G7gh;$flDOA6GKypws0RM7zRL!l*~&gJgU*fZ^%}zf+}7|
zRLqt|yDHwJJ;sI9n=B9<`Jk-)ZJV#)CfP2#=xs-36)elACxu>zaG@;Z)x5bYm)`^x
zHyd)D?5cXdH!ibY^I44Ps$*Fd&teFd#k1HnVIwPlub`v}#@o%wx;!k|MHuc}q^g!>
z`L;{9Bo$FwpTP3L$VVA%qo_hw-S5hiS4#RRYNLO<sQewiZH3D=wu!pFe3)GQHP*VE
ge7yQ+oOSu}5Bj<>i{F&|FaQ7m07*qoM6N<$g5QXY-2eap

literal 0
HcmV?d00001

diff --git a/public/images/educoder/project_packages/mobile.png b/public/images/educoder/project_packages/mobile.png
new file mode 100755
index 0000000000000000000000000000000000000000..cd73520c732c931fcae55531ac837ddd09081c21
GIT binary patch
literal 1367
zcmV-d1*rOoP)<h;3K|Lk000e1NJLTq005Q%003?X0{{R3@*Wzb0000sP)t-s`rmW(
z*l6$Y_3`ob`rmW++im~<|MS;o``>c=;B$G<{r>vw`T6_$;)2HI_~h;OtKIth>!xbF
z5@G-V019+cPE+>(|NsC0|M@b!_SY>F000EWNkl<Zc-rlp?V6h)5Jp3oS(9os-v7;3
zR0uNzeu0=DA=&M=-DjWE!^<!j)7#_mynWetJ|4G$3chRH;Q6?H9hDiw1b!ivnMwFg
zt{>J9>xcEj`eFUB{DC_kg|J@xMj@=e-Z%OZSoo^{_Ko_51#B^_x|x2d>&Acj-vL<M
zR^9i__?Zpwn`%^8*jC*e%*M<U+M$MledA-PonWc9>i%VZUwg}LB!m8sV(sHf&Q?9<
zsQIirJw5(7mQq)&#Kt}5r^MPJEPW+zC=eEFJ6D3OW?{^K$+0$1<Z)Y#zU#Ho2&|35
zj@xSP>mz`*jVsC4A*@Yc3AWa;bQo&`*A=!la9v_+9qh2JCdJk&*EP1PHLfeNRjmuV
zDqABK7PZyB+jhZLRjuzuC)jHL4Wo_Qsx~A)-%8XHD`<;SMY!_W>e{yLHrT3ss2EtT
zZ0YVjz`Q%XW~-v9H^ImAZ0XLx{G(WU84DfQ3AVJ3Vo6&SPuBEFfMu}Nd02P7z7l;`
z6O^3D#FePK_Wd?VU$g~5S?E6)SE?<`uxJayd1q{xF<T64*;dGvm4!rDQCn3kS(Yr5
ztsz=FY*oSeo0$|5R?=1_N`sq0<*uvb*%Noz61xsviG-`5t%_GILG%GDnJqenBwHRH
z7_M@*s%X6uw(ta7-Ks5?cY-!wQ!Hky;*CShmYGCMU5TB;a{X4fEn7BN$jKmsEz^{C
z?u*Y?V-KxESV*%)i^Bw!V9R3Zxr-m$F8fDX-{ZD0FoP<$tu5z7@Q$ps%VOEGw#uBU
zLAdg3DK}+4rP~T$p1cS9t&gk#6WF4aVI|H@bLb<Itxua3C=V7b)s|_RhtaZ+>9{X!
zp(|REij{23FQ>sVlrSB)^$EQ4pkN9;<f-z(aTi#AmmJv)t*%sC-8(Yc#g!P_4B_x3
z@+u!2GFzlFMB)yKw(Lrr%7J)HC4yif-3?`RaLLMGtBs6+Ez$giW#!0LH1cn;5;3+x
zi)5X-5*e0%s^IO6o52Juwi0*QitD1Xl6(1X>q?}#BAEy7Dt%9kzm_QL7RJwD9@BVJ
zPKFL*?gag(?6;=M;Ge)~uzXh;R^pz1E57SkP5G+)#_rT>XL!v5CM)q&eLrAJ>H@h8
zA<@?I>*oPm(Fp_^trS~ZhGz?dn>2``H9m{nzXeKGQ57hnZVt=bH3Fn$sc5ohSy<?9
zH&80pH;`0KGk7fW2W`b=0f8%Pi=GP=sqfNOscgm0U~(2ytNbBbO7gJMP}bI`I;emw
z3U)MG`?zWodC~iUY?bFZJZKA`-*caC-@ka@Cl6r$Dm++DjWBn!GFeMN?|Xfj=L_cR
zx51jlqh)`@(HqlkeKr@=s(FmB7fxSQYJR%bfiXdF3f;dg`F?rx(^dTSLKWF{M4wDt
zW2W2qXKhicVBUerN?M7_Z1GFC{FN{ncu!aEH$9+Z<1b_`o(pYxPmTNrHVhmLX$eJM
z830eRMc9_k(10TEbLtV!edo&P!;h9CwE@B<>ttJ`zy)iA+zQh+pTotM7E+-L3uJ2v
zjUB>#Tcxo)I(Esy0pWF65PDOU0KDuyWTEQr+q(4a-mYLFX^IA@uXuAjtMSjr?K}S~
Zf&U}?8+Dktk3j$c002ovPDHLkV1haGwgdnG

literal 0
HcmV?d00001

diff --git a/public/images/educoder/project_packages/other.png b/public/images/educoder/project_packages/other.png
new file mode 100755
index 0000000000000000000000000000000000000000..a700cd5dec4561d0adc46073916d20b6cb58840c
GIT binary patch
literal 1107
zcmV-Z1g!gsP)<h;3K|Lk000e1NJLTq005Q%003?T0{{R3H}3bP0000UP)t-s|B1o>
zh{FGg!T*WD{)N8#f4cww|Nrp!{h!SK;_&U2hM)id00VSVPE+<WykwYQY5)KO;Ymb6
zRA}Dqn$J$$Fc8Kgcmnza@CH>gk+Qc+V@q(ZEzuVMaYkaxc|j~^XbW#!|MxiAWNmM5
z-9a4oke|L8e;!Y~+nk*@%f!i9^X0T%CQdJ!^LDBD)|@WJY8GUDJ+h9hBkRaIvW~3(
zfdxzjx(_Tw4GY?B-}kM37B(SjSpDmIy?*@Yq>jtKYZs53a@OVR!;OmD55xL-6XFev
zS^a~3^!8b^t|IGR6tiCZv%iKciG{4oKmOS}p5}NjMHvgW5B^z`<chL(!=_o};on1D
zQeYA5H9UL!KGL;Q*fi@UKKwq?#U(p{HPFR(tYw`pp<rwoT^c3FS=Q^~9CKOSY`r)a
z<1BMLv11*Lt|4rC53OeWr9nakX0rO5WDgB=2^+brupjTb(K>P)X}_-PIl}5vFwA3J
zd0|g-$2wYFf@QHlIAI@r*rSy$U3!h8Sx&P$iJ$tY_<Xi!$2!E5@TKQTmNUB4Vr^9z
zRVub2I_WbM$#FT&VsdvVHg~ERGihe&nhKvEx92!!)N3l@B0Ai`x{SRNVbd(^eXTbJ
z5I(Ba2#(-%TAA5H(FEER*VGfP^dc3O-3yZ$AQ+WVSQhJTxF1dB<3a*J5o?v|3LGNr
z5M3rq^^Yo8tuD!|>ut%<q>1%8DmO%X*~mMGMl9=kAK<EAU3(VX1)2mcVjWAX5<wLz
z*ldm&x;zZfD1!rZ`HrKD&km@UD?QgJ<1W3B->cS<v<P3VdVj?XQTtRyb-iM@2~Isg
zmrGIC%B*6$h%T36Tk9_i;mrEV+P=m5{g~EkUe{`p^%l0Zk)(a9|8VB)h%cYdY8bhW
zAD_~4xt%>bGsV|ebEXYm!>Jumw|ksp(SbsZ&E%MMLy7aMl{K#`nF6@Rm{Z@kW?|Fw
zx?s<p0w*Yag4r`e_}&HHUD~O8?>Y!dx`RwG+PO@2s4I{ASU`s^?#8ZAEOZ@5i^BbP
zFr6Ecqy;&P3Wo~YI!9M18TYc1G{Nr0Hcyv<aWYmWd&h6b7V_?yz$fWY<Gt9TgYCbw
zQjjoL(m4r&yIRcDrLz=qs3gnix1vYout0lW4s}J(ThnLW%Yh8m;%TR6rU^p6E>kiK
z@*H7jF5`Po%Dpd)j!(;lt~-~on5|Z<m+xD~rC6j(^)mk|MP)H!)O;4W0aYZc=nMgc
z_p8ACiy1AK?OnxpwOZB>vwgTNm(@j31^2!kd1diwx@J?%0+L~HS8F^`ejg3d6F|qC
zs=IBvcUtD`fLO%>VlH=-#SK(?=MKZp6<UO2m3&tYqs~Qjos@ltpUi@E4YjO`X2IVU
Z`~x<#xq0UJa{&MV002ovPDHLkV1jU19@GE;

literal 0
HcmV?d00001

diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index f9248d58..3debdf6f 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -969,3 +969,94 @@ html>body #ajax-indicator { position: fixed; }
 .radio-check input[type='checkbox']:checked + label:after {
     background: #29BD8B;
 }
+
+/* 个人中心-众包 */
+.project-packages-list {
+}
+.project-packages-list .project-package-item {
+    display: -webkit-flex;
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 20px;
+    padding: 20px;
+    background: white;
+    box-shadow:1px 3px 3px 1px rgba(156,156,156,0.16);
+}
+
+.project-packages-list .project-package-item:hover{
+    box-shadow:2px 6px 6px 3px rgba(156,156,156,0.16);
+    opacity: 1;
+    border-radius: 2px;
+}
+
+.project-packages-list .project-package-item .item-image {
+    width: 150px;
+    height: 110px;
+}
+.project-packages-list .project-package-item .item-body {
+    margin-left: 20px;
+    flex: 1;
+}
+
+.project-package-item .item-body {
+    display: -webkit-flex;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+
+.project-package-item .item-body .item-head {
+    display: -webkit-flex;
+    display: flex;
+    justify-content: space-between;
+    font-size: 20px;
+    height: 40px;
+}
+.project-package-item .item-head-title {
+    max-width: 700px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.project-package-item .item-head-tags span {
+    color: white;
+}
+.project-package-item .item-head-tags span.pending { color: red; }
+.project-package-item .item-head-tags span.bidding_won { color: lightgreen; }
+.project-package-item .item-head-tags span.bidding_lost { color: grey; }
+
+.project-package-item .item-head-blank {
+    flex: 1;
+}
+.project-package-item .item-head-price {
+    margin-left: 20px;
+    color: #F83B2D;
+    font-size: 28px;
+    font-weight: bold;
+}
+.project-package-item .item-head-price span {
+    font-size: 18px;
+}
+.project-package-item .item-category {
+    display: -webkit-flex;
+    display: flex;
+}
+.project-package-item .item-category-item {
+    padding: 0 10px;
+    color: #FF6800;
+    font-size: 14px;
+    background:rgba(255,235,213,1);
+    border-radius:13px;
+}
+.project-package-item .item-other {
+    display: -webkit-flex;
+    display: flex;
+    justify-content: space-between;
+    color: #999999;
+}
+.project-package-item .item-group {
+    flex: 1;
+}
+.project-package-item .item-other-blank {
+    flex: 2
+}
\ No newline at end of file