Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

pages/jiuzhai/jz_Line.vue

@@ -550,7 +550,7 @@
 					startDate: '',
 					endDate: '',
 					startCityId: -1,
-					companyId: 0,
+					companyId: -1,
 					searchKey: '', //搜索数据
 					priceOrderByField: 2,
 					PlaceIds: '',
@@ -737,7 +737,10 @@
 							this.branchList = res.data.SiteList;
 							this.startCitys = res.data.CityList;
 							this.lineList = res.data.LineList;
+							// #ifdef MP-AG
 							this.msg.companyId = this.branchList[0].BId;
+							// #endif
+							
 							this.currentBrachName = this.branchList[0].BName;
 							this.CityId = this.branchList[0].CityId;
 							this.currentLineId = this.lineList[0]
@@ -755,7 +758,10 @@
 							if (customerInfo && customerInfo.salesBaseInfo) {
 								let tempCompany = this.branchList.find(x => x.BId == customerInfo.salesBaseInfo.rB_Branch_id)
 								if (tempCompany && tempCompany.BId) {
+									// #ifdef MP-AG
 									this.msg.companyId = tempCompany.BId
+									// #endif
+									
 									this.currentBrachName = tempCompany.BName
 								}
 							}