From bf7caa73ab71952541efaf561792530a65e425ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 24 Oct 2019 10:42:46 +0800
Subject: [PATCH 1/4] jingsai.8
---
.../src/modules/competition/Registration.js | 35 ++++---------------
.../personal/PersonalCompetititem.js | 4 +--
2 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js
index 38a270843..d6be71f13 100644
--- a/public/react/src/modules/competition/Registration.js
+++ b/public/react/src/modules/competition/Registration.js
@@ -596,39 +596,16 @@ class Registration extends React.Component {
//个人竞赛
// /competitions/:identifier/competition_teams.json
Personalregistration = () => {
- let {teacher_staff, member_staff, data, enroll_ended} = this.state;
+ let {teacher_staff, member_staff, data, enroll_ended, enrolled} = this.state;
if (enroll_ended === true) {
//已截止
this.props.showNotification(`报名已截止`);
return;
}
- if (teacher_staff) {
- if (teacher_staff.mutiple_limited) {
- if (teacher_staff.mutiple_limited === true) {
- if (data) {
- if (data.length > teacher_staff.maximum) {
- this.props.showNotification(`你已经报名,不能重复报名！`);
- return
- }
- }
- }
- }
-
-
- }
- if (member_staff) {
- if (member_staff.mutiple_limited) {
- if (member_staff.mutiple_limited === true) {
- if (data) {
- if (data.length > member_staff.maximum) {
- this.props.showNotification(`你已经报名,不能重复报名！`);
-
- return;
- }
- }
- }
- }
+ if (enrolled === true) {
+ this.props.showNotification(`你已经报名,不能重复报名！`);
+ return;
}
const url = `/competitions/${this.props.match.params.identifier}/competition_teams.json`;
axios.post(url).then((response) => {
@@ -636,14 +613,14 @@ class Registration extends React.Component {
if (response.data) {
this.props.showNotification(`报名成功,预祝您夺得桂冠!`);
this.Refreshteam();
-
-
}
}
}).catch((error) => {
});
}
+
+
render() {
const {page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint} = this.state;
// var listItems = "";
diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js
index 0b888431c..e3863b3a7 100644
--- a/public/react/src/modules/competition/personal/PersonalCompetititem.js
+++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js
@@ -57,8 +57,8 @@ class PersonalCompetititem extends React.Component {
// const listItems = mydatas.map((item, index) =>
//
// );
- console.log("PersonalCompetititem");
- console.log(data);
+ // console.log("PersonalCompetititem");
+ // console.log(data);
return (
<div>
{
From ad044af7a2f1e8a5107d87913c132e358e75dded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 24 Oct 2019 10:44:18 +0800
Subject: [PATCH 2/4] jingsai.9
---
public/react/src/modules/competition/Registration.js | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js
index d6be71f13..d89060173 100644
--- a/public/react/src/modules/competition/Registration.js
+++ b/public/react/src/modules/competition/Registration.js
@@ -546,7 +546,6 @@ class Registration extends React.Component {
};
//刷新战队
Refreshteam = () => {
-
const {keyword, page, per_page} = this.state;
this.Getdata(keyword, page, per_page, this.props.user.admin);
this.GetenrollmentAPI();
@@ -600,7 +599,6 @@ class Registration extends React.Component {
if (enroll_ended === true) {
//已截止
this.props.showNotification(`报名已截止`);
-
return;
}
if (enrolled === true) {
@@ -623,16 +621,6 @@ class Registration extends React.Component {
render() {
const {page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint} = this.state;
- // var listItems = "";
-
- // if (competition_teams) {
- // listItems = competition_teams.map((item, index) =>
- //
- // );
- // }
- // const listItemss = test.map((item, index) =>
- //
- // );
return (
<div className="newMain clearfix ">
From c46e7033402b2f23f16e3f0337b26810a0bacfe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 24 Oct 2019 11:25:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?jingsai.10=20=E5=9B=BE=E7=89=87=E8=B5=84?=
=?UTF-8?q?=E6=BA=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../images/educoder/competition/Noentry.jpg | Bin 0 -> 3125 bytes
.../educoder/competition/Rectanglex.png | Bin 0 -> 4529 bytes
.../images/educoder/competition/pexjiazai.png | Bin 0 -> 1171 bytes
.../educoder/competition}/tipregistit.jpg | Bin
.../modules/competition/CompetitionMaxImg.js | 18 ++++---
.../src/modules/competition/RegisListview.js | 4 +-
.../modules/competition/RegisListviewdata.js | 4 +-
.../src/modules/competition/RegisNodata.js | 4 +-
.../src/modules/competition/Registration.js | 2 -
.../competition/comcss/competition.css | 2 -
.../competition/competmodal/PersonModal.js | 50 ++++++++++++------
.../competmodal/PersonModaltion.js | 1 -
.../personal/PersonalCompetititem.js | 5 +-
13 files changed, 54 insertions(+), 36 deletions(-)
create mode 100644 public/images/educoder/competition/Noentry.jpg
create mode 100755 public/images/educoder/competition/Rectanglex.png
create mode 100644 public/images/educoder/competition/pexjiazai.png
rename public/{react/src/modules/competition/comcss => images/educoder/competition}/tipregistit.jpg (100%)
diff --git a/public/images/educoder/competition/Noentry.jpg b/public/images/educoder/competition/Noentry.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5ffc34e17062409c1ce4643c63a0c03a0d03e72b
GIT binary patch
literal 3125
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
P00000NkvXXu0mjf7PSMa
literal 0
HcmV?d00001
diff --git a/public/images/educoder/competition/Rectanglex.png b/public/images/educoder/competition/Rectanglex.png
new file mode 100755
index 0000000000000000000000000000000000000000..0aa2a31b159a0476db98bfb47ece71f79598d9a1
GIT binary patch
literal 4529
zcmeAS@N?(olHy`uVBq!ia0y~y;LHKCQ#jawq(sGQRR#vZ3Qrfukczmsw+?bLDDbd2
zzTJQB%EAQxciEQ?9Gvj{-Av2Vf(i}|42(=H90K?m2g)0DZ~V&3AxbgOK!1k~PX!4X
z3bj~(lVh7whA}}mK$HvQ{3OD?V6`qxO=~%B@erw;CAyAS-%V^t&~7qwCQ|vqY4Z33
z7a9%@4Gt;_H@X&_B@h=d<-j0j9}Qw~(2fQ%EX|CjVpxGTT2PD@6c}~NXhAVrP@q@a
zqXoriK`~lT;B2CfwkSqh6zE;3(XI!)%RJhm7;RCYw<vb(I8>1HV|(vE;7|;Mr>mdK
II;Vst0HmRm0ssI2
literal 0
HcmV?d00001
diff --git a/public/images/educoder/competition/pexjiazai.png b/public/images/educoder/competition/pexjiazai.png
new file mode 100644
index 0000000000000000000000000000000000000000..78f56b82aae5b403dfa09cf2d5921807bce8ca42
GIT binary patch
literal 1171
zcmV;E1Z?|>P)<h;3K|Lk000e1NJLTq000~S000{Z1^@s6ZwT)!0004iX+uL$Nkc;*
zP;zf(X>4Tx04R}TU|_09EGWofVPIg$%_}Jia(7aQh>TKTzr(=Iz{4QKV8tMwm|R@o
z7!csYfD?SX#=r=oFYAKLYC5NOcj`vL=woW%va9V}b8zbe1MZa6;$#K}Mh+l5C8any
z7sv+b(Mv8UDgm<R0NJ|bB?Tb%86aDv2<Si{`vHiZ4q<-*v6H}TCJwNgkRWFuTL#D$
zNP@6+K<sn~+Xlo=&PYrFvO)gRfw%z-xPo0249yLEbsY&foK%pTQwp;K6k0r~d7;5T
zS_p_`7=jsG7!()`8O#|B7<?IY8Gx3Tq*j!G6g%e^R2F5XXOt*70z)@d!8t#-ptK~l
zNJqglFIi7V!N|bS0Hh8SZxG`@2Z3#16g!U)%bLu<VDW~5fw>AHma?3IVT(NjgLp7P
zOno-cN$(jLc7zus7A3+R&-jgn5WhIh*a*VrabjR#z4!nBXEg=}_DKv3e<%L`|9jE@
z|9=+)?Z3moa3BW&w$y8VEZD>N0008cNkl<ZNDaMKNoy)W5Uz2-B@&|nlN^*t2v6~p
zAV~ZP{$WA9iHP9gc@tccD42+fYh0tgeD!EE?TkhxSkN=wJyrE}tv$+QGFj0H$#6m}
zhBEC7xLhu2KA+QKu^`Op%P)#SA%np{X0w@0ru|g?$OVvQvq|so?>xHQE{(@yS}vAk
zv0BLCaFEC2p_`i<y1KgJ^)4fnT`}zU`;`Bir)sTA!{LxttL@>2mDktT6!;UMTmLN?
zjYeJEtroUgElMVn1W<ONuK4#RJW;FFsMT!I$LNDXp^z@91`t-jh4FZtUH7eWzu9;)
zrc5ToV8LLJW2~0cWGO7lX0!C=YBk?Ma~v9=&(F^qISCLMST2`2Id;WMqeW-q^YfE(
zxg3W?{aFH>PN!5T6gc(OOvldQtzxk#iA#WQZ*Q6tN!$l6;IT%dA?1PusOR$oF*NM3
z5<`##*lxGQKEF{{DC*6cve|6p^ZDrf{9NKcJ3Aw<*Gu>=2u%V*kW>~ZZb3-tNF+iC
zJ~FOSsc_+2tyYRgqYMcCL?S`GUXR;bEEeNV^YZdS>2#WAvl+KT)TkiILa~WAP738{
zU2eB~T~Btqoh~je$YS~5)?6+Zi#eT6=EFW(oan8Jq7a54$wDaabUOSE*$NjS@b!9q
z-ECl1wOVB*unbKCgdU5M0`TkWD_e(s01I$l<00ts@^TFbr3g0aaWELH`zYL$&*$02
zh|Op;VsW@Wl}hm;aVV@oh^IQHl7)W1pGu_?Gva|$>k&XV6AXN)V+=JRvDC>W#SmAF
z`lDL#m^rc=@l;zV0V3dmKtNLl$ACcwhrhqSm&7GNoapZEj_);fW=RrzE|4hUa9HCp
z2@tw)D%2lJ;#k6ApPrrwIk8DwZ~Q|qV4>J%wb8@l!`2IUD<Bl0EPneJV<#X$Px=!D
lKtaFtoA{%J0`Rxq{{Z}0k`Tss4^sdD002ovPDHLkV1jty6e9ot
literal 0
HcmV?d00001
diff --git a/public/react/src/modules/competition/comcss/tipregistit.jpg b/public/images/educoder/competition/tipregistit.jpg
similarity index 100%
rename from public/react/src/modules/competition/comcss/tipregistit.jpg
rename to public/images/educoder/competition/tipregistit.jpg
diff --git a/public/react/src/modules/competition/CompetitionMaxImg.js b/public/react/src/modules/competition/CompetitionMaxImg.js
index 7a81b952a..c5d99a88b 100644
--- a/public/react/src/modules/competition/CompetitionMaxImg.js
+++ b/public/react/src/modules/competition/CompetitionMaxImg.js
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import competition from './comcss/competition.css';
-
+import {getImageUrl} from 'educoder';
// 团队竞赛报名大图
class CompetitionMaxImg extends React.Component {
constructor(props) {
@@ -38,7 +38,9 @@ class CompetitionMaxImg extends React.Component {
</style>
{
type === 1 || type === 2 ?
- <div className="registrationback">
+ <div className="registrationback"
+ style={{"background": `url(${getImageUrl(`images/educoder/competitions/tipregistit.jpg`)})`}}
+ >
<p className="registrationbackp1">Educoder竞赛平台</p>
<p className="registrationbackp2">Educoder是一个面向计算机类的互联网IT教育和实战平台，</p>
<p className="registrationbackp3">提供企业级工程实训，以实现工程化专业教学的自动化和智能化。</p>
@@ -54,7 +56,8 @@ class CompetitionMaxImg extends React.Component {
</div>
:
type === 3 ?
- <div className="registrationback">
+ <div className="registrationback"
+ style={{"background": `url(${getImageUrl(`images/educoder/competitions/tipregistit.jpg`)})`}}>
<p className="registrationbackp1">Educoder竞赛平台</p>
<p className="registrationbackp4">高校智能课堂与综合实训平台</p>
<div className="registrationbackp2button2">
@@ -69,7 +72,8 @@ class CompetitionMaxImg extends React.Component {
</div>
:
type === 4 || type === 5 ?
- <div className="registrationback1">
+ <div className="registrationback1"
+ style={{"background": `url(${getImageUrl(`images/educoder/competitions/tipregistit.jpg`)})`}}>
<p className="registrationbackp11">Educoder竞赛平台</p>
<p className="registrationbackp22">高校智能课堂与综合实训平台</p>
<div className="registrationbackp2button3">
@@ -83,7 +87,8 @@ class CompetitionMaxImg extends React.Component {
</div>
</div>
: type === 6 ?
- <div className="registrationback">
+ <div className="registrationback"
+ style={{"background": `url(${getImageUrl(`images/educoder/competitions/tipregistit.jpg`)})`}}>
<p className="registrationbackp1">Educoder竞赛平台</p>
<p className="registrationbackp2">Educoder是一个面向计算机类的互联网IT教育和实战平台，</p>
<p className="registrationbackp3">提供企业级工程实训，以实现工程化专业教学的自动化和智能化。</p>
@@ -106,7 +111,8 @@ class CompetitionMaxImg extends React.Component {
</div>
</div>
:
- <div className="registrationback">
+ <div className="registrationback"
+ style={{"background": `url(${getImageUrl(`images/educoder/competitions/tipregistit.jpg`)})`}}>
</div>
}
diff --git a/public/react/src/modules/competition/RegisListview.js b/public/react/src/modules/competition/RegisListview.js
index 73f94592c..a1c283220 100644
--- a/public/react/src/modules/competition/RegisListview.js
+++ b/public/react/src/modules/competition/RegisListview.js
@@ -8,8 +8,8 @@ import axios from 'axios';
import moment from 'moment';
import competition from './comcss/competition.css';
import {Checkbox, Table, Pagination, Menu, Icon} from "antd";
+import {getImageUrl} from 'educoder';
// 团队竞赛报名无报名子组件团队 在线竞赛 > 全国高校计算机大赛-项目挑战>
-import Rectanglex from "../../modules/competition/Rectanglex.png";
class RegisListview extends React.Component {
constructor(props) {
super(props)
@@ -25,7 +25,7 @@ class RegisListview extends React.Component {
display: "flex",
justifyContent: " space-around",
alignItems: "center",
- background: `url(${Rectanglex})`,
+ background: `url(${getImageUrl(`images/educoder/competitions/Rectanglex.png`)})`,
height: "50px",
backgroundPosition: "center",
backgroundSize: "110% 100%",
diff --git a/public/react/src/modules/competition/RegisListviewdata.js b/public/react/src/modules/competition/RegisListviewdata.js
index 3bd8fe0b2..397064662 100644
--- a/public/react/src/modules/competition/RegisListviewdata.js
+++ b/public/react/src/modules/competition/RegisListviewdata.js
@@ -9,7 +9,6 @@ import moment from 'moment';
import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder';
import {TPMIndexHOC} from '../tpm/TPMIndexHOC';
import competition from './comcss/competition.css';
-import pexjiazai from './pexjiazai.png'
import {Button} from 'antd';
// 团队竞赛报名无报名子组件团队 竞赛报名-已创建战队
@@ -97,7 +96,8 @@ class RegisListviewdata extends React.Component {
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</img>
- <img className="regitemimgs22" src={pexjiazai}>
+ <img className="regitemimgs22"
+ src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}>
</img>
</div>
diff --git a/public/react/src/modules/competition/RegisNodata.js b/public/react/src/modules/competition/RegisNodata.js
index 3f8835634..a8441f420 100644
--- a/public/react/src/modules/competition/RegisNodata.js
+++ b/public/react/src/modules/competition/RegisNodata.js
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import competition from './comcss/competition.css';
-import Noentry from './Noentry.jpg';
+import {getImageUrl} from 'educoder';
// 团队竞赛报名无报名子组件
class RegisNodata extends React.Component {
constructor(props) {
@@ -17,7 +17,7 @@ class RegisNodata extends React.Component {
height: "80px",
width: "125px",
marginTop: "107px",
- background: `url(${Noentry})`,
+ background: `url(${getImageUrl(`images/educoder/competitions/Noentry.jpg`)})`,
backgroundPosition: "center",
backgroundSize: "110% 100%",
}}>
diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js
index d89060173..9bffc492c 100644
--- a/public/react/src/modules/competition/Registration.js
+++ b/public/react/src/modules/competition/Registration.js
@@ -21,8 +21,6 @@ import MessagePersonModal from './competmodal/MessagePersonModal';
import PersonalModalteam from './competmodal/PersonalModalteam';
import PersonalCompetititem from './personal/PersonalCompetititem';
import ExittheteamModel from './competmodal/ExittheteamModel';
-import pexjiazai from "./pexjiazai.png";
-
// 团队竞赛报名无报名
class Registration extends React.Component {
/***
diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css
index 102f2492d..14e0d788e 100644
--- a/public/react/src/modules/competition/comcss/competition.css
+++ b/public/react/src/modules/competition/comcss/competition.css
@@ -323,7 +323,6 @@
display: -webkit-flex;
flex-direction: column;
align-items: center;
- background-image: url(./tipregistit.jpg);
}
.registrationback1 {
@@ -331,7 +330,6 @@
width: 1200px;
display: flex;
flex-direction: column;
- background-image: url(./tipregistit.jpg);
}
.regitem2 {
diff --git a/public/react/src/modules/competition/competmodal/PersonModal.js b/public/react/src/modules/competition/competmodal/PersonModal.js
index ffa924900..53091d5e5 100644
--- a/public/react/src/modules/competition/competmodal/PersonModal.js
+++ b/public/react/src/modules/competition/competmodal/PersonModal.js
@@ -65,13 +65,13 @@ class PersonModal extends Component {
school_name: this.props.user.user_school,
student_id: null,
identity: this.props.user.user_identity,
- type: "创建者",
+ type: "导师",
};
data.push(datas);
- console.log("itemiddata");
- console.log("编辑战队")
- console.log(this.props.itemiddata);
+ // console.log("itemiddata");
+ // console.log("编辑战队")
+ // console.log(this.props.itemiddata);
try {
if (this.props.Newtit === false) {
for (var i = 0; i < this.props.itemiddata.team_members.length; i++) {
@@ -126,7 +126,7 @@ class PersonModal extends Component {
school_name: this.props.user.user_school,
student_id: null,
identity: this.props.user.user_identity,
- type: "创建者",
+ type: "导师",
};
data.push(datas);
this.setState({
@@ -670,11 +670,21 @@ class PersonModal extends Component {
textAlign: "center",
}}
>{item.name === undefined || item.name === null || item.name === "" ? "--" : item.name}</p>
- <p className=" reglistviewdivss4p"
- style={{
- textAlign: "center",
- }}
- >{item.type === undefined || item.type === null || item.type === "" ? "--" : item.type}</p>
+ {
+ index === 0 ?
+ <p className=" reglistviewdivss4p"
+ style={{
+ textAlign: "center",
+ }}
+ >创建者</p>
+ :
+ <p className=" reglistviewdivss4p"
+ style={{
+ textAlign: "center",
+ }}
+ >{item.type === undefined || item.type === null || item.type === "" ? "--" : item.type}</p>
+ }
+
<p className=" reglistviewdivss5p"
style={{
textAlign: "center",
@@ -685,12 +695,20 @@ class PersonModal extends Component {
textAlign: "center",
}}
>{item.identity === undefined || item.identity === null || item.identity === "" ? "--" : item.identity}</p>
- <p className=" reglistviewdivss33p"
- style={{
- textAlign: "center",
- }}
- >{item.type && item.type === "创建者" ? "" :
- <i className="iconfont icon-guanbi font-12" onClick={() => this.deletedata(item)}/>}</p>
+ {
+ index === 0 ?
+ <p className=" reglistviewdivss33p"
+ style={{
+ textAlign: "center",
+ }}
+ ></p>
+ :
+ <p className=" reglistviewdivss33p"
+ style={{
+ textAlign: "center",
+ }}
+ ><i className="iconfont icon-guanbi font-12" onClick={() => this.deletedata(item)}/></p>
+ }
</div>
);
var cpersondiv1Items = [];
diff --git a/public/react/src/modules/competition/competmodal/PersonModaltion.js b/public/react/src/modules/competition/competmodal/PersonModaltion.js
index e8e4148ee..680566297 100644
--- a/public/react/src/modules/competition/competmodal/PersonModaltion.js
+++ b/public/react/src/modules/competition/competmodal/PersonModaltion.js
@@ -9,7 +9,6 @@ import moment from 'moment';
import competition from './comcss/competition.css';
import {Checkbox, Table, Pagination, Menu, Icon} from "antd";
// 团队竞赛报名无报名子组件团队 在线竞赛 > 全国高校计算机大赛-项目挑战>
-import Rectanglex from "../../modules/competition/Rectanglex.png";
class PersonModaltion extends React.Component {
constructor(props) {
diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js
index e3863b3a7..bd6a092eb 100644
--- a/public/react/src/modules/competition/personal/PersonalCompetititem.js
+++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js
@@ -10,8 +10,6 @@ import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder';
import {TPMIndexHOC} from '../../tpm/TPMIndexHOC';
import competition from '../comcss/competition.css';
import {Button, message} from 'antd';
-import pexjiazai from '../pexjiazai.png'
-
// 点击按钮复制功能
function jsCopy() {
var e = document.getElementById("copy_invite_code");
@@ -126,7 +124,8 @@ class PersonalCompetititem extends React.Component {
</img>
- <img className="regitemimgs22" src={pexjiazai}>
+ <img className="regitemimgs22"
+ src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}>
</img>
</div>
From b41f537ae842f7810b4c503010814332632a5501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 24 Oct 2019 11:26:24 +0800
Subject: [PATCH 4/4] =?UTF-8?q?jingsai.10=20=E5=9B=BE=E7=89=87=E8=B5=84?=
=?UTF-8?q?=E6=BA=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/competition/Noentry.jpg | Bin 3125 -> 0 bytes
.../react/src/modules/competition/Rectanglex.png | Bin 4529 -> 0 bytes
.../react/src/modules/competition/pexjiazai.png | Bin 1171 -> 0 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 public/react/src/modules/competition/Noentry.jpg
delete mode 100755 public/react/src/modules/competition/Rectanglex.png
delete mode 100644 public/react/src/modules/competition/pexjiazai.png
diff --git a/public/react/src/modules/competition/Noentry.jpg b/public/react/src/modules/competition/Noentry.jpg
deleted file mode 100644
index 5ffc34e17062409c1ce4643c63a0c03a0d03e72b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3125
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
P00000NkvXXu0mjf7PSMa
diff --git a/public/react/src/modules/competition/Rectanglex.png b/public/react/src/modules/competition/Rectanglex.png
deleted file mode 100755
index 0aa2a31b159a0476db98bfb47ece71f79598d9a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4529
zcmeAS@N?(olHy`uVBq!ia0y~y;LHKCQ#jawq(sGQRR#vZ3Qrfukczmsw+?bLDDbd2
zzTJQB%EAQxciEQ?9Gvj{-Av2Vf(i}|42(=H90K?m2g)0DZ~V&3AxbgOK!1k~PX!4X
z3bj~(lVh7whA}}mK$HvQ{3OD?V6`qxO=~%B@erw;CAyAS-%V^t&~7qwCQ|vqY4Z33
z7a9%@4Gt;_H@X&_B@h=d<-j0j9}Qw~(2fQ%EX|CjVpxGTT2PD@6c}~NXhAVrP@q@a
zqXoriK`~lT;B2CfwkSqh6zE;3(XI!)%RJhm7;RCYw<vb(I8>1HV|(vE;7|;Mr>mdK
II;Vst0HmRm0ssI2
diff --git a/public/react/src/modules/competition/pexjiazai.png b/public/react/src/modules/competition/pexjiazai.png
deleted file mode 100644
index 78f56b82aae5b403dfa09cf2d5921807bce8ca42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1171
zcmV;E1Z?|>P)<h;3K|Lk000e1NJLTq000~S000{Z1^@s6ZwT)!0004iX+uL$Nkc;*
zP;zf(X>4Tx04R}TU|_09EGWofVPIg$%_}Jia(7aQh>TKTzr(=Iz{4QKV8tMwm|R@o
z7!csYfD?SX#=r=oFYAKLYC5NOcj`vL=woW%va9V}b8zbe1MZa6;$#K}Mh+l5C8any
z7sv+b(Mv8UDgm<R0NJ|bB?Tb%86aDv2<Si{`vHiZ4q<-*v6H}TCJwNgkRWFuTL#D$
zNP@6+K<sn~+Xlo=&PYrFvO)gRfw%z-xPo0249yLEbsY&foK%pTQwp;K6k0r~d7;5T
zS_p_`7=jsG7!()`8O#|B7<?IY8Gx3Tq*j!G6g%e^R2F5XXOt*70z)@d!8t#-ptK~l
zNJqglFIi7V!N|bS0Hh8SZxG`@2Z3#16g!U)%bLu<VDW~5fw>AHma?3IVT(NjgLp7P
zOno-cN$(jLc7zus7A3+R&-jgn5WhIh*a*VrabjR#z4!nBXEg=}_DKv3e<%L`|9jE@
z|9=+)?Z3moa3BW&w$y8VEZD>N0008cNkl<ZNDaMKNoy)W5Uz2-B@&|nlN^*t2v6~p
zAV~ZP{$WA9iHP9gc@tccD42+fYh0tgeD!EE?TkhxSkN=wJyrE}tv$+QGFj0H$#6m}
zhBEC7xLhu2KA+QKu^`Op%P)#SA%np{X0w@0ru|g?$OVvQvq|so?>xHQE{(@yS}vAk
zv0BLCaFEC2p_`i<y1KgJ^)4fnT`}zU`;`Bir)sTA!{LxttL@>2mDktT6!;UMTmLN?
zjYeJEtroUgElMVn1W<ONuK4#RJW;FFsMT!I$LNDXp^z@91`t-jh4FZtUH7eWzu9;)
zrc5ToV8LLJW2~0cWGO7lX0!C=YBk?Ma~v9=&(F^qISCLMST2`2Id;WMqeW-q^YfE(
zxg3W?{aFH>PN!5T6gc(OOvldQtzxk#iA#WQZ*Q6tN!$l6;IT%dA?1PusOR$oF*NM3
z5<`##*lxGQKEF{{DC*6cve|6p^ZDrf{9NKcJ3Aw<*Gu>=2u%V*kW>~ZZb3-tNF+iC
zJ~FOSsc_+2tyYRgqYMcCL?S`GUXR;bEEeNV^YZdS>2#WAvl+KT)TkiILa~WAP738{
zU2eB~T~Btqoh~je$YS~5)?6+Zi#eT6=EFW(oan8Jq7a54$wDaabUOSE*$NjS@b!9q
z-ECl1wOVB*unbKCgdU5M0`TkWD_e(s01I$l<00ts@^TFbr3g0aaWELH`zYL$&*$02
zh|Op;VsW@Wl}hm;aVV@oh^IQHl7)W1pGu_?Gva|$>k&XV6AXN)V+=JRvDC>W#SmAF
z`lDL#m^rc=@l;zV0V3dmKtNLl$ACcwhrhqSm&7GNoapZEj_);fW=RrzE|4hUa9HCp
z2@tw)D%2lJ;#k6ApPrrwIk8DwZ~Q|qV4>J%wb8@l!`2IUD<Bl0EPneJV<#X$Px=!D
lKtaFtoA{%J0`Rxq{{Z}0k`Tss4^sdD002ovPDHLkV1jty6e9ot