页面修改

pages/jiuzhai/jz_Line.vue

@@ -291,8 +291,8 @@
 					<text style="margin-left: 20rpx;">{{currentBrachName}}</text>
 				</view>
 				<view style="width: 1px; flex: 1;">
-					<u-search placeholder="目的地名称" v-model="searchKey" input-align="left" :value="searchKey" text-color="#111" bg-color="rgba(0,0,0,0)"
-					 :show-action="false"></u-search>
+					<u-search placeholder="目的地名称" v-model="msg.searchKey" input-align="left" :value="msg.searchKey" text-color="#111"
+					 bg-color="rgba(0,0,0,0)" :show-action="false"></u-search>
 				</view>
 			</view>
 			<view>
@@ -314,7 +314,6 @@
 									</view>
 								</template>
 							</scroll-view>
-
 							<view style="box-shadow: 0px -10px 30px 0px rgba(36, 36, 36, 0.06);margin-top:40rpx;display: flex;">
 								<view style="flex:1;margin-right: 30rpx;">
 									<u-button :custom-style="btnStyle" @click="clearTeams">清除</u-button>
@@ -363,7 +362,7 @@
 							</view>
 						</view>
 					</u-dropdown-item>
-					<u-dropdown-item v-model="msg.startCity" :title="optionsTitle[3]" :options="startCitys" @change="changeStartCity">
+					<u-dropdown-item v-model="msg.startCityId" :title="optionsTitle[3]" :options="startCitys" @change="changeStartCity">
 					</u-dropdown-item>
 				</u-dropdown>
 			</view>
@@ -428,8 +427,9 @@
 					days: ['<100'],
 					startDate: '',
 					endDate: '',
-					startCity: -1,
-					branchId: 0
+					startCityId: -1,
+					companyId: 0,
+					searchKey: '', //搜索数据
 				},
 				time: '',
 				params: {
@@ -456,7 +456,7 @@
 					background: "#111"
 				},
 				dataList: [], //数据
-				searchKey: '', //搜索数据
+
 				value1: 1,
 				isShowDate: false,
 				orderBys: [],
@@ -528,13 +528,12 @@
 				this.apipost(
 					"b2b_get_GetMiniAppTravelQuery", {},
 					res => {
-						console.log("res", res);
 						if (res.resultCode == 1) {
 							this.orderBys = res.data.OrderByList;
 							this.branchList = res.data.SiteList;
 							this.startCitys = res.data.CityList;
 							this.lineList = res.data.linePlaceList;
-							this.msg.branchId = this.branchList[0].BId
+							this.msg.companyId = this.branchList[0].BId
 							this.currentBrachName = this.branchList[0].BName
 						}
 					},
@@ -542,7 +541,7 @@
 				);
 			},
 			changeBranch(val) {
-				this.msg.branchId = this.branchList[val].BId
+				this.msg.companyId = this.branchList[val].BId
 				this.currentBrachName = this.branchList[val].BName
 			},
 			setDays(day) {
@@ -588,6 +587,7 @@
 				this.optionsTitle[2] = temp == '' ? '天数日期' : temp
 				this.$forceUpdate()
 				this.$refs.uDropdown.close();
+				this.research();
 			},
 			chosenDateResult(obj) {
 				this.msg.startDate = obj.start;
@@ -616,6 +616,7 @@
 				}
 				this.$forceUpdate()
 				this.$refs.uDropdown.close();
+				this.research();
 			},
 			setTeams(x, y) {
 				let id = this.lineList[x].Teams[y].TeamId
@@ -625,7 +626,7 @@
 				} else {
 					this.msg.team.splice(temp, 1)
 				}
-				this.$forceUpdate()
+				this.$forceUpdate();
 			},
 			changeOrderBy(index) {
 				let temp = this.orderBys.find(x => {
@@ -638,6 +639,7 @@
 				this.optionsTitle[0] = temp.label
 				this.msg.orderBy = temp.value
 				this.$forceUpdate()
+				this.research();
 			},
 			changeStartCity(index) {
 				if (index == -1) {
@@ -655,6 +657,7 @@
 					this.msg.startCity = temp.value
 				}
 				this.$forceUpdate()
+				this.research();
 			},
 			open(index) {
 				this.$refs.uDropdown.highlight();
@@ -662,8 +665,14 @@
 			close(index) {
 				this.$refs.uDropdown.highlight(index);
 			},
+			research() {
+				this.msg.pageIndex = 1;
+				this.dataLis = [];
+				this.getList();
+			},
 			//获取数据
 			getList() {
+				console.log("this.msg", this.msg);
 				this.apipost(
 					"b2b_get_GetB2BTravelPageList",
 					this.msg,