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

frontend/pc-web/app/view/Interaction/notice/SchoolNotice.js

@@ -72,7 +72,8 @@ Ext.define('school.view.interaction.notice.SchoolNotice', {
                 fieldLabel: "内容",
                 height: 300,
                 columnWidth: 1,
-                allowBlank: false
+                allowBlank: false,
+                maxLength: 5000
             }, {
                 xtype: 'mfilefield',
                 name: 'notify_files',

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

@@ -7,10 +7,10 @@ import store from './../redux/store/store'
  * Created by RaoMeng on 2018/11/21
  * Desc: 项目接口
  */
-export const _host = 'https://school-api.ubtob.com'
+// export const _host = 'https://school-api.ubtob.com'
 // export const _host = 'http://10.1.80.47:9520' //顾群
 // export const _host = 'http://10.1.80.180:9520' //赵耀
-// export const _host = 'http://10.1.80.36:9520'  //陈伟
+export const _host = 'http://10.1.80.36:9520'  //陈伟
 
 export const _baseURL = _host + '/api/school'
 // export const _baseURL = _host

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

@@ -17,6 +17,7 @@ import {API,_baseURL} from '../../../configs/api.config';
 import {Toast} from 'antd-mobile';
 import {connect} from 'react-redux';
 import ImagesViewer from '../../../components/imagesVIewer/index';
+import {saveListState} from "../../../redux/actions/listState";
 
 class ApprovelDetail extends Component{
     constructor(){
@@ -200,6 +201,12 @@ class ApprovelDetail extends Component{
                 this.setState({
                     showButton:false
                 })
+                if (this.props.listState && !isObjEmpty(this.props.listState.listData2)) {
+                    this.props.listState.listData2[this.props.listState.itemIndex].approveStatus = 2
+                    saveListState({
+                        listData2: this.props.listState.listData2,
+                    })()
+                }
                 this.backTask = setTimeout(()=>{
                     // this.props.history.push("/approvel")
                     this.props.history.goBack()
@@ -297,6 +304,7 @@ class ApprovelDetail extends Component{
     }
 }
 let mapStateToProps = (state) => ({
+    listState: {...state.redListState},
     userInfo: {...state.redUserInfo}
 })
 

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

@@ -226,7 +226,7 @@ class Approvel extends Component {
             scrollTop2: approvelScroll,
             listData2: approvelList,
             pageIndex2: approveleIndex,
-            itemIndex: itemIndex
+            itemIndex: itemIndex || this.props.listState.itemIndex
         })()
     }
     getMyApplyData = () => {