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

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

@@ -176,6 +176,11 @@ class NewAlbum extends Component {
             return
         }
 
+        if (albumTitle.length > 50) {
+            Toast.fail('相册标题过长')
+            return
+        }
+
         const {classList, classText} = this.state
 
         if (classList[classText]) {

frontend/wechat-web/src/modules/hiPages/send-vote/SendVote.js

@@ -247,7 +247,7 @@ class SendVote extends Component {
         if (this.isRequesting == true) {
             return
         }
-        this.isRequesting = true
+
         const stuList = [], teacherList = []
         if (!isObjEmpty(this.checkNodes)) {
             this.checkNodes.forEach((node, index) => {
@@ -340,7 +340,7 @@ class SendVote extends Component {
         console.log('params', {
             voteString: params
         })
-
+        this.isRequesting = true
         Toast.loading('投票发布中...', 0)
         fetchPost(API.voteCreate, {
             voteString: JSON.stringify(params)