ソースを参照

工单接口对接

renmy 11 ヶ月 前
コミット
c8a232594e

+ 13 - 4
common/http.js

@@ -21,6 +21,10 @@ export function wxLogin(params) {
         });
     })
 }
+//登录用户协议
+export function getAgreement(){
+	return request.post("/system/config/configKey/sys.login.userAgreement")
+}
 //用户信息
 export function getInfoData(){
 	return request.get("/getInfo")
@@ -49,6 +53,14 @@ export function getUserListByStationCode(stationCode){
 export function addOrder(params){
 	return request.post("/mini/order/add",params)
 }
+//工单上报记录
+export function getOrderLogList(params){
+	return request.post("/mini/workOrderLog/table/list",params)
+}
+//获取运维工单
+export function getOrderList(params){
+	return request.post("/mini/order/table/list",params)
+}
 
 
 
@@ -101,10 +113,7 @@ export function homeStation(params){
 export function getExchangeTimes(params){
 	return request.post("/exchange/record/getExchangeNum",params)
 }
-//登录用户协议
-export function getAgreement(){
-	return request.post("/user/agreement",1)
-}
+
 //充电方式费率
 export function chargeMethod(){
 	return request.get("/inquire/chargeMethod")

+ 1 - 1
config.js

@@ -1,6 +1,6 @@
 export default {
 	web_name: "智小狸",
-	uni_app_web_api_url: "http://localhost:8087/zl", //后端统一接口路径
+	uni_app_web_api_url: "http://192.168.0.54:8087/zl", //后端统一接口路径
 	web_socket_url:'wss://zk.li-ai.com.cn/driver/ws/',
 	// uni_app_web_api_url: "http://192.168.3.110:8088/driver/api",
 	// web_socket_url:'ws://192.168.3.110:8088/driver/ws/',

+ 3 - 3
pages/index/index.vue

@@ -16,7 +16,7 @@
 							设备故障单填写
 						</view>
 					</view>
-					<view class="page-home-order-item" @click="gotoOrder(0)">
+					<view class="page-home-order-item" @click="gotoOrder(1)">
 						<image class="page-home-order-img" src="@/static/home-order-second.png" mode=""></image>
 						<view class="page-home-order-name">
 							{{'待处理(' + pending + ')'}}
@@ -28,13 +28,13 @@
 					<view class="page-home-order-item" @click="gotoOrder(2)">
 						<image class="page-home-order-img" src="@/static/home-order-third.png" mode=""></image>
 						<view class="page-home-order-name">
-							{{'已处理(' + closed + ')'}}
+							{{'已完结(' + closed + ')'}}
 						</view>
 						<view class="page-home-order-remark">
 							已完成可查看
 						</view>
 					</view>
-					<view class="page-home-order-item" @click="gotoOrder(1)">
+					<view class="page-home-order-item" @click="gotoOrder(0)">
 						<image class="page-home-order-img" src="@/static/home-order-four.png" mode=""></image>
 						<view class="page-home-order-name">
 							{{'未处理(' + notProcessed + ')'}}

+ 153 - 78
pages/index/order.vue

@@ -2,42 +2,51 @@
 	<view class="page-content">
 		<view class="page-search-container">
 			<u-input type="select" class="page-search-text" :select-open="show" placeholder="请选择换电站" v-model="formData.name" @click="show = true"/>
-			<u-tabs-swiper ref="tabs" :list="tabsList" :current="current" :is-scroll="false" bar-height="6" bar-width="40" active-color="#2979ff" @change="tabsChange" ></u-tabs-swiper>
+			<view class="searchType-top-container">
+				<view :class="current == 1 ? 'searchType-top-left-active' : 'searchType-top-left'" @click="tabsChange(1)">
+					待处理
+				</view>
+				<view :class="current == 0 ? 'searchType-top-left-active' : 'searchType-top-left'" @click="tabsChange(0)">
+					未处理
+				</view>
+				<view :class="current == 2 ? 'searchType-top-left-active' : 'searchType-top-left'" @click="tabsChange(2)">
+					已完结
+				</view>
+			</view>
+			<!-- <u-tabs-swiper ref="tabs" :list="tabsList" :current="current" :is-scroll="false" bar-height="6" bar-width="40" active-color="#2979ff" @change="tabsChange" ></u-tabs-swiper> -->
 		</view>
-		<swiper class="swiper-group" :style="{height:swiperContentHeight}" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
-			<swiper-item class="swiper-item" v-for="(item, index) in tabs" :key="index">
-				<scroll-view  class="scroll-content-container" :style="{height:scrollerHeight}"  scroll-y @scrolltolower="onreachBottom" @click="gotoDetail(item)">
-					<view class="order-container" v-for="(order,i) in item.dataSet" :key="i">
-						<view class="order-title-container">
-							<view class="order-title-text">
-								充电机故障充电机故障充电机故障充电机故障
-							</view>
-							<view class="order-status">
-								待处理
-							</view>
+		<view class="swiper-group">
+			<scroll-view  class="scroll-content-container" :style="{height:scrollerHeight}"  scroll-y @scrolltolower="onreachBottom">
+				<view class="order-container" v-for="(order,i) in orderlist" :key="i" @click="gotoDetail(order)">
+					<view class="order-title-container">
+						<view class="order-title-text">
+							{{order.problemTitle || '-'}}
 						</view>
-						<view class="order-time">
-							{{'2023-10-21 15:22:55'}}
-						</view>
-						<view class="order-site">
-							{{'三江换电站'}}
-						</view>
-						<view class="order-reason">
-							{{'三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站'}}
+						<view class="order-status">
+							{{order.status == 0 ? '未处理' : (order.status == 1 ? '待处理' : '已完结')}}
 						</view>
 					</view>
-					<view v-if="no_more" class="no-more">亲, 没有更多了
+					<view class="order-time">
+						{{order.occurrenceTime || '-'}}
 					</view>
-					<!-- 无数据提供的页面 -->
-					<view v-if="!item.dataSet.length">
-						<view class="yoshop-notcont">
-							<text class="cont">亲,暂无订单哦</text>
-						</view>
+					<view class="order-site">
+						{{order.stationName || '-'}}
 					</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-		<u-select :list="siteList" v-model="show" @confirm="siteSelectCallback"> </u-select>
+					<view class="order-reason">
+						{{order.deviceProblem || '-'}}
+					</view>
+				</view>
+				<view v-if="noMore" class="more-data">
+					{{textInfo}}
+				</view>
+			</scroll-view>
+			<view v-if="!orderlist.length">
+				<view class="yoshop-notcont">
+					<text class="cont">暂无工单</text>
+				</view>
+			</view>
+		</view>	
+		<u-select :list="siteList" v-model="show" value-name="stationCode" label-name="stationName" @confirm="siteSelectCallback"> </u-select>
 	</view>
 </template>
 
@@ -45,39 +54,38 @@
 	export default {
 	  data() {
 	    return {
-			//表头列表
-			tabsList: [{
-				name: '待处理'
-			}, {
-				name: '未处理'
-			}, {
-				name: '已办结'
-			}],
+			//当前下标
 			current: 0,
 			swiperCurrent: 0,
 			scrollerHeight: 0,
 			swiperContentHeight: 0,
-			tabs:[
-				  {name:'全部',index:0,dataSet:[]},
-				  {name:'菜单2',index:1,dataSet:[]},
-				  {name:'菜单3',index:2,dataSet:[]},
-				  {name:'菜单3',index:3,dataSet:[]}
-			],
+			//查询条件
 			formData: {
 				name: '全部站点',
+				stationCode: null,
+				pageIndex: 1,
+				pageSize: 10,
+				orderStatus: null,
 			},
+			//是否显示站点
 			show: false,
-			siteList: [
-				{label: '全部站点', value: ''},
-			]
+			//站点列表
+			siteList: [],
+			//是否更多
+			noMore: false,
+			//工单列表
+			orderlist: [],
+			//总条数
+			pageTotal: 0,
+			//提示
+			textInfo: '',
 	    }
 	  },
 		//第一次加载
 		onLoad(e) {
-			  console.log('打印参数:',this.current)
-			  this.swiperCurrent = e.type
-			  this.current = e.type
-			  this.tabsChange(0);
+			  this.swiperCurrent = e.type;
+			  this.current = e.type;
+			  this.formData.orderStatus = Number(e.type);
 		},
        onReady() {
             let that = this
@@ -85,7 +93,7 @@
                 success: function (res) {
                     let windowHeight= res.windowHeight;
                     that.swiperContentHeight = (windowHeight-158) + 'px';
-                    that.scrollerHeight = (windowHeight-5) + 'px'; // 给5px的底部间距
+                    that.scrollerHeight = (windowHeight - 60) + 'px'; // 给5px的底部间距
                 }
             });
         },
@@ -95,36 +103,38 @@
 		},
 		mounted() {
 			this.getSites();
+			this.getDataList();
 		},
 		methods: {
 			// tabs通知swiper切换
 			tabsChange(index) {
-				console.log(index)
-				this.swiperCurrent = index;
-				
-				// this.tabs[index].dataSet = this.tabs[index].dataSet.concat(list);
-			},
-			// swiper-item左右移动,通知tabs的滑块跟随移动
-			transition(e) {
-				let dx = e.detail.dx;
-				this.$refs.tabs.setDx(dx);
-			},
-			// 由于swiper的内部机制问题,快速切换swiper不会触发dx的连续变化,需要在结束时重置状态
-			// swiper滑动结束,分别设置tabs和swiper的状态
-			animationfinish(e) {
-				let current = e.detail.current;
-				this.$refs.tabs.setFinishCurrent(current);
-				this.swiperCurrent = current;
-				this.current = current;
+				this.current = index;
+				this.formData.pageIndex = 1;
+				this.formData.orderStatus = index;
+				this.getDataList();
 			},
+			
 			// scroll-view到底部加载更多
 			onreachBottom() {
-				this.tabsChange(this.swiperCurrent);
+				this.noMore = true;
+				this.textInfo = '向上拉加载更多';
+				if(this.pageTotal > this.formData.pageIndex * this.formData.pageSize) {
+					this.textInfo = '加载中...'
+					this.formData.pageIndex += 1;
+					this.getDataList();
+				} else {
+					this.textInfo = '我是有底线的';
+					setTimeout(() => {
+						this.noMore = false;
+					}, 1000);
+				}
 			},
 			//站点选择
 			siteSelectCallback(data) {
 				uni.hideKeyboard();
 				this.formData.name = data[0].label;
+				this.formData.stationCode = data[0].value;
+				this.getDataList();
 			},
 			//跳转详情页面
 			gotoDetail(item) {
@@ -134,17 +144,35 @@
 			},
 			//获取权限内所有站点列表
 			getSites() {
-				this.datalist = [];
+				this.siteList = [];
+				let siteList = [{stationName: '全部站点', stationCode: ''}];
+				let _that = this;
+				_that.$http.getHasStationCodeAndName().then(res => {
+					uni.hideLoading();
+					if(res.code == 200) {
+						siteList = siteList.concat(res.data);
+						_that.siteList = siteList
+					} else {
+						_that.$utils.msg(res.msg);
+					}
+				})
+			},
+			//获取列表数据
+			getDataList() {
 				uni.showLoading({
 					title: '搜索中...',
 				})
-				this.$http.getHasStationCodeAndName().then(res => {
-					uni.hideLoading();
+				let _that = this;
+				_that.$http.getOrderList(_that.formData).then(res => {
 					if(res.code == 200) {
-						this.datalist = res.data || [];
+						if (_that.formData.pageIndex == 1) _that.orderlist = [];
+						 _that.pageTotal = res.data.total;
+						 _that.orderlist = _that.orderlist.concat(res.data.list);
+						 _that.noMore = false;
 					} else {
-						this.$utils.msg(res.msg);
+						_that.$utils.msg(res.msg);
 					}
+					uni.hideLoading();
 				})
 			}
 		}	
@@ -158,6 +186,7 @@
 		box-sizing: border-box;
 		background: $uni-bg-color;
 		padding-bottom: env(safe-area-inset-bottom);
+		overflow: hidden;
 		.page-search-container {
 			display: flex;
 			background: #FFFFFF;
@@ -165,10 +194,34 @@
 				margin-left: 30rpx;
 				width: 30%;
 			}
+			.searchType-top-container {
+				display: flex;
+				width: 70%;
+				height: 80rpx;
+				margin-left: 40rpx;
+				.searchType-top-left {
+					width: 33%;
+					text-align: center;
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #131212;
+					line-height: 80rpx;
+				}
+				.searchType-top-left-active {
+					width: 33%;
+					text-align: center;
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #3F8CFF;
+					line-height: 80rpx;
+					border-bottom: 1rpx solid #3F8CFF;
+				}
+			}
 		}
 		.swiper-group {
-			padding: 0 32rpx;
-			height: 100% !important;
+			padding: 0 32rpx 40rpx 32rpx;
 			.order-container {
 				height: 270rpx;
 				background: #FFFFFF;
@@ -232,7 +285,29 @@
 				}
 			}
 		}
-		
+		.more-data {
+			background: #FFFFFF;
+			margin-top: 10rpx;
+			line-height: 60rpx;
+			text-align: center;
+			font-size: 28rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #989796;
+		}
+		.yoshop-notcont {
+			position: fixed;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -30%);
+			.cont {
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #4E5969;
+				line-height: 40rpx;
+			}
+		}
 	}
     
 </style>

+ 12 - 10
pages/index/orderUp.vue

@@ -219,26 +219,28 @@
 			},
 			//获取站点下的人员列表
 			getPersons(code) {
-				this.personSelectList = [];
-				this.$http.getUserListByStationCode(code).then(res => {
+				let _that = this;
+				_that.personSelectList = [];
+				_that.$http.getUserListByStationCode(code).then(res => {
 					uni.hideLoading();
 					if(res.code == 200) {
-						this.personSelectList = res.data || [];
+						_that.personSelectList = res.data || [];
 					} else {
-						this.$utils.msg(res.msg);
+						_that.$utils.msg(res.msg);
 					}
 				})
 			},
 			//提交
 			submiHandle() {
-				this.isClick = true;
-				this.$refs.uform.validate(valid => {
+				let _that = this;
+				_that.isClick = true;
+				_that.$refs.uform.validate(valid => {
 					if (!valid) {
-						this.isClick = false;
+						_that.isClick = false;
 						return
 					}
-					this.$http.addOrder(this.form).then(res => {
-						this.isClick = false;
+					_that.$http.addOrder(_that.form).then(res => {
+						_that.isClick = false;
 						if(res.code == 200) {
 							uni.showToast({
 								title: '上报成功',
@@ -249,7 +251,7 @@
 								uni.navigateBack();
 							}, 1000);
 						} else {
-							this.$utils.msg(res.msg);
+							_that.$utils.msg(res.msg);
 						}
 					})
 				});

+ 5 - 4
pages/index/supplier.vue

@@ -51,16 +51,17 @@
 			},
 			//获取站点内供货商的列表
 			getSupplierListData() {
-				this.dataList = [];
+				let _that = this;
+				_that.dataList = [];
 				uni.showLoading({
 					title: '搜索中...',
 				})
-				this.$http.getSupplierList(this.param).then(res => {
+				_that.$http.getSupplierList(_that.param).then(res => {
 					uni.hideLoading();
 					if(res.code == 200) {
-						this.dataList = res.data.list || [];
+						_that.dataList = res.data.list || [];
 					} else {
-						this.$utils.msg(res.msg);
+						_that.$utils.msg(res.msg);
 					}
 				})
 			},

+ 3 - 2
pages/index/supplierDetail.vue

@@ -83,13 +83,14 @@
 			},
 			//点击图片
 			imageHandle(data) {
+				let _that = this;
 				let list = [];
-				this.detailData.urls.forEach(item => {
+				_that.detailData.urls.forEach(item => {
 					list.push(item)
 				})
 				uni.previewImage({
 					urls: list,
-					current: this.detailData.urls[data]
+					current: _that.detailData.urls[data]
 				})
 			},
 		}	

+ 5 - 5
pages/ucenter/index.vue

@@ -5,15 +5,15 @@
 		<view class="personal-info">
 			<view class="personal-info-left">
 				<view class="personal-name">
-					<span>{{userinfo.nickName}}</span>
-					<span class="personal-phone">{{' / ' + userinfo.phonenumber}}</span>
+					<span>{{userinfo.nickName || '微信用户'}}</span>
+					<span class="personal-phone">{{' / ' + userinfo.phonenumber || '-'}}</span>
 				</view>
 				<view class="personal-role">
-					{{userinfo.roles[0].roleName}}
+					{{userinfo.roles[0].roleName || '-'}}
 				</view>
 			</view>
 			<view class="personal-info-right">
-				{{usernameFirst}}
+				{{usernameFirst || '微'}}
 			</view>
 		</view>
 
@@ -45,7 +45,7 @@
 					{
 					  title: '参与工单',
 					  path: '/pages/ucenter/mineNotes',
-					  type: 0,
+					  type: 1,
 					}
 				],
 				dataInfo: {},

+ 182 - 83
pages/ucenter/mineNotes.vue

@@ -2,42 +2,47 @@
 	<view class="page-content">
 		<view class="page-search-container">
 			<u-input type="select" class="page-search-text" :select-open="show" placeholder="请选择换电站" v-model="formData.name" @click="show = true"/>
-			<u-tabs-swiper ref="tabs" :list="tabsList" :current="current" :is-scroll="false" bar-height="6" bar-width="40" active-color="#2979ff" @change="tabsChange" ></u-tabs-swiper>
+			<view class="searchType-top-container">
+				<view :class="current == 0 ? 'searchType-top-left-active' : 'searchType-top-left'" @click="tabsChange(0)">
+					工单上报
+				</view>
+				<view :class="current == 1 ? 'searchType-top-right-active' : 'searchType-top-right'" @click="tabsChange(1)">
+					参与工单
+				</view>
+			</view>
 		</view>
-		<swiper class="swiper-group" :style="{height:swiperContentHeight}" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
-			<swiper-item class="swiper-item" v-for="(item, index) in tabs" :key="index">
-				<scroll-view  class="scroll-content-container" :style="{height:scrollerHeight}"  scroll-y @scrolltolower="onreachBottom" @click="gotoDetail(item)">
-					<view class="order-container" v-for="(order,i) in item.dataSet" :key="i">
-						<view class="order-title-container">
-							<view class="order-title-text">
-								充电机故障充电机故障充电机故障充电机故障
-							</view>
-							<view class="order-status">
-								待处理
-							</view>
+		<view class="swiper-group">
+			<scroll-view  class="scroll-content-container" :style="{height:scrollerHeight}"  scroll-y @scrolltolower="onreachBottom">
+				<view class="order-container" v-for="(order,i) in orderlist" :key="i" @click="gotoDetail(order)">
+					<view class="order-title-container">
+						<view class="order-title-text">
+							{{order.problemTitle || '-'}}
 						</view>
-						<view class="order-time">
-							{{'2023-10-21 15:22:55'}}
-						</view>
-						<view class="order-site">
-							{{'三江换电站'}}
-						</view>
-						<view class="order-reason">
-							{{'三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站'}}
+						<view class="order-status">
+							{{order.status == 0 ? '未处理' : (order.status == 1 ? '待处理' : '已完结')}}
 						</view>
 					</view>
-					<view v-if="no_more" class="no-more">亲, 没有更多了
+					<view class="order-time">
+						{{order.occurrenceTime || '-'}}
 					</view>
-					<!-- 无数据提供的页面 -->
-					<view v-if="!item.dataSet.length">
-						<view class="yoshop-notcont">
-							<text class="cont">亲,暂无订单哦</text>
-						</view>
+					<view class="order-site">
+						{{order.stationName || '-'}}
+					</view>
+					<view class="order-reason">
+						{{order.deviceProblem || '-'}}
 					</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-		<u-select :list="siteList" v-model="show" @confirm="siteSelectCallback"> </u-select>
+				</view>
+				<view v-if="noMore" class="more-data">
+					{{textInfo}}
+				</view>
+			</scroll-view>
+			<view v-if="!orderlist.length">
+				<view class="yoshop-notcont">
+					<text class="cont">暂无工单</text>
+				</view>
+			</view>
+		</view>
+		<u-select :list="siteList" v-model="show" value-name="stationCode" label-name="stationName" @confirm="siteSelectCallback"> </u-select>
 	</view>
 </template>
 
@@ -45,37 +50,36 @@
 	export default {
 	  data() {
 	    return {
-			//表头列表
-			tabsList: [{
-				name: '工单上报'
-			}, {
-				name: '参与工单'
-			}],
+			//当前下标
 			current: 0,
-			swiperCurrent: 0,
 			scrollerHeight: 0,
 			swiperContentHeight: 0,
-			tabs:[
-				  {name:'工单上报',index:0,dataSet:[]},
-				  {name:'参与工单',index:1,dataSet:[]},
-			],
+			//查询条件
 			formData: {
 				name: '全部站点',
+				stationCode: null,
+				recordType: 0,
+				pageIndex: 1,
+				pageSize: 10,
 			},
+			//是否显示站点
 			show: false,
-			siteList: [
-				{label: '全部站点', value: ''},
-				{label: '兰州皋兰站', value: '1'},
-				{label: '河北沧州站', value: '2'}
-			]
+			//站点列表
+			siteList: [],
+			//是否更多
+			noMore: false,
+			//工单列表
+			orderlist: [],
+			//总条数
+			pageTotal: 0,
+			//提示
+			textInfo: '',
 	    }
 	  },
 		//第一次加载
 		onLoad(e) {
-			  console.log('打印参数:',this.current)
-			  this.swiperCurrent = e.type
-			  this.current = e.type
-			  this.tabsChange(0);
+			this.current = e.type;
+			this.formData.recordType = e.type;
 		},
        onReady() {
             let that = this
@@ -83,55 +87,51 @@
                 success: function (res) {
                     let windowHeight= res.windowHeight;
                     that.swiperContentHeight = (windowHeight-158) + 'px';
-                    that.scrollerHeight = (windowHeight-5) + 'px'; // 给5px的底部间距
+                    that.scrollerHeight = (windowHeight - 60) + 'px'; // 给5px的底部间距
                 }
             });
         },
 		//页面显示
 		onShow() {
 	
+		},
+		mounted() {
+			this.getSites();
+			this.getDataList();
 		},
 		methods: {
 			// tabs通知swiper切换
 			tabsChange(index) {
-				this.swiperCurrent = index;
-				let list = [
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
-				]
-				this.tabs[index].dataSet = this.tabs[index].dataSet.concat(list);
-			},
-			// swiper-item左右移动,通知tabs的滑块跟随移动
-			transition(e) {
-				let dx = e.detail.dx;
-				this.$refs.tabs.setDx(dx);
-			},
-			// 由于swiper的内部机制问题,快速切换swiper不会触发dx的连续变化,需要在结束时重置状态
-			// swiper滑动结束,分别设置tabs和swiper的状态
-			animationfinish(e) {
-				let current = e.detail.current;
-				this.$refs.tabs.setFinishCurrent(current);
-				this.swiperCurrent = current;
-				this.current = current;
+				this.current = index;
+				this.formData.pageIndex = 1;
+				if(index == 1) {
+					this.formData.recordType = 1
+				} else {
+					this.formData.recordType = 0
+				}
+				this.getDataList();
 			},
 			// scroll-view到底部加载更多
 			onreachBottom() {
-				this.tabsChange(this.swiperCurrent);
+				this.noMore = true;
+				this.textInfo = '向上拉加载更多';
+				if(this.pageTotal > this.formData.pageIndex * this.formData.pageSize) {
+					this.textInfo = '加载中...'
+					this.formData.pageIndex += 1;
+					this.getDataList();
+				} else {
+					this.textInfo = '我是有底线的';
+					setTimeout(() => {
+						this.noMore = false;
+					}, 1000);
+				}
 			},
 			//站点选择
 			siteSelectCallback(data) {
 				uni.hideKeyboard();
 				this.formData.name = data[0].label;
+				this.formData.stationCode = data[0].value;
+				this.getDataList();
 			},
 			//跳转详情页面
 			gotoDetail(item) {
@@ -139,7 +139,39 @@
 					url: '/pages/index/orderDetail?id=' + item.id
 				})
 			},
-			
+			//获取权限内所有站点列表
+			getSites() {
+				let _that = this;
+				_that.siteList = [];
+				let siteList = [{stationName: '全部站点', stationCode: ''}];
+				_that.$http.getHasStationCodeAndName().then(res => {
+					uni.hideLoading();
+					if(res.code == 200) {
+						siteList = siteList.concat(res.data);
+						_that.siteList = siteList
+					} else {
+						_that.$utils.msg(res.msg);
+					}
+				})
+			},
+			//获取列表数据
+			getDataList() {
+				let _that = this;
+				uni.showLoading({
+					title: '搜索中...',
+				})
+				_that.$http.getOrderLogList(_that.formData).then(res => {
+					if(res.code == 200) {
+						if (_that.formData.pageIndex == 1) _that.orderlist = [];
+						 _that.pageTotal = res.data.total;
+						 _that.orderlist = _that.orderlist.concat(res.data.list);
+						 _that.noMore = false;
+					} else {
+						_that.$utils.msg(res.msg);
+					}
+					uni.hideLoading();
+				})
+			}
 		}	
 	}
 </script>
@@ -151,6 +183,7 @@
 		box-sizing: border-box;
 		background: $uni-bg-color;
 		padding-bottom: env(safe-area-inset-bottom);
+		overflow-y: hidden;
 		.page-search-container {
 			display: flex;
 			background: #FFFFFF;
@@ -158,6 +191,50 @@
 				margin-left: 30rpx;
 				width: 30%;
 			}
+			.searchType-top-container {
+				display: flex;
+				width: 70%;
+				height: 80rpx;
+				margin-left: 40rpx;
+				.searchType-top-left {
+					width: 50%;
+					text-align: center;
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #131212;
+					line-height: 80rpx;
+				}
+				.searchType-top-left-active {
+					width: 50%;
+					text-align: center;
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #3F8CFF;
+					line-height: 80rpx;
+					border-bottom: 1rpx solid #3F8CFF;
+				}
+				.searchType-top-right {
+					width: 50%;
+					text-align: center;
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #131212;
+					line-height: 80rpx;
+				}
+				.searchType-top-right-active {
+					width: 50%;
+					text-align: center;
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #3F8CFF;
+					line-height: 80rpx;
+					border-bottom: 1rpx solid #3F8CFF;
+				}
+			}
 		}
 		.swiper-group {
 			padding: 0 32rpx;
@@ -225,7 +302,29 @@
 				}
 			}
 		}
-		
+		.more-data {
+			background: #FFFFFF;
+			margin-top: 10rpx;
+			line-height: 60rpx;
+			text-align: center;
+			font-size: 28rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #989796;
+		}
+		.yoshop-notcont {
+			position: fixed;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -30%);
+			.cont {
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #4E5969;
+				line-height: 40rpx;
+			}
+		}
 	}
     
 </style>