diff --git a/app/views/competitions/index.html.erb b/app/views/competitions/index.html.erb index c8743251..0ff957e3 100644 --- a/app/views/competitions/index.html.erb +++ b/app/views/competitions/index.html.erb @@ -4,7 +4,8 @@ <% @competitions.each do |competition| %> <% if competition.status? %>
-
+
+
报名中
<%= image_tag(url_to_avatar(competition), :width => "100%", :height => "100%") %> diff --git a/public/react/src/index.js b/public/react/src/index.js index b691e1d5..739ceebe 100644 --- a/public/react/src/index.js +++ b/public/react/src/index.js @@ -38,8 +38,8 @@ window.__useKindEditor = false; // TODO 读取到package.json中的配置? var proxy = "http://localhost:3000" -// proxy = "http://testbdweb.trustie.net" -// proxy = "http://testbdweb.educoder.net" +// proxy = "http://testbdweb.trustie.net" + proxy = "http://testbdweb.educoder.net" // proxy ="http://192.168.2.63:3000" // proxy='https://www.educoder.net' const requestMap={}; diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 0fe51311..ebd532c9 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -362,7 +362,7 @@ class PackageIndexNEITaskDetails extends Component {
{data&&data.attachments.length>0?
-
+
需求文件:
{data&&data.attachments.map((item,key)=>{ @@ -380,9 +380,9 @@ class PackageIndexNEITaskDetails extends Component { {/*发布者和竞选者状态show*/} {this.state.setbiddingmantype===false&&data&&data.published_at!=null?
{/*下面是头像*/} -
+
-
+
报名列表({data&&data.bidding_users.length})
@@ -426,9 +426,9 @@ class PackageIndexNEITaskDetails extends Component { {this.state.setbiddingmantype===true?
{/*发布人选择状态*/} {/*下面是头像*/} -
+
-
+
报名列表({data&&data.bidding_users.length})
diff --git a/public/react/src/modules/projectPackages/packageconcnet.css b/public/react/src/modules/projectPackages/packageconcnet.css index 45ea361d..e49e5c9c 100644 --- a/public/react/src/modules/projectPackages/packageconcnet.css +++ b/public/react/src/modules/projectPackages/packageconcnet.css @@ -275,7 +275,7 @@ .packageabsolute{ position: absolute; right: -16px; - top: -11px; + top: -7px; } .relativef{ position: relative; @@ -328,4 +328,8 @@ .padding26{ padding: 26px; box-sizing: border-box; +} + +.pd26{ + padding: 26px; } \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 4354798b..2822c384 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3514,4 +3514,5 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important; .vertical4{ vertical-align: -4px; + margin-right: 0px !important; } \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 27873001..5b9f41fa 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -1114,4 +1114,23 @@ html>body #ajax-indicator { position: fixed; } .list-count span { color: coral; padding: 0 3px; +} + + +.applycompetitions{ + line-height: 30px; + border-radius: 14px; + color: #666; + background: rgba(41,189,139,1); + opacity: 0.8; + font-size: 14px; + font-family: MicrosoftYaHei; + font-weight: 400; + color: rgba(255,255,255,1); + position: absolute; + bottom: 139px; + left: 18px; + width: 73px; + height: 30px; + text-align: center; } \ No newline at end of file