上午bug修改

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

@@ -68,9 +68,9 @@ export default class PrincipalItem extends Component {
                     <div className='principal-item-root'>
                         <div className='principal-item-top'>
                             <div className='principal-item-time'>{principalBean.time}</div>
-                            <span className={principalBean.status == '已查阅' ?
+                         {/*   <span className={principalBean.status == '已查阅' ?
                                 'principal-item-status-done' :
-                                'principal-item-status-todo'}>{principalBean.status}</span>
+                                'principal-item-status-todo'}>{principalBean.status}</span>*/}
                         </div>
                         <div className='principal-item-content'>{principalBean.suggest}</div>
                         {enclosureItem}

frontend/wechat-web/src/configs/api.config.js

@@ -10,6 +10,7 @@ import store from './../redux/store/store'
 export const _host = 'https://school-api.ubtob.com'
 // export const _host = 'http://10.1.80.36:9520'
 export const _baseURL = _host + '/api/school'
+// export const _baseURL = _host
 
 export const API = {
     //获取openId
@@ -174,7 +175,7 @@ export const API = {
     GET_PICTURE_LIST: _baseURL + '/wxSchool/clazzPicture/getPictureByAlbum',
 
     //创建通知公告
-    NOTIFY_CREATE: _baseURL + '/wxSchool/notify/createNotify',
+    NOTIFY_CREATE: _baseURL + '/notice/savePublish',
     //通知公告列表家长端
     NOTIFY_LIST_PARENT: _baseURL + '/wxSchool/notify/notifyListByStu',
     //通知公告列表教师端
@@ -200,7 +201,8 @@ export const API = {
     //作业列表教师端
     HOMEWORK_LIST_TEACHER: _baseURL + '/wxSchool/taskNotify/listTaskTeacher',
     //创建作业发布
-    homeWorkAdd: _baseURL + "/wxSchool/taskNotify/createTask",
+    // homeWorkAdd: _baseURL + "/wxSchool/taskNotify/createTask",
+    homeWorkAdd: _baseURL + "/homework/save",
     //作业详情
     HOMEWORK_DETAIL: _baseURL + '/wxSchool/taskNotify/taskDetail',
     //作业回复

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

@@ -218,15 +218,22 @@ class AnnounceRelease extends Component {
         // }
 
         const paramObj = {
-            notifyTitle: announceTitle,
+          /*  notifyTitle: announceTitle,
             notifyType: 3,
             notifyDetails: announceContent,
             notifyCreator: this.props.userInfo.user.userFunId,
             notifyStatus: 1,
             notifyFiles: JSON.stringify(fileUrls),
-            notifyRemarks: '',
+            notifyRemarks: '',*/
             // notifyTeacher: JSON.stringify(teacherList),
             // notifyStu: JSON.stringify(stuList),
+
+            notify_title:announceTitle,
+            notify_details:announceContent,
+            notify_status:1,
+            notify_creator:this.props.userInfo.user.userFunId,
+            creator:this.props.userInfo.user.userName,
+            notify_files:JSON.stringify(fileUrls)
         }
 
         console.log(paramObj)

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

@@ -79,7 +79,7 @@ class ApprovelDetail extends Component{
         return(
             <div ref={node => this.node = node}>
                 <div className="headerDiv">
-                    <img className="headerImg" src={hi1_img} alt=""/>
+                    <img className="headerImg" src={this.props.userInfo.userAvatar.length == 0 ? hi1_img : this.props.userInfo.userAvatar} alt=""/>
                     <div style={{marginTop:10}}>
                         <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>

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

@@ -150,7 +150,7 @@ class ReleaseAssignmentPage extends React.Component {
 
         Toast.loading('正在发布...', 0)
         const params = {
-            subjectId: courseValue[0],
+            /*subjectId: courseValue[0],
             taskTitle: taskTitle,
             taskContext: taskContent,
             taskFiles: JSON.stringify(fileUrls),
@@ -158,7 +158,19 @@ class ReleaseAssignmentPage extends React.Component {
             startDate: now.format('yyyy-MM-dd hh:mm:ss'),
             endDate: moment(endDate).format('YYYY-MM-DD HH:mm:ss'),
             taskCreator: this.props.userInfo.user.userFunId,
-            taskClassid: personArrays
+            taskClassid: personArrays*/
+
+            task_title:taskTitle,
+            task_context:taskContent,
+            creator:this.props.userInfo.user.userName,
+            task_files:JSON.stringify(fileUrls),
+            task_status:1,
+            create_date:now.format('yyyy-MM-dd hh:mm:ss'),
+            start_date:now.format('yyyy-MM-dd hh:mm:ss'),
+            end_date:moment(endDate).format('YYYY-MM-DD HH:mm:ss'),
+            task_creator:this.props.userInfo.user.userFunId,
+            subject_id:courseValue[0]
+
         }
         fetchPost(API.homeWorkAdd, {
             taskString: JSON.stringify(params)

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

@@ -113,10 +113,10 @@ class UserInfo extends Component {
                 </div>
                 <div className='gray-line' style={{height: '1px'}}></div>
             </div>)}
-            <div className='user-info-item-top'>
+            {/*<div className='user-info-item-top'>
                 <text className='user-info-item-name'>身份</text>
                 <text className='user-info-item-phone'>{this.type == 1 ? '教师' : '家长'}</text>
-            </div>
+            </div>*/}
         </div>
     }