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

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

@@ -35,14 +35,14 @@ export default class PrincipalItem extends Component {
         if (!isObjEmpty(principalBean.enclosure) && principalBean.enclosure != '[]') {
             enclosureItem =
                 <div className='principal-enclosure-layout'>
-                    <img src={_baseURL + principalBean.enclosure[0]} className='principal-enclosure-img'
+                    <img src={ principalBean.enclosure[0]} className='principal-enclosure-img'
                          onClick={this.handlePreview}/>
                     <span className='principal-enclosure-count'>({principalBean.enclosure.length}张)</span>
                 </div>
 
             try {
                 principalBean.enclosure.forEach((enclosure, index) => {
-                    pictureUrls.push(_baseURL + enclosure)
+                    pictureUrls.push( enclosure)
                 })
             } catch (e) {
 

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

@@ -141,7 +141,7 @@ export const API = {
     //出入校单次记录详情
     INOUT_RECORD_DETAIL: _baseURL + '/wxSchool/outInRecord/inout/detail',
 
-    //更改手机号是获取验证码
+    //更改手机号时间获取验证码
     SEND_CODEUPDATE: _baseURL + '/wxSchool/user/sendCodeUpdate',
 
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////

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

@@ -60,11 +60,11 @@ export default class UploadImage extends Component {
                 </div>
                 <div className="item_sty">
                     <div className="left_title1">标题:</div>
-                    <input ref='albumTitle'  className="right_input" style={{marginLeft:10}} type="text" placeholder="请输入" maxLength={20} autoFocus="autoFocus" value={this.state.albumTitle}/>
+                    <input ref='albumTitle'  className="right_input" style={{marginLeft:10}} type="text" placeholder="请输入" maxLength={20} value={this.state.albumTitle}/>
                 </div>
                 <div className="item_sty">
                     <div className="left_title1">描述:</div>
-                    <textarea ref='albumRemarks'  className="form-control textarea_sty" rows="3"  placeholder="请输入" maxLength={100} autoFocus="autoFocus" value={this.state.albumRemarks}/>
+                    <textarea ref='albumRemarks'  className="form-control textarea_sty" rows="3"  placeholder="请输入" maxLength={100}  value={this.state.albumRemarks}/>
                 </div>
                 <div className='uploadLayout'>
                     <Button className='commonButton' type="primary" block style={{borderRadius:30}}
@@ -176,7 +176,7 @@ export default class UploadImage extends Component {
 
         let albumTitle = this.state.albumTitle
         let albumRemarks = this.state.albumRemarks
-        if(albumTitle == '' || albumRemarks.length == 0){
+        if(albumTitle == '' || albumTitle.length == 0){
             Toast.fail('请输入相册标题')
             return
         }

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

@@ -3,6 +3,6 @@
 .item_sty{padding:10px 15px; display: flex;fontSize:12px;}
 .comBtn_sty{width:302px;height:36px;margin-top: 40px;font-size:15px}
 .textarea_sty{border:none;fontSize:15px; color:#333333;padding:10px 20px;}
-.nextarr_sty{height:15px;width:8px;margin-left:5px;}
+.nextarr_sty{height:15px;width:8px;}
 
 

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

@@ -45,13 +45,13 @@ export default class ScoreData extends Component {
                                 marginLeft: 5
                             }}>{this.props.itemdata.scoreBasic.scoreScope}</span></div>
                             <div className="left_sty">班级排名: <span
-                                className="right_sty">{this.props.itemdata.classRank}</span></div>
+                                className="right_sty">{this.props.itemdata.scoreBasic.classRank}</span></div>
                             <div className="left_sty">年级排名: <span
-                                className="right_sty">{this.props.itemdata.schoolRank}</span></div>
+                                className="right_sty">{this.props.itemdata.scoreBasic.gradeRank}</span></div>
                             <div className="left_sty">班级平均分: <span
-                                className="right_sty">{this.props.itemdata.classAverage}</span></div>
+                                className="right_sty">{this.props.itemdata.scoreBasic.classAverage}</span></div>
                             <div className="left_sty">年级平均分: <span
-                                className="right_sty">{this.props.itemdata.schoolAverage}</span></div>
+                                className="right_sty">{this.props.itemdata.scoreBasic.gradeAverage}</span></div>
                         </div>
                     </div>
                 </div>

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

@@ -62,7 +62,13 @@ class LeaveAddPage extends Component{
             <div ref={node => this.node = node} style={{fontFamily:"PingFangSC-Regular",letterSpacing:2.5}} className="common-column-layout">
                 <div id="padding10">
                     <img class="img-circle" id="margin_top_bottom_15"
-                         src={"http://img5.imgtn.bdimg.com/it/u=1494163297,265276102&fm=26&gp=0.jpg"} width={60}
+                         src={ (
+                             this.props.userInfo.parent.student.avatar  == '' ||
+                             this.props.userInfo.parent.student.avatar == null ||
+                             this.props.userInfo.parent.student.avatar == undefined ||
+                             this.props.userInfo.parent.student.avatar.length == 0
+                         ) ?  "http://img5.imgtn.bdimg.com/it/u=1494163297,265276102&fm=26&gp=0.jpg"
+                             : this.props.userInfo.parent.student.avatar} width={60}
                          height={60}/>
                     <span class="span_17 text_bold " id="row_margin">{this.props.userInfo.user.student.stuName}的请假条</span>
                 </div>

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

@@ -111,6 +111,8 @@ class PrincipalHistory extends Component {
                     }
 
                     principalList.push(rechargeBean)
+
+                    console.log('principalList',principalList)
                 })
             }