diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 3a8fdc20..04bb288b 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -16,8 +16,10 @@
- +
diff --git a/public/images/educoder/beian.png b/public/images/educoder/beian.png new file mode 100755 index 00000000..9f763946 Binary files /dev/null and b/public/images/educoder/beian.png differ diff --git a/public/react/src/index.js b/public/react/src/index.js index 8107571d..b691e1d5 100644 --- a/public/react/src/index.js +++ b/public/react/src/index.js @@ -39,7 +39,7 @@ window.__useKindEditor = false; // TODO 读取到package.json中的配置? var proxy = "http://localhost:3000" // proxy = "http://testbdweb.trustie.net" -// proxy = "http://testbdweb.educoder.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/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index c1422416..512ab6ea 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -244,18 +244,18 @@ class PackageConcent extends Component {
- + {item.visit_count}人浏览
- + {moment(item.deadline_at).endOf('day').fromNow()}竞标截止
- + {item.bidding_users_count}人竞标
diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 25edbe6c..680fa8d4 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -244,11 +244,11 @@ class PackageIndexNEITaskDetails extends Component {
'} className={"fl"}> - {this.props.current_user.username} + {/*{this.props.current_user.username}*/} - 任务大厅 + 众包社区 - 详情 + {data&&data.title} 返回 diff --git a/public/react/src/modules/projectPackages/packageconcnet.css b/public/react/src/modules/projectPackages/packageconcnet.css index 329de857..6727c95c 100644 --- a/public/react/src/modules/projectPackages/packageconcnet.css +++ b/public/react/src/modules/projectPackages/packageconcnet.css @@ -312,4 +312,11 @@ .pd35{ padding-left: 35px; +} +.tabelcli{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-width: 850px; + display: table-cell; } \ No newline at end of file diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js index 1ec7c6cc..0d0a7b02 100644 --- a/public/react/src/modules/tpm/NewFooter.js +++ b/public/react/src/modules/tpm/NewFooter.js @@ -55,12 +55,19 @@ class NewFooter extends Component {
-

- © 2019 EduCoder湘ICP备17009477号Trustie   &   IntelliDE inside.

-
+
+

+ © 2019 EduCoder + 湘ICP备17009477号 + + 湘公网安备43019002000962号 + Trustie   &   IntelliDE inside. 版权所有 湖南智擎科技有限公司 +

+
+ ); } } diff --git a/public/react/src/modules/tpm/beian.png b/public/react/src/modules/tpm/beian.png new file mode 100755 index 00000000..9f763946 Binary files /dev/null and b/public/react/src/modules/tpm/beian.png differ diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 53ad1612..4354798b 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3510,4 +3510,8 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important; white-space: nowrap; width: 412px; display: inline-block; +} + +.vertical4{ + vertical-align: -4px; } \ No newline at end of file