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

frontend/wechat-web/src/modules/hiPages/res_apply/UserItem.js

@@ -30,7 +30,7 @@ export default class UserItem extends Component{
                 <div className="comhline_sty1"></div>
                 <div className="item_sty">
                     <div className="left_title">数量</div>
-                    <input   ref='itemnumber' className="text-right right_input" type="number" placeholder="请输入" maxLength={3} value={this.props.itemata.artCount} />
+                    <input   ref='itemnumber' className="text-right right_input" type="number" placeholder="请输入" maxLength={6} value={this.props.itemata.artCount} />
                 </div>
                 <div className="comhline_sty1"></div>
             </div>
@@ -49,7 +49,7 @@ export default class UserItem extends Component{
         console.log('itemnumber%1 === 0',itemnumber%1 == 0)
         if(itemnumber.length > 0){
             if(itemnumber%1 == 0 && itemnumber > 0){
-                if(itemnumber.length > 3){
+                if(itemnumber.length > 6){
                     Toast.show('可申请数量有限',1)
                     this.props.handelRItem({
                         artName:itemuser,

frontend/wechat-web/src/redux/actions/listState.js

@@ -6,6 +6,11 @@
 import {CLEAR_LIST_STATE, LIST_STATE} from "../constants/actionTypes";
 import store from '../store/store'
 
+/**
+ * 保存列表状态
+ * @param data
+ * @returns {Function}
+ */
 export const saveListState = (data) => {
     return () => {
         store.dispatch({
@@ -15,6 +20,10 @@ export const saveListState = (data) => {
     }
 }
 
+/**
+ * 清除列表状态
+ * @returns {Function}
+ */
 export const clearListState = () => {
     return () => {
         store.dispatch({

frontend/wechat-web/src/redux/reducers/redListState.js

@@ -20,11 +20,13 @@ const redListState = (state = initListState, action) => {
 
     switch (action.type) {
         case LIST_STATE:
+            //更新列表状态
             return {
                 ...state,
                 ...action
             }
         case CLEAR_LIST_STATE:
+            //清空列表状态
             return initListState
         default:
             return state