Merge branch 'master' of http://122.51.230.86:3000/dianliang/driver-manage

pages/index/cadetManage.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="content">
 		<view class="top-">
-			<u-search @change="findCadetList()" placeholder="请输入搜索内容" v-model="keyword"></u-search>
+			<u-search @change="changeInput()" placeholder="请输入搜索内容" v-model="param.name"></u-search>
 		</view>
 
 		<view class="g_">
-			共{{cadetList.total}}人
+			共{{param.total}}人
 		</view>
 		<u-empty mode="list" v-if="cadetList.total == 0">
 		</u-empty>
-		<view class="box_" v-for="(item,index) in cadetList.rows" :key="index ">
+		<view class="box_" v-for="(item,index) in cadetList" :key="index ">
 			<view style="display: flex;align-items: center;
 			justify-content: space-between;width: 100%;">
 				<view class="d-s" @click="goDetails(item.identity)">
@@ -50,7 +50,12 @@
 		data() {
 			return {
 				keyword: '',
-				cadetList: []
+				cadetList: [],
+				param:{
+					pageNum:1,
+					pageSize:10,
+					total:0
+				}
 			}
 		},
 		onShow() {
@@ -61,30 +66,39 @@
 			uni.stopPullDownRefresh()
 		},
 		onReachBottom() {
-			// this.show = true
+	
-			setTimeout(() => {
+			// 触底加载
-				console.log("加载执行");
+			if (this.cadetList.length < this.param.total) {
-			}, 2000)
+				this.param.pageNum++
+				this.findCadetList()
+				
+			} 
 		},
 
 		methods: {
 			async changeInput() {
-				if (this.keyword) {
+			      this.cadetLis =[]
-					let res = await request({
+				  this.findCadetList()
-						url: `/system/pay/stuList?name=${this.keyword}`,
-						method: 'get'
-					})
-					this.cadetList = res
-				} else {
-					this.findCadetList()
-				}
 			},
 			async findCadetList() {
 				let res = await request({
 					url: `/system/pay/stuList`,
-					method: 'get'
+					method: 'get',
+					params:this.param
 				})
-				this.cadetList = res
+				if (res.code == 0) {
+					if (this.param.pageNum != 1) {
+						 this.cadetList =  this.cadetList.concat(res.data.records)
+					} else {
+						this.cadetList = res.data.records
+					}
+					this.param.total = res.data.total						
+				} else {
+					uni.showToast({
+						title: "网络不佳请稍后再试",
+						icon: 'error'
+					})		
+				}
 			},
 			gettel(tel) {
 				uni.makePhoneCall({

pages/index/orderManage.vue

@@ -155,11 +155,13 @@
 					method: 'get',
 					params: {
 						isSign: isSign,
-						state: state
+						state: state,
+						pageNum:1,
+						pageSize:10
 					}
 				})
 
-				this.orderList = res.rows
+				this.orderList = res.data.records
 			},
 
 			// getindex(index) {