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

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/controller/WxPrincipalMailboxController.java

@@ -32,7 +32,7 @@ public class WxPrincipalMailboxController {
 	 * 校长信箱创建
 	 * @return
 	 */
-	@PostMapping("/mailboxString")
+	@PostMapping("/principalMailbox")
 	public ResultBean principalMailbox(String mailboxString){
 		try {
 			Assert.notNull(mailboxString,"请填入单据相应信息");

applications/school/school-server/src/main/resources/mapper/WxPrincipalMailboxMapper.xml

@@ -103,12 +103,12 @@
 			#{mailboxStatus}, 
 			#{notifier},
 			#{schoolId},
-			#{mb_stuid},
-			#{mb_student},
-			#{mb_grade},
-			#{mb_class},
-			#{mb_ignore},
-			#{mb_reply},
+			#{mbStuid},
+			#{mbStudent},
+			#{mbGrade},
+			#{mbClass},
+			#{mbIgnore},
+			#{mbReply},
 			#{mbCreatorname}
 		)
 	</insert>
@@ -126,13 +126,13 @@
 			<if test="mailboxStatus != null">`mailbox_status` = #{mailboxStatus}, </if>
 			<if test="notifier != null">`notifier` = #{notifier},</if>
 			<if test="schoolId != null"> `school_id` = #{schoolId}, </if>
-			<if test="mbStuid != null"> mb_stuid = #{mbStuid}, </if>
-			<if test="mbStudent != null"> mb_student = #{mbStudent}, </if>
-			<if test="mbGrade != null"> mb_grade = #{mbGrade}, </if>
-			<if test="mbClass != null"> mb_class = #{mbClass}, </if>
-			<if test="mbIgnore != null"> mb_ignore = #{mbIgnore}, </if>
-			<if test="mbReply != null"> mb_reply = #{mbReply}, </if>
-			<if test="mbCreatorname != null">mb_creatorname = #{mbCreatorname} </if>
+			<if test="mbStuid != null"> `mb_stuid` = #{mbStuid}, </if>
+			<if test="mbStudent != null"> `mb_student` = #{mbStudent}, </if>
+			<if test="mbGrade != null"> `mb_grade` = #{mbGrade}, </if>
+			<if test="mbClass != null"> `mb_class` = #{mbClass}, </if>
+			<if test="mbIgnore != null"> `mb_ignore` = #{mbIgnore}, </if>
+			<if test="mbReply != null"> `mb_reply` = #{mbReply}, </if>
+			<if test="mbCreatorname != null">`mb_creatorname` = #{mbCreatorname} </if>
 		</set>
 		where mailbox_id = #{mailboxId}
 	</update>

frontend/pc-web/app/model/basic/StudentParents.js

@@ -54,5 +54,8 @@ Ext.define('school.model.basic.StudentParents', {
     }, {
         name: 'parent_rel',
         type: 'string'
+    }, {
+        name: 'ps_relation',
+        type: 'string'
     }],
 });

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

@@ -74,7 +74,7 @@ Ext.define('school.view.interaction.mailbox.List', {
                 name: 'mb_ignore',
                 displayField: 'name',
                 valueField: 'value',
-                editable: false,
+                editable: true,
                 value: '0',
                 store: Ext.create('Ext.data.ArrayStore', {
                     fields: ['name', 'value'],
@@ -112,9 +112,6 @@ Ext.define('school.view.interaction.mailbox.List', {
                     xtype: 'button',
                     text: '取消忽略',
                     handler: 'onUnIgnoreClick'
-                }, {
-                    xtype: 'button',
-                    text: '删除'
                 }],
                 columns : [{
                     text: 'ID',

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

@@ -119,7 +119,7 @@ Ext.define('school.view.interaction.mailbox.ListController', {
         });
 
         if(data.length == 0) {
-            school.util.BaseUtil.showErrorToast('请先勾选需要删除的记录');
+            school.util.BaseUtil.showErrorToast('请先勾选需要忽略的记录');
             return;
         }
 
@@ -165,7 +165,7 @@ Ext.define('school.view.interaction.mailbox.ListController', {
         });
 
         if(data.length == 0) {
-            school.util.BaseUtil.showErrorToast('请先勾选需要删除的记录');
+            school.util.BaseUtil.showErrorToast('请先勾选需要取消忽略的记录');
             return;
         }
 

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

@@ -1,85 +0,0 @@
-Ext.define('school.view.Interaction.mailbox.MailboxController', {
-    extend: 'Ext.app.ViewController',
-    alias: 'controller.interaction-mailbox-mailbox',
-    // 回复
-    ReplyClick: function () {
-        Ext.MessageBox.show({
-            title: '回复处理',
-            msg: '回复对象：'+rec.data.code,
-            width:500,
-            height:600,
-            buttons: Ext.MessageBox.OKCANCEL,
-            multiline: true,
-            scope: this,
-            fn: this.showResultText,//处理输入的文字
-        });
-    },
-    // 导出
-    exportClick: function () {
-        Ext.Msg.alert('导出', '我是导出');
-    },
-    //删除
-    deleteClick: function (o) {
-        let gird = o.ownerCt.ownerCt;
-        let data = gird.getSelectionModel().getSelection();
-        if(data.length == 0){
-            Ext.Msg.alert("提示","您最少要选择一条数据");
-        }else{
-            //1.先得到ID的数据(name)
-            let st = gird.getStore();
-            let ids = [];
-            Ext.Array.each(data,function(record){
-                ids.push(record.get('name'));
-            })
-            Ext.MessageBox.confirm('删除邮件','你确定要删除吗?',function(btn){
-                if (btn == 'yes') {
-                    //2.后台操作(delet)
-                    // Ext.Ajax.request({
-                    //     url:'/extjs/extjs!deleteData.action',
-                    //     params:{ids:ids.join(",")},
-                    //     method:'POST',
-                    //     timeout:2000,
-                    //     success:function(response,opts){
-                    //         Ext.Array.each(data,function(record){
-                    //             st.remove(record);
-                    //         })
-                    //     }
-                    // })
-                    //3.前端操作DOM进行删除(ExtJs)
-                    Ext.Array.each(data,function(record){
-                        st.remove(record);
-                    })
-                }
-            });
-        }
-    },
-    // 批量回复
-    batchClick: function (o) {
-        let gird = o.ownerCt.ownerCt;
-        let items = gird.getStore().data.items;//所有的内容
-        let batch = [];
-        for (let i = 0; i < items.length; i++) {
-            if (items[i].data.Handle) {
-                batch.push(items[i].data.code)
-                Ext.MessageBox.show({
-                    title: '回复处理',
-                    msg: '回复对象：'+batch.join(','),
-                    width:500,
-                    height:600,
-                    buttons: Ext.MessageBox.OKCANCEL,
-                    multiline: true,
-                    scope: this,
-                    fn: this.showResultText,//回调函数
-                });
-            }
-        }
-    },
-    // 回调函数
-    showResultText: function (btn,text) {
-        if (btn == 'ok') {
-            alert('点击的按钮是：'+btn+'内容是：'+text);
-        } else {
-            return
-        }
-    },
-});

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

@@ -1,110 +0,0 @@
-/**
- * 校长信箱
- */
-Ext.define('school.view.interaction.mailbox.Mailbox', {
-    extend: 'Ext.grid.Panel',
-    xtype: 'interaction-mailbox-mailbox',
-    // dataUrl: '/api/interact/timetable/list',
-
-    controller: 'interaction-mailbox-mailbox',
-
-    //字段属性
-    _title: '校长信箱',
-    _idField: 'id',
-    _codeField: 'pu_code',
-    _statusField: 'pu_status',
-    _statusCodeField: 'pu_statuscode',
-    _auditmanField: 'pu_auditman',
-    _auditdateField: 'pu_auditdate',
-    _relationColumn: 'pd_puid',
-    _readUrl: '/api/purchase/purchase/read',
-    _saveUrl: '/api/purchase/purchase/save',
-    _auditUrl: '/api/purchase/purchase/audit',
-    _unAuditUrl: '/api/purchase/purchase/unAudit',
-    _deleteUrl: '/api/purchase/purchase/delete',
-    _turnInUrl: '/api/purchase/purchase/turnProdin',
-    initId: 0,
-    initComponent: function() {
-        Ext.apply(this, {
-            // title: '校长信箱',
-            store: Ext.create('Ext.data.Store', {
-                fields:['code', 'content', 'Enclosure', 'time', 'name', 'Handle'],
-                data:[
-                    {code:"U001", content:"孩子作业太少了，回家每天玩王者荣耀，希望学校老师布置作业多一点，让我孩子忙起来", Enclosure:'无', time:"01/10/2004 16:00", name:'张三', Handle:true},
-                    {code:"U002", content:"学校课本费收入明细未公开，希望课本费明细能够向我们家长公开", Enclosure:'有', time:"01/10/2004 16:00", name:'张三', Handle:false},
-                    {code:"U003", content:"觉得十分激烈的交锋了", Enclosure:'无', time:"01/10/2004 16:00", name:'张三', Handle:true},
-                ]
-            }),
-            columns : [
-                {text: '编号',dataIndex: 'code', flex: 0.1}, 
-                {text: '内容',dataIndex: 'content', flex: 0.3},
-                {text: '附件',dataIndex: 'Enclosure', flex: 0.1}, 
-                {text: '日期',dataIndex: 'time',xtype: 'datecolumn',format:'Y-m-d H:i', flex: 0.2}, 
-                {text: '提出人',dataIndex: 'name', flex: 0.1}, 
-                {text: '处理', flex: 0.2, align:'center', dataIndex: 'Handle',
-                    renderer: function(val,meta,rec) {
-                        // 为元素生成唯一id
-                        var id = Ext.id();
-                        if (!rec.data.Handle) {
-                            return Ext.String.format('<div>已回复</div>');
-                        } else {
-                            Ext.defer(function() {
-                                Ext.widget('button', {
-                                    renderTo: id,
-                                    text: '回复',
-                                    // handler: 'ReplyClick'//点击回复事件
-                                    handler: function () {//点击回复事件
-                                        Ext.MessageBox.show({
-                                            title: '回复处理',
-                                            msg: '回复对象：'+rec.data.code,
-                                            width:500,
-                                            height:600,
-                                            buttons: Ext.MessageBox.OKCANCEL,
-                                            multiline: true,
-                                            scope: this,
-                                            fn: function (btn,text) {//回调函数
-                                                if (btn == 'ok') {
-                                                    alert('点击的按钮是：'+btn+'内容是：'+text);
-                                                } else {
-                                                    return
-                                                }
-                                            },
-                                        });
-                                    } 
-                                });
-                            }, 50);
-                            return Ext.String.format('<div id="{0}"></div>', id);
-                        }
-                    }
-                },
-            ],
-            listeners: {// 每一行添加点击事件
-                'rowclick': function(grid, rowIndex, e) {
-                    let data = rowIndex.data//获取点击行的数据
-                    // console.log(data);
-                },
-            },
-            tbar: ['->',{
-                xtype: 'button',
-                text: '导出',
-                handler: 'exportClick'
-            }, {
-                xtype: 'button',
-                text: '删除',
-                handler: 'deleteClick'
-            }, {
-                xtype: 'button',
-                text: '批量回复',
-                handler: 'batchClick'
-            }],
-            multiSelect:true,//运行多选，默认是单选
-            dockedItems :[{//分页组件
-				xtype:'pagingtoolbar',//分页组件 
-				store:Ext.data.StoreManager.lookup('s_user'),//分页组件也需要获取到数据
-				dock:'bottom',//定位到底部
-				displayInfo:true//是否展示信息
-			}],
-        });
-        this.callParent();
-    },
-})

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

@@ -124,16 +124,26 @@ Ext.define('school.view.basic.class.ClassDetail', {
                 }, {
                     text: '学科id',
                     dataIndex: 'subject_id',
+                    hidden: true,
                     editor: {
                         xtype: 'textfield'
                     }
+                    /**
+                     * TODO 未写入id
+                     */
                 }, {
                     text: '学科',
                     dataIndex: 'subject_name',
-                    xtype: 'subjectcolumn'
+                    xtype: 'subjectcolumn',
+                    listeners: {
+                        select: function(column, combo, record, e) {
+                            column.up('grid').selection.set('subject_id', record.get('subject_id'));
+                        }
+                    }
                 }, {
                     text: '任课教师id',
                     dataIndex: 'teacher_id',
+                    hidden: true,
                     editor: {
                         xtype: 'textfield'
                     }
@@ -150,7 +160,8 @@ Ext.define('school.view.basic.class.ClassDetail', {
                             field:'teacher_name',width:150
                         }],
                         dbfinds:[{
-                            from:'teacher_name',to:'teacher_name'
+                            from: 'teacher_name', to: 'teacher_name',
+                            from: 'teacher_id', to: 'teacher_id'
                         }],
                         defaultCondition: "1=1",
                         dbSearchFields:[{

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

@@ -47,7 +47,7 @@ Ext.define('school.view.core.form.field.FileField', {
 	        },
 			listeners: {
 				change: function(field){
-					if(field.value != null){
+					if(!!field.value){
 						field.ownerCt.ownerCt.upload(field.ownerCt, field);
 					}
 				}
@@ -172,6 +172,7 @@ Ext.define('school.view.core.form.field.FileField', {
 				fieldStyle: 'background:#E0EEEE;'
 			}));
 		});
+		me.dirty = false;
 	},
 	
 	checkUploadAmount:function(form){

frontend/pc-web/app/view/core/grid/column/SubjectColumn.js

@@ -5,19 +5,31 @@ Ext.define('school.view.core.grid.column.SubjectColumn', {
     extend: 'Ext.grid.column.Column',
     xtype: 'subjectcolumn',
 
-    editor: {
-        xtype: 'subjectcombo',
-        fieldLabel: null
-    },
-    renderer: function(v, m , r) {
-        let store = m.column.getEditor().store;
-        let idx = store.find('subject_id', v);
+    initComponent: function() {
+        var me = this;
+        Ext.apply(me, {
+            editor: {
+                xtype: 'subjectcombo',
+                fieldLabel: null,
+                listeners: {
+                    select: function(combo, r, e) {
+                        me.fireEvent('select', me, combo, r, e);
+                    }
+                }
+            },
+            renderer: function(v, m , r) {
+                let store = m.column.getEditor().store;
+                let idx = store.find('subject_id', v);
+        
+                if(idx != -1) {
+                    let subject = store.getAt(idx);
+                    return subject.get('subject_name');
+                }else {
+                    return null
+                }
+            }
+        });
 
-        if(idx != -1) {
-            let subject = store.getAt(idx);
-            return subject.get('subject_name');
-        }else {
-            return null
-        }
+        me.callParent(arguments);
     }
 });

frontend/pc-web/overrides/form/field/TextField.js

@@ -0,0 +1,5 @@
+Ext.define('school.override.form.field.TextField', {
+    override: 'Ext.form.field.Text',
+    maxLength: 50
+
+});

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/configs/api.config.js

@@ -100,7 +100,7 @@ export const API = {
     //学生端  学生所在班级的课表  按星期的每天分map
     curriculumListByTeacherId: _baseURL + '/wxSchool/clazzCurriculum/curriculumListByTeacherId',
     //创建校长信箱
-    PRINCIPAL_MAILBOX: _baseURL + '/wxSchool/principalMailbox/mailboxString',
+    PRINCIPAL_MAILBOX: _baseURL + '/wxSchool/principalMailbox/principalMailbox',
     //获取学生和老师所有对象
     getClazzByTeacherId: _baseURL + '/wxSchool/user/getClazzByTeacherId',
     // 获取抄送老师

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;