完成列表页调整

pages/jiuzhai/jz_Line.vue

@@ -355,7 +355,7 @@
 												<text style="font-size: 28rpx;color:#111;font-weight: 800;margin-right: 10rpx;">{{x.DestinationName}}</text>
 											</view>
 											<view class="team-box">
-												<view v-for="(y,yi) in x.Teams" :key="i" class="team" :class="{'active':msg.team.indexOf(y.TeamId)!=-1}"
+												<view v-for="(y,yi) in x.Teams" :key="yi" class="team" :class="{'active':msg.team.indexOf(y.TeamId)!=-1}"
 												 @click="setTeams(y.TeamId)">
 													<view class="team-content">{{y.TeamName}}</view>
 												</view>
@@ -596,6 +596,8 @@
 					this.msg.team.push(parseInt(x));
 				})
 			}
+		  }else if(option && option.lineId){
+			  this.msg.lineId=option.lineId
 		  }
 		  if(option&&option.PlaceIds){
 		    this.msg.PlaceIds = option.PlaceIds
@@ -614,7 +616,6 @@
 				this.allTeams=false
 				this.currentLineId=item
 				//changeTeam
-				
 			},
 			//获取查询条件
 			getLineQuery() {
@@ -630,6 +631,17 @@
 							this.currentBrachName = this.branchList[0].BName;
 							this.CityId = this.branchList[0].CityId;
 							this.currentLineId = this.lineList[0]
+							if(this.msg.lineId!=0){
+								let temp = this.lineList.find(x=>x.LineID==this.msg.lineId)
+								if(temp){
+									this.currentLineId=temp
+									this.optionsTitle[1] = temp.LineShortName
+								}else{
+									this.currentLineId = this.lineList[0]
+								}
+							}else{
+								this.currentLineId = this.lineList[0]
+							}
 							//let temp = ''
 							// if(this.msg.team.length>0){
 							// 	if(this.lineList.length>0){
@@ -725,10 +737,12 @@
 				} else {
 					let temp = ''
 					this.lineList.forEach(x => {
-						x.Teams.forEach(y => {
-							if (this.msg.team.indexOf(y.TeamId) != -1) {
-								temp += y.TeamName + ","
-							}
+						x.PlaceList.forEach(y=>{
+							y.Teams.forEach(z => {
+								if (this.msg.team.indexOf(z.TeamId) != -1) {
+									temp += z.TeamName + ","
+								}
+							})
 						})
 					})
 					this.optionsTitle[1] = temp
@@ -741,7 +755,6 @@
 				this.research();
 			},
 			setTeams(teamId) {
-				console.log(teamId,this.msg.team)
 				let id = teamId
 				let temp = this.msg.team.indexOf(id)
 				if (temp == -1) {