diff --git a/App.vue b/App.vue index af1fc85..bf74840 100644 --- a/App.vue +++ b/App.vue @@ -4,7 +4,7 @@ max-width: 828rpx; //最大宽度自己可以调整 margin: auto !important; } - + /* #endif */ @import "uview-ui/index.scss"; diff --git a/components/navigation/navigation.vue b/components/navigation/navigation.vue index 9711118..7ffa493 100644 --- a/components/navigation/navigation.vue +++ b/components/navigation/navigation.vue @@ -63,24 +63,22 @@ .nav-head{ height: 40rpx; - background-color: #fAFAFA; + background-color: #fff; text-align: center; font-weight: 700; font-size: 36rpx; color: #000; padding: 40rpx 16rpx; - margin-top: 50rpx; + // margin-top: 50rpx; display: flex; justify-content: center; flex-direction: row-reverse; align-items: center; - //margin-top: 80rpx; - position: static; + // margin-top: 80rpx; position: sticky; - top: 40px; - + top: 20px; width: 100%; - z-index: 9999; + z-index: 8; } .back{ diff --git a/pages/fingerPage/index.css b/pages/fingerPage/index.css index 9eab506..79c4a79 100644 --- a/pages/fingerPage/index.css +++ b/pages/fingerPage/index.css @@ -1,7 +1,10 @@ page{ overflow-y: hidden; } - +.lans{ + text-align: center; + margin-bottom:20rpx ; +} .logo{ display: block; margin: 0 auto; diff --git a/pages/fingerPage/index.vue b/pages/fingerPage/index.vue index db6d127..fa00784 100644 --- a/pages/fingerPage/index.vue +++ b/pages/fingerPage/index.vue @@ -1,31 +1,37 @@ @@ -35,12 +41,33 @@ export default { data() { return { + cnt:this.$t('index').Confirm, + can:this.$t('index').Cancel, checked: false, show: false, showFinger: false, fingerSuccess: false, fingerFail: false, hou_jia_w: false, + language: this.$store.state.language == 'en' ? 'English' : '简体中文', + show: false, + list3: [{ + label: this.$t('index').langfan, + disabled: false, + value: "b", + }, + { + label: this.$t('index').langjian, + disabled: false, + value: "a", + }, + { + label: this.$t('index').eng, + disabled: false, + value: "c", + }, + + ], }; }, methods: { @@ -51,163 +78,193 @@ }) console.log(123456465) }, - goFinger() { - this.showFinger = true; - this.show = true; - this.fingerPass() - }, - // 依旧保留指纹 - cancel_hou() { - this.hou_jia_w = false; - this.show = false; - this.checked = true; - }, - // 确认取消指纹 - confirm_hou() { - this.checked = false - this.hou_jia_w = false; - this.show = false; - uni.setStorageSync('fingerPass', false) - }, - // 关闭所有 - cancel() { - this.showFinger = false; - this.checked = false; - this.show = false; - this.printCancel(); - - }, - // 取消指纹识别 - printCancel() { - this.show = false; - this.showFinger = false - console.log(this.showFinger, 777777777777) - plus.fingerprint.cancel(); + confirm(e){ + uni.setStorageSync('lang',e[0].value) + + if (e[0].value == 'c') { + this._i18n.locale = 'en' + this.$store.commit('setLanguage', 'en') + uni.setStorageSync('langTrue', 'English') + uni.setStorageSync("language", 'en') + uni.redirectTo({ + url:'/pages/fingerPage/index' + }) + + } else if (e[0].value == 'a') { + this._i18n.locale = 'zh-CN' + this.$store.commit('setLanguage', 'zh-CN') + uni.setStorageSync("language", 'zh-CN') + uni.setStorageSync('langTrue', '简体中文') + uni.redirectTo({ + url:'/pages/fingerPage/index' + }) + } else if (e[0].value == 'b'){ + this._i18n.locale = 'zh-CNF' + this.$store.commit('setLanguage', 'zh-CNF') + uni.setStorageSync("language", 'zh-CNF') + uni.setStorageSync('langTrue', '繁體中文') + uni.redirectTo({ + url:'/pages/fingerPage/index' + }) + } }, - - fingerPass() { - console.log(this.checked) - // 如果是启动的就调指纹 - this.show = true; - this.showFinger = true; - this.fingerprint(true); + goFinger(){ + this.showFinger=true; + this.show=true; + this.fingerPass() }, - fingerprint: function() { - // 进来先判断本机有没有指纹 - // #ifdef APP-PLUS - if (!plus.fingerprint.isSupport()) { - uni.showToast({ - title: this.$t('index').fingerprintidentification, - icon: 'none', - duration: 1500 - }) - // this.disabled = true; - } else if (!plus.fingerprint.isKeyguardSecure()) { - uni.showToast({ - title: this.$t('index').notequipped, - icon: 'none', - duration: 1500 - }) - - } else if (!plus.fingerprint.isEnrolledFingerprints()) { - uni.showToast({ - title: this.$t('index').oninthesetting, - icon: 'none', - duration: 1500 - }) - // this.disabled = true; - } else { - // this.result = '此设备支持指纹识别'; - // // this.disabled = false; - // #ifdef MP-WEIXIN - // this.disabled = false; - uni.showToast({ - title: 'Please use it in wechat real machine. The simulator does not support it', - icon: 'none', - duration: 1500 - }) - // #endif - // #ifndef APP-PLUS || MP-WEIXIN - uni.showToast({ - title: 'Fingerprint identification is not supported on this platform', - icon: 'none', - duration: 1500, - }) - // #endif - // 进来先判断本机有没有指纹 - let that = this; - // #ifdef APP-PLUS - plus.fingerprint.authenticate(function() { - plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框 - // 指纹验证成功后走这里 - // 存储设置里开启指纹后的状态，隐藏使用密码 - uni.setStorageSync('fingerPass', true) - that.showFinger = false; - that.fingerSuccess = true; - that.show = false; - uni.reLaunch({ - url: '/pages/menu/wallet/index' - }) - }, function(e) { - // 指纹识别失败后的各种情况 - switch (e.code) { - case e.AUTHENTICATE_MISMATCH: - plus.nativeUI.toast(that.$t('index').Fingerprintmatchingfailed); - // uni.setStorageSync('fingerPass',false) - that.showFinger = false; - that.fingerFail = true; - that.checked = false - that.show = false; - break; - case e.AUTHENTICATE_OVERLIMIT: - plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框 - plus.nativeUI.alert(that.$t('index').Thenumberoffingerprint); - // uni.setStorageSync('fingerPass',false) - that.showFinger = false; - that.fingerFail = true; - that.checked = false - that.show = false; - break; - case e.CANCEL: - plus.nativeUI.toast(that.$t('index').Recognitioncancelled); - // uni.setStorageSync('fingerPass',false) + // 依旧保留指纹 + cancel_hou() { + this.hou_jia_w = false; + this.show = false; + this.checked = true; + }, + // 确认取消指纹 + confirm_hou() { + this.checked = false + this.hou_jia_w = false; + this.show = false; + uni.setStorageSync('fingerPass', false) + }, + // 关闭所有 + cancel() { + this.showFinger = false; + this.checked = false; + this.show = false; + this.printCancel(); + + }, + // 取消指纹识别 + printCancel() { + this.show = false; + this.showFinger = false + console.log(this.showFinger,777777777777) + plus.fingerprint.cancel(); + }, + + fingerPass() { + console.log(this.checked) + // 如果是启动的就调指纹 + this.show = true; + this.showFinger = true; + this.fingerprint(true); + }, + fingerprint: function() { + // 进来先判断本机有没有指纹 + // #ifdef APP-PLUS + if (!plus.fingerprint.isSupport()) { + uni.showToast({ + title: this.$t('index').fingerprintidentification, + icon: 'none', + duration: 1500 + }) + // this.disabled = true; + } else if (!plus.fingerprint.isKeyguardSecure()) { + uni.showToast({ + title: this.$t('index').notequipped, + icon: 'none', + duration: 1500 + }) + + } else if (!plus.fingerprint.isEnrolledFingerprints()) { + uni.showToast({ + title: this.$t('index').oninthesetting, + icon: 'none', + duration: 1500 + }) + // this.disabled = true; + } else { + // this.result = '此设备支持指纹识别'; + // // this.disabled = false; + // #ifdef MP-WEIXIN + // this.disabled = false; + uni.showToast({ + title: 'Please use it in wechat real machine. The simulator does not support it', + icon: 'none', + duration: 1500 + }) + // #endif + // #ifndef APP-PLUS || MP-WEIXIN + uni.showToast({ + title: 'Fingerprint identification is not supported on this platform', + icon: 'none', + duration: 1500, + }) + // #endif + // 进来先判断本机有没有指纹 + let that = this; + // #ifdef APP-PLUS + plus.fingerprint.authenticate(function() { + plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框 + // 指纹验证成功后走这里 + // 存储设置里开启指纹后的状态，隐藏使用密码 + uni.setStorageSync('fingerPass', true) that.showFinger = false; - that.checked = false - that.fingerFail = true; + that.fingerSuccess = true; that.show = false; - break; - default: - plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框 - // uni.setStorageSync('fingerPass',false) - that.showFinger = false; - that.checked = false - that.show = false; - that.fingerFail = true; - plus.nativeUI.alert(that.$t('index').Fingerprintidentificationfailed); - break; + uni.reLaunch({ + url:'/pages/menu/wallet/index' + }) + }, function(e) { + // 指纹识别失败后的各种情况 + switch (e.code) { + case e.AUTHENTICATE_MISMATCH: + plus.nativeUI.toast(that.$t('index').Fingerprintmatchingfailed); + // uni.setStorageSync('fingerPass',false) + that.showFinger=false; + that.fingerFail=true; + that.checked=false + that.show=false; + break; + case e.AUTHENTICATE_OVERLIMIT: + plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框 + plus.nativeUI.alert(that.$t('index').Thenumberoffingerprint); + // uni.setStorageSync('fingerPass',false) + that.showFinger=false; + that.fingerFail=true; + that.checked=false + that.show=false; + break; + case e.CANCEL: + plus.nativeUI.toast(that.$t('index').Recognitioncancelled); + // uni.setStorageSync('fingerPass',false) + that.showFinger=false; + that.checked=false + that.fingerFail=true; + that.show=false; + break; + default: + plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框 + // uni.setStorageSync('fingerPass',false) + that.showFinger=false; + that.checked=false + that.show=false; + that.fingerFail=true; + plus.nativeUI.alert(that.$t('index').Fingerprintidentificationfailed); + break; + } + }); + // Android平台手动弹出等待提示框 + if ('Android' == plus.os.name) { + this.show = true; + /* plus.nativeUI.showWaiting('指纹识别中...').onclose = function() { + plus.fingerprint.cancel(); + } */ + } + // #endif } - }); - // Android平台手动弹出等待提示框 - if ('Android' == plus.os.name) { - this.show = true; - /* plus.nativeUI.showWaiting('指纹识别中...').onclose = function() { - plus.fingerprint.cancel(); - } */ - } - // #endif - } - // #endif - }, - change(status) { - - }, - - }, + // #endif + }, + change(status) { + + }, + + }, onLoad() { // 每次进来拿缓存里有没有指纹 if (uni.getStorageSync('fingerPass')) { - this.showFinger = true; - this.show = true; + this.showFinger=true; + this.show=true; this.fingerPass() } @@ -222,7 +279,7 @@ };