瀏覽代碼

未开发功能调整, 隐藏, 上线, 内容优化, 区域接口, 设备列表

zhengkaixin 3 月之前
父節點
當前提交
d8bd09f301

+ 22 - 0
apis/pagejs/deviceTab.js

@@ -0,0 +1,22 @@
+import requestWhite from '@/apis/utils/requestWhite'
+
+export function floorlockList(data) {
+	var url='/mobile/sysUser/floorlockList';
+	
+	return requestWhite({
+		method: 'POST',
+		data: data,
+		url: url
+	})
+}
+
+
+export function parkingList(data) {
+	var url='/mobile/sysUser/parkingList';
+	
+	return requestWhite({
+		method: 'POST',
+		data: data,
+		url: url
+	})
+}

+ 11 - 0
apis/pagejs/user.js

@@ -9,6 +9,17 @@ export function login(data) {
 	})
 }
 
+export function findByOpenId(data) {
+	var url='/mobile/sysUser/findByOpenId';
+	
+	return requestWhite({
+		method: 'get',
+		data: data,
+		url: url
+	})
+}
+
+
 export function logout(data) {
 	var url='/mobile/sysUser/logout';
 	

+ 6 - 4
apis/utils/init.js

@@ -64,11 +64,13 @@ var openId = jphelp.getOpenId();
 			let [error, res] = response;
 
 			if (res.data.code == 200 && res.data.result) {
-
+ 
 				var token = res ? res.data.data.token : '';
-				jphelp.setPersonInfo(res.data.data.regUser);
-				jphelp.setPersonInfoPlus(res.data.data);
-
+				
+				
+			
+				jphelp.setPersonInfo(res.data.data.user);
+				jphelp.setPersonInfoPlus(res.data.data)
 				jphelp.setToken(token);
 
 			} else {

+ 3 - 4
apis/utils/request.js

@@ -49,11 +49,10 @@ const request = (options) => {
 			if (res.data.code == 200&&res.data.result) {
 				
 				var token = res ? res.data.data.token : '';
-				jphelp.setPersonInfo(res.data.data.regUser );
-				
-				jphelp.setToken(token);
-				jphelp.setPersonInfoPlus(res.data.data);
 				
+				jphelp.setPersonInfo(res.data.data.user);
+				jphelp.setPersonInfoPlus(res.data.data)
+			
 				options.token=token
 				
 				var isson= requestSon(options)

+ 6 - 6
components/Tabbar.vue

@@ -41,13 +41,13 @@
 					 	pagePath: "/pages/deviceTab/index",
 					 	
 					 },
-					{
-						iconPath: img6,
-						selectedIconPath: img5,
-						text: '用户',
-						pagePath: "/pages/userTab/index",
+					// {
+					// 	iconPath: img6,
+					// 	selectedIconPath: img5,
+					// 	text: '用户',
+					// 	pagePath: "/pages/userTab/index",
 						
-					},
+					// },
 					
 					{
 						iconPath: img8,

+ 2 - 2
config/.env.dev.js

@@ -13,10 +13,10 @@ const UNI_APP = {
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   , 用于样式人员快速访问各种功能 ,快速测试等
 
 
-	openId:"123456",
+	openId:"1234568",
 	
 	//appid
-	VUE_APP_WXAPPID:"wx0b3c41a903053808",
+	VUE_APP_WXAPPID:"wxa9f555dc92a1cbfc",
 	VUE_APP_ALIAPPID:"2021003131641247",
 	
 }  

+ 1 - 3
config/.env.js

@@ -22,9 +22,7 @@ function() {
 		}
 		
     } else if (process.env.NODE_ENV === "production") {  
-		if(NODE_NAME=="v4"){
-			ENV_VAR = require('./.env.prodv4.js');
-		}else if(NODE_NAME=="test"){
+		if(NODE_NAME=="test"){
 			ENV_VAR = require('./.env.test.js'); 
 		}else if(NODE_NAME=="production"){
 			ENV_VAR = require('./.env.prod.js');

+ 2 - 2
config/.env.prod.js

@@ -2,7 +2,7 @@ const UNI_APP = {
 	ProjectName :"智泊e家",
 	//BASE_URL: 'http://36.134.122.108/railroad-server/',
 	BASE_URL: 'https://youdian-test.hbjp.com.cn/floorlock-server/',
-
+	BASE_URL:"https://zbyj.hbjp.com.cn/floorlock-server/",
 	//BASE_URL: 'https://dgj.jzrccs.com/electric-manager-api/',
 	
 	NODE_ENV :"prod",
@@ -10,7 +10,7 @@ const UNI_APP = {
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
 	//openId:"123456",
 	//appid
-	VUE_APP_WXAPPID:"wx0b3c41a903053808",
+	VUE_APP_WXAPPID:"wxa9f555dc92a1cbfc",
 
 	BACK_URL:"https://yjwg.hbjp.com.cn/index/#/master/",
 	

+ 0 - 12
package.json

@@ -49,18 +49,6 @@
 					"CUSTOM-CONST": true,
 					"NODE_NAME_T": "production"
 				}
-			},
-			"v4-platform": {
-				"title": "v4",
-				"BROWSER": "Chrome",
-				"env": {
-					"UNI_PLATFORM": "h5",
-					"NODE_NAME": "v4"
-				},
-				"define": {
-					"CUSTOM-CONST": true,
-					"NODE_NAME_T": "v4"
-				}
 			}
 		}
 	}

+ 74 - 10
pages/deviceTab/deviceList.vue

@@ -2,7 +2,7 @@
 	<view>
 		<u-navbar  title="设备列表"  ></u-navbar>
 		<view class="main">
-			<view class="tabs">
+			<view class="tabs" v-if="0">
 				<u-picker  v-model="tabsFrom.show1"
 				  :default-selector="[tabsFrom.show1Index]"
 				 mode="selector" :range="tabsFrom.selector1"  range-key="label" @confirm="selector1confirm" ></u-picker>
@@ -20,29 +20,30 @@
 			</view>
 			
 			<view class="list">
-				<view class="line"   @click="gotoUrl('/pages/deviceTab/dataLock?id=1')" >
+				<view class="line"   v-for="(item,i) in list" :key="i"
+				 @click="gotoUrl('/pages/deviceTab/dataLock?id='+item.id)" >
 					<view class="body">
 						<view class="imgclass">
 							<image class="img" src="@/assets/img/deviceTab/index2-1.svg" mode=""></image>
 						</view>
 						<view class="item">
 							<view class="name">
-								<view class="text">软件园</view>
-								<view class="tag">私人车位</view>
+								<view class="text">{{item.name}}</view>
+								<view class="tag" :class="'type'+item.type">{{item.typeN}}</view>
 							</view>
 							<view class="value">
-								占用9
+								{{item.parkingName}}
 							</view>
 						</view>
 					</view>
 					<view class="goto">
-						<view class="dian"></view>
-						<view  class="text">在线</view>
+						<view class="dian" :class="'status'+item.status"></view>
+						<view  class="text" :class="'status'+item.status" >{{item.status==1?'在线':'离线'}}</view>
 						<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
 					</view>
 				</view>
 				
-				<view class="line">
+			<!-- 	<view class="line">
 					<view class="body">
 						<view class="imgclass">
 							<image class="img" src="@/assets/img/deviceTab/index2-1.svg" mode=""></image>
@@ -62,11 +63,12 @@
 					<view class="goto">
 						<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
 					</view>
-				</view>
+				</view> -->
 				
 			</view>
 			
-			<view class="floating-button" @click="gotoUrl('/pages/deviceTab/bindLock')">
+			<view class="floating-button" v-if="false"
+			  @click="gotoUrl('/pages/deviceTab/bindLock')">
 				<view class="button">
 					<img class="img" src="@/assets/img/deviceTab/index2-2.svg" alt="">
 			
@@ -77,6 +79,8 @@
 			
 			
 		</view>
+		<u-divider :isnone="list.length==0" nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
+		
 		
 	</view>
 </template>
@@ -89,6 +93,12 @@
 		
 		data() {
 			return {
+				list:[],
+				listForm:{
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+				},
 				title:"场站列表",
 				tabsFrom: {
 					show1: false,
@@ -114,6 +124,53 @@
 					]
 				},
 			};
+		},
+		onLoad(op) {
+			if(op.id){
+				this.listForm.parkingId=op.id
+			}
+			this.getList()
+		},
+		onReachBottom() {
+			if (this.list.length < this.listForm.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		methods: {
+			
+			myLoadmore(){
+				this.listForm.pageIndex += 1;
+				this.getList()
+			},
+			getList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+							 
+				API.floorlockList(this.listForm).then((res) => {
+					var list=[]
+					
+					if (this.listForm.pageIndex == 1) {
+						list = res.data.data;
+					} else {
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+					this.list = res.data.data
+					uni.hideLoading();
+				
+				}).catch(error => {
+				
+					uni.hideLoading();
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
 		}
 	}
 </script>
@@ -137,6 +194,10 @@
 							background-color: rgba(184,184,184,1);
 							 margin-right: 16rpx;
 						}
+						.status1{
+							background-color: #4CAF50;
+							color:#4CAF50;
+						}
 						.text{
 							 margin-right: 16rpx;
 							 font-size: 24rpx;
@@ -172,6 +233,9 @@
 																padding:1px 8rpx;
 																margin-left: 8rpx;
 															 }
+															 .type2{
+																 background-color: #8161ff;
+															 }
 						 								 }
 						 								 .value{
 						 								 	color: rgba(119,119,119,1);

+ 53 - 27
pages/deviceTab/index.vue

@@ -3,19 +3,22 @@
 		<u-navbar  :title="title" :is-back="0" ></u-navbar>
 		<view class="main">
 			<view class="list">
-				<view class="line"   @click="gotoUrl('/pages/deviceTab/deviceList?id=1')" >
+				<view class="line"  v-for="(item,i) in list" :key="i"
+				  @click="gotoUrl('/pages/deviceTab/deviceList?id='+item.id)" >
 					<view class="body">
 						<view class="imgclass">
 							<image class="img" src="@/assets/img/deviceTab/index1-1.svg" mode=""></image>
 						</view>
 						<view class="item">
 							<view class="name">
-								软件园
+								{{item.name}}
 							</view>
-							<view class="value">
+							<view class="value"  >
+								<!-- 占用9<span>/</span>
 								占用9<span>/</span>
-								占用9<span>/</span>
-								共9台
+								共9台 -->
+								
+								{{item.openStatusN}}
 							</view>
 						</view>
 					</view>
@@ -24,30 +27,11 @@
 					</view>
 				</view>
 				
-				<view class="line">
-					<view class="body">
-						<view class="imgclass">
-							<image class="img" src="@/assets/img/deviceTab/index1-1.svg" mode=""></image>
-						</view>
-						<view class="item">
-							<view class="name">
-								软件园
-							</view>
-							<view class="value">
-								占用9<span>/</span>
-								占用9<span>/</span>
-								共9台
-							</view>
-						</view>
-					</view>
-					<view class="goto">
-						<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
-					</view>
-				</view>
+				
 				
 			</view>
 		</view>
-		<u-divider border-color="#CFD2D5">已经到底了</u-divider>
+		<u-divider  :isnone="list.length==0" nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
 		
 		<tabbar :current="1"></tabbar>
 	</view>
@@ -63,8 +47,50 @@
 		},
 		data() {
 			return {
-				title:"场站列表"
+				title:"场站列表",
+				list:[],
+				listForm:{
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+				},
 			};
+		},
+		onLoad() {
+			this.getList()
+		},
+		onReachBottom() {
+			if (this.list.length < this.listForm.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		methods: {
+			
+			myLoadmore(){
+				this.listForm.pageIndex += 1;
+				this.getList()
+			},
+			getList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+							 
+				API.parkingList(this.listForm).then((res) => {
+					
+					this.list = res.data.parkingInfoList
+					uni.hideLoading();
+				
+				}).catch(error => {
+				
+					uni.hideLoading();
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			
 		}
 	}
 </script>

+ 15 - 11
pages/index/index.vue

@@ -345,8 +345,8 @@
 											{{item.statusN}}
 
 										</view>
-										<view class="tag" :class="'lockStatus'+item.lockStatus">
-											{{item.lockStatus==0?'空闲':'使用中'}}
+										<view class="tag" :class="'lockStatus lockStatus'+item.lockStatus">
+											{{item.lockStatusN}}
 										</view>
 									</view>
 
@@ -366,7 +366,7 @@
 			<u-divider border-color="#CFD2D5">已经到底了</u-divider>
 
 		</view>
-		<tabbar :current="0"></tabbar>
+		<tabbar :current="0" ></tabbar>
 
 	</view>
 </template>
@@ -469,7 +469,7 @@
 					body3: 0,
 					body4: 0,
 					body5: 0,
-					body6: 0,
+					body6: 1,
 					body7: 0,
 					body8: 0,
 					body9: 0,
@@ -808,11 +808,11 @@
 			occupancyByTimeBar(init) {
 				if (init) {
 					var date = new Date();
-
-					//this.body3data.query.startTime = date.getFullYear() + "-" + (date.getMonth() + 1) + "-1"
+					//test
+					this.body3data.query.startTime = date.getFullYear() + "-" + (date.getMonth() + 1) + "-1"
 
 					var endOfMonth = new Date(date.getFullYear(), date.getMonth() + 1, 0)
-					//this.body3data.query.endTime = parseUnixTime(endOfMonth, '{y}-{m}-{d}')
+					this.body3data.query.endTime = parseUnixTime(endOfMonth, '{y}-{m}-{d}')
 
 				}
 				this.jpContentMap.body3 = 0
@@ -849,7 +849,7 @@
 				this.jpContentMap.body4 = 0
 				
 				var date = new Date();
-				
+				//test
 				this.body4data.query.startTime = date.getFullYear() + "-" + (date.getMonth() + 1) + "-1"
 				
 				var endOfMonth = new Date(date.getFullYear(), date.getMonth() + 1, 0)
@@ -1944,9 +1944,13 @@
 				.statusN0 {
 					background-color: rgba(153, 153, 153, 1);
 				}
-
-				.lockStatus1 {
-					background-color: rgba(153, 153, 153, 1);
+				.lockStatus{
+					
+					background-color: rgba(153, 153, 153, 1);
+				}
+				
+				.lockStatus2 {
+					background-color: #03A9F4
 				}
 			}
 		}

+ 18 - 15
pages/login/login.vue

@@ -14,14 +14,14 @@
 		<!-- 手机号/密码 -->
 		<view class="input-box">
 			
-			<u-input  v-model="phone"  style="padding: 0 20px" class="tel-input" type="text"  placeholder="请输入手机号码" />
+			<u-input  v-model="userName"  style="padding: 0 20px" class="tel-input" type="text"  placeholder="请输入账号" />
 		
 			<u-input  v-model="password" style="padding: 0 20px" class="password-input" type="password"  placeholder="请输入密码" :password-icon="true" />
 
 		</view>
 		
 		 <button class="login-disable" :class="{
-			 login:password.length&&phone.length
+			 login:password.length&&userName.length
 		 }" @click="submit" >登录</button>
 		 
 		 <view class="reset"  @click="gotoUrl('/pages/login/findBackPassword')" >
@@ -38,7 +38,7 @@
 	export default {
 		data() {
 			return {
-				phone:"",
+				userName:"",
 				password:"",
 			}
 		},
@@ -60,6 +60,7 @@
 				 
 				
 				}).then((response) => {
+					
 					if(response.message){
 						uni.hideLoading();
 						if(response.message=='没有权限'){
@@ -72,7 +73,8 @@
 						}
 					}else{
 						this.loginset(response)
-						uni.redirectTo({
+						
+						uni.switchTab({
 							url: '/pages/index/index'
 						})
 					}
@@ -86,19 +88,19 @@
 				})
 			},
 			submit(){
-				if(!(this.phone.length&&this.password.length)){
+				if(!(this.userName.length&&this.password.length)){
 					return
 				}
-				var checkPhoneResult = checkPhone(this.phone);
+				// var checkPhoneResult = checkPhone(this.phone);
 					
-				if (checkPhoneResult !== true) {
-					uni.showToast({
-						icon: "none",
-						title: checkPhoneResult,
+				// if (checkPhoneResult !== true) {
+				// 	uni.showToast({
+				// 		icon: "none",
+				// 		title: checkPhoneResult,
 						
-					})
-					return;
-				}
+				// 	})
+				// 	return;
+				// }
 				
 				if(!this.password.length){
 					uni.showToast({
@@ -115,7 +117,7 @@
 				
 				API.login({
 					password:this.password,
-					phone:this.phone,
+					userName:this.userName,
 					openId: this.jphelp.getOpenId(),
 					noerror:true,
 					//type:2,
@@ -138,7 +140,8 @@
 						}
 					}else{
 						this.loginset(response)
-						uni.redirectTo({
+						
+						uni.switchTab({
 							url: '/pages/index/index'
 						})
 					}

+ 64 - 9
pages/myTab/abnormalList.vue

@@ -18,7 +18,7 @@
 						name="arrow-up" v-if="tabsFrom.show3"></u-icon><u-icon v-else name="arrow-down"></u-icon></view>
 			</view>
 
-			<view class="list">
+			<view class="list" v-if="0">
 				<view class="line" @click="gotoUrl('/pages/myTab/abnormalInfo?id=1')">
 					<view class="body">
 						<view class="imgclass">
@@ -69,6 +69,8 @@
 
 
 		</view>
+		<u-divider :isnone="list.length==0" nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
+
 
 	</view>
 </template>
@@ -82,6 +84,12 @@
 		data() {
 			return {
 				title: "场站列表",
+				list: [],
+				listForm: {
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+				},
 				tabsFrom: {
 					show1: false,
 					show1Index: 0,
@@ -105,6 +113,52 @@
 					]
 				},
 			};
+		},
+		onLoad(op) {
+
+			this.getList()
+		},
+		onReachBottom() {
+			if (this.list.length < this.listForm.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		methods: {
+
+			myLoadmore() {
+				this.listForm.pageIndex += 1;
+				this.getList()
+			},
+			getList() {
+				return
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+
+				API.floorlockList(this.listForm).then((res) => {
+					var list = []
+
+					if (this.listForm.pageIndex == 1) {
+						list = res.data.data;
+					} else {
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+					this.list = res.data.data
+					uni.hideLoading();
+
+				}).catch(error => {
+
+					uni.hideLoading();
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
 		}
 	}
 </script>
@@ -141,23 +195,24 @@
 
 				.item {
 					margin-left: 16rpx;
-					    width: 100%;
+					width: 100%;
+
 					.name {
-						color: rgba(51, 51, 51, 1);
-						font-weight: bold;
-						
+						color: rgba(51, 51, 51, 1);
+						font-weight: bold;
+
 						font-size: 28rpx;
 						display: flex;
-						align-items: center;
+						align-items: center;
 						justify-content: space-between;
 
 					}
 
 					.value {
 						color: rgba(119, 119, 119, 1);
-						font-size: 24rpx;
-						display: flex;
-						align-items: center;
+						font-size: 24rpx;
+						display: flex;
+						align-items: center;
 						justify-content: space-between;
 
 					}

+ 3 - 2
pages/myTab/dataUser.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="jpmain  ">
+		<u-navbar title="个人信息" title-color="#101010"></u-navbar>
 		
 		<u-popup v-model="showMessage" mode="bottom" border-radius="30" >
 			<view class="showMessage">
@@ -70,14 +71,14 @@
 							<u-icon name="arrow-right" style="margin-left: 8rpx;" size="24" color="#BBBBBB"></u-icon>
 						</view>
 					</view>
-					<view class="item">
+					<!-- <view class="item">
 						<view class="title">
 							手机号码
 						</view>
 						<view class="goto">
 							{{userInfo.phone}}
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			

+ 57 - 3
pages/myTab/feedbackList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<u-navbar title="反馈记录" title-color="#101010"></u-navbar>
-		<view class="record">
+		<view class="record" v-if="0">
 			<view class="title">
 				<view class="classify">
 					功能异常
@@ -18,22 +18,76 @@
 				<!-- <image class="img" src="../../assets/img/feedbackPic.png"  mode=""></image> -->
 			</view>
 		</view>
+		<u-divider :isnone="list.length==0" nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
+		
 		<!-- 底部 -->
-		<view class="bottom">
+		<view class="bottom" v-if='0'>
 			<button class="fill-in">填写反馈</button>
 		</view>
 	</view>
 </template>
 
 <script>
+	
 	export default {
+	
 		data() {
 			return {
+				title: "场站列表",
+				list: [],
+				listForm: {
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+				},
 				
+			};
+		},
+		onLoad(op) {
+	
+			this.getList()
+		},
+		onReachBottom() {
+			if (this.list.length < this.listForm.recordsTotal) {
+				this.myLoadmore();
 			}
 		},
 		methods: {
-			
+	
+			myLoadmore() {
+				this.listForm.pageIndex += 1;
+				this.getList()
+			},
+			getList() {
+				return
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+	
+				API.floorlockList(this.listForm).then((res) => {
+					var list = []
+	
+					if (this.listForm.pageIndex == 1) {
+						list = res.data.data;
+					} else {
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+					this.list = res.data.data
+					uni.hideLoading();
+	
+				}).catch(error => {
+	
+					uni.hideLoading();
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
 		}
 	}
 </script>

+ 9 - 2
pages/myTab/index.vue

@@ -18,8 +18,8 @@
 						
 					</view>
 					<view class="text">
-						<view class="text1">{{userInfo.nickName}}</view>
-						<view class="text2">{{userInfo.phone}}</view>
+						<view class="text1">{{userInfo.realName}}</view>
+						<view class="text2">{{userInfo.userName}}</view>
 					</view>
 				</view>
 				<view class="value">
@@ -129,6 +129,13 @@
 				},
 				whiteNum:0,
 			};
+		},
+		onLoad() {
+			this.userInfo=this.jphelp.getPersonInfo()
+			console.log(this.userInfo)
+		},
+		methods:{
+			
 		}
 	}
 </script>

+ 56 - 3
pages/myTab/myMessage.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<u-navbar title="我的消息" ></u-navbar>
-		<view class="main">
+		<view class="main"  v-if="0">
 			<view class="line">
 				<view class="imgc img1">
 					<img class="img" src="@/assets/img/myTab/message1.svg">
@@ -86,8 +86,10 @@
 					</view>
 				</view>
 			</view>
-			<u-divider border-color="#CFD2D5">已经到底了</u-divider>
+			
 		</view>
+		<u-divider :isnone="list.length==0" nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
+		
 	</view>
 </template>
 
@@ -95,8 +97,59 @@
 	export default {
 		data() {
 			return {
-				
+				list: [],
+				listForm: {
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+				},
 			};
+		},
+		onLoad(op) {
+
+			this.getList()
+		},
+		onReachBottom() {
+			if (this.list.length < this.listForm.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		methods: {
+		
+			myLoadmore() {
+				this.listForm.pageIndex += 1;
+				this.getList()
+			},
+			getList() {
+				return
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+		
+				API.floorlockList(this.listForm).then((res) => {
+					var list = []
+		
+					if (this.listForm.pageIndex == 1) {
+						list = res.data.data;
+					} else {
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+					this.list = res.data.data
+					uni.hideLoading();
+		
+				}).catch(error => {
+		
+					uni.hideLoading();
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
 		}
 	}
 </script>