按钮统一修改

frontend/wechat-web/src/components/HomeWorkItem.jsx

@@ -24,8 +24,9 @@ export default class HomeWorkItem extends Component {
 
         return (
             <div style={{padding: '0 10px'}} onClick={this.onItemClick}>
+                <div className="top_Time" style={{marginBottom:0,marginTop:10}}><span className="top_time_span">{homeWork.endDate}</span></div>
                 <div className='recharge-item-root'>
-                    <div className='common-flex-row homework-item-title-layout'>
+                    <div className='common-flex-row homework-item-title-layout' >
                         <div style={{width: '85%'}} className='homework-item-title'>{homeWork.notifyName}</div>
                         <div style={{width: '15%', textAlign: 'right'}}
                              className={homeWork.taskStatus === 2 ? 'homework-item-done'
@@ -38,10 +39,10 @@ export default class HomeWorkItem extends Component {
                              dangerouslySetInnerHTML={{ __html: homeWork.notifyDetails.replaceAll('\n', '<br/>') }}>
                         </div>
                     </div>
-                    <div className='recharge-item-line'>
-                        <div className='recharge-item-caption'>截止日期：</div>
-                        <div className='recharge-item-value'>{homeWork.endDate}</div>
-                    </div>
+                    {/*<div className='recharge-item-line'>*/}
+                        {/*<div className='recharge-item-caption'>截止日期：</div>*/}
+                        {/*<div className='recharge-item-value'>{homeWork.endDate}</div>*/}
+                    {/*</div>*/}
                     <div className='recharge-item-line'>
                         <div className='recharge-item-caption'>发布老师：</div>
                         <div className='recharge-item-value'>{homeWork.notifyCreatorName}</div>

frontend/wechat-web/src/index.css

@@ -179,7 +179,7 @@ span.ant-select-selection.ant-select-selection--multiple {
 
 .commonButton {
     letter-spacing: 10px;
-    border-radius: 9px;
+    border-radius: 30px;
     font-size: 14px;
     color: white;
     background: #4197FC;

frontend/wechat-web/src/modules/accountBind/AccountBind.jsx

@@ -80,7 +80,7 @@ class AccountBind extends Component {
                        ref={input => this.codeInput = input} onChange={this.codeChange}
                        value={code} type='number' onKeyPress={this.phoneKeyPress}/>
 
-                <Button type="primary" block className='commonButton' style={{marginTop: '35px'}}
+                <Button type="primary" block className='commonButton' style={{marginTop: '35px',borderRadius: '30px',}}
                         onClick={this.bindEvent}>绑定</Button>
             </div>
         );

frontend/wechat-web/src/modules/accountBind/BindMenu.jsx

@@ -194,13 +194,13 @@ class BindMenu extends Component {
                 <Button type="primary" block
                         style={{
                             marginTop: '20px', letterSpacing: '10px',
-                            borderRadius: '9px', fontSize: '14px'
+                            borderRadius: '9px', fontSize: '14px',borderRadius: '30px',
                         }}
                         onClick={this.parentBind}>我是家长</Button>
                 <Button type="primary" block
                         style={{
                             marginTop: '20px', letterSpacing: '10px',
-                            background: '#05DC40', borderRadius: '9px',
+                            background: '#05DC40', borderRadius: '30px',
                             fontSize: '14px', border: 'none'
                         }}
                         onClick={this.teacherBind}>我是老师</Button>

frontend/wechat-web/src/modules/album/NewAlbum.jsx

@@ -77,7 +77,7 @@ class NewAlbum extends Component {
                           onChange={this.descriptionChange}/>
                 <div style={{flex: '1'}}></div>
                 <div className='confirmLayout'>
-                    <Button className='commonButton' type="primary" block
+                    <Button className='commonButton'  type="primary" block style={{borderRadius:30}}
                             onClick={this.releaseEvent}>新建</Button>
                 </div>
             </div>

frontend/wechat-web/src/modules/album/UploadImage.jsx

@@ -58,7 +58,7 @@ export default class UploadImage extends Component {
                 </div>
 
                 <div className='uploadLayout'>
-                    <Button className='commonButton' type="primary" block
+                    <Button className='commonButton' type="primary" block style={{borderRadius:30}}
                             onClick={this.releaseEvent}>更新</Button>
                 </div>
             </div>

frontend/wechat-web/src/modules/announce/AnnounceRelease.jsx

@@ -88,7 +88,7 @@ class AnnounceRelease extends Component {
                     handleChange={this.handleChange.bind(this)}
                 />
 
-                <Button className='commonButton' type='primary' style={{margin: '35px'}}
+                <Button className='commonButton' type='primary' style={{margin: '35px',borderRadius:30}}
                         onClick={this.releaseAnnounce}>发布</Button>
 
                 {/*<span className='announce-release-history'>历史发布</span>*/}

frontend/wechat-web/src/modules/hiPages/access-notice/AccessNotice.css

@@ -1,5 +1,5 @@
 .header_sty1{position: fixed;top: 0px;width: 100%;}
-.header_sty{  position: fixed;top: 0px;height: 90px;width: 100%;background-color:#E7EDF6;align-content: center;display: flex;flex-direction: row;  }
+.header_sty{  position: fixed;top: 0px;height: 90px;width: 100%;background: none;align-content: center;display: flex;flex-direction: row; z-index: 99; }
 .header{height: 60px;width: 60px;margin: 20px 10px 0 80px;}
 .timeList_sty{height: auto;display: flex;flex-direction: row;align-items: center}
 .out_in{height: 38px;width: 38px;padding-top: 0px;border: none;}
@@ -7,4 +7,27 @@
 .center_sty{display: flex;flex-direction: row;margin-top:100px;}
 .foot-sty{height:47px;width: 100%;position: fixed;bottom: 0px;}
 .foot-sty1{display: flex;flex-direction: row;}
-.comhline_sty1{background-color:#F2F2F2;width:100%;height:1px;}
+.comhline_sty1{background-color:#F2F2F2;width:100%;height:1px;}
+.av_items{
+    align-items: center;  justify-content: center;
+    width: auto;  background: #FFF;height: auto;
+    position: fixed;  top:55px;  left: 30px;  right: 30px;
+    border-radius: 10px;
+}
+.an_contain{
+    font-family: PingFangSC-Regular;letter-spacing: 2.5px; background: #6A879F;height: 100vh;opacity: 0.6;
+}
+.item_in_out{
+    width: 36px;height: 36px;border-radius: 50%;font-size: 12px;color: #FFF;text-align: center;
+    align-items: center;  justify-content: center;line-height: 30px;
+}
+.in{background-color: #43CEAF;}
+.out{background-color: #589CFE;}
+.san_jiao{
+    width:0;
+    height:0;
+    border-width:0 3px 3px;
+    border-style:solid;
+    border-color:transparent transparent #666666;/*透明 透明  灰*/
+    margin: 5px 15px;
+}

frontend/wechat-web/src/modules/hiPages/access-notice/AccessNotice.js

@@ -89,44 +89,28 @@ class AccessNotice extends Component {
             })
         }
         return (
-            <div style={{fontFamily: "PingFangSC-Regular", letterSpacing: 2.5}}>
-                {/*<div className="header_sty1">*/}
-                <div className="header_sty">
-                    {this.state.stuPhoto ?
-                        <img className="img-circle header"
-                             src={_baseURL + this.state.stuPhoto}
-                             alt=""/> : <div className='header'>
-                            <Avatar size={50} icon='user'/>
-                        </div>}
+           <div className="an_contain">
+               <div className="header_sty">
+                   {this.state.stuPhoto ?
+                       <img className="img-circle header"
+                            src={_baseURL + this.state.stuPhoto}
+                            alt=""/> :
+                       <div className='header'>
+                           <Avatar size={50} icon='user'/>
+                       </div>}
 
-                    <div style={{marginTop: 20}}>
-                        <div style={{color: "#4087DC", fontSize: 18}}>{this.state.studentName}</div>
-                        <div style={{color: "#666666", fontSize: 12, marginTop: 5}}>{this.state.studentGrade}</div>
-                    </div>
-                </div>
-                {/*</div>*/}
-                <div className="center_sty">
-                    <div style={{
-                        width: 95, color: "#4087DC", fontSize: "20px", paddingLeft: 30, paddingTop: 60,
-                        position: 'fixed',
-                    }}>
-                        <div>智</div>
-                        <div>慧</div>
-                        <div>校</div>
-                        <div>园</div>
-                        <br/>
-                        <div>平</div>
-                        <div>安</div>
-                        <div>出</div>
-                        <div>行</div>
-                    </div>
-                    <div style={{marginBottom: 50, marginLeft: 90,marginTop:20}}>
-                        {NoticeItems}
-                        {/*{this.state.out_inData.map((itemdata, index) => <ItemComp key={index} itemdata={itemdata}*/}
-                                                                                  {/*handelSItem={this.handelSItem}></ItemComp>)}*/}
-                    </div>
-                </div>
-            </div>
+                   <div style={{marginTop: 20,display:"flex",flexDirection:"row"}}>
+                       <div style={{color: "#FFF", fontSize: 18}}>{this.state.studentName}</div>
+                       <div style={{color: "#FFF", fontSize: 12, marginTop: 5,marginLeft:10}}>{this.state.studentGrade}</div>
+                   </div>
+               </div>
+
+               <div className="av_items">
+                   <div style={{marginBottom: 50, marginLeft: 50,marginTop:50,}}>
+                       {NoticeItems}
+                   </div>
+               </div>
+           </div>
         )
     }
 

frontend/wechat-web/src/modules/hiPages/access-notice/ItemComp.js

@@ -21,22 +21,23 @@ export default class ItemComp extends Component{
      render(){
         return(
             <div>
-                {!this.props.isFirst ?  <img className="lineimg_sty" src={line_img} alt=""/> : ''}
+                {!this.props.isFirst ?  <div className="san_jiao"></div> : ''}
                 <div className="timeList_sty">
                     {}
                     <div className='common-flex-column'
                          style={{height: '100%', justifyContent: 'center', alignItems: 'center'}}>
                         {this.props.isFirst ? <div style={{flex: 1}}></div>
                             : <div style={{background: '#E9E9E9', flex: '1', width: '2px'}}></div>}
-                        {(this.props.itemdata.inDate==''||this.props.itemdata.inDate==null) ? <img className="mg-circle out_in" src={exit_img} alt=""/> :
-                            <img className="mg-circle out_in" src={enter_img} alt=""/>
+                        {(this.props.itemdata.inDate==''||this.props.itemdata.inDate==null) ?
+                            <div className="item_in_out in">进</div> :
+                            <div className="item_in_out out">出</div>
                         }
                         {this.props.isLast ? <div style={{flex: 1}}></div>
                             : <div style={{background: '#E9E9E9', flex: '1', width: '2px'}}></div>}
                     </div>
                     <div style={{marginLeft:30}}>
-                        <div style={{color:"#666666",fontSize:12}}>{this.state.showTime1}</div>
-                        <div style={{color:"#333333",fontSize:12,marginTop:5}}>{this.props.itemdata.recordName}</div>
+                        <div style={{color:"#000000",fontSize:12,fontWeight:'bold'}}>{this.state.showTime1}</div>
+                        {/*<div style={{color:"#333333",fontSize:12,marginTop:5}}>{this.props.itemdata.recordName}</div>*/}
                     </div>
                 </div>
             </div>

frontend/wechat-web/src/modules/hiPages/accessnoticedetail/AccessNoticeDetail.css

@@ -1,6 +1,5 @@
 .an_student_name{
     font-family: PingFangSC-Regular;
-    font-size: 15px;
     color: #222222;
     margin:20px 40px 10px 40px;text-align: left;
 }
@@ -14,5 +13,5 @@
     letter-spacing: 1.25px;text-align: left;margin: 30px;
 }
 .an_student_foot_time{
-    background-color: #E7EDF6;text-align: left;padding-left: 25px;
+    background-color: #F7F7F7;text-align: left;padding-left: 25px;
 }

frontend/wechat-web/src/modules/hiPages/accessnoticedetail/AccessNoticeDetail.js

@@ -19,7 +19,7 @@ class AccessNoticeDetail extends Component {
             studentType: '出校时间',
             studentPhoto: 'http://pic.vjshi.com/2018-08-28/8b163ad1a98e567f26cea40f34d56a27/00001.jpg?x-oss-process=style/watermark',
             studentHourMinues: '',
-
+            studentgrade:'三年八班'
         }
     }
 
@@ -67,10 +67,12 @@ class AccessNoticeDetail extends Component {
     }
 
     render() {
-        const {studentName, studentType, studentPhoto, studentTime, studentDate} = this.state
+        const {studentName, studentType, studentPhoto, studentTime, studentDate,studentgrade} = this.state
         return (
             <div style={{textAlign: 'center',}}>
-                <div className="an_student_name">{studentName}</div>
+                <div className="an_student_name">
+                    <span style={{fontSize:18}}>{studentName} <span style={{marginLeft:20,fontSize:12,color:"#666666"}}>{studentgrade}</span></span>
+                </div>
                 <img className="an_student_photo" src={studentPhoto} alt=""/>
                 <div className="an_student_type">{studentType}</div>
                 <div className='an_student_foot_time'>

frontend/wechat-web/src/modules/hiPages/approvel-detail/ApprovelDetail.css

@@ -7,6 +7,6 @@
 .lineimg_sty{height: 20px;width: 2px;margin-left: 20px;}
 .doing{color: #C70404;}
 .done{color: #666666; }
-.disagree_sty{width:120px;height: 30px;border-radius: 8px;font-size: 12px;border: 1px solid #4197FC;}
-.agree_sty{width:120px;height: 30px;border-radius: 8px;font-size: 12px;}
+.disagree_sty{width:120px;height: 30px;border-radius: 30px;font-size: 12px;border: 1px solid #4197FC;}
+.agree_sty{width:120px;height: 30px;border-radius: 30px;font-size: 12px;}
 .textarea_sty{}

frontend/wechat-web/src/modules/hiPages/changephonenumber/ChangePhoneNumber.js

@@ -54,7 +54,7 @@ let mSeconds = 0;
                 }
 
                 {
-                    this.state.changeSuccess == false ? <Button className='commonButton' type='primary' style={{margin: '35px'}}
+                    this.state.changeSuccess == false ? <Button className='commonButton' type='primary' style={{margin: '35px',borderRadius:30}}
                                                                 onClick={this.doBindPhone}>绑定</Button> : ''
                 }
 

frontend/wechat-web/src/modules/hiPages/class-schedule/ClassSchedule.css

@@ -41,6 +41,7 @@
     font-size: 18px;
     color: #0F1011;
     letter-spacing: 0;
+    font-weight: bold;
 }
 
 .sch_teacher_sty {

frontend/wechat-web/src/modules/hiPages/class-schedule/ClassSchedule.js

@@ -15,15 +15,15 @@ import hi0_img from '../../../style/imgs/ic_head1.png';
 function HSItem(props) {
     return (
         <div className='common-flex-row' style={{height: '60px', paddingLeft: '26px'}}>
-            <div className='common-flex-column'
-                 style={{height: '100%', justifyContent: 'center', alignItems: 'center'}}>
-                {props.isFirst ? <div style={{flex: 1}}></div>
-                    : <div style={{background: '#E9E9E9', flex: '1', width: '2px'}}></div>}
-                <div className="green_point"></div>
-                {props.isLast ? <div style={{flex: 1}}></div>
-                    : <div style={{background: '#E9E9E9', flex: '1', width: '2px'}}></div>}
-
-            </div>
+            {/*<div className='common-flex-column'*/}
+                 {/*style={{height: '100%', justifyContent: 'center', alignItems: 'center'}}>*/}
+                {/*{props.isFirst ? <div style={{flex: 1}}></div>*/}
+                    {/*: <div style={{background: '#E9E9E9', flex: '1', width: '2px'}}></div>}*/}
+                {/*<div className="green_point"></div>*/}
+                {/*{props.isLast ? <div style={{flex: 1}}></div>*/}
+                    {/*: <div style={{background: '#E9E9E9', flex: '1', width: '2px'}}></div>}*/}
+
+            {/*</div>*/}
             <div className="sch_hang_sty">
                 <div
                     className="sch_time_sty">{props.itemdata.startTime}–{props.itemdata.endTime}</div>
@@ -31,7 +31,7 @@ function HSItem(props) {
                 <img className="teach_img"
                      src={props.itemdata.teacherPhoto == "" || props.itemdata.userPhoto == null ? hi0_img : props.itemdata.userPhoto}
                      alt=""/>
-                <div className="sch_teacher_sty">{props.itemdata.teacherName}</div>
+                <div className="sch_teacher_sty">{props.itemdata.teacherName}老师</div>
             </div>
             {/*<img src={line_img} alt="" style={{width:2,height:15,marginLeft:12}}/>*/}
         </div>

frontend/wechat-web/src/modules/hiPages/field-trip/FieldTrip.js

@@ -172,7 +172,7 @@ class FieldTrip extends Component {
 
 
                 {/*<center>*/}
-                <Button className='commonButton' type='primary' style={{margin: '35px'}}
+                <Button className='commonButton' type='primary' style={{margin: '35px',borderRadius:30}}
                         onClick={this.doSaveClick}>提交</Button>
                 {/*<button type="button" className="btn btn-primary comBtn_sty" onClick={this.doSaveClick}>提交</button>*/}
                 {/*</center>*/}

frontend/wechat-web/src/modules/hiPages/res_apply/ResApply.js

@@ -112,7 +112,7 @@ class ResApply extends Component{
                     handleChange={this.handleChange.bind(this)}
                 />
 
-                <Button className='commonButton' type='primary' style={{margin: '35px'}}
+                <Button className='commonButton' type='primary' style={{margin: '35px',borderRadius:30}}
                         onClick={this.doSaveClick}>提交</Button>
                 {/*<center><button type="button" className="btn btn-primary comBtn_sty"  onClick={this.doSaveClick}>提交</button></center>*/}
             </div>

frontend/wechat-web/src/modules/hiPages/score-inquiry/ScoreData.js

@@ -19,14 +19,14 @@ export default class ScoreData extends Component {
 
         return (
             <div style={{width: '100%'}}>
-                {/*<div className="top_Time"><span className="top_time_span">2018-10-25 10:20</span></div>*/}
+                <div className="top_Time"><span className="top_time_span">{this.props.itemdata.scoreBasic.scoreDate}</span></div>
                 <div className="score_data_sty">
                     <div className="title_sty">{this.props.itemdata.title}</div>
                     <div className="gray-line" style={{height: '1px'}}></div>
                     <div className="left_sty1">
                         <div style={{width: "50%", padding: 10}}>
-                            <div style={{fontSize: 12, color: "#333333", padding: 10}}>考试时间:<span style={{
-                                color: "#666666",
+                            <div style={{fontSize: 12, color: "#999999", padding: 10}}>考试时间:<span style={{
+                                color: "#333333",
                                 marginLeft: 5
                             }}>{moment(this.props.itemdata.scoreBasic.scoreDate).format('YYYY-MM-DD')}</span></div>
                             <div className="left_sty">姓名: <span
@@ -40,8 +40,8 @@ export default class ScoreData extends Component {
                         </div>
                         <div style={{height: 100, width: 1, background: "#F2F2F2", marginTop: 60}}></div>
                         <div style={{width: "50%", padding: 10}}>
-                            <div style={{fontSize: 12, color: "#333333", padding: 10}}>考试范围:<span style={{
-                                color: "#666666",
+                            <div style={{fontSize: 12, color: "#999999", padding: 10}}>考试范围:<span style={{
+                                color: "#333333",
                                 marginLeft: 5
                             }}>{this.props.itemdata.scoreBasic.scoreScope}</span></div>
                             <div className="left_sty">班级排名: <span

frontend/wechat-web/src/modules/hiPages/score-inquiry/ScoreInquiry.css

@@ -16,11 +16,10 @@
 
 .title_sty {
     font-size: 15px;
-    text-align: center;
     width: 100%;
     padding: 10px;
     font-family: PingFangSC-Regular;
-    color: #4197FC;
+    color: #329BFF;
     letter-spacing: 0;
 }
 
@@ -44,7 +43,7 @@
 
 .left_sty {
     font-size: 14px;
-    color: #666666;
+    color: #999999;
     margin: 10px;
 }
 
@@ -65,6 +64,7 @@
     height: 25px;
     width: 100%;
     background-color: #F2F2F2;
+    margin-bottom: 10px;
 }
 
 .top_time_span {
@@ -72,4 +72,6 @@
     width: 160px;
     border-radius: 20px;
     padding: 5px 20px;
+    color: #6C6C6C;
+    font-size: 12px;
 }

frontend/wechat-web/src/modules/hiPages/send-vote/SendVote.js

@@ -219,7 +219,7 @@ class SendVote extends Component {
                     beforeUpload={this.beforeUpload.bind(this)}
                     handleChange={this.handleChange.bind(this)}
                 />
-                <Button className='commonButton' type='primary' style={{margin: '35px'}}
+                <Button className='commonButton' type='primary' style={{margin: '35px',borderRadius:30}}
                         onClick={this.doSendVote}>提交</Button>
                 {/*<center><Button type="button" className="btn btn-primary comBtn_sty"*/}
                 {/*onClick={this.doSendVote}>提交</Button></center>*/}

frontend/wechat-web/src/modules/hiPages/sendMeetting/SendMeet.js

@@ -182,7 +182,7 @@ class SendMeet extends Component {
                 {/*<center><Button type="button" className="btn btn-primary comBtn_sty"*/}
                 {/*onClick={this.doSaveClick}>创建</Button></center>*/}
 
-                <Button className='commonButton' type='primary' style={{margin: '35px'}}
+                <Button className='commonButton' type='primary' style={{margin: '35px',borderRadius:30}}
                         onClick={this.doSaveClick}>创建</Button>
             </div>
         )

frontend/wechat-web/src/modules/homework/ReleaseAssignmentPage.js

@@ -247,7 +247,7 @@ class ReleaseAssignmentPage extends React.Component {
             />
 
             <Button type="primary" onClick={this.commitAction}
-                    style={{margin: '35px 35px 16px'}}
+                    style={{margin: '35px 35px 16px',borderRadius:30}}
                     className='commonButton'>发布作业</Button>
 
             {/*<span className='announce-release-history' onClick={this.goListAction}>历史发布</span>*/}

frontend/wechat-web/src/modules/leave/LeaveAddCPage.js

@@ -128,7 +128,7 @@ class LeaveAddCPage extends Component {
                     beforeUpload={this.beforeUpload.bind(this)}
                     handleChange={this.handleChange.bind(this)}
                 />
-                <Button className='commonButton' type='primary' style={{margin: '35px'}}
+                <Button className='commonButton' type='primary' style={{margin: '35px',borderRadius:30}}
                         onClick={this.onSubmitClick}>提交</Button>
                 {/*</div>*/}
             </div>

frontend/wechat-web/src/modules/leave/LeaveAddPage.js

@@ -107,7 +107,7 @@ class LeaveAddPage extends Component{
                         beforeUpload={this.beforeUpload.bind(this)}
                         handleChange={this.handleChange.bind(this)}
                     />
-                <Button className='commonButton' type='primary' style={{margin: '35px'}}
+                <Button className='commonButton' type='primary' style={{margin: '35px',borderRadius:30}}
                         onClick={this.onSubmitClick}>提交</Button>
 
             </div>

frontend/wechat-web/src/modules/notificationCenter/NotifyBoardDetail.jsx

@@ -103,6 +103,7 @@ class NotifyBoardDetail extends Component {
                             {enclosureItem}
                         </div>
                         <div className='notify-detail-modal-time'>{notifyDetail.noIssue}</div>
+                        <div className='notify-detail-modal-time'>{notifyDetail.noTime}</div>
                         {/*<div className='notify-detail-modal-time'>{notifyDetail.noTime}</div>*/}
                         <div className='gray-line'></div>
                         <div className='common-flex-row-10 common-font-family'>

frontend/wechat-web/src/modules/payment/RechargeRelease.jsx

@@ -141,7 +141,7 @@ class RechargeRelease extends Component {
                 <div className='gray-line'></div>
 
                 <Button type='primary'
-                        style={{margin: '35px'}}
+                        style={{margin: '35px',borderRadius:30}}
                         className='commonButton'
                         onClick={this.onRechargeRelease}>发起收款</Button>
             </div>

frontend/wechat-web/src/modules/principalMailbox/PrincipalMailbox.jsx

@@ -62,7 +62,7 @@ class PrincipalMailbox extends Component {
                     <span style={{marginLeft: '5px'}}>匿名</span>
                 </div>
                 <div className='principal-uploadLayout'>
-                    <Button className='commonButton' type="primary" block
+                    <Button className='commonButton' type="primary" block style={{borderRadius:30}}
                             onClick={this.releaseEvent}>提交</Button>
                 </div>
 

frontend/wechat-web/src/modules/user/UserInfo.js

@@ -136,7 +136,7 @@ class UserInfo extends Component {
         return <div className={'user-column'}>
             <div className='user-info-item-top'>
                 <div>
-                    <text className='user-info-item-name'>手机号码</text>
+                    <text className='user-info-item-name'>手机号</text>
                     <div className='user-info-item-phone' style={{marginTop: '8px'}}>{userPhone}</div>
                 </div>
                 <div className="item_flex_1 flex_row_right">

frontend/wechat-web/src/modules/video/UploadVideo.jsx

@@ -107,7 +107,7 @@ class UploadVideo extends Component {
                 </div>
 
                 <div className='uploadLayout'>
-                    <Button className='commonButton' type="primary" block
+                    <Button className='commonButton' type="primary" block style={{borderRadius:30}}
                             onClick={this.releaseEvent} disabled={!this.state.uploadDone}>发布</Button>
                 </div>
             </div>

frontend/wechat-web/src/modules/vote/VoteDetailPage.js

@@ -324,7 +324,7 @@ class VoteDetailPage extends React.Component {
                     <div className="row flex_center" id="row_vote">
                         {this.state.voteState == true ? (
                             <Button onClick={this.onClickEvent.bind(this)} type="primary" block
-                                    style={{margin: '30px 10px'}}
+                                    style={{margin: '30px 10px',borderRadius:30}}
                                     className='commonButton'>
                                 投票</Button>
                         ) : (
@@ -335,7 +335,8 @@ class VoteDetailPage extends React.Component {
                                         backgroundColor: "#9D9D9D",
                                         color: "#ffffff",
                                         border: "1px solid #ffffff",
-                                        margin: '30px 10px'
+                                        margin: '30px 10px',
+                                        borderRadius:30
                                     }}>{this.state.data.voteStatus == 4 ? '已截止' : '已投票'}</Button>
                         )
                         }

frontend/wechat-web/src/style/css/homework.css

@@ -4,10 +4,11 @@
 
 .homework-item-title {
     font-family: PingFangSC-Regular;
-    font-size: 15px;
-    color: #333333;
+    font-size: 16px;
+    color: #000;
     letter-spacing: 0;
     flex: 1;
+    font-weight: bold;
 }
 
 .homework-item-todo, .homework-item-done {

frontend/wechat-web/src/style/css/payment.css

@@ -120,12 +120,12 @@
 
 .recharge-item-caption {
     width: 85px;
-    color: #666666;
+    color: #999999;
 }
 
 .recharge-item-value {
     flex: 1;
-    color: #333333;
+    color: #666666;
     overflow: hidden;
     word-wrap: break-word;
     padding-right: 10px;