Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/global/newHead.vue

@@ -29,6 +29,21 @@
 .CityChange .el-select .el-input__inner:focus {
   border: none;
 }
+.juanmei{
+  width: 140px !important;
+  cursor: pointer;
+  padding-right: 40px;
+}
+.juanmei div{
+  text-align: right !important;
+}
+.juanmei img{
+  z-index: 1;
+  position: absolute;
+  top: -20px;
+  width: 135px;
+  left: 21px;
+}
 </style>
 <template>
   <!-- 头部 -->
@@ -327,6 +342,11 @@
               <img src="../../assets/img/task/nav_text.png" alt="">
             </div>
           </li>
+          <li :class="{_active: navActive === 9}" class="juanmei">
+            <div @click="handleSelect('', ), navActive = 9">
+              <img src="../../assets/img/task/juanmei.png" alt="">
+            </div>
+          </li>
         </ul>
       </div>
       <!-- <div  id="map-container" class="map-container">

src/components/mall/search.vue

@@ -260,30 +260,30 @@ export default {
             this.loadTeamData()
         },
         loadTeamData(){
-            // if(this.keywords=='') {
-            //     this.Info('请输入搜索关键字')
-            //     return 
-            // }
             let minTripDay=-1,maxTripDay=-1,minPrice=-1,maxPrice=-1,startDate='',endDate='',startCityId=0
             let search0="";
             let search1="";
             if(this.searchItem[0]!='' && this.searchItem[0]!='0') {
                 this.lines.forEach(x=>{
                     if(x.name==this.searchItem[0]){
-                        lineId=x.id;
+                        this.lineId=x.id;
                         search0=x.name;
                     }
                 })
                 this.searchItem[0]=search0;
+            } else {
+                this.lineId= 0;
             }
             if(this.searchItem[1]!='' && this.searchItem[1]!='0') {
                 this.xilies.forEach(x=>{
                     if(x.name==this.searchItem[1]){
-                        lineTeamId=x.id;
+                        this.lineTeamId=x.id;
                         search1=x.name;
                     }
                 })
                 this.searchItem[1]=search1;
+            } else {
+                this.lineTeamId=0;
             }
             if(this.searchItem[4]!='' && this.searchItem[4]!='0'){
                 this.dayCount.forEach(x=>{
@@ -450,7 +450,6 @@ export default {
             if(this.companyId!=-1){
                 this.apipost('b2b_get_GetGroupSearchItem',{'companyId':this.companyId,cityId:this.cityId},r=>{
                     this.lines=r.data.data.line
-                    console.log("this.lines",this.lines)
                     if(this.$route.query.lineId&&this.$route.query.lineteamId){
                         this.lineId=this.$route.query.lineId;
                         this.lineteamId=this.$route.query.lineteamId;
@@ -475,7 +474,7 @@ export default {
             }
         },
         handleClose(i) {
-            this.$set(this.searchItem,i,'')            
+            this.$set(this.searchItem,i,'')
             if(i==0){
                 this.xilies=[]
                 this.$set(this.searchItem,1,'')

src/components/newPersonalCenter/block/Information.vue

@@ -452,7 +452,7 @@ export default {
                     data.branchList.forEach(x=>{
                         this.tags.push({id:x.brandId,name:x.brandName});
                         this.tagsCopy.push({id:x.brandId,name:x.brandName});
-                    })                     
+                    })
                 }else{
                     this.$message.error(r.data.message);
                 }