修改搜索条件（3139）

src/components/PushContainer/index.jsx

@@ -452,10 +452,9 @@ class PushContainer extends Component {
       hasCalcIndex: false
     })
   }
-  whichTemp(tab,name){
-    console.log('tan',tab)
+  whichTemp(tab,name,hasSearch){
     if(tab!=2||!name){
-      if(tab == 1 && name) {
+      if(tab == 1 && name&&hasSearch) {
         this.templateSearch(name,1)
       } else {
         store.dispatch(initAdminItemList(1,true))

src/components/TemplateItems/index.jsx

@@ -228,7 +228,6 @@ class TemplateItems extends React.Component {
                 msg:'还没有保存模板'
             })
         }
-        if(admin||selectTemp ===2)
         this.setState({
             hasSearch: true
         })
@@ -295,11 +294,11 @@ class TemplateItems extends React.Component {
         },0)
 
         this.props.whichTemp(num,val)
-        if(val){
-            this.setState({
-                hasSearch:true
-            })
-        }
+        // if(val){
+        //     this.setState({
+        //         hasSearch:true
+        //     })
+        // }
     }
     render() {
         const {selectTemp,whichTemp, checkItemsAdmin,handleAllCheckboxAdmin,handleMangerTemplateAdmin,allCheckShowAdmin,admin,adminItems,allCheckShow, handleMangerTemplate,handleClickGetMore, handleDelList, handleAllCheckbox, items,checkItems,current,hasMore,templateNormsSearchList } = this.props;
@@ -363,7 +362,7 @@ class TemplateItems extends React.Component {
                             {
                                 <div className={`${style.topBorder} clearfix`}>
                                     {
-                                        !allCheckShow&&<div className={`${style.personalTmp} ${selectTemp==1?style.personalTmpOwn:''} clearfix`} onClick={()=>whichTemp(1,(this.state.val).trim())}>
+                                        !allCheckShow&&<div className={`${style.personalTmp} ${selectTemp==1?style.personalTmpOwn:''} clearfix`} onClick={()=>whichTemp(1,(this.state.val).trim(),hasSearch)}>
                                             <span className={style.tip}>个人模板</span>
                                             <i></i>
                                             {
@@ -374,7 +373,7 @@ class TemplateItems extends React.Component {
                                     {
                                         !admin?!allCheckShowAdmin&&<div 
                                             className={`${style.personalTmp} ${style.personalTmpStatand} ${selectTemp==2?style.personalTmpOwn:''}`} 
-                                            onClick={()=>{this.whichTemp(2,(this.state.val).trim());allCheckShow&&handleMangerTemplate(2)}}
+                                            onClick={()=>{this.whichTemp(2,(this.state.val).trim(),hasSearch);allCheckShow&&handleMangerTemplate(2)}}
                                             >标准模板 {selectTemp==2&&<img src={tempTip} className={style.tempTip} alt="" onMouseEnter={this.showTipContent} onMouseLeave={this.showTipContent}/>}
                                             {
                                                 showTipContent&&<div className={style.tempTipContent}>