diff --git a/manifest.json b/manifest.json index 3029751..3e2ef94 100644 --- a/manifest.json +++ b/manifest.json @@ -18,7 +18,8 @@ }, /* 模块配置 */ "modules" : { - "Barcode" : {} + "Barcode" : {}, + "Camera" : {} }, /* 应用发布信息 */ "distribute" : { diff --git a/package-lock.json b/package-lock.json index a99b3c6..09d0361 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "clipboard": "^2.0.11", "dayjs": "^1.11.19", "html5-qrcode": "^2.3.8", + "jsqr": "^1.4.0", "uview-plus": "^3.6.29", "vue": "^3.4.0" }, @@ -5103,6 +5104,12 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/jsqr": { + "version": "1.4.0", + "resolved": "https://registry.npmmirror.com/jsqr/-/jsqr-1.4.0.tgz", + "integrity": "sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A==", + "license": "Apache-2.0" + }, "node_modules/lcid": { "version": "3.1.1", "resolved": "https://registry.npmmirror.com/lcid/-/lcid-3.1.1.tgz", diff --git a/package.json b/package.json index 6733a1c..12e3dc6 100644 --- a/package.json +++ b/package.json @@ -16,10 +16,11 @@ "@dcloudio/uni-app": "3.0.0-4080720251210001", "@dcloudio/uni-components": "3.0.0-4080720251210001", "@dcloudio/uni-h5": "3.0.0-4080720251210001", - "vue": "^3.4.0", "clipboard": "^2.0.11", "dayjs": "^1.11.19", "html5-qrcode": "^2.3.8", - "uview-plus": "^3.6.29" + "jsqr": "^1.4.0", + "uview-plus": "^3.6.29", + "vue": "^3.4.0" } } diff --git a/pages/login/login.vue b/pages/login/login.vue index 7c5eb61..6cb407a 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -62,25 +62,32 @@ - - - - 扫一扫 - × + + + + 扫一扫 + × + + + + + + 点击下方按钮选择相机拍照 + + + + 将二维码放入框内即可自动扫描 - - 将二维码放入框内即可自动扫描 -