zc

api/basicsModules/index.js

@@ -62,6 +62,11 @@ export const systemAppletRolePermission = (data) => {
 		data: data,
 	})
 };
+
+
+
+/************************扫码相关************************/
+
 //化学品终端-扫码登录
 export const chemicalAioIdentityScanLogin  = (data) => {
 	return apiResquest({
@@ -70,8 +75,14 @@ export const chemicalAioIdentityScanLogin  = (data) => {
 		data: data,
 	})
 };
-
-
+//化学品终端-双人认证
+export const chemicalAioVerifyAppletLogin  = (data) => {
+	return apiResquest({
+		url: `/chemical/aio/verify/appletLogin`,
+		method: 'GET',
+		data: data,
+	})
+};
 
 
 /************************未调试************************/
@@ -94,4 +105,5 @@ export const gradingControl  = (data) => {
         method: 'POST',
         data: {...data}
     })
-};
+};
+

api/request/config.js

@@ -2,12 +2,13 @@ const config = {
 	// base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
-	// base_url: 'http://192.168.1.17:8080',//小飞
+	base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.20:8080',//志伟
 	// base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'http://192.168.1.43:9800',//43服务器
-	base_url: 'http://192.168.1.43/api',//43-V3服务器
+	// base_url: 'http://192.168.1.43/api',//43-V3服务器
+	// base_url: 'http://192.168.1.8/api',//1.8-V3服务器
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试

pages/saoCode/saoCode.vue

@@ -1,7 +1,7 @@
 <!--扫描二维码页面-->
 <template>
 	<view id="saoCode">
-		<web-view :src="baseUrl+'admin/#/codeHtml?code='+code+'&type='+type"></web-view>
+		<web-view v-if="webViewType" :src="baseUrl+'admin/#/codeHtml?code='+code+'&type='+type"></web-view>
 	</view>
 </template>
 
@@ -10,13 +10,14 @@
 		config
 	} from '@/api/request/config.js'
 	import {
-		chemicalAioIdentityScanLogin
+		chemicalAioIdentityScanLogin,chemicalAioVerifyAppletLogin
 	} from '@/api/basicsModules/index.js'
 
 	export default {
 		name: "saoCode",
 		data() {
 			return {
+				webViewType:false,
 				baseUrl: config.base_url,
 				code: "",
 				type: "",
@@ -26,8 +27,10 @@
 			let self = this;
 			if (option.q) {
 				let text = decodeURIComponent(option.q)
+				console.log('text',text)
 				let list = text.split("?")[1].split("&");
 				let codeData = {};
+				console.log('codeData',codeData)
 				list.forEach((item) => {
 					codeData[item.split("=")[0]] = item.split("=")[1];
 				})
@@ -40,6 +43,9 @@
 					if (codeData.type == 11) {
 						//化学品终端-扫码登录
 						this.chemicalAioIdentityScanLogin(codeData.code, codeData.subId, codeData.macId);
+					}else if (codeData.type == 12) {
+						//化学品终端-双人认证
+						this.chemicalAioVerifyAppletLogin(codeData.doorId, codeData.subId, codeData.macId, codeData.code);
 					}
 				}
 			} else {
@@ -48,6 +54,9 @@
 				if (codeData.type == 11) {
 					//化学品终端-扫码登录
 					this.chemicalAioIdentityScanLogin(codeData.code, codeData.subId, codeData.macId);
+				}else if (codeData.type == 12) {
+					//化学品终端-双人认证
+					this.chemicalAioVerifyAppletLogin(codeData.doorId, codeData.subId, codeData.macId, codeData.code);
 				}
 			}
 		},
@@ -79,6 +88,30 @@
 					});
 				}, 2000);
 			},
+			//化学品终端-双人认证
+			async chemicalAioVerifyAppletLogin(doorId, subId, macId, code) {
+				const {
+					data
+				} = await chemicalAioVerifyAppletLogin({
+					doorId: doorId,
+					subId: subId,
+					macId: macId,
+					code: code,
+					userId: uni.getStorageSync('userId'),
+				});
+				uni.showToast({
+					mask: true,
+					icon: "none",
+					position: "center",
+					title: data.message,
+					duration: 2000
+				});
+				setTimeout(function() {
+					uni.redirectTo({
+						url: '/pages/mine/mine',
+					});
+				}, 2000);
+			},
 		},
 	}
 </script>