Merge branch 'lcq' into newVersion6.0

src/store/reducers/newAdvice.js

@@ -72,7 +72,12 @@ export default (state = initSearchList, action) => {
         return newState;
     }
     if (action.type == DEL_ONE_PIC) {
+
         const newState = Object.assign({}, state);
+        console.log('删除推送reduces');
+        console.log(newState, 'newState');
+        // console.log(state, 'state');
+
         let tempArr = newState.labelListBig;
         let tempArrs = newState.labelListSmall;
         let tmpLis = action.item,tempBigOrder=[],tempSmallOrder=[],tempTotalOrder=[];
@@ -87,6 +92,8 @@ export default (state = initSearchList, action) => {
         tempSmallOrder = tempArrs.filter((item)=>item.check)
         tempTotalOrder=tempBigOrder.concat(tempSmallOrder)
         newState.totalOrder=[...tempTotalOrder]
+        newState.drugOrder = newState.labelListBig;
+        newState.operationOrder = newState.labelListSmall;
         return newState;
     }