Przeglądaj źródła

电子信息牌扫码

dedsudiyu 1 miesiąc temu
rodzic
commit
c518cd5b9a

+ 2 - 2
api/request/config.js

@@ -2,7 +2,7 @@ const config = {
 	/****** 后台服务地址 ******/
 	
 	// base_url: 'http://192.168.1.43/api', //43服务器
-	// base_url: 'http://192.168.1.8/api',//1.8服务器
+	base_url: 'http://192.168.1.8/api',//1.8服务器
 	// base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
@@ -22,7 +22,7 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/api/', //暨大化材
 	// base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
     //base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
-	base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
+	// base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
 	// base_url: 'http://172.16.0.65/api/', //西北农林
 	//base_url: 'https://lab.zjznai.com/labapp/', //43测试
 	// base_url: 'https://metersphere.zjznai.com/labSystem/', //中国海关

+ 8 - 0
pages.json

@@ -136,6 +136,14 @@
 			"root": "pages_basics", //分包根路径
 			"name": "basics", //分包名字可写可不写
 			"pages": [
+				{
+					"path": "views/demo", //忘记密码
+					"style": {
+						"navigationBarTitleText": "测试",
+						"navigationBarTextStyle": "white", //导航文字颜色
+						"navigationBarBackgroundColor": "#0183FA" //导航背景色
+					}
+				},
 				{
 					"path": "views/forgotPassword/forgotPassword", //忘记密码
 					"style": {

+ 4 - 4
pages/api/index.js

@@ -394,11 +394,11 @@ export const chemicalAioVerifyAppletLogin  = (data) => {
 	})
 };
 //电子信息牌二维码-小程序扫码验证
-export const appBoardScanCodeVerification  = (data) => {
+export const laboratoryAppBoardScanCodeVerification  = (data) => {
 	return apiResquest({
-		url: `/app/board/scanCodeVerification`,
-		method: 'GET',
-		data: data,
+		url: `/laboratory/app/board/scanCodeVerification`,
+		method: 'POST',
+		data: {...data}
 	})
 };
 

+ 1 - 1
pages/views/pupilPage/pupilHome.vue

@@ -167,7 +167,7 @@
 						if (codeData.type == 1 || codeData.type == 2 || codeData.type == 3 || codeData.type ==
 							5 || codeData.type == 7 ||
 							codeData.type == 8 || codeData.type == 9 || codeData.type == 10 ||
-							codeData.type == 11 || codeData.type == 12) {
+							codeData.type == 11 || codeData.type == 12 || codeData.type == 13) {
 							uni.navigateTo({
 								url: '/pages/views/saoCode/saoCode?q=' + encodeURIComponent(res.result)
 							});

+ 5 - 4
pages/views/saoCode/saoCode.vue

@@ -12,7 +12,7 @@
 	import {
 		chemicalAioVerifyScanLogin,
 		chemicalAioVerifyAppletLogin,
-		appBoardScanCodeVerification,
+		laboratoryAppBoardScanCodeVerification,
 		laboratoryAppletGetSubDetailInfo
 	} from '@/pages/api/index.js'
 	export default {
@@ -80,7 +80,7 @@
 						this.chemicalAioVerifyAppletLogin(codeData.doorId, codeData.subId, codeData.macId, codeData.code);
 					} else if (codeData.type == 13) {
 						//电子信息牌二维码-小程序扫码验证
-						this.appBoardScanCodeVerification(codeData.macId, codeData.subId);
+						this.laboratoryAppBoardScanCodeVerification(codeData.macId, codeData.subId, codeData.code);
 					} else if (codeData.type == 7) {
 						//培训课程
 						uni.reLaunch({
@@ -181,12 +181,13 @@
 				}, 2000);
 			},
 			//电子信息牌二维码-小程序扫码验证
-			async appBoardScanCodeVerification(macId, subId) {
+			async laboratoryAppBoardScanCodeVerification(macId, subId, code) {
 				const {
 					data
-				} = await appBoardScanCodeVerification({
+				} = await laboratoryAppBoardScanCodeVerification({
 					macId: macId,
 					subId: subId,
+					code: code,
 					userId: uni.getStorageSync('userId'),
 				});
 				uni.showToast({

+ 1 - 1
pages/views/teacherPage/teacherHome.vue

@@ -235,7 +235,7 @@
 						if (codeData.type == 1 || codeData.type == 2 || codeData.type == 3 || codeData.type ==
 							5 || codeData.type == 7 ||
 							codeData.type == 8 || codeData.type == 9 || codeData.type == 10 ||
-							codeData.type == 11 || codeData.type == 12) {
+							codeData.type == 11 || codeData.type == 12 || codeData.type == 13) {
 							uni.reLaunch({
 								url: '/pages/views/saoCode/saoCode?q=' + encodeURIComponent(res.result)
 							});

+ 42 - 0
pages_basics/views/demo.vue

@@ -0,0 +1,42 @@
+<!--扫描二维码页面-->
+<template>
+	<view id="demo-view-page">
+		<web-view @message="handleMessage"
+		:src="'http://192.168.1.10/#/miniProgramAuthentication?token='+'11112222'">
+		</web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "demo",
+		data() {
+			return {
+				
+			}
+		},
+		onLoad(option) {
+			
+		},
+		mounted() {
+
+		},
+
+		methods: {
+			handleMessage(e) {
+				console.log('e>>>>>', e);
+				const receivedData = e.detail.data; // 接收到的数据
+				console.log('收到H5消息:', receivedData);
+				// 处理数据逻辑...
+			}
+		},
+	}
+</script>
+
+<style lang="stylus" scoped>
+	#demo-view-page {
+		width:100%;
+		height:100%;
+		overflow:scroll;
+	}
+</style>