Merge remote-tracking branch 'origin/dev5.4.1' into dev/new1

# Conflicts:
#	src/components/MainSuit/index.jsx

src/components/Banner/ModeChange/index.less

@@ -18,8 +18,8 @@
       top: 100px;
       width: 45%;
       min-width: 450px;
-      left:50%;
-      margin-left: -216px;
+      left:27%;
+      /*margin-left: -216px;*/
       min-height: 284px;
       background: #fff;
       .oper{

src/components/MainSuit/index.jsx

@@ -268,7 +268,7 @@ class MainSuit extends Component{
   }*/
   render(){
     const {readMode,type,CommonSymptoms,searchData,fetchPushInfos,isRead,totalHide,handleInput,fuzhen,saveText,editClear,datas,commSymHide,showArr} = this.props;
-    const {symptom,boxLeft,boxTop} = this.state;
+    const {boxLeft,boxTop} = this.state;
     const symptomFlag = CommonSymptoms.length>0 ? true : false;
     const searchFlag = searchData.length>0 ? true : false;
     const boxTop1 = datas.length>0?boxTop:45;

src/containers/OperationContainer.js

@@ -109,6 +109,8 @@ function mapDispatchToProps(dispatch) {
           dispatch({
             type:ISREAD
           });
+          //删除文字选中状态
+          window.getSelection().empty();
           //右侧推送
           setTimeout(function(){      //延迟待确定后的数据更新后推送，避免获取的参数还是旧的
             if(didPushParamChange()){     //操作后内容有变化才推送

src/containers/SpreadDrop.js

@@ -534,10 +534,18 @@ function mapDispatchToProps(dispatch,store){
               })
             }
         }else{
-          console.log(result.msg);
+          if(+obj.type===2){
+            (!obj.hasCommon)&&dispatch(getCommSymptoms());
+            dispatch({
+              type:SETDROPSHOW,
+              data:obj
+            });
+          }else{
+            Notify.info(result.msg);
+            return;
+          }
           //Notify.info("暂无推送");
           // 接口请求失败，不往下执行显示下拉
-          return
         }
       }
       dispatch({

src/modules/HomePage/index.jsx

@@ -169,19 +169,16 @@ const mapDispatchToProps = function (dispatch) {
         const end = homePage.select_end;
         const boxMark = homePage.select_boxMark;
         if(!boxMark)return;
+        //删除后清除选中标记,放在删除事件后面会有清空不及时的问题
+        dispatch({
+          type:RESET_SELECT_TAG
+        });
         dispatch({
           type:boxMap[boxMark],
           start,
           end,
           boxMark
         });
-        //删除后清楚选中标记
-        //setTimeout(()=>{
-          dispatch({
-            type:RESET_SELECT_TAG
-          });
-        //})
-
       },
       resetSelect(){
           dispatch({

src/utils/utils.js

@@ -266,5 +266,7 @@ export function deleteSelectedLabels(state,action){
   res.data = newObj.newArr;
   res.saveText = newObj.saveText;
   res.update = Math.random();
+  //删除文字选中状态
+  window.getSelection().empty();
   return res;
 }