Merge remote-tracking branch 'origin/hyx_2025-01-13_xgf2.0' into hyx_2025-01-13_xgf2.0
commit
b05fb1f146
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name" : "秦港相关方",
|
"name" : "秦港相关方",
|
||||||
"appid" : "__UNI__97E1400",
|
"appid" : "__UNI__1CB19A9",
|
||||||
"description" : "秦港相关方",
|
"description" : "秦港相关方",
|
||||||
"versionName" : "1.0.42",
|
"versionName" : "1.0.42",
|
||||||
"versionCode" : 42,
|
"versionCode" : 42,
|
||||||
|
@ -26,6 +26,7 @@
|
||||||
"VideoPlayer" : {},
|
"VideoPlayer" : {},
|
||||||
"iBeacon" : {},
|
"iBeacon" : {},
|
||||||
"Fingerprint" : {},
|
"Fingerprint" : {},
|
||||||
|
"LivePusher" : {},
|
||||||
"Camera" : {},
|
"Camera" : {},
|
||||||
"Maps" : {}
|
"Maps" : {}
|
||||||
},
|
},
|
||||||
|
@ -34,23 +35,29 @@
|
||||||
/* android打包配置 */
|
/* android打包配置 */
|
||||||
"android" : {
|
"android" : {
|
||||||
"permissions" : [
|
"permissions" : [
|
||||||
"<uses-permission android:name=\"android.permission.INTERNET\" />",
|
"<uses-feature android:name=\"android.hardware.camera\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />",
|
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
|
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\" />",
|
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />",
|
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />",
|
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
|
||||||
"<uses-permission android:name=\"com.asus.msa.SupplementaryDID.ACCESS\" />",
|
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
||||||
"<uses-permission android:name=\"com.huawei.android.launcher.permission.CHANGE_BADGE\" />",
|
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\" />",
|
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\" />",
|
"<uses-permission android:name=\"android.permission.READ_SMS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />",
|
"<uses-permission android:name=\"android.permission.READ_VOICEMAIL\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />",
|
"<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\" />",
|
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\" />",
|
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.READ_LOGS\" />",
|
"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
|
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
|
||||||
]
|
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
|
||||||
|
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
|
||||||
|
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\" />",
|
||||||
|
"<uses-permission android:name=\"android.permission.VIDEO_CAPTURE\" />",
|
||||||
|
"<uses-permission android:name=\"android.permission.AUDIO_CAPTURE\" />"
|
||||||
|
],
|
||||||
|
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
|
||||||
},
|
},
|
||||||
/* ios打包配置 */
|
/* ios打包配置 */
|
||||||
"ios" : {
|
"ios" : {
|
||||||
|
|
|
@ -38,8 +38,8 @@ export default {
|
||||||
return {
|
return {
|
||||||
publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',
|
publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',
|
||||||
form: {
|
form: {
|
||||||
userName: '',
|
userName: '14730797906',
|
||||||
userPwd: ''
|
userPwd: 'Aa@123456789'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -51,7 +51,6 @@ import store from '@/store/index';
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
verification: store.state.verification, // 本地读取人脸检测验证状态
|
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
currentPage: 1,
|
currentPage: 1,
|
||||||
totalPage: 0,
|
totalPage: 0,
|
||||||
|
@ -71,11 +70,6 @@ export default {
|
||||||
await this.resetList()
|
await this.resetList()
|
||||||
},
|
},
|
||||||
|
|
||||||
async onLoad(query) {
|
|
||||||
// await this.getUserFaceCompleted()
|
|
||||||
// await this.resetList()
|
|
||||||
},
|
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
async resetList() {
|
async resetList() {
|
||||||
this.pageSize = 10
|
this.pageSize = 10
|
||||||
|
@ -86,7 +80,7 @@ export default {
|
||||||
async getData() {
|
async getData() {
|
||||||
// verification --> 0: 未完成人脸认证
|
// verification --> 0: 未完成人脸认证
|
||||||
// verification --> 1: 已完成人脸认证
|
// verification --> 1: 已完成人脸认证
|
||||||
if (this.verification === '1') {
|
if (store.getters.getVerification === '1') {
|
||||||
let resData = await getClassList({
|
let resData = await getClassList({
|
||||||
showCount: this.pageSize,
|
showCount: this.pageSize,
|
||||||
currentPage: this.currentPage
|
currentPage: this.currentPage
|
||||||
|
@ -155,7 +149,7 @@ export default {
|
||||||
// const userFaceData = await getIsUploadFace()
|
// const userFaceData = await getIsUploadFace()
|
||||||
// verification --> 0: 未完成人脸认证
|
// verification --> 0: 未完成人脸认证
|
||||||
// verification --> 1: 已完成人脸认证
|
// verification --> 1: 已完成人脸认证
|
||||||
if (this.verification === '0') {
|
if (store.getters.getVerification === '0') {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: '温馨提示',
|
title: '温馨提示',
|
||||||
content: '检测到您还未完成人脸信息读取,请先完成人脸信息认证!',
|
content: '检测到您还未完成人脸信息读取,请先完成人脸信息认证!',
|
||||||
|
|
Loading…
Reference in New Issue