From e7ab90e5cb1b04cc8e736fd7b1e7b795727be466 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 25 Mar 2023 10:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=BA=BF=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue         | 44 ++++++++++++++++++++++++++++++++++-
 pages/management/hcxInfo.vue  |  7 +++++-
 pages/management/hcxcheck.vue |  7 +++++-
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index d65da15..f86e649 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -21,7 +21,7 @@
 					<view class="submit">
 						<button class="primary-button" :disabled="disabled" @click="toLogin">登&nbsp;&nbsp;录</button>
 					</view>
-					<view class="scanBox">
+					<view class="scanBox" @tap="toScan">
 						<view class="iconfont scan_icon"></view>
 						<text class="san_text">扫码登录</text>
 					</view>
@@ -49,6 +49,7 @@
 <script>
 	import { RSAencrypt } from '@/utils/jsencrypt.js'
 	import {handLogin} from '@/utils/getData2.js'
+	import permision from "@/utils/permission.js"
 	export default {
 		data() {
 			return {
@@ -138,7 +139,48 @@
 				} catch (e) {
 					this.disabled = false
 				}
+			},
+			async toScan() {
+				// #ifdef APP-PLUS
+				let status = await this.checkPermission();
+				if (status !== 1) {
+				    return;
+				}
+				// #endif
+				uni.scanCode({
+					success: (res) => {
+						console.log(res.result)
+					},
+					fail: (err) => {
+						// uni.showToast({
+						// 	title: '出错',
+						// 	icon: 'none'
+						// })
+					}
+				});
 			}
+			// #ifdef APP-PLUS
+			,
+			async checkPermission(code) {
+				let status = permision.isIOS ? await permision.requestIOS('camera') :
+					await permision.requestAndroid('android.permission.CAMERA');
+			
+				if (status === null || status === 1) {
+					status = 1;
+				} else {
+					uni.showModal({
+						content: "需要相机权限",
+						confirmText: "设置",
+						success: function(res) {
+							if (res.confirm) {
+								permision.gotoAppSetting();
+							}
+						}
+					})
+				}
+				return status;
+			}
+			// #endif
 		}
 	}
 </script>
diff --git a/pages/management/hcxInfo.vue b/pages/management/hcxInfo.vue
index ea83bd2..675c9ec 100644
--- a/pages/management/hcxInfo.vue
+++ b/pages/management/hcxInfo.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<nav-bar title="缓存线-详情"></nav-bar>
+		<nav-bar :inner2="true" @goIn="goIn" title="缓存线-详情"></nav-bar>
 		<view class="search-confirm-wrap">
 			<view class="search-wrap">
 				<view class="search-item">
@@ -110,6 +110,11 @@
 			selectChange3(e) {
 				this.index3 = e
 			},
+			goIn () {
+				uni.navigateTo({
+					url: `/pages/management/hcxcheck`
+				})
+			},
 			toSearch () {
 			  this.dataList = []
 			  this._queryInstraction()
diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue
index bae4cae..92a26a5 100644
--- a/pages/management/hcxcheck.vue
+++ b/pages/management/hcxcheck.vue
@@ -33,7 +33,7 @@
 			</view>
 		</view>
 		<view class="material-wrap">
-			<view class="material-item" v-for="(e, i) in dataList" :key="i" :class="['bg-gray', 'bg-green', 'bg-yellow','bg-red'][Number(e.status) - 1]">
+			<view class="material-item" v-for="(e, i) in dataList" :key="i" :class="['bg-gray', 'bg-green', 'bg-yellow','bg-red'][Number(e.status) - 1]" @tap="toInfo(e)">
 				<view class="material-title">{{e.vehicle_code}}</view>
 				<view class="material-spec">{{e.material_spec}}</view>
 			</view>
@@ -64,6 +64,11 @@
 			selectChange1(e) {
 				this.index1 = e
 			},
+			toInfo(e) {
+				uni.navigateTo({
+					url: `/pages/management/hcxInfo`
+				})
+			}
 		}
 	}
 </script>