Merge branch 'master' of ssh://10.10.100.21/source/smartschool-platform

frontend/pc-web/app/view/Interaction/mailbox/List.js

@@ -114,10 +114,6 @@ Ext.define('school.view.interaction.mailbox.List', {
                     handler: 'onUnIgnoreClick'
                 }],
                 columns : [{
-                    text: 'ID',
-                    dataIndex: 'mailbox_id',
-                    hidden: true
-                }, {
                     text: '标题',
                     dataIndex: 'mailbox_title',
                     width: 120
@@ -134,45 +130,17 @@ Ext.define('school.view.interaction.mailbox.List', {
                     },
 
                     width: 300
-                }, {
-                    xtype: 'datecolumn',
-                    text: '日期',
-                    dataIndex: 'create_date',
-                    width: 150
-                }, {
-                    text: '提出人',
-                    dataIndex: 'mb_creatorname',
-                    width: 120
-                }, {
-                    text: '年级',
-                    dataIndex: 'mb_grade'
-                }, {
-                    text: '班级',
-                    dataIndex: 'mb_class'
-                }, {
-                    text: '学生',
-                    dataIndex: 'mb_student'
                 }, {
                     text: '回复状态',
                     dataIndex: 'mailbox_status',
                     renderer: function(v, m, r) {
                         return v == 3 ? '已回复' : '未回复';
                     }
-                }, {
-                    text: '忽略状态',
-                    dataIndex: 'mb_ignore',
-                    renderer: function(v, m, r) {
-                        return v == 1 ? '已忽略' : '正常';
-                    }
-                }, {
-                    text: '回复信息',
-                    dataIndex: 'mb_reply',
-                    width: 250
                 }, {
                     xtype:'actioncolumn',
                     width:70,
                     dataIndex:'actioncolumn',
-                    text:'操作',
+                    text:'回复',
                     align: 'center',
                     items: [{
                         tooltip: '回复',
@@ -182,6 +150,38 @@ Ext.define('school.view.interaction.mailbox.List', {
                     listeners: {
                         click: 'onActionClick'
                     }
+                }, {
+                    text: '回复信息',
+                    dataIndex: 'mb_reply',
+                    width: 250
+                }, {
+                    text: '忽略状态',
+                    dataIndex: 'mb_ignore',
+                    renderer: function(v, m, r) {
+                        return v == 1 ? '已忽略' : '正常';
+                    }
+                }, {
+                    text: 'ID',
+                    dataIndex: 'mailbox_id',
+                    hidden: true
+                }, {
+                    xtype: 'datecolumn',
+                    text: '日期',
+                    dataIndex: 'create_date',
+                    width: 150
+                }, {
+                    text: '提出人',
+                    dataIndex: 'mb_creatorname',
+                    width: 120
+                }, {
+                    text: '年级',
+                    dataIndex: 'mb_grade'
+                }, {
+                    text: '班级',
+                    dataIndex: 'mb_class'
+                }, {
+                    text: '学生',
+                    dataIndex: 'mb_student'
                 }]
             },
         });

frontend/pc-web/app/view/Interaction/timetable/Detail.js

@@ -43,7 +43,7 @@ Ext.define('school.view.interaction.timetable.Detail', {
                 allowBlank: false,
                 listeners: {
                     select: function (combo, record, eOpts) {
-                        combo.up('form').getForm().findField('gradeId').setValue(record.get('value'));
+                        combo.up('form').getForm().findField('gradeId').setValue(record.get('grade_id'));
                         combo.up('form').getForm().findField('clazzId').setValue(null);
                         combo.up('form').getForm().findField('clazzName').setValue(null);
                     }
@@ -76,6 +76,7 @@ Ext.define('school.view.interaction.timetable.Detail', {
                     },
                     select: function (combo, record, eOpts) {
                         combo.up('form').getForm().findField('clazzId').setValue(record.get('clazz_id'));
+                        combo.up('form').getForm().findField('gradeId').setValue(record.get('grade_id'));
                         combo.up('form').getForm().findField('gradeName').setValue(record.get('clazz_grade'));
                     }
                 }

frontend/pc-web/app/view/Interaction/timetable/List.js

@@ -208,6 +208,7 @@ Ext.define('school.view.interaction.timetable.List', {
     refresh: function() {
         Ext.StoreMgr.get('store_grade').load();
         Ext.StoreMgr.get('store_class').load();
+        Ext.StoreMgr.get('store_subject').load();
         this.items.items[0].store.load();
     }
 });

frontend/pc-web/app/view/auth/Dialog.scss

@@ -20,11 +20,6 @@ $dialog-trigger-color: dynamic(#e5e5e5);
         }
     }
 
-    .x-form-text-default,
-    .x-placeholder-label-default {
-        padding: 15px;
-    }
-
     .trigger-glyph-noop {
         cursor: default;
     }

frontend/pc-web/app/view/auth/Login.js

@@ -40,40 +40,41 @@ Ext.define('school.view.auth.Login', {
                 margin : '5 0'
             },
             items: [
+                {
+                    xtype: 'component',
+                    height: 50,
+                    html:'<div class="auth-title"><img class="x-logo-text" style="" src="resources/images/zhihuixiaoyuan.png" alt=""><div>',
+                },
                 {
                     xtype: 'label',
-                    text: '账 户 登 录'
+                    style: {
+                        'font-size': '18px',
+                        'text-align': 'center',
+                        'color': '#676565',
+                        'font-weight': 'bold'
+                    },
+                    text: '账户登录'
                 },
                 {
                     xtype: 'textfield',
                     cls: 'auth-textbox',
                     name: 'username',
                     bind: '{username}',
-                    height: 55,
+                    height: 40,
                     hideLabel: true,
                     allowBlank : false,
-                    emptyText: '账号/邮箱/手机号',
-                    triggers: {
-                        glyphed: {
-                            cls: 'trigger-glyph-noop auth-email-trigger'
-                        }
-                    }
+                    emptyText: '用户名'
                 },
                 {
                     xtype: 'textfield',
                     cls: 'auth-textbox',
-                    height: 55,
+                    height: 40,
                     hideLabel: true,
                     emptyText: '密码',
                     inputType: 'password',
                     name: 'password',
                     bind: '{password}',
-                    allowBlank : false,
-                    triggers: {
-                        glyphed: {
-                            cls: 'trigger-glyph-noop auth-password-trigger'
-                        }
-                    }
+                    allowBlank : false
                 },
                 {
                     xtype: 'container',
@@ -95,11 +96,12 @@ Ext.define('school.view.auth.Login', {
                 },
                 {
                     xtype: 'button',
+                    height: 40,
                     reference: 'loginButton',
-                    scale: 'large',
-                    ui: 'soft-green',
-                    iconAlign: 'right',
-                    iconCls: 'x-fa fa-angle-right',
+                    // scale: 'large',
+                    // ui: 'soft-green',
+                    // iconAlign: 'right',
+                    // iconCls: 'x-fa fa-angle-right',
                     text: '登录',
                     formBind: true,
                     listeners: {

frontend/pc-web/app/view/auth/Login.scss

@@ -14,6 +14,14 @@ $social-weixin-btn-background: dynamic(#00d500);
     > .x-body-el {
         background-color: rgba(black, 0.25);
     }
+
+    .auth-dialog-login {
+        border-radius: 4px;
+
+        .auth-title {
+            text-align: center;
+        }
+    }
 }
 
 //UI Styles for buttons

frontend/pc-web/app/view/basic/class/ClassInfoController.js

@@ -7,6 +7,9 @@ Ext.define('school.view.basic.class.ClassInfoController', {
         view = me.getView(),
         viewModel = me.getViewModel();
 
+        Ext.StoreMgr.get('store_grade').load();
+        Ext.StoreMgr.get('store_class').load();
+        Ext.StoreMgr.get('store_subject').load();
         viewModel.get('store_gradeclass').load();
     },
 

frontend/pc-web/app/view/core/form/field/ClassComboBox.js

@@ -8,7 +8,23 @@ Ext.define('school.view.core.form.field.ClassComboBox', {
     editable: true,
     minChars: 0,
     queryMode: 'local',
-    initComponent: function() {
+
+    // Template for the dropdown menu.
+    // Note the use of the "x-list-plain" and "x-boundlist-item" class,
+    // this is required to make the items selectable.
+    tpl: Ext.create('Ext.XTemplate',
+        '<ul class="x-list-plain"><tpl for=".">',
+        '<li role="option" class="x-boundlist-item">{clazz_name} | {clazz_grade}</li>',
+        '</tpl></ul>'
+    ),
+    // template for the content inside text field
+    displayTpl: Ext.create('Ext.XTemplate',
+        '<tpl for=".">',
+        '{clazz_name} | {clazz_grade}',
+        '</tpl>'
+    ),
+
+    initComponent: function () {
         var me = this;
 
         Ext.apply(me, {
@@ -16,5 +32,6 @@ Ext.define('school.view.core.form.field.ClassComboBox', {
         });
 
         me.callParent(arguments);
-    }
+    },
+
 });

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

@@ -40,6 +40,7 @@ export default class MeetingSignItem extends Component {
                             {meetingBean.meetStatus}
                         </div>
                     </div>
+                    <div style={{height:1,width:'100%',backgroundColor:'#F2F2F2',marginTop:5,marginBottom:5}}></div>
                     <div className='contentItem'>
                         <div className='captionText'>时间：</div>
                         <div className='valueText'>{meetingBean.startTime + ' 到 ' + meetingBean.endTime}</div>

frontend/wechat-web/src/modules/hiPages/LeaveDetail/LeaveDetail.js

@@ -106,7 +106,7 @@ class LeaveDetail extends Component {
                     </div>
                     <div className="leave_reason">
                         <div style={{fontSize: 12, color: "#666666",width:'20%'}}>请假时间：</div>
-                        <div style={{fontSize: 12, color: "#333333",width:'80%'}}>{itemdetail.startTime}—{itemdetail.endTime}</div>
+                        <div style={{fontSize: 12, color: "#666666",width:'80%'}}>{itemdetail.startTime}—{itemdetail.endTime}</div>
                     </div>
                     <div  style={{marginTop: 10}} className="leave_reason">
                         <div style={{fontSize: 12, color: "#666666",width:'20%'}}>请假事由：</div>
@@ -120,7 +120,7 @@ class LeaveDetail extends Component {
                         </div>
                     </div>
 
-                    <div style={{fontSize: 15, color: "#666666", marginTop: 10,marginLeft:5}}>回复：</div>
+                    <div style={{fontSize: 15, color: "#666666", marginTop: 10,marginLeft:15}}>回复：</div>
                     <div className="comhline_sty1" style={{marginTop: 5}}></div>
                 </div>
 
@@ -130,12 +130,10 @@ class LeaveDetail extends Component {
                         <List
                             dataSource={itemdetail.leaveMessages}
                             renderItem={item => (
-                                <List.Item>
-                                    <div>
+                                    <div style={{paddingTop:5,paddingBottom:5}}>
                                         <span className=" margin_left_right_20"
-                                              style={{color: '#333333',wordWrap:'break-word'}}>{item.replyContent}</span>
+                                              style={{color: '#333333',wordWrap:'break-word',fontSize:14}}>{item.replyContent}</span>
                                     </div>
-                                </List.Item>
                             )}
                         />
                     }

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

@@ -1,6 +1,6 @@
 .comhline_sty {background-color:#F2F2F2;width:100%;height:10px}
 .comhline_sty1{background-color:#F2F2F2;width:100%;height:1px;}
-.headerDiv{display: flex;flex-direction: row;height: 75px;width: 100%;  }
+.headerDiv{display: flex;flex-direction: row;height: 75px;width: 100%;  background: #CAE8DA;opacity: 0.7;}
 .headerImg{height: 45px;width: 45px;border-radius: 25px;margin: 10px 20px;  }
 .timeList_sty{height: auto;display: flex;flex-direction: row;}
 .out_in{height: 45px;width: 45px;padding-top: 0px;border: none;}
@@ -9,4 +9,3 @@
 .done{color: #666666; }
 .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/approvel-detail/ApprovelDetail.js

@@ -81,11 +81,10 @@ class ApprovelDetail extends Component{
                 <div className="headerDiv">
                     <img className="headerImg" src={hi1_img} alt=""/>
                     <div style={{marginTop:10}}>
-                        <div style={{color:"#000000",fontSize:15}}>{this.state.docModel.proposer.value}</div>
+                        <div style={{color:"#333333",fontSize:18}}>{this.state.docModel.proposer.value}</div>
                         <div style={{color:"#666666",fontSize:12,marginTop:10}}>{this.state.docModel.oaApprove.creatDate}</div>
                     </div>
                 </div>
-                <div className="comhline_sty"></div>
 
                 <div style={{marginTop:10}}>
                     {this.state.docModel.basic.map((itemdata,index) =>
@@ -122,14 +121,26 @@ class ApprovelDetail extends Component{
                     </div>
                 </div> : ''}
                 <Modal
-                    title={this.state.AMTitle}
+                    // title={this.state.AMTitle}
                     visible={this.state.AMvisible}
                     okText={'确认'}
                     onOk={this.doApprovel.bind(this,1)}
                     cancelText={'取消'}
+                    centered={true}
+                    closable={false}
+                    footer={null}
                     onCancel={this.doApprovel.bind(this,0)}>
                     <div onChange={this.handelValueCom}>
+                        <div style={{textAlign:'center',fontSize:15,color:'#292929',marginBottom:10}}>{this.state.AMTitle}</div>
                         <textarea autoFocus="autoFocus" ref='approveOpinion' className="form-control" rows="5" placeholder="填写意见说明（非必填）"  maxLength={50}></textarea>
+                       <div style={{display:'flex',flexDirection:'row',marginTop:20}}>
+                           <div style={{width:'50%',textAlign:'center'}}>
+                               <Button className="disagree_sty"  style={{borderRadius:5}} onClick={this.doApprovel.bind(this,0)} >取消</Button>
+                           </div>
+                           <div style={{width:'50%',textAlign:'center'}}>
+                               <Button  type="primary" className="agree_sty"  style={{borderRadius:5}} onClick={this.doApprovel.bind(this,1)} >提交</Button>
+                           </div>
+                       </div>
                     </div>
                 </Modal>
                 {this.state.previewVisible ?
@@ -150,9 +161,9 @@ class ApprovelDetail extends Component{
     handleStatusClick = (status)=>{
         var statusTitle = null
         if(status == 1){
-            statusTitle = '同意'
+            statusTitle = '同 意'
         }else if(status == 2){
-            statusTitle = '不同意'
+            statusTitle = '不 同 意'
         }
         // console.log('您点击了',statusTitle)
         this.setState({

frontend/wechat-web/src/modules/hiPages/approvel-detail/DetailItem.js

@@ -10,12 +10,12 @@ function DetailItem2(props) {
     return(
        <div>
            <div style={{ display: 'flex',flexDirection:'row',fontsize:15,marginLeft:10,marginRight:10,marginTop:10}}>
-               <span style={{width:"35%",textAlign:'left',color:'#666666'}}>{props.itemdata1[0].key}</span>
-               <span  style={{width:"65%",textAlign:'right',color:'#333333',wordWrap:'break-word'}}>{props.itemdata1[0].value}</span>
+               <span style={{width:"35%",textAlign:'left',color:'#999999'}}>{props.itemdata1[0].key}</span>
+               <span  style={{width:"65%",textAlign:'right',color:'#666666',wordWrap:'break-word'}}>{props.itemdata1[0].value}</span>
            </div>
            <div style={{ display: 'flex',flexDirection:'row',fontsize:15,marginLeft:10,marginRight:10,marginTop:10}}>
-               <span style={{width:"35%",textAlign:'left',color:'#666666'}}>{props.itemdata1[1].key}</span>
-               <span  style={{width:"65%",textAlign:'right',color:'#333333',wordWrap:'break-word'}}>{props.itemdata1[1].value}</span>
+               <span style={{width:"35%",textAlign:'left',color:'#999999'}}>{props.itemdata1[1].key}</span>
+               <span  style={{width:"65%",textAlign:'right',color:'#666666',wordWrap:'break-word'}}>{props.itemdata1[1].value}</span>
            </div>
            <div className='comhline_sty'></div>
        </div>
@@ -36,9 +36,9 @@ export default class DetailItem extends Component{
                                 <DetailItem2 index = {index} itemdata1 = {itemdata1}></DetailItem2>
                             )}
                         </div> :<div>
-                        <div style={{ display: 'flex',flexDirection:'row',fontsize:15,marginLeft:10,marginRight:10,marginTop:10}}>
-                            <span style={{width:"35%",textAlign:'left',color:'#666666'}}>{this.props.itemdata.key}</span>
-                            <span  style={{width:"65%",textAlign:'right',color:'#333333',wordWrap:'break-word'}}>{this.props.itemdata.value}</span>
+                        <div style={{ display: 'flex',flexDirection:'row',fontsize:14,marginLeft:10,marginRight:10,marginTop:10}}>
+                            <span style={{width:"35%",textAlign:'left',color:'#999999'}}>{this.props.itemdata.key}</span>
+                            <span  style={{width:"65%",textAlign:'right',color:'#666666',wordWrap:'break-word'}}>{this.props.itemdata.value}</span>
                         </div>
                         <div className="comhline_sty1"></div>
                     </div>

frontend/wechat-web/src/modules/hiPages/approvel-detail/ItemApprovel.js

@@ -17,15 +17,14 @@ export default class ItemApprovel extends Component{
      render(){
         return(
             <div style={{marginLeft:20}}>
-                <img className="lineimg_sty" src={line_img} alt=""/>
                 <div className="timeList_sty">
-                    <img className="img-circle out_in" src={hi2_img} alt=""/>
-                    <div style={{marginLeft:30,width:"62%"}}>
-                        <div style={{color:'#666666',fontSize:12}}>{this.props.approveDate}</div>
-                        <div style={{color:"#666666",fontSize:15,marginTop:5,wordWrap:'break-word'}}>{this.props.itemdata.value }<span>{this.props.suggest.value==null?"":"("+this.props.suggest.value+")"}</span></div>
+                    <div style={{width:10,height:10,background:'#BDBDBD',borderRadius:'30px'}}></div>
+                    <div style={{marginLeft:10,width:"62%"}}>
+                        <div ><span style={{color:'#000000',fontSize:15}}>{this.props.itemdata.value }</span><span style={{color:'#666666',fontSize:12,marginLeft:10}}>{this.props.approveDate}</span></div>
+                        <div style={{color:"#666666",fontSize:12,marginTop:5,wordWrap:'break-word'}}><span>{this.props.suggest.value==null?"":"(审批语:"+this.props.suggest.value+")"}</span></div>
                     </div>
                     <div style={{fontSize:12,textAlign:'right'}} className={this.props.approveStatus == 1?'doing':'done'}>
-                        {this.props.approveStatus == 1 ? '待审批' : (this.props.approveStatus == 2 ? '已审批' : '已拒绝')}</div>
+                        {this.props.approveStatus == 1 ? '等待审批' : (this.props.approveStatus == 2 ? '已同意' : '已拒绝')}</div>
                 </div>
             </div>
         )

frontend/wechat-web/src/modules/hiPages/approvel/Approvel.css

@@ -1,12 +1,12 @@
 .item-Style{
-    background-color: #FFFFFF;height: 76px;border-radius: 6px;
+    background-color: #FFFFFF;height: 66px;border-radius: 6px;
     display: flex;flex-direction: row;width:100%;
 }
 .img_sty{
-    height:45px;width: 45px;margin: 15px 10px;
+    height:45px;width: 45px;margin: 10px 10px
 }
 .img_circle{
-    height:45px;width: 45px;margin: 15px 10px; border-radius: 29px;
+    height:45px;width: 45px;margin: 10px 10px; border-radius: 29px;
 }
 .doing{
     color: #C70404 ;

frontend/wechat-web/src/modules/hiPages/approvel/ApprovelItem.js

@@ -36,10 +36,10 @@ export default class ApprovelItem extends Component{
 
         const {itemdata,isMyApply,approveId} = this.state
         return(
-                    <div style={{padding:10}}>
+                    <div style={{padding:10,paddingBottom:0}}>
                         <Link to={"/approvel-detail/" + isMyApply +"/"+ approveId }>
                             <div className="item-Style" onClick={this.ItemClick.bind(this,isMyApply,itemdata,this.props.index)}>
-                                <div style={{width:'20%'}}>
+                                <div style={{width:'18%'}}>
                                     <div style={{width:76,height:'100%'}}>
                                         <img src={itemdata.approveType == 1 ? icon_trip : (itemdata.approveType == 2 ? icon_res : icon_leave)} className={isMyApply==true?'img_sty':"img_circle"}/>
                                     </div>
@@ -48,7 +48,7 @@ export default class ApprovelItem extends Component{
                                     <div style={{color:"#333333",fontSize:15,marginTop:10}}>
                                         {itemdata.approveType == 1 ? '出差申请' :  (itemdata.approveType == 2 ? '用品申请' : '请假申请' )}
                                     </div>
-                                    <div style={{color:"#666666",fontSize:12,marginTop:15}}>{this.props.itemdata.creatDate}</div>
+                                    <div style={{color:"#666666",fontSize:12,marginTop:5}}>{this.props.itemdata.creatDate}</div>
                                 </div>
                                 <div className={itemdata.approveStatus==1?'doing':'done'}
                                      style={{textAlign:'left',marginTop:10,fontSize:12,width:'15%'}}>

frontend/wechat-web/src/modules/hiPages/meet-detail/MeetDetail.css

@@ -43,8 +43,8 @@
 .titleText {
     flex: 1;
     font-family: PingFangSC-Regular;
-    font-size: 14px;
-    color: #333333;
+    font-size: 16px;
+    color: #000000;
     letter-spacing: 0;
     font-weight: bold;
 }
@@ -72,8 +72,8 @@
 
 .captionText {
     font-family: PingFangSC-Regular;
-    font-size: 12px;
-    color: #666666;
+    font-size: 14px;
+    color: #999999;
     letter-spacing: 0;
     width: 65px;
     padding: 0;
@@ -83,8 +83,8 @@
 .valueText {
     flex: 1;
     font-family: PingFangSC-Regular;
-    font-size: 12px;
-    color: #333333;
+    font-size: 14px;
+    color: #666666;
     letter-spacing: 0;
     -ms-word-wrap: break-word;
     word-wrap: break-word;

frontend/wechat-web/src/modules/hiPages/meet-detail/MeetDetail.js

@@ -88,7 +88,7 @@ class MeetDetail extends Component {
                     {this.state.unsignList.map((itemdata, index) => <SignItem itemdata={itemdata}></SignItem>)}
                 </div>
                     {this.state.notifyStatus == 3 ? <div style={{textAlign:'center',marginTop:20}}>
-                        <Button  className='end_sty' style={{color:'#FFFFFF',backgroundColor:'#929292'}}>已结束</Button>
+                        <Button  className='end_sty' style={{color:'#FFFFFF',backgroundColor:'#929292',borderRadius:30}}>已结束</Button>
                     </div> : <div style={{textAlign:'center',marginTop:20,marginBottom:20}}>
                         {this.state.showEndBtn == true ? <Button type="primary"  className='end_sty ' onClick={this.EndMeetting}>结束会议</Button> : ""}
                     </div>}

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

@@ -3,7 +3,7 @@
     color: #333333;
     padding: 10px 20px;
     font-family: PingFangSC-Regular;
-    font-size: 14px;
+    font-size: 15px;
     letter-spacing: 1.5px;
 }
 

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

@@ -142,7 +142,7 @@ class SendMeet extends Component {
                  className='common-column-layout'>
                 {/*<p>{new Date().getTime()}</p>*/}
                 <textarea autoFocus="autoFocus" ref='meetTitle' className="form-control textarea_sty" rows="2"
-                          placeholder="请填写会议主题…"  maxLength={50}></textarea>
+                          placeholder="请填写会议主题…"   maxLength={50}></textarea>
                 <textarea ref='meetAddress' className="form-control textarea_sty" rows="3"
                           placeholder="请填写会议地址…"  maxLength={100}></textarea>
                 <div className="comhline_sty"></div>

frontend/wechat-web/src/modules/homework/AssignmentDetailPage.css

@@ -18,14 +18,14 @@
 
 .homework-detail-top-name {
     font-family: PingFangSC-Medium;
-    font-size: 16px;
-    color: #4087DC;
+    font-size: 18px;
+    color: #333333;
     letter-spacing: 2.25px;
 }
 
 .homework-detail-top-time {
     font-family: PingFangSC-Regular;
-    font-size: 14px;
+    font-size: 12px;
     color: #595959;
     letter-spacing: 1.5px;
     padding-top: 6px;
@@ -90,8 +90,8 @@
 
 .homework-detail-leave-name {
     font-family: PingFangSC-Medium;
-    font-size: 15px;
-    color: #333333;
+    font-size: 13px;
+    color: #000000;
     font-weight: bold;
     letter-spacing: 0;
     width: 80px;
@@ -100,7 +100,7 @@
 
 .homework-detail-leave-content {
     font-family: PingFangSC-Medium;
-    font-size: 14px;
+    font-size: 13px;
     color: #666666;
     letter-spacing: 0;
     padding-right: 10px;

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

@@ -13,7 +13,7 @@ import {getIntValue, getStrValue, isObjEmpty} from '../../utils/common';
 import ImagesViewer from "../../components/imagesVIewer/ImagesViewer";
 import {Toast} from 'antd-mobile'
 import {Avatar} from 'antd'
-
+import leave_img from '../../style/imgs/leave_messages.png';
 import {connect} from 'react-redux'
 import {saveListState} from "../../redux/actions/listState";
 
@@ -194,7 +194,7 @@ class AssignmentDetailPage extends React.Component {
                         <div className="homework-detail-top-name">{this.state.teachName}老师</div>
                         <div className='homework-detail-top-time'>
                             <span>截止时间：</span>
-                            <span style={{color: ' #151515'}}>{this.state.endTime}</span>
+                            <span >{this.state.endTime}</span>
                         </div>
                     </div>
                 </div>
@@ -212,7 +212,9 @@ class AssignmentDetailPage extends React.Component {
                                                           height={130}/>) : ("")}
 
                 </div>
-                <div className="margin_top_bottom_10 homework-detail-leave-caption">留言{this.state.data.length != 0 ? (
+                <div className="margin_top_bottom_10 homework-detail-leave-caption">
+                    <img src={leave_img} style={{height:18,width:21,marginRight:10}}/>
+                    {this.state.data.length != 0 ? (
                     <span>
                         ({this.state.data.length}条)
                     </span>) : (<div></div>)}</div>
@@ -225,12 +227,10 @@ class AssignmentDetailPage extends React.Component {
                     locale={{emptyText: '暂无留言'}}
                     dataSource={this.state.data}
                     renderItem={item => (
-                        <List.Item>
-                            <div style={{display: 'flex'}}>
+                            <div style={{display: 'flex',paddingTop:5,paddingBottom:5}}>
                                 <div className="homework-detail-leave-name">{item.name}:</div>
                                 <div className='homework-detail-leave-content'>{item.content}</div>
                             </div>
-                        </List.Item>
                     )}/>
             </div>
             {this.state.role === "teacher" ? "" :

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

@@ -22,7 +22,7 @@ export default class LeaveItem extends Component {
                 <Link to={'/leavedetail/' + this.props.role + '/' + item.lvId}>
                     <div style={{backgroundColor:'#FFF',width:'100%',padding:10,borderRadius:10}} onClick = {this.ItemClick.bind(this,this.props.index)}>
                         <div className="leave_row_sty">
-                            <div style={{fontSize: 15, color: "#333333",width:'60%',textAlign:'left'}}> {item.title}</div>
+                            <div style={{fontSize: 16, color: "#000000",width:'60%',textAlign:'left'}}> {item.title}</div>
                             <div style={{width:'40%',textAlign:'right'}}>
                                 {
                                     this.state.role == "parent" ? '' :
@@ -37,13 +37,13 @@ export default class LeaveItem extends Component {
                             </div>
                         </div>
                         <div className="leave_row_sty" style={{marginTop:5}}>
-                            <div  style={{fontSize: 12, color: "#666666",width:'20%'}}>请假时间：</div>
-                            <div style={{fontSize: 12, color: "#333333",width:'80%'}}>{item.startTime}—{item.endTime}</div>
+                            <div  style={{fontSize: 14, color: "#999999",width:'21%'}}>请假时间：</div>
+                            <div style={{fontSize: 14, color: "#666666",width:'79%'}}>{item.startTime}—{item.endTime}</div>
                         </div>
 
                         <div className="leave_row_sty" style={{marginTop:5}}>
-                            <div style={{fontSize: 12, color: "#666666",width:'20%'}}>请假事由：</div>
-                            <div style={{fontSize: 12, color: "#333333",width:'80%',wordWrap:'break-word'}}>{item.content}</div>
+                            <div style={{fontSize: 14, color: "#999999",width:'21%'}}>请假事由：</div>
+                            <div style={{fontSize: 14, color: "#666666",width:'79%',wordWrap:'break-word'}}>{item.content}</div>
                         </div>
                     </div>
                 </Link>

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

@@ -107,15 +107,13 @@ class NotifyBoardDetail extends Component {
                         {/*<div className='notify-detail-modal-time'>{notifyDetail.noTime}</div>*/}
                         <div className='gray-line'></div>
                         <div className='common-flex-row-10 common-font-family'>
-                            <span style={{color: '#363636'}}>接收人名单</span>
-                            <div style={{flex: '1', textAlign: 'right'}}>
+                            <span style={{color: '#363636',fontSize:14}}>接收人</span>
                                 {/*<span style={{fontSize: '12px', color: '#CD1D1D'}}>未读：{notifyDetail.unRead}</span>*/}
                                 <span style={{
                                     fontSize: '12px',
-                                    color: '#161616',
+                                    color: '#666666',
                                     marginLeft: '10px'
                                 }}>{getIntValue(notifyDetail.readed, 'length')}/{notifyDetail.allCount}</span>
-                            </div>
                         </div>
                         <div>
                             {receiveItems}

frontend/wechat-web/src/style/css/consume-re.css

@@ -108,8 +108,8 @@
 
 .notify-item-title {
     font-family: PingFangSC-Regular;
-    font-size: 14px;
-    color: #333333;
+    font-size: 16px;
+    color: #000000;
     letter-spacing: 0;
     flex: 1;
     margin-left: 6px;
@@ -157,16 +157,16 @@
     width: 70px;
     margin: 0 10px;
     font-family: PingFangSC-Regular;
-    font-size: 12px;
-    color: #666666;
+    font-size: 14px;
+    color: #999999;
     letter-spacing: 2px;
 }
 
 .notify-item-value {
     margin-right: 16px;
     font-family: PingFangSC-Regular;
-    font-size: 12px;
-    color: #333333;
+    font-size: 14px;
+    color: #666666;
     letter-spacing: 0;
 }
 
@@ -193,8 +193,8 @@
 
 .notify-item-detail {
     font-family: PingFangSC-Regular;
-    font-size: 12px;
-    color: #666666;
+    font-size: 14px;
+    color: #999999;
     letter-spacing: 2px;
     flex: 1;
 }
@@ -253,7 +253,7 @@
 
 .notify-detail-modal-content-text {
     font-family: PingFangSC-Regular;
-    font-size: 12px;
+    font-size: 14px;
     color: #878787;
     letter-spacing: 1.33px;
     padding: 12px 18px;

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

@@ -29,7 +29,7 @@
 }
 
 .system-msg-item-header {
-    background: #FDA800;
+    background: #329BFF;
     width: 46px;
     height: 46px;
     border-radius: 34px;

frontend/wechat-web/src/style/css/principal-mailbox.css

@@ -9,12 +9,12 @@
 
 .headerLayout {
     width: 100%;
-    background: #50C661;
-    height: 46px;
-    text-align: center;
-    line-height: 46px;
+    background: #3BC7AD;
+    height: 34px;
+    padding-left: 10px;
+    line-height: 34px;
     font-family: PingFangSC-Regular;
-    font-size: 13px;
+    font-size: 14px;
     color: #FFFFFF;
     letter-spacing: 1.88px;
 }
@@ -113,8 +113,8 @@
 .principal-item-time {
     flex: 1;
     font-family: PingFangSC-Regular;
-    font-size: 15px;
-    color: #303030;
+    font-size: 16px;
+    color: #000000;font-weight: bold;
     letter-spacing: 2px;;
 }
 
@@ -134,8 +134,8 @@
 
 .principal-item-content {
     font-family: PingFangSC-Regular;
-    font-size: 12px;
-    color: #333333;
+    font-size: 14px;
+    color: #878787 ;
     letter-spacing: 1.5px;
     margin: 10px 0;
 }