cat-eye-test

main.js

@@ -29,21 +29,29 @@ $http.afterRequest = function(err) {
 		uni.removeStorage('userId')
 		uni.removeStorage('Token')
 		uni.removeStorage('testProjectId')
-		uni.$showMsg('令牌过期，请重新登录')
+		uni.showToast({
+			title: '令牌过期，请重新登录',
+			icon: 'none',
+			duration: 2000
+		})
+		uni.hideLoading()
 		uni.redirectTo({
 			url: "/pages/login/login"
 		})
 		return
 	}
-	uni.$showMsg('加载成功')
 	uni.hideLoading()
+
+
 }
 // 封装弹框的方法
 uni.$showMsg = function(title = '数据请求失败！', duration = 1500) {
 	uni.showToast({
 		title,
 		duration,
-		icon: 'none'
+		icon: 'none',
+		mask: true
+
 	})
 }
 Vue.use(uView);

node_modules/.package_versions.json

@@ -0,0 +1,5 @@
+{
+  "@escook/request-miniprogram": [
+    "0.2.1"
+  ]
+}

node_modules/@escook/request-miniprogram/README.md

@@ -0,0 +1,99 @@
+## 安装
+
+```bash
+npm install @escook/request-miniprogram
+```
+
+## 导入
+
+```js
+// 按需导入 $http 对象
+import { $http } from '@escook/request-miniprogram'
+
+// 将按需导入的 $http 挂载到 wx 顶级对象之上，方便全局调用
+wx.$http = $http
+
+// 在 uni-app 项目中，可以把 $http 挂载到 uni 顶级对象之上，方便全局调用
+uni.$http = $http
+```
+
+## 使用
+
+### 支持的请求方法
+
+```js
+// 发起 GET 请求，data 是可选的参数对象
+$http.get(url, data?)
+
+// 发起 POST 请求，data 是可选的参数对象
+$http.post(url, data?)
+
+// 发起 PUT 请求，data 是可选的参数对象
+$http.put(url, data?)
+
+// 发起 DELETE 请求，data 是可选的参数对象
+$http.delete(url, data?)
+```
+
+### 配置请求根路径
+
+```js
+$http.baseUrl = 'https://www.example.com'
+```
+
+### 请求拦截器
+
+```js
+// 请求开始之前做一些事情
+$http.beforeRequest = function (options) {
+  // do somethimg...
+}
+```
+
+例 1，展示 loading 效果：
+
+```js
+// 请求开始之前做一些事情
+$http.beforeRequest = function (options) {
+  wx.showLoading({
+    title: '数据加载中...',
+  })
+}
+```
+
+例 2，自定义 header 请求头：
+
+```js
+// 请求开始之前做一些事情
+$http.beforeRequest = function (options) {
+  if (options.url.indexOf('/home/catitems') !== -1) {
+    options.header = {
+      'X-Test': 'AAA',
+    }
+  }
+}
+```
+
+### 响应拦截器
+
+```js
+// 请求完成之后做一些事情
+$http.afterRequest = function () {
+  // do something...
+}
+```
+
+例如，隐藏 loading 效果：
+
+```js
+// 请求完成之后做一些事情
+$http.afterRequest = function () {
+  wx.hideLoading()
+}
+```
+
+## 开源协议
+
+![MIT](https://img.shields.io/badge/License-MIT-blue)
+
+**enjoy!**

node_modules/@escook/request-miniprogram/miniprogram_dist/index.js

@@ -0,0 +1,73 @@
+class Request {
+  constructor(options = {}) {
+    // 请求的根路径
+    this.baseUrl = options.baseUrl || ''
+    // 请求的 url 地址
+    this.url = options.url || ''
+    // 请求方式
+    this.method = 'GET'
+    // 请求的参数对象
+    this.data = null
+    // header 请求头
+    this.header = options.header || {}
+    this.beforeRequest = null
+    this.afterRequest = null
+  }
+
+  get(url, data = {}) {
+    this.method = 'GET'
+    this.url = this.baseUrl + url
+    this.data = data
+    return this._()
+  }
+
+  post(url, data = {}) {
+    this.method = 'POST'
+    this.url = this.baseUrl + url
+    this.data = data
+    return this._()
+  }
+
+  put(url, data = {}) {
+    this.method = 'PUT'
+    this.url = this.baseUrl + url
+    this.data = data
+    return this._()
+  }
+
+  delete(url, data = {}) {
+    this.method = 'DELETE'
+    this.url = this.baseUrl + url
+    this.data = data
+    return this._()
+  }
+
+  _() {
+    // 清空 header 对象
+    this.header = {}
+    // 请求之前做一些事
+    this.beforeRequest && typeof this.beforeRequest === 'function' && this.beforeRequest(this)
+    // 发起请求
+    return new Promise((resolve, reject) => {
+      let weixin = wx
+      // 适配 uniapp
+      if ('undefined' !== typeof uni) {
+        weixin = uni
+      }
+      weixin.request({
+        url: this.url,
+        method: this.method,
+        data: this.data,
+        header: this.header,
+        success: (res) => { resolve(res) },
+        fail: (err) => { reject(err) },
+        complete: (res) => {
+          // 请求完成以后做一些事情
+          this.afterRequest && typeof this.afterRequest === 'function' && this.afterRequest(res)
+        }
+      })
+    })
+  }
+}
+
+export const $http = new Request()

node_modules/@escook/request-miniprogram/package.json

@@ -0,0 +1,26 @@
+{
+  "name": "@escook/request-miniprogram",
+  "version": "0.2.1",
+  "description": "基于 Promise 的小程序网路请求库",
+  "main": "miniprogram_dist/index.js",
+  "miniprogram": "miniprogram_dist",
+  "scripts": {},
+  "keywords": [
+    "request",
+    "miniprogram",
+    "wx",
+    "weixin"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:liulongbin1314/request-miniprogram.git"
+  },
+  "bugs": {
+    "url": "https://github.com/liulongbin1314/request-miniprogram/issues"
+  },
+  "author": "LiuLongBin",
+  "license": "MIT",
+  "__npminstall_done": true,
+  "_from": "@escook/request-miniprogram@0.2.1",
+  "_resolved": "https://registry.npmmirror.com/@escook/request-miniprogram/-/request-miniprogram-0.2.1.tgz"
+}

pages.json

@@ -40,6 +40,7 @@
 		}, {
 			"path": "pages/cat-eye-test/cat-eye-test",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "猫眼测试",
 				"enablePullDownRefresh": false
 			}
@@ -57,14 +58,7 @@
 
 		}
 
-		, {
-			"path": "pages/test/test",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		},
+		,
 		{
 			"path": "pages/try/try",
 			"style": {

pages/bluetooth/bluetooth.vue

@@ -15,7 +15,7 @@
  			<u-swipe-action btn-width="500">
  				<u-swipe-action-item v-if="show1" :options="options1" @click="click(item.id)"
  					v-for="(item,index) in productList" :key="index">
- 					<view class="list-items">
+ 					<view v-if="productList.length!==0" class="list-items">
  						<view class="list-item" @click="toText(item)">
  							<view class="left">
  								<!-- 左 -->
@@ -27,24 +27,26 @@
  								<!-- 中 -->
  								<view class="msg">
  									<view class="id">
- 										{{item.id}}
+ 										{{item.deviceId}}
  									</view>
  									<view class="type">
- 										<text>{{item.model}}</text>
- 										<text>{{item.type}}</text>
- 										<text>信号：{{item.signalValue}}</text>
+ 										<text>{{item.description}}</text>
+ 										<text>信号值：{{item.signalValue}}</text>
  									</view>
  								</view>
 
  							</view>
  							<!-- 后 -->
- 							<view class="button" @click.stop="textBtn(item.id)">
- 								<u-button v-if="item.type=='猫眼'" type="primary" size="small">风鸣</u-button>
+ 							<view class="button" @click.stop="textBtn(item)">
+ 								<u-button v-if="item.type==0" type="primary" size="small">风鸣</u-button>
  								<u-button v-else type="primary" size="small">开门</u-button>
  							</view>
  						</view>
 
  					</view>
+ 					<view v-else class="noData" style="text-align: center;">
+ 						无数据
+ 					</view>
  				</u-swipe-action-item>
  			</u-swipe-action>
  		</scroll-view>
@@ -91,12 +93,12 @@
 
  				],
  				parameter: {
- 					testProjectId: 13,
+ 					testProjectId: null,
  					pageSize: 10,
  					pageNo: 1,
  					status: 2
-
  				},
+ 				total: 0,
  				productList: []
 
 
@@ -108,10 +110,16 @@
 
  		methods: {
  			scrolltolower() {
- 				console.log('触底了');
+ 				// console.log('触底了');
+ 				if (this.parameter.pageNo * this.parameter.pageSize >= this.total) {
+ 					return uni.$showMsg('数据加载完毕')
+
+ 				}
+ 				this.parameter.pageNo++
+ 				this.getBluetoothList()
  			},
  			toText(item) {
- 				console.log(item);
+ 				// console.log(item);
  				uni.showModal({
  					title: '温馨提示',
  					content: "点击确定进入测试阶段",
@@ -119,13 +127,18 @@
  						if (res.confirm) {
  							// this.show1 = false
  							this.$u.toast(`点击了确定`)
- 							if (item.type == '猫眼') {
+ 							let currentSite = JSON.stringify(item)
+ 							if (item.type === 0) {
+ 								// console.log('猫眼');
+ 								// console.log(item);
  								uni.navigateTo({
- 									url: "/pages/cat-eye-test/cat-eye-test"
+ 									url: "/pages/cat-eye-test/cat-eye-test?item=" + currentSite
  								})
  							} else {
+ 								// console.log('门锁');
+ 								// console.log(item);
  								uni.navigateTo({
- 									url: "/pages/lock-test/lock-test"
+ 									url: "/pages/lock-test/lock-test?item=" + currentSite
  								})
  							}
 
@@ -136,26 +149,56 @@
  				})
 
  			},
- 			textBtn(id) {
- 				console.log(id);
+ 			async textBtn(item) {
+ 				if (item.type === 0) {
+ 					console.log('我是猫眼');
+ 					const {
+ 						data: res
+ 					} = await uni.$http.post('/api/v1/test/bluetooth/testCam', {
+ 						deviceId: item.deviceId
+ 					})
+ 					if (res.code === 200) {
+ 						uni.$showMsg(res.data)
+ 					} else {
+ 						uni.$showMsg('测试失败')
+ 					}
+
+ 				} else {
+ 					const {
+ 						data: res
+ 					} = await uni.$http.post('/api/v1/test/bluetooth/openDoor', {
+ 						deviceId: item.deviceId
+ 					})
+ 					if (res.code === 200) {
+ 						uni.$showMsg(res.data)
+ 					} else {
+ 						uni.$showMsg('测试失败')
+ 					}
+ 				}
  			},
  			change(index) {
  				// this.current = index;
- 				console.log(index.index);
-				let current=index.index
- 				// this.parameter.status = index.index
- 				// this.getBluetoothList()
-				if(current==1){
-					this.parameter.status=0
-					this.getBluetoothList()
-				}else if(current==2){
-					this.parameter.status=1
-					this.getBluetoothList()
-				}else{
-					this.parameter.status=2
-					this.getBluetoothList()
-				}
-				
+ 				// console.log(index.index);
+ 				let current = index.index
+ 				if (current == 0) {
+ 					this.productList = []
+ 					this.parameter.pageNo = 1
+ 					this.parameter.status = 2
+ 					this.getBluetoothList()
+ 				} else if (current == 1) {
+ 					this.productList = []
+ 					this.parameter.pageNo = 1
+ 					this.parameter.status = 0
+ 					this.getBluetoothList()
+ 				} else {
+ 					this.productList = []
+ 					this.parameter.pageNo = 1
+ 					this.parameter.status = 1
+ 					this.getBluetoothList()
+ 				}
+
+
+
  			},
 
  			scan() {
@@ -171,6 +214,8 @@
  			},
  			search() {
  				console.log('点击了搜索');
+ 				this.productList = []
+ 				this.parameter.pageNo = 1
  				this.getBluetoothList()
 
  			},
@@ -197,15 +242,31 @@
  				const {
  					data: res
  				} = await uni.$http.post('/api/v1/test/testResult/queryByCondition', this.parameter)
- 				
- 				this.productList = res.data.records
-				console.log(this.productList);
- 			}
+ 				console.log(res);
+ 				if (res.code === 200) {
+ 					uni.$showMsg('数据加载成功')
+ 					this.total = res.data.total
+ 					this.productList = [
+ 						...this.productList,
+ 						...res.data.records
+ 					]
+ 				} else {
+ 					uni.$showMsg('数据加载失败')
+ 				}
 
+ 				// console.log(this.productList);
+
+ 			},
+ 			async searchBluetooth() {
 
 
- 		},
 
+ 				// const {
+ 				// 	data: res
+ 				// } = await uni.$http.post('/api/v1/test/testProject/bluetooth/search', testId)
+
+ 			}
+ 		},
  		onLoad() {
  			let btn = uni.createSelectorQuery().in(this).select('.btn')
  			btn.boundingClientRect(data => {
@@ -216,8 +277,10 @@
  				// console.log(this.wh);
  			}).exec()
  			const sysInfo = uni.getSystemInfoSync()
-
+ 			this.parameter.testProjectId = uni.getStorageSync('testProjectId')
+ 			console.log(this.parameter.testProjectId);
  			this.getBluetoothList()
+
  		}
  	}
  </script>
@@ -260,6 +323,7 @@
  	}
 
  	.scan {
+ 		z-index: 9999;
  		position: fixed;
  		width: 120rpx;
  		height: 120rpx;

pages/cat-eye-test/cat-eye-test.vue

@@ -1,5 +1,10 @@
 <template>
 	<view class="u-page">
+		<view class="" style="height: 44px;">
+			<u-navbar bgColor="#3c9cff" title="个人中心" @leftClick="leftClick">
+			</u-navbar>
+		</view>
+
 		<view class="u-demo-block">
 			<view class="u-demo-block__content steps">
 				<u-steps :current="current1" direction="column">
@@ -16,9 +21,13 @@
 			</view>
 
 		</view>
-		<view class="upload">
-			<u-button type="primary" size="large">完成测试并上传信息</u-button>
+		<view class="upload" style="width: 100vw;">
+			<u-button  type="primary" size="large">完成测试并上传信息</u-button>
 		</view>
+		<u-modal :show="show1" :title="title" :content='content1' @confirm="confirm" :asyncClose="true">
+			<u-button   slot="confirmButton" type="primary"  text="通过" shape="circle"></u-button>
+			<u-button   slot="confirmButton" type="error" text="不通过" shape="circle"></u-button>
+		</u-modal>
 	</view>
 
 </template>
@@ -27,8 +36,15 @@
 	export default {
 		data() {
 			return {
+				show1: true,
+				title: '温馨提示',
+				content1: '人脸信息未上传，点击确定按钮到我的页面上传人脸',
+				obj: {
+					testProjectId: 26,
+					deviceId: "b44f96f012f5"
+				},
 				show: false,
-				current1: 0,
+				current1: null,
 				timer: null,
 				stepList: [{
 						id: 0,
@@ -51,23 +67,169 @@
 			}
 		},
 		methods: {
+			leftClick() {
+				console.log('模态框');
+				uni.showModal({
+					title: '温馨提示',
+					content: '系统已成功植入您的人脸，请问您的人脸验证是否通过？',
+					success: res => {
+						if (res.confirm) {
+							// this.show1 = false
+							this.$u.toast(`点击了确定`)
+							uni.navigateBack({
+								delta: 1
+							})
+
+						} else {
+							this.$u.toast(`点击了取消`)
+
+
+						}
+					}
+				})
+			},
+			// 得到网关id
+			async getGatewayDeviceId() {
+				let msg = {
+					userId: uni.getStorageSync('userId'),
+					pageNo: 1,
+					pageSize: 10
+				}
+				const {
+					data: res
+				} = await uni.$http.post('/api/v1/test/testProject/queryByCondition', msg)
+				if (res.code === 200) {
+					this.deviceId = res.data.records[0].gatewayDeviceId
+					console.log('已得到网关id');
+				}
+
+			},
+			// 测试网关连接
+			async testGateway() {
+				console.log(this.deviceId);
+				uni.showLoading({
+					title: '网关测试连接中',
+					icon: 'none'
+				})
+				const {
+					data: res
+				} = await uni.$http.get(`/api/v1/test/gateway/connection/${this.deviceId}`)
+				if (res.data.isConnect == true) {
+					uni.showToast({
+						duration: 1500,
+						title: '网关连接成功',
+						icon: 'none'
+					})
+				}
+			},
+			// 测试信号
+			async testSignal() {
+				const {
+					data: res
+				} = await uni.$http.post('/api/v1/test/bluetooth/checkSignal', this.obj)
+				console.log(res);
+				if (res.data.isNormal == true) {
+					this.current1 = 0
+					uni.$showMsg('信号测试成功')
+				}
+			},
+
+			// 检测人脸是否上传
+			async faceHas() {
+				let {
+					data: res
+				} = await uni.$http.get(`/api/v1/test/user/${uni.getStorageSync('userId')}/hasUploadFace`)
+				console.log(res);
+				if (res.data.hasUploadFace === true) {
+					console.log('人脸已上传');
+					this.show1 = true
+
+				} else {
+					this.show1 = true
+				}
+			},
+			confirm() {
+				setTimeout(() => {
+					// 3秒后自动关闭
+					this.show = false;
+					uni.switchTab({
+						url: "/pages/mine/mine"
+					})
+				}, 2000)
+			},
+			// 猫眼植入特征值
+			async uploadFace() {
+				let {
+					data: res
+				} =
+				await uni.$http.post('/api/v1/test/bluetooth/addTestFaceToCam', {
+					userId: uni.getStorageSync('userId'),
+					deviceId: 'b44f96f012f5'
+				})
+				console.log('植入人脸', res);
+				if (res.code === 200) {
+					uni.showLoading({
+						mask: true,
+						duration: 5000,
+						icon: 'none',
+						title: '系统已成功植入您的人脸，请进行人脸测试',
+						success: () => {
+							console.log(1);
+						}
+					})
+					// uni.showModal({
+					// 	title: '温馨提示',
+					// 	content: '请问您的人脸是否通过',
+					// 	success: res => {
+					// 		if (res.confirm) {
+					// 			// this.show1 = false
+					// 			this.$u.toast(`点击了确定`)
+					// 			uni.switchTab({
+					// 				url: "/pages/mine/mine"
+					// 			})
+					// 		} else {
+					// 			this.$u.toast(`点击了取消`)
+
+
+					// 		}
+					// 	}
+					// })
+
+				} else {
+					uni.showModal({
+						title: '温馨提示',
+						content: '人脸信息未上传，点击确定按钮到我的页面上传人脸',
+						success: res => {
+							if (res.confirm) {
+								// this.show1 = false
+								this.$u.toast(`点击了确定`)
+								uni.switchTab({
+									url: "/pages/mine/mine"
+								})
+							} else {
+								this.$u.toast(`点击了取消`)
+							}
+						}
+					})
+					console.log('植入失败');
+				}
 
+
+			}
 		},
 		onLoad() {
-			// this.timer = setInterval(() => {
-			// 	this.current1++
-			// 	console.log(this.current1);
-			// 	if (this.current1 === 3) {
-			// 		uni.showLoading({
-			// 			title: '加载中',
-			// 			mask: true
-			// 		});
-			// 		uni.hideLoading()
-			// 		this.stepList[3].error = true
-			// 		clearInterval(this.timer)
-			// 	}
-			// }, 3000)
-		},
+
+			// this.getGatewayDeviceId().then(() => {
+			// 	this.testGateway().then(() => {
+			// 		this.testSignal().then(() => {
+			// 			this.faceHas()
+			// 		})
+			// 	})
+			// })
+
+		}
+
+
 
 	}
 </script>
@@ -97,6 +259,16 @@
 		// }
 	}
 
+	
+
+	.u-modal__button-group--confirm-button {
+		flex-direction: row !important;
+		
+	}
+	.u-modal .u-button{
+		width: 180rpx !important;
+	
+	}
 	.upload {
 		position: fixed;
 		bottom: 0;

pages/lock-test/lock-test.vue

@@ -17,9 +17,9 @@
 			</view>
 
 		</view>
-<view class="upload">
-	<u-button type="primary" size="large" :disabled="btnShow">完成测试并上传信息</u-button>
-</view>
+		<view class="upload">
+			<u-button type="primary" size="large" :disabled="btnShow">完成测试并上传信息</u-button>
+		</view>
 	</view>
 
 </template>
@@ -28,9 +28,18 @@
 	export default {
 		data() {
 			return {
-				btnShow:true,
+				timer: null,
+				room: {
+					deviceId: "b44f96f00ff0",
+					hotelId: 3,
+					building: 2,
+					floor: 7,
+					room: "7728"
+				},
+				deviceId: '',
+				btnShow: true,
 				show: false,
-				current1: 0,
+				current1: null,
 				timer: null,
 				stepList: [{
 						id: 0,
@@ -39,7 +48,7 @@
 						error: false
 					}, {
 						id: 1,
-						title: '测试开门',
+						title: '蓝牙测试开门',
 						desc: '20022-09-08',
 						error: false
 					},
@@ -60,27 +69,147 @@
 			}
 		},
 		methods: {
-			queren() {
-				console.log(11111111);
-			}
-		},
-		onLoad() {
-			this.timer = setInterval(() => {
-				this.current1++
-				console.log(this.current1);
-				if(this.current1 === 2){
-					this.btnShow=false
+			// 得到网关的id
+			async getGatewayDeviceId() {
+				let msg = {
+					userId: uni.getStorageSync('userId'),
+					pageNo: 1,
+					pageSize: 10
 				}
-				if (this.current1 === 3) {
-					uni.showLoading({
-						title: '加载中',
-						mask: true
-					});
+				const {
+					data: res
+				} = await uni.$http.post('/api/v1/test/testProject/queryByCondition', msg)
+				if (res.code === 200) {
+
+					this.deviceId = res.data.records[0].gatewayDeviceId
+				} else {
+					console.log(111111111111);
+				}
+
+
+			},
+			// 测试网关连接
+			async testGateway() {
+				console.log(this.deviceId);
+				uni.showLoading({
+					title: '网关测试连接中',
+					icon: 'none'
+				})
+				const {
+					data: res
+				} = await uni.$http.get(`/api/v1/test/gateway/connection/${this.deviceId}`)
+				if (res.data.isConnect == true) {
 					uni.hideLoading()
-					this.stepList[3].error = true
-					clearInterval(this.timer)
+					uni.showToast({
+						duration: 1500,
+						title: '网关连接成功',
+						icon: 'success'
+					})
+				} else {
+					console.log('网关连接失败');
+				}
+			},
+			// 测试信号
+			async testSignal(obj) {
+				uni.showLoading({
+					title: '信号测试中',
+					icon: 'none'
+				})
+				const {
+					data: res
+				} = await uni.$http.post('/api/v1/test/bluetooth/checkSignal', obj)
+				console.log(res);
+				if (res.data.isNormal == true) {
+					uni.hideLoading()
+					this.current1 = 0
+					console.log('信号测试');
+				} else {
+					console.log('信号测试失败');
+					console.log(11111111111111);
 				}
-			}, 3000)
+			}, 
+			// 下发房间号
+			async updataTime() {
+				uni.showLoading({
+					icon: 'none',
+					title: "正在加载中",
+
+				})
+				const {
+					data: res
+				} = await uni.$http.post('/api/v1/test/bluetooth/setRoom', this.room)
+				console.log(res);
+				if (res.code == 200) {
+					uni.hideLoading()
+				} else {
+					console.log('时间更新失败');
+				}
+
+			},
+			// 测试开门
+			async openDoor() {
+				uni.showLoading({
+					title: '测试开门中',
+					icon: 'none'
+				})
+				const {
+					data: res
+				} = await uni.$http.post('/api/v1/test/bluetooth/openDoor', {
+					deviceId: "b44f96f00ff0"
+				})
+				console.log(res);
+				if (res.code == 200) {
+					this.current1 = 1
+					uni.$u.toast(`开门成功`)
+					uni.hideLoading()
+
+
+				}
+
+			},
+			// 测试刷卡
+			async swipe() {
+				uni.showLoading({
+					title: '请刷卡',
+					icon: 'none'
+				})
+				const {
+					data: res
+				} = await uni.$http.post('/api/v1/test/bluetooth/queryOpenDoorRes', {
+					deviceId: "b44f96f00ff0"
+				})
+				console.log(res);
+				if (res.data.cardOpenDoorRes === true) {
+					uni.hideLoading()
+					this.current1 = 2
+					uni.$u.toast(`刷卡开门成功`)
+				} else {
+					this.$u.toast(`刷卡失败`)
+				}
+			},
+
+		},
+		onLoad(option) {
+			let item = JSON.parse(option.item)
+			console.log(item);
+			const obj = {
+				testProjectId: 26,
+				deviceId: "b44f96f00ff0"
+			}
+			this.getGatewayDeviceId().then(() => {
+				this.testGateway().then(() => {
+					this.testSignal(obj).then(() => {
+						this.updataTime().then(() => {
+							this.swipe().then(() => {
+								console.log('刷卡开门成功了');
+							})
+						})
+
+					})
+				})
+			}).catch(() => {
+
+			})
 		},
 
 	}
@@ -109,11 +238,28 @@
 		// 	height: 25vh;
 		// 	background-color: blue;
 		// }
-		
+
 	}
-	.upload{
+
+	.upload {
 		position: fixed;
 		bottom: 0;
 		width: 100vw;
 	}
-</style>
+</style>
+<!-- 	this.timer = setInterval(() => {
+				this.current1++
+				console.log(this.current1);
+				if (this.current1 === 2) {
+					this.btnShow = false
+				}
+				if (this.current1 === 3) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					});
+					uni.hideLoading()
+					this.stepList[3].error = true
+					clearInterval(this.timer)
+				}
+			}, 3000) -->

pages/login/login.vue

@@ -1,6 +1,7 @@
 <template>
 
 	<view>
+
 		<view class="head" style="display: flex;justify-content: center;align-items: center;">
 			<image style="width: 100;height: 100%;"
 				src="https://www.zhisheji.com/uc_server/data/avatar/000/19/68/09_avatar_small.jpg?time=1527483060"
@@ -48,7 +49,7 @@
 			return {
 				openPassword: true,
 				name: true,
-				active: true,
+				active: false,
 				loginMsg: {
 					userName: 'admin',
 					password: 'rW8[cD1!bQ6{'
@@ -66,10 +67,10 @@
 					data: result
 				} = await uni.$http.post("/api/v1/user/login", this.loginMsg)
 				if (result.code === 200) {
+					uni.$showMsg('登录成功')
 					uni.setStorageSync('userId', result.data.permissions[0].id)
 					uni.setStorageSync('Token', result.data.tokenValue)
 					this.getProjectList()
-					uni.$showMsg('登录成功')
 					uni.switchTab({
 						url: "/pages/index/index"
 					})
@@ -109,7 +110,7 @@
 					data: res
 				} = await uni.$http.post('/api/v1/test/testProject/queryByCondition', msg)
 				// console.log(res.data.records[0].id);
-				uni.setStorageSync('testProjectId',res.data.records[0].id)
+				uni.setStorageSync('testProjectId', res.data.records[0].id)
 
 
 			}

pages/mine/mine.vue

@@ -11,8 +11,8 @@
 		<view class="middle-num">
 			<u-cell-group>
 				<u-cell icon="setting-fill" :value="value" title="项目选择" @click="show=true" :isLink="true"></u-cell>
-				<u-cell icon="order" title="新增项目" @click="toAddProject" :isLink="true"></u-cell>
-				<u-cell icon="list-dot" @click="toList" title="项目列表" :isLink="true"></u-cell>
+				<!-- 		<u-cell icon="order" title="新增项目" @click="toAddProject" :isLink="true"></u-cell>
+				<u-cell icon="list-dot" @click="toList" title="项目列表" :isLink="true"></u-cell> -->
 
 			</u-cell-group>
 
@@ -179,7 +179,7 @@
 	}
 
 	.exit {
-		margin-top: 150px;
+		margin-top: 50px;
 		background: white;
 		width: 95%;
 		margin-left: 20rpx;
@@ -195,7 +195,7 @@
 		background: white;
 		width: 95%;
 		margin-left: 20rpx;
-		height: 300rpx;
+		height: 100rpx;
 		border-radius: 10px;
 		margin-top: -16rpx;
 	}

pages/project-list/project-list.vue

@@ -58,8 +58,14 @@
 				const {
 					data: res
 				} = await uni.$http.post('/api/v1/test/testProject/queryByCondition', this.msg)
-				uni.hideLoading()
-				this.list = res.data.records
+				console.log(res);
+				if(res.code===200){
+					uni.hideLoading()
+					this.list = res.data.records
+				}else{
+					this.$u.toast(`修改失败`)
+				}
+				
 			},
 			async click(e, item) {
 				console.log(item);
@@ -76,7 +82,13 @@
 					const {
 						data: res
 					} = await uni.$http.delete(`/api/v1/test/testProject/${item.id}`)
-					this.getList()
+					if(res.code==200){
+						uni.hideLoading()
+						this.getList()
+					}else{
+						this.$u.toast(`删除失败，请重新删除`)
+					}
+				
 				}
 			}
 

pages/test/test.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		<button>12345</button>
-	</view>
-</template>
-<script>
-	export default{
-		data(){
-			return{
-				
-			}
-		},
-		onLoad(){
-			uni.showLoading({
-				title:'加载中',
-				mask:true
-			})
-		}
-	}
-	
-</script>
-<style></style>

pages/try/try.vue

@@ -1,32 +1,27 @@
 <template>
 	<view>
-		<image v-if="pic" style="width: 100vw;height: 400px;border:1px solid red" :src="pic" mode=""></image>
+		<u-modal :show="show" :title="title" @confirm="confirm" :content='content' :asyncClose="true"></u-modal>
+		<u-button @click="show = true">打开</u-button>
 	</view>
 </template>
+
 <script>
 	export default {
 		data() {
 			return {
-				pic:''
-			}
-		},
-		
-		methods: {
-			async getFace() {
-				await uni.$http.get(`/api/v1/test/user/face/${uni.getStorageSync('userId')}`).then((res) => {
-					console.log(res.data.data);
-					this.pic = 'data:image/png;base64,' + res.data.data
-					console.log(this.pic);
-					// this.pic = res.data.data
+				show: false,
+				title: '标题',
+				content: 'uView的目标是成为uni-app生态最优秀的UI框架'
+			};
 
-				}).catch((err) => {
-					console.log(err)
-				})
-			},
 		},
-		onLoad(){
-			this.getFace()
+		methods: {
+			confirm() {
+				setTimeout(() => {
+					// 3秒后自动关闭
+					this.show = false;
+				}, 3000)
+			}
 		}
-	}
-</script>
-<style lang="scss"></style>
+	};
+</script>

pages/upload-face/upload-face.vue

@@ -89,7 +89,8 @@
 					if (result.code === 200) {
 						uni.showToast({
 							duration:1500,
-							title:result.data
+							title:result.data,
+							icon:'none'
 						})
 						this.pic = ''
 					} else {

unpackage/dist/dev/mp-weixin/app.json

@@ -7,7 +7,6 @@
     "pages/lock-test/lock-test",
     "pages/cat-eye-test/cat-eye-test",
     "pages/upload-face/upload-face",
-    "pages/test/test",
     "pages/try/try",
     "pages/tabbar/room/room",
     "pages/tabbar/gateway/gateway",

unpackage/dist/dev/mp-weixin/pages/bluetooth/bluetooth.wxss

@@ -34,6 +34,7 @@
   width: 100%;
 }
 .scan {
+  z-index: 9999;
   position: fixed;
   width: 120rpx;
   height: 120rpx;

unpackage/dist/dev/mp-weixin/pages/cat-eye-test/cat-eye-test.json

@@ -1,9 +1,12 @@
 {
+  "navigationStyle": "custom",
   "navigationBarTitleText": "猫眼测试",
   "enablePullDownRefresh": false,
   "usingComponents": {
+    "u-navbar": "/uni_modules/uview-ui/components/u-navbar/u-navbar",
     "u-steps": "/uni_modules/uview-ui/components/u-steps/u-steps",
     "u-steps-item": "/uni_modules/uview-ui/components/u-steps-item/u-steps-item",
-    "u-button": "/uni_modules/uview-ui/components/u-button/u-button"
+    "u-button": "/uni_modules/uview-ui/components/u-button/u-button",
+    "u-modal": "/uni_modules/uview-ui/components/u-modal/u-modal"
   }
 }

unpackage/dist/dev/mp-weixin/pages/cat-eye-test/cat-eye-test.wxss

@@ -38,6 +38,12 @@
 .steps .u-steps-item .u-steps-item__line {
   height: 100px !important;
 }
+.u-modal__button-group--confirm-button {
+  flex-direction: row !important;
+}
+.u-modal .u-button {
+  width: 180rpx !important;
+}
 .upload {
   position: fixed;
   bottom: 0;

unpackage/dist/dev/mp-weixin/pages/mine/mine.wxss

@@ -65,7 +65,7 @@ page {
   margin-top: 9%;
 }
 .exit {
-  margin-top: 150px;
+  margin-top: 50px;
   background: white;
   width: 95%;
   margin-left: 20rpx;
@@ -80,7 +80,7 @@ page {
   background: white;
   width: 95%;
   margin-left: 20rpx;
-  height: 300rpx;
+  height: 100rpx;
   border-radius: 10px;
   margin-top: -16rpx;
 }

unpackage/dist/dev/mp-weixin/pages/test/test.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/pages/test/test.wxml

@@ -1 +0,0 @@
-<view><button>12345</button></view>

unpackage/dist/dev/mp-weixin/pages/try/try.json

@@ -1,5 +1,8 @@
 {
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "u-modal": "/uni_modules/uview-ui/components/u-modal/u-modal",
+    "u-button": "/uni_modules/uview-ui/components/u-button/u-button"
+  }
 }