Merge remote-tracking branch 'origin/test' into test

src/js/itemManager.js

@@ -191,6 +191,12 @@ function editItem(item,activePage){
     $("#mainBox .itemMsgBox .confirmEdit", parent.document).on("click", function(){
         var reg = new RegExp(/^\d+(\.\d)?$/);
         if(reg.test(itemCpoy.score)){
+            console.log('itemCopy', itemCpoy)
+            if(!itemCpoy.msg.trim()){
+                $.alerModal({"message":"提示信息不能为空~",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                return 
+            }
+            
             saveEdit(itemCpoy,activePage)
             $("#mainBox .itemMsgBox .itemMsgInfoTips", parent.document).css("display","none")
             $('#mainBox .itemMsgBox', parent.document).remove()