处理不必要的请求

main.js

@@ -14,9 +14,10 @@ uni.$http = $http
 $http.baseUrl = "http://test.cloud.boyuantech.net:9001"
 // 请求拦截器
 $http.beforeRequest = function(options) {
-	uni.showLoading({
-		title: '数据加载中...'
-	})
+	// uni.showLoading({
+	// 	title: '数据加载中...',
+	// 	mask: true,
+	// })
 	// console.log(options);
 	options.header = {
 		Token: uni.getStorageSync('Token')
@@ -34,13 +35,13 @@ $http.afterRequest = function(err) {
 			icon: 'none',
 			duration: 2000
 		})
-		uni.hideLoading()
+		// uni.hideLoading()
 		uni.redirectTo({
 			url: "/pages/login/login"
 		})
 		return
 	}
-	uni.hideLoading()
+	// uni.hideLoading()
 
 
 }

pages.json

@@ -27,16 +27,13 @@
 				"navigationBarTitleText": "我的",
 				"enablePullDownRefresh": false
 			}
-
-		}
-
-		, {
+		}, {
 			"path": "pages/lock-test/lock-test",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "门锁测试",
 				"enablePullDownRefresh": false
 			}
-
 		}, {
 			"path": "pages/cat-eye-test/cat-eye-test",
 			"style": {
@@ -44,21 +41,13 @@
 				"navigationBarTitleText": "猫眼测试",
 				"enablePullDownRefresh": false
 			}
-
-		}
-
-		, {
+		}, {
 			"path": "pages/upload-face/upload-face",
 			"style": {
 				"navigationBarTitleText": "人脸上传",
 				"enablePullDownRefresh": false
-
-
 			}
-
-		}
-
-		,
+		},
 		{
 			"path": "pages/try/try",
 			"style": {

pages/bluetooth/bluetooth.vue

@@ -4,13 +4,13 @@
  		<view class="tabs">
  			<u-tabs :list="tabList" @click="change" lineWidth="30" lineColor="#02A7F0" :activeStyle="{
 					color: '#02A7F0', 
-					fontWeight: 'bold'
+					fontWeight: 'bold',
+					transform:'scale(1.05)'
 				}" :inactiveStyle="{
-					color: '#000000'
-				}" itemStyle="height: 50px; width: 33.3%;padding:0;border-bottom:1px solid #a0a0a0"></u-tabs>
+					color: '#000000',
+					transform:'scale(1)'}" itemStyle="height: 50px; width: 33.3%;padding:0;border-bottom:1px solid #a0a0a0"></u-tabs>
 
  		</view>
-
  		<scroll-view scroll-y="true" :style="'height:'+wh+'px;'" @scrolltolower="scrolltolower">
  			<u-swipe-action btn-width="500">
  				<u-swipe-action-item v-if="show1" :options="options1" @click="click(item.id)"
@@ -31,7 +31,7 @@
  									</view>
  									<view class="type">
  										<text>{{item.description}}</text>
- 										<text>信号值：{{item.signalValue}}</text>
+ 										<text>信号值：{{item.signalNum}}</text>
  									</view>
  								</view>
 
@@ -61,8 +61,10 @@
  </template>
  <script>
  	export default {
+
  		data() {
  			return {
+
  				show1: true,
  				options1: [{
  					text: '删除',
@@ -70,43 +72,37 @@
  						backgroundColor: '#f56c6c'
  					}
  				}],
-
  				wh: '',
  				active: 0,
-
  				tabList: [{
  						name: '未检测',
  						badge: {
- 							value: 5,
+ 							value: null,
  						}
  					}, {
  						name: '检测失败',
  						badge: {
- 							value: 5,
+ 							value: null,
  						}
  					}, {
  						name: '检测成功',
  						badge: {
- 							value: 5,
+ 							value: null,
  						}
  					},
 
  				],
  				parameter: {
- 					testProjectId: null,
+ 					testProjectId: uni.getStorageSync("testProjectId"),
  					pageSize: 10,
  					pageNo: 1,
  					status: 2
  				},
  				total: 0,
  				productList: []
-
-
  			}
  		},
- 		computed: {
- 			// ...mapGetters(["productList"]),
- 		},
+
 
  		methods: {
  			scrolltolower() {
@@ -150,8 +146,13 @@
 
  			},
  			async textBtn(item) {
+ 				uni.showLoading({
+ 					mask: true,
+ 					title: '数据加载中',
+ 				})
  				if (item.type === 0) {
  					console.log('我是猫眼');
+
  					const {
  						data: res
  					} = await uni.$http.post('/api/v1/test/bluetooth/testCam', {
@@ -185,67 +186,150 @@
  					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() {
+ 			async scan() {
+ 				uni.showLoading({
+ 					title: "正在获取蓝牙设备",
+ 					icon: 'none'
+ 				})
  				console.log('扫一扫');
- 				uni.scanCode({
- 					scanType: ['barCode', 'qrCode'],
- 					success: function(res) {
- 						console.log('条码类型：' + res.scanType);
- 						console.log('条码内容：' + res.result);
- 					}
- 				});
+ 				let arr = []
+ 				const {
+ 					data: res
+ 				} = await uni.$http.post('/api/v1/test/testResult/queryByCondition', {
+ 					testProjectId: uni.getStorageSync("testProjectId"),
+ 					pageSize: 100,
+ 					pageNo: 1,
+ 					status: 2
+ 				}, )
+ 				uni.hideLoading()
+ 				if (res.code == 200) {
+ 					arr = res.data.records
+ 					console.log(arr);
+ 					uni.scanCode({
+ 						scanType: ['barCode', 'qrCode'],
+ 						success: function(res) {
+ 							console.log('条码类型：' + res.scanType);
+ 							console.log('条码内容：' + res.result);
+ 							let arr1 = arr.filter((item) => {
+ 								return item == res.result
+ 							})
+ 							// console.log(arr1);
+ 							let scanDeviced = JSON.stringify(arr1[0])
+ 							if (arr1 == 0) {
+ 								// this.$u.toast(`未找到该设备`)
+ 								uni.showToast({
+ 									icon: "error",
+ 									title: "未找到该设备"
+ 								})
+ 								// console.log('未找到该设备');
+ 							} else {
+ 								// console.log('找到该设备');
+ 								if (arr1[0].type == 0) {
+ 									uni.navigateTo({
+ 										url: "/pages/cat-eye-test/cat-eye-test?item=" +
+ 											scanDeviced
+
+ 									})
+ 								} else {
+ 									uni.navigateTo({
+ 										url: "/pages/lock-test/lock-test?item=" + scanDeviced
+ 									})
+ 								}
+ 							}
+ 						}
+ 					});
+ 				} else {
+ 					this.$u.toast(`请重新获取蓝牙设备`)
+ 				}
+
+
+
 
  			},
  			search() {
- 				console.log('点击了搜索');
- 				this.productList = []
- 				this.parameter.pageNo = 1
- 				this.getBluetoothList()
+ 				this.searchBluetooth().then(() => {
+ 					this.parameter.pageNo = 1
+ 					this.productList = []
+ 					this.getBluetoothList()
+ 				})
+ 				// console.log('点击了搜索');
+ 				// this.productList = []
+ 				// this.parameter.pageNo = 1
+ 				// this.getBluetoothList()
 
  			},
  			// 右滑删除
  			click(index) {
+
  				console.log('click', index);
  				uni.showModal({
  					title: '温馨提示',
  					content: '确定要删除吗？',
- 					success: res => {
+ 					success: async res => {
  						if (res.confirm) {
  							// this.show1 = false
- 							this.$u.toast(`点击了确定`)
+ 							// this.$u.toast(`点击了确定`)
+ 							uni.showLoading({
+ 								mask: true,
+ 								title: '正在删除中'
+ 							})
+
+ 							let {
+ 								data: res
+ 							} = await uni.$http.delete(`/api/v1/test/testResult/${index}`)
+ 							console.log(res);
+ 							if (res.code == 200) {
+ 								this.productList = []
+ 								this.getBluetoothList()
 
+ 							} else {
+ 								this.$u.toast(`删除失败`)
+ 							}
  						} else {
  							this.$u.toast(`点击了取消`)
-
-
  						}
  					}
  				})
  			},
  			async getBluetoothList() {
+ 				uni.showLoading({
+ 					mask: true,
+ 					title: '数据加载中'
+ 				})
  				const {
  					data: res
  				} = await uni.$http.post('/api/v1/test/testResult/queryByCondition', this.parameter)
+ 				uni.hideLoading()
  				console.log(res);
  				if (res.code === 200) {
  					uni.$showMsg('数据加载成功')
  					this.total = res.data.total
+ 					if (this.parameter.status == 2) {
+ 						this.tabList[0].badge.value = res.data.total
+ 					} else if (this.parameter.status == 0) {
+ 						this.tabList[1].badge.value = res.data.total
+ 					} else if (this.parameter.status == 1) {
+ 						this.tabList[2].badge.value = res.data.total
+ 					}
  					this.productList = [
  						...this.productList,
  						...res.data.records
@@ -258,14 +342,25 @@
 
  			},
  			async searchBluetooth() {
+ 				uni.showLoading({
+ 					mask: true,
+ 					title: "网关扫描中",
+ 					icon: 'none'
+ 				})
+ 				const {
+ 					data: res
+ 				} = await uni.$http.post('/api/v1/test/testProject/bluetooth/search', {
+ 					testProjectId: uni.getStorageSync('testProjectId')
+ 				})
+ 				if (res.code == 200) {
+ 					uni.hideLoading()
+ 					// this.$u.toast(`网关扫描成功`)
+ 				} else {
+ 					this.$u.toast(`网关失败，点击按钮重新扫描`)
+ 				}
+ 				console.log(res);
+ 			},
 
-
-
- 				// const {
- 				// 	data: res
- 				// } = await uni.$http.post('/api/v1/test/testProject/bluetooth/search', testId)
-
- 			}
  		},
  		onLoad() {
  			let btn = uni.createSelectorQuery().in(this).select('.btn')
@@ -279,7 +374,10 @@
  			const sysInfo = uni.getSystemInfoSync()
  			this.parameter.testProjectId = uni.getStorageSync('testProjectId')
  			console.log(this.parameter.testProjectId);
- 			this.getBluetoothList()
+
+ 			this.searchBluetooth().then(() => {
+ 				this.getBluetoothList()
+ 			})
 
  		}
  	}

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

@@ -1,6 +1,6 @@
 <template>
 	<view class="u-page">
-		<view class="" style="height: 44px;">
+		<view class="" style="height: 44px;margin-bottom: 88rpx;">
 			<u-navbar bgColor="#3c9cff" title="个人中心" @leftClick="leftClick">
 			</u-navbar>
 		</view>
@@ -22,12 +22,33 @@
 
 		</view>
 		<view class="upload" style="width: 100vw;">
-			<u-button  type="primary" size="large">完成测试并上传信息</u-button>
+			<u-button type="primary" size="large" @click="uploadTestMsg">完成测试并上传信息</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-button @click=pass slot="confirmButton" type="primary" text="通过" shape="circle"></u-button>
+			<u-button @click="noPass" slot="confirmButton" type="error" text="不通过" shape="circle"></u-button>
 		</u-modal>
+		<u-popup customStyle="width: 70vw" :round="10" mode="center" :show="show7" @close="close">
+			<view class="popupView" style="height: 150px;">
+				<view class="power">
+					功耗选择
+				</view>
+				<view class="inputNum" style="">
+					<view class="">
+						功耗：
+					</view>
+					<u--input placeholder="请输入功耗" border="surround" v-model="value" @change="changeInput"></u--input>
+				</view>
+
+				<u-radio-group  placement="row">
+					<u-radio :customStyle="{margin: '15px 30px'}" v-for="(item, index) in radiolist1" :key="index"
+						:label="item.value" :name="item.powerRefs" @change="radioChange" iconPlacement="right">
+					</u-radio>
+
+				</u-radio-group>
+
+			</view>
+		</u-popup>
 	</view>
 
 </template>
@@ -36,12 +57,34 @@
 	export default {
 		data() {
 			return {
-				show1: true,
+				value: '',
+				uploadMsg: {
+					testProjectId: uni.getStorageSync('testProjectId'),
+					deviceId: "",
+					type: null
+				},
+				radiolist1: [{
+						value: '通过',
+						disabled: false,
+						powerRefs: true
+
+					},
+					{
+						value: '不通过',
+						disabled: false,
+						powerRefs: false
+					}
+
+				],
+				show7: false,
+				flag: 0,
+				gatewayDeviceId: uni.getStorageSync('gatewayDeviceId'),
+				show1: false,
 				title: '温馨提示',
-				content1: '人脸信息未上传，点击确定按钮到我的页面上传人脸',
+				content1: '系统已成功植入您的人脸，请问您的人脸验证是否通过',
 				obj: {
-					testProjectId: 26,
-					deviceId: "b44f96f012f5"
+					testProjectId: uni.getStorageSync('testProjectId'),
+					deviceId: ""
 				},
 				show: false,
 				current1: null,
@@ -49,29 +92,104 @@
 				stepList: [{
 						id: 0,
 						title: '测试信号',
-						desc: '20022-09-08',
+						desc: '测试网关信号',
 						error: false
 					}, {
 						id: 1,
 						title: '测试人脸开门',
-						desc: '20022-09-08',
+						desc: '测试人脸是否开门正常',
 						error: false
 					},
 					{
 						id: 2,
 						title: '功耗输入',
-						desc: '20022-09-08',
+						desc: '测试功耗',
 						error: false
 					}
 				]
 			}
 		},
 		methods: {
+			changeInput(e) {
+				console.log('change', e);
+			},
+			radioChange(n) {
+				console.log(n);
+
+				if (n) {
+					this.current1 = 3
+					this.show7 = false
+					this.flag = 6
+				} else {
+					this.stepList[2].error = true
+					this.show7 = false
+				}
+				this.show7 = false
+
+
+
+			},
+			pass() {
+				this.current1 = 2
+				this.show1 = false
+				this.flag = 5
+				this.show7 = true
+			},
+			noPass() {
+				this.show1 = false
+				this.stepList[1].error = true
+			},
+			async uploadTest() {
+				uni.showLoading({
+					mask: true,
+					title: "正在上传本次测试结果",
+					icon: 'none'
+				})
+				let {
+					data: res
+				} = await uni.$http.post('/api/v1/test/testResult', this.uploadMsg)
+				uni.hideLoading()
+				console.log(res);
+				if (res.code == 200) {
+					uni.$showMsg('上传成功')
+
+				} else {
+					uni.$showMsg('上传失败')
+				}
+			},
+			uploadTestMsg() {
+				console.log(this.uploadMsg);
+				if (this.flag == 0 || this.flag == 1 || this.flag == 2) {
+					this.$set(this.uploadMsg, 'status', 0)
+					this.$set(this.uploadMsg, 'faceOpenRes', true)
+
+					this.uploadTest()
+				}
+				if (this.flag == 3 || this.flag == 4) {
+					this.$set(this.uploadMsg, 'status', 0)
+					this.$set(this.uploadMsg, 'signlRes', true)
+					this.uploadTest()
+				}
+				if (this.flag == 5) {
+					this.$set(this.uploadMsg, 'status', 0)
+					this.$set(this.uploadMsg, 'signlRes', true)
+					this.$set(this.uploadMsg, 'faceOpenRes', true)
+					this.uploadTest()
+				}
+				if (this.flag == 6) {
+					this.$set(this.uploadMsg, 'status', 1)
+					this.$set(this.uploadMsg, 'signlRes', true)
+					this.$set(this.uploadMsg, 'faceOpenRes', true)
+					this.$set(this.uploadMsg, 'powerRes', true)
+					this.uploadTest()
+				}
+			},
 			leftClick() {
 				console.log('模态框');
+				uni.hideLoading()
 				uni.showModal({
 					title: '温馨提示',
-					content: '系统已成功植入您的人脸，请问您的人脸验证是否通过？',
+					content: '确定取消上传本次测试信息吗？',
 					success: res => {
 						if (res.confirm) {
 							// this.show1 = false
@@ -79,7 +197,6 @@
 							uni.navigateBack({
 								delta: 1
 							})
-
 						} else {
 							this.$u.toast(`点击了取消`)
 
@@ -88,144 +205,137 @@
 					}
 				})
 			},
-			// 得到网关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: '网关测试连接中',
+					title: '正在测试网关连接',
 					icon: 'none'
 				})
 				const {
 					data: res
-				} = await uni.$http.get(`/api/v1/test/gateway/connection/${this.deviceId}`)
+				} = await uni.$http.get(`/api/v1/test/gateway/connection/${this.gatewayDeviceId}`)
+				uni.hideLoading()
 				if (res.data.isConnect == true) {
-					uni.showToast({
-						duration: 1500,
-						title: '网关连接成功',
-						icon: 'none'
-					})
+					this.flag = 1
+					console.log('网关连接成功');
+				} else {
+					console.log('网关连接失败');
+					this.$u.toast(`网关连接失败`)
 				}
 			},
 			// 测试信号
 			async testSignal() {
+				uni.showLoading({
+					mask: true,
+					title: '信号测试中',
+					icon: 'none'
+				})
 				const {
 					data: res
 				} = await uni.$http.post('/api/v1/test/bluetooth/checkSignal', this.obj)
-				console.log(res);
+
+				uni.hideLoading()
 				if (res.data.isNormal == true) {
-					this.current1 = 0
-					uni.$showMsg('信号测试成功')
+					this.current1 = 1
+					this.flag = 3
+					console.log('信号测试成功')
+				} else {
+					this.$u.toast(`信号测试失败`)
 				}
 			},
 
 			// 检测人脸是否上传
 			async faceHas() {
+				uni.showLoading({
+					mask: true,
+					title: '检测人脸是否上传',
+					icon: 'none'
+				})
 				let {
 					data: res
 				} = await uni.$http.get(`/api/v1/test/user/${uni.getStorageSync('userId')}/hasUploadFace`)
-				console.log(res);
+				uni.hideLoading()
 				if (res.data.hasUploadFace === true) {
 					console.log('人脸已上传');
-					this.show1 = true
-
+					this.flag = 2
 				} else {
-					this.show1 = true
+					this.$u.toast(`人脸未上传，请去我的页面上传人脸`)
 				}
 			},
-			confirm() {
-				setTimeout(() => {
-					// 3秒后自动关闭
-					this.show = false;
-					uni.switchTab({
-						url: "/pages/mine/mine"
-					})
-				}, 2000)
-			},
+			// confirm() {
+			// 	setTimeout(() => {
+			// 		// 3秒后自动关闭
+			// 		this.show = false;
+			// 		uni.switchTab({
+			// 			url: "/pages/mine/mine"
+			// 		})
+			// 	}, 2000)
+			// },
 			// 猫眼植入特征值
 			async uploadFace() {
+				uni.showLoading({
+					mask: true,
+					title: '下发人脸',
+					icon: 'none'
+				})
 				let {
 					data: res
 				} =
 				await uni.$http.post('/api/v1/test/bluetooth/addTestFaceToCam', {
 					userId: uni.getStorageSync('userId'),
-					deviceId: 'b44f96f012f5'
+					deviceId: this.obj.deviceId
 				})
-				console.log('植入人脸', res);
+				// console.log(res);
+				uni.hideLoading()
+
 				if (res.code === 200) {
-					uni.showLoading({
-						mask: true,
-						duration: 5000,
-						icon: 'none',
-						title: '系统已成功植入您的人脸，请进行人脸测试',
-						success: () => {
-							console.log(1);
-						}
+					this.show1 = true
+					console.log('植入成功');
+					uni.showToast({
+				
+						duration: 1500,
+						title: '人脸植入成功',
+						icon: 'none'
 					})
-					// 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(`点击了取消`)
-
-
-					// 		}
-					// 	}
-					// })
+					this.show1 = true
+					this.flag = 4
 
 				} 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('植入失败');
+					this.$u.toast(`人脸植入失败`)
+					console.log('人脸上传失败');
+					this.stepList[1].error = true
 				}
-
-
 			}
 		},
-		onLoad() {
+		onLoad(option) {
+			console.log(111);
+			let item = JSON.parse(option.item)
+			console.log(item);
+			this.obj.deviceId = item.deviceId
+			this.uploadMsg.deviceId = item.deviceId
+			this.uploadMsg.type = item.type
+			this.testGateway().then(() => {
+				if (this.flag != 1) {
+					return
+				}
+				this.faceHas().then(() => {
+					if (this.flag != 2) {
+						return
+					}
+					this.testSignal().then(() => {
+						if (this.flag != 3) {
+							return
+						}
+
+						this.uploadFace()
+					})
+				})
+
+			})
 
-			// this.getGatewayDeviceId().then(() => {
-			// 	this.testGateway().then(() => {
-			// 		this.testSignal().then(() => {
-			// 			this.faceHas()
-			// 		})
-			// 	})
-			// })
 
 		}
 
@@ -259,19 +369,37 @@
 		// }
 	}
 
-	
+
 
 	.u-modal__button-group--confirm-button {
 		flex-direction: row !important;
-		
+
 	}
-	.u-modal .u-button{
+
+	.u-modal .u-button {
 		width: 180rpx !important;
-	
+
 	}
+
 	.upload {
 		position: fixed;
 		bottom: 0;
 		width: 100vw;
 	}
+
+	.power {
+		text-align: center;
+		margin: 13px 0 20px 0;
+	}
+
+	.inputNum {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 0 20rpx;
+	}
+
+	.u-radio-group {
+		margin-top: 20rpx;
+	}
 </style>

pages/lock-test/lock-test.vue

@@ -1,6 +1,9 @@
 <template>
 	<view class="u-page">
-
+		<view class="" style="height: 44px;margin-bottom: 88rpx;">
+			<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">
@@ -18,8 +21,27 @@
 
 		</view>
 		<view class="upload">
-			<u-button type="primary" size="large" :disabled="btnShow">完成测试并上传信息</u-button>
+			<u-button type="primary" size="large" @click="uploadTestMsg">完成测试并上传信息</u-button>
 		</view>
+		<u-popup customStyle="width: 70vw" :round="10" mode="center" :show="show7" @close="close">
+			<view class="popupView" style="height: 150px;">
+				<view class="power">
+					功耗选择
+				</view>
+				<view class="inputNum" style="">
+					<view class="">
+						功耗：
+					</view>
+					<u--input placeholder="请输入功耗" border="surround" v-model="value" @change="changeInput"></u--input>
+				</view>
+				<u-radio-group placement="row">
+					<u-radio :customStyle="{margin: '15px 30px'}" v-for="(item, index) in radiolist1" :key="index"
+						:label="item.value" :name="item.powerRefs" @change="radioChange" iconPlacement="right">
+					</u-radio>
+				</u-radio-group>
+
+			</view>
+		</u-popup>
 	</view>
 
 </template>
@@ -28,188 +50,346 @@
 	export default {
 		data() {
 			return {
+				value: '',
+				uploadMsg: {
+					testProjectId: uni.getStorageSync('testProjectId'),
+					deviceId: "",
+					type: null
+				},
+				radiolist1: [{
+						value: '通过',
+						disabled: false,
+						powerRefs: true
+
+					},
+					{
+						value: '不通过',
+						disabled: false,
+						powerRefs: false
+					}
+
+				],
+				show7: false,
+				flag: 0,
 				timer: null,
+				cardPass: false,
 				room: {
-					deviceId: "b44f96f00ff0",
+					deviceId: "",
 					hotelId: 3,
 					building: 2,
 					floor: 7,
 					room: "7728"
 				},
-				deviceId: '',
-				btnShow: true,
+				gatewayDeviceId: uni.getStorageSync('gatewayDeviceId'),
+
 				show: false,
 				current1: null,
-				timer: null,
 				stepList: [{
 						id: 0,
 						title: '测试信号',
-						desc: '20022-09-08',
+						desc: '测试蓝牙设备信号值是否通过',
 						error: false
 					}, {
 						id: 1,
 						title: '蓝牙测试开门',
-						desc: '20022-09-08',
+						desc: '测试蓝牙进行门锁开门',
 						error: false
 					},
 					{
 						id: 2,
 						title: '测试刷卡',
-						desc: '20022-09-08',
+						desc: '房间信息已经植入，请进行刷卡验证',
 						error: false
 					},
 
 					{
 						id: 3,
 						title: '测试功率',
-						desc: '20022-09-08',
+						desc: '验证功耗是否通过',
 						error: false
 					}
 				]
 			}
 		},
+
 		methods: {
-			// 得到网关的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) {
+			changeInput(e) {
+				console.log(e);
+			},
+
+			leftClick() {
+				console.log('模态框');
+				uni.hideLoading()
+				uni.showModal({
+					title: '温馨提示',
+					content: '确定取消上传本次测试信息吗？',
+					success: res => {
+						if (res.confirm) {
+							// this.show1 = false
+							this.$u.toast(`点击了确定`)
+							this.flag = 99
+							// console.log(this.flag);
+							uni.navigateBack({
+								delta: 1
 
-					this.deviceId = res.data.records[0].gatewayDeviceId
-				} else {
-					console.log(111111111111);
-				}
 
+							})
+						} else {
+							this.$u.toast(`点击了取消`)
 
+
+						}
+					}
+				})
 			},
+
 			// 测试网关连接
 			async testGateway() {
-				console.log(this.deviceId);
 				uni.showLoading({
-					title: '网关测试连接中',
+					mask: true,
+					title: '正在测试网关连接',
 					icon: 'none'
 				})
 				const {
 					data: res
-				} = await uni.$http.get(`/api/v1/test/gateway/connection/${this.deviceId}`)
+				} = await uni.$http.get(`/api/v1/test/gateway/connection/${this.gatewayDeviceId}`)
+				uni.hideLoading()
 				if (res.data.isConnect == true) {
-					uni.hideLoading()
-					uni.showToast({
-						duration: 1500,
-						title: '网关连接成功',
-						icon: 'success'
-					})
+					this.flag = 1
+					console.log('网关连接成功');
 				} else {
 					console.log('网关连接失败');
+					this.$u.toast(`网关连接失败`)
 				}
 			},
 			// 测试信号
 			async testSignal(obj) {
 				uni.showLoading({
-					title: '信号测试中',
+					mask: true,
+					title: '正在测试信号',
 					icon: 'none'
 				})
 				const {
 					data: res
 				} = await uni.$http.post('/api/v1/test/bluetooth/checkSignal', obj)
-				console.log(res);
+				uni.hideLoading()
 				if (res.data.isNormal == true) {
-					uni.hideLoading()
-					this.current1 = 0
-					console.log('信号测试');
+					this.current1 = 1
+					this.flag = 2
+					console.log('信号测试成功');
 				} else {
+					this.stepList[0].error = true
 					console.log('信号测试失败');
-					console.log(11111111111111);
+					this.$u.toast(`信号测试失败`)
 				}
-			}, 
+			},
 			// 下发房间号
 			async updataTime() {
 				uni.showLoading({
+					mask: true,
 					icon: 'none',
-					title: "正在加载中",
-
+					title: "正在下发房间号"
 				})
 				const {
 					data: res
 				} = await uni.$http.post('/api/v1/test/bluetooth/setRoom', this.room)
-				console.log(res);
+				uni.hideLoading()
 				if (res.code == 200) {
-					uni.hideLoading()
+					this.flag = 4
+					console.log('时间更新成功');
 				} else {
+					this.$u.toast(`时间更新失败`)
 					console.log('时间更新失败');
 				}
-
 			},
 			// 测试开门
 			async openDoor() {
 				uni.showLoading({
-					title: '测试开门中',
+					mask: true,
+					title: '蓝牙开门测试中',
 					icon: 'none'
 				})
 				const {
 					data: res
 				} = await uni.$http.post('/api/v1/test/bluetooth/openDoor', {
-					deviceId: "b44f96f00ff0"
+					deviceId: this.room.deviceId
 				})
-				console.log(res);
+				uni.hideLoading()
 				if (res.code == 200) {
-					this.current1 = 1
+					this.current1 = 2
+					this.flag = 3
 					uni.$u.toast(`开门成功`)
-					uni.hideLoading()
-
-
+					console.log('开门成功');
+				} else {
+					this.stepList[1].error = true
+					console.log('开门失败');
 				}
-
 			},
 			// 测试刷卡
 			async swipe() {
-				uni.showLoading({
-					title: '请刷卡',
-					icon: 'none'
-				})
 				const {
 					data: res
 				} = await uni.$http.post('/api/v1/test/bluetooth/queryOpenDoorRes', {
-					deviceId: "b44f96f00ff0"
+					deviceId: this.room.deviceId,
+					type: 5,
+
 				})
-				console.log(res);
+				// console.log(res);
 				if (res.data.cardOpenDoorRes === true) {
-					uni.hideLoading()
-					this.current1 = 2
+					this.current1 = 3
+					this.cardPass = true
+					this.flag = 5
+					console.log('开门记录');
 					uni.$u.toast(`刷卡开门成功`)
 				} else {
-					this.$u.toast(`刷卡失败`)
+					// this.stepList[2].error = true
+				}
+			},
+			radioChange(n) {
+				console.log(n);
+				if (n) {
+					this.current1 = 4
+					this.show7 = false
+					this.flag = 6
+				} else {
+					this.stepList[3].error = true
+					this.show7 = false
+				}
+				// this.show7 = false
+
+			},
+			async uploadTest() {
+				uni.showLoading({
+					mask: true,
+					title: "正在上传本次测试结果",
+					icon: 'none'
+				})
+				let {
+					data: res
+				} = await uni.$http.post('/api/v1/test/testResult', this.uploadMsg)
+				uni.hideLoading()
+				console.log(res);
+				if (res.code == 200) {
+					uni.$showMsg('上传成功')
+					// uni.switchTab({
+					// 	url: "/pages/bluetooth/bluetooth"
+					// })
+				} else {
+					uni.$showMsg('上传失败')
 				}
 			},
+			uploadTestMsg() {
+
+				if (this.flag == 1 || this.flag == 0) {
+					console.log('失败的案例');
+					console.log(this.uploadMsg);
+					this.$set(this.uploadMsg, 'status', 0)
+					// this.$set(this.uploadMsg, 'signlRes', false)
+					// this.$set(this.uploadMsg, 'doorOpenRes', false)
+					// this.$set(this.uploadMsg, 'powerRes', false)
+					// this.$set(this.uploadMsg, 'cardOpenRes', false)
+					this.uploadTest()
+				}
+				if (this.flag == 2) {
+					this.$set(this.uploadMsg, 'status', 0)
+					this.$set(this.uploadMsg, 'signlRes', true)
+					// this.$set(this.uploadMsg, 'doorOpenRes', false)
+					// this.$set(this.uploadMsg, 'powerRes', false)
+					// this.$set(this.uploadMsg, 'cardOpenRes', false)
+					this.uploadTest()
+				}
+				if (this.flag == 3 || this.flag == 4) {
+					this.$set(this.uploadMsg, 'status', 0)
+					this.$set(this.uploadMsg, 'signlRes', true)
+					this.$set(this.uploadMsg, 'doorOpenRes', true)
+					// this.$set(this.uploadMsg, 'powerRes', false)
+					// this.$set(this.uploadMsg, 'cardOpenRes', false)
+					this.uploadTest()
+				}
+				if (this.flag == 5) {
+					this.$set(this.uploadMsg, 'status', 0)
+					this.$set(this.uploadMsg, 'signlRes', true)
+					this.$set(this.uploadMsg, 'doorOpenRes', true)
+					// this.$set(this.uploadMsg, 'powerRes', false)
+					this.$set(this.uploadMsg, 'cardOpenRes', true)
+					this.uploadTest()
+				}
+				if (this.flag == 6) {
+					this.$set(this.uploadMsg, 'status', 1)
+					this.$set(this.uploadMsg, 'signlRes', true)
+					this.$set(this.uploadMsg, 'doorOpenRes', true)
+					this.$set(this.uploadMsg, 'powerRes', true)
+					this.$set(this.uploadMsg, 'cardOpenRes', true)
+					this.uploadTest()
+				}
+				// else {
+				// 	console.log('失败的案例');
+				// 	console.log(this.uploadMsg);
+				// 	this.$set(this.uploadMsg, 'status', 0)
+
+				// 	this.uploadTest()
+				// }
+			}
 
 		},
 		onLoad(option) {
 			let item = JSON.parse(option.item)
-			console.log(item);
+			// console.log(item);
+			this.uploadMsg.deviceId = item.deviceId
+			this.uploadMsg.type = item.type
+			this.room.deviceId = item.deviceId
 			const obj = {
-				testProjectId: 26,
-				deviceId: "b44f96f00ff0"
+				testProjectId: uni.getStorageSync('testProjectId'),
+				deviceId: item.deviceId
 			}
-			this.getGatewayDeviceId().then(() => {
-				this.testGateway().then(() => {
-					this.testSignal(obj).then(() => {
+
+			this.testGateway().then(() => {
+				if (this.flag != 1) {
+					return
+				}
+				this.testSignal(obj).then(() => {
+					if (this.flag != 2) {
+						return
+					}
+					this.openDoor().then(() => {
+						if (this.flag != 3) {
+							return
+						}
 						this.updataTime().then(() => {
-							this.swipe().then(() => {
-								console.log('刷卡开门成功了');
+							if (this.flag != 4) {
+								return
+							}
+							uni.showLoading({
+								mask: true,
+								title: "请刷卡",
+								icon: "none"
 							})
+							let counter = 0
+							this.timer = setInterval(() => {
+								console.log(counter);
+								// 一分钟之后不再自动调取接口
+								if (counter == 11) {
+									uni.hideLoading()
+									clearInterval(this.timer)
+									this.stepList[2].error = true
+									this.$u.toast(`检测到未刷卡`)
+									return
+								}
+								if (this.cardPass == true) {
+									this.show7 = true
+									uni.hideLoading()
+									clearInterval(this.timer)
+								}
+								counter++
+								this.swipe()
+							}, 5000)
 						})
-
 					})
-				})
-			}).catch(() => {
 
+
+				})
 			})
+
 		},
 
 	}
@@ -246,6 +426,22 @@
 		bottom: 0;
 		width: 100vw;
 	}
+
+	.power {
+		text-align: center;
+		margin: 13px 0 20px 0;
+	}
+
+	.inputNum {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 0 20rpx;
+	}
+
+	.u-radio-group {
+		margin-top: 20rpx;
+	}
 </style>
 <!-- 	this.timer = setInterval(() => {
 				this.current1++

pages/login/login.vue

@@ -66,16 +66,22 @@
 				const {
 					data: result
 				} = await uni.$http.post("/api/v1/user/login", this.loginMsg)
+				// console.log(data);
 				if (result.code === 200) {
-					uni.$showMsg('登录成功')
-					uni.setStorageSync('userId', result.data.permissions[0].id)
-					uni.setStorageSync('Token', result.data.tokenValue)
-					this.getProjectList()
-					uni.switchTab({
-						url: "/pages/index/index"
+					uni.showToast({
+						title: '登录成功',
+						duration: 2000,
+						complete: () => {
+							uni.setStorageSync('userId', result.data.userId)
+							uni.setStorageSync('Token', result.data.tokenValue)
+							this.getProjectList()
+							uni.switchTab({
+								url: "/pages/index/index"
+							})
+						}
 					})
 				} else {
-					uni.$showMsg(result.data.msg)
+					uni.$showMsg('账号或者密码错误')
 				}
 			},
 			changActive() {
@@ -97,8 +103,6 @@
 					this.login()
 
 				}
-
-
 			},
 			async getProjectList() {
 				let msg = {
@@ -111,8 +115,7 @@
 				} = 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('gatewayDeviceId', res.data.records[0].gatewayDeviceId)
 			}
 		},
 

pages/mine/mine.vue

@@ -10,7 +10,7 @@
 
 		<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="setting-fill" :value="value" title="项目选择" @click="projectChoose" :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> -->
 
@@ -45,6 +45,7 @@
 					[]
 				],
 				show: false,
+				arr: []
 
 
 
@@ -52,14 +53,30 @@
 		},
 
 		methods: {
-
+			projectChoose() {
+				this.getProjectList()
+				this.show = true
+				console.log('弹出');
+			},
 			confirm(e) {
-				console.log('confirm', e)
-				uni.setStorageSync('testProjectId', e.value[0].id)
-				this.value = e.value[0].description
+
+				console.log('confirm', e.value[0])
+				console.log(this.arr);
+
+				let getWay = this.arr.filter((item) => {
+					return item.description == e.value[0]
+				})
+				console.log(getWay, '过滤');
+				uni.setStorageSync('testProjectId', getWay[0].id)
+				uni.setStorageSync('gatewayDeviceId', getWay[0].gatewayDeviceId)
+				// uni.setStorageSync('testProjectId', e.value[0].id)
+				this.value = getWay[0].description
 				this.show = false
 			},
 
+
+
+
 			selectClick(index) {
 				console.log(index)
 			},
@@ -101,19 +118,42 @@
 				})
 			},
 			async getProjectList() {
+				uni.showLoading({
+					title: "正在请求中"
+				})
 				const {
 					data: res
 				} = await uni.$http.post('/api/v1/test/testProject/queryByCondition', this.msg)
 				console.log(res);
-				this.columns[0] = res.data.records
-				this.value = this.columns[0][0].description
+				uni.hideLoading()
+				if (res.code == 200) {
+					if (res.data.records.length == 0) {
+						this.$u.toast(`未检测到测试项目`)
+					} else {
+						let filter = []
+						res.data.records.forEach((item) => {
+							filter.push(item.description)
+						})
+						this.columns[0] = filter
+						this.arr = res.data.records
+					}
+					let filter = []
+					res.data.records.forEach((item) => {
+						filter.push(item.description)
+					})
+					this.columns[0] = filter
+					this.arr = res.data.records
+
+				} else {
+					this.$u.toast(`请求失败`)
+				}
+
 			}
 
 
 		},
 
 		onLoad(options) {
-			this.getProjectList()
 			// const {
 			// 	page
 			// } = options

pages/try/try.vue

@@ -1,27 +1,42 @@
 <template>
-	<view>
-		<u-modal :show="show" :title="title" @confirm="confirm" :content='content' :asyncClose="true"></u-modal>
-		<u-button @click="show = true">打开</u-button>
-	</view>
+	<u-tabs :list="tabList" lineWidth="30" lineColor="#f56c6c" :activeStyle="{
+            color: '#303133',
+            fontWeight: 'bold',
+            transform: 'scale(1.05)'
+        }" :inactiveStyle="{
+            color: '#606266',
+            transform: 'scale(1)'
+        }" itemStyle="padding-left: 15px; padding-right: 15px;width:25%; height: 34px;"></u-tabs>
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				show: false,
-				title: '标题',
-				content: 'uView的目标是成为uni-app生态最优秀的UI框架'
-			};
-
+			tabList: [{
+					name: '未检测',
+					badge: {
+						value: null,
+					}
+				}, {
+					name: '检测失败',
+					badge: {
+						value: null,
+					}
+				}, {
+					name: '检测成功',
+					badge: {
+						value: null,
+					}
+				},
+			
+			],
+			}
 		},
 		methods: {
-			confirm() {
-				setTimeout(() => {
-					// 3秒后自动关闭
-					this.show = false;
-				}, 3000)
+			click(item) {
+				console.log('item', item);
 			}
 		}
-	};
+	}
 </script>

pages/upload-face/upload-face.vue

@@ -6,7 +6,7 @@
 			<img v-else :src="pic" alt="">
 		</view>
 		<view class="upload" style="width: 100%;">
-			<u-button color="red" @click="deleteFace" type="primary" size="large" text="删除人脸特征值"></u-button>
+			<u-button color="red" @click="deleteFace" type="primary" size="large" text="删除人脸"></u-button>
 		</view>
 	</view>
 </template>
@@ -59,9 +59,15 @@
 						let url = "data:image/jpg" + ";base64," + res.data //base64地址
 						url = url.split(',')[1]
 						that.msg.facePic = url
+						uni.showLoading({
+							mask:true,
+							title:'图片上传中'
+						})
 						const {
 							data: result
 						} = await uni.$http.post('/api/v1/test/user/face', that.msg)
+						uni.hideLoading()
+						this.$u.toast(`人脸上传成功`)
 						console.log(result);
 						that.pic = 'data:image/jpeg;base64,' + url
 

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

@@ -7,6 +7,10 @@
     "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-modal": "/uni_modules/uview-ui/components/u-modal/u-modal"
+    "u-modal": "/uni_modules/uview-ui/components/u-modal/u-modal",
+    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
+    "u--input": "/uni_modules/uview-ui/components/u--input/u--input",
+    "u-radio-group": "/uni_modules/uview-ui/components/u-radio-group/u-radio-group",
+    "u-radio": "/uni_modules/uview-ui/components/u-radio/u-radio"
   }
 }

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

@@ -49,4 +49,17 @@
   bottom: 0;
   width: 100vw;
 }
+.power {
+  text-align: center;
+  margin: 13px 0 20px 0;
+}
+.inputNum {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 0 20rpx;
+}
+.u-radio-group {
+  margin-top: 20rpx;
+}
 

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

@@ -1,9 +1,15 @@
 {
+  "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-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
+    "u--input": "/uni_modules/uview-ui/components/u--input/u--input",
+    "u-radio-group": "/uni_modules/uview-ui/components/u-radio-group/u-radio-group",
+    "u-radio": "/uni_modules/uview-ui/components/u-radio/u-radio"
   }
 }

unpackage/dist/dev/mp-weixin/pages/lock-test/lock-test.wxss

@@ -43,4 +43,17 @@
   bottom: 0;
   width: 100vw;
 }
+.power {
+  text-align: center;
+  margin: 13px 0 20px 0;
+}
+.inputNum {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 0 20rpx;
+}
+.u-radio-group {
+  margin-top: 20rpx;
+}
 

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

@@ -2,7 +2,6 @@
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "u-modal": "/uni_modules/uview-ui/components/u-modal/u-modal",
-    "u-button": "/uni_modules/uview-ui/components/u-button/u-button"
+    "u-tabs": "/uni_modules/uview-ui/components/u-tabs/u-tabs"
   }
 }

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

@@ -1 +1 @@
-<view><u-modal vue-id="747b5948-1" show="{{show}}" title="{{title}}" content="{{content}}" asyncClose="{{true}}" data-event-opts="{{[['^confirm',[['confirm']]]]}}" bind:confirm="__e" bind:__l="__l"></u-modal><u-button bind:click="__e" vue-id="747b5948-2" data-event-opts="{{[['^click',[['e0']]]]}}" bind:__l="__l" vue-slots="{{['default']}}">打开</u-button></view>
+<u-tabs vue-id="747b5948-1" list="{{tabList}}" lineWidth="30" lineColor="#f56c6c" activeStyle="{{({color:'#303133',fontWeight:'bold',transform:'scale(1.05)'})}}" inactiveStyle="{{({color:'#606266',transform:'scale(1)'})}}" itemStyle="padding-left: 15px; padding-right: 15px;width:25%; height: 34px;" bind:__l="__l"></u-tabs>

unpackage/dist/dev/mp-weixin/project.config.json

@@ -19,7 +19,7 @@
     "condition": false
   },
   "compileType": "miniprogram",
-  "libVersion": "3.1.4",
+  "libVersion": "3.1.5",
   "appid": "wxf0b2cd7a47e84f8c",
   "projectname": "text-installation",
   "condition": {

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -12,7 +12,7 @@
         },
         {
           "name": "",
-          "pathName": "pages/mine/mine",
+          "pathName": "pages/bluetooth/bluetooth",
           "query": "",
           "launchMode": "default",
           "scene": null