liyi/wx-starlock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 修改我的页面显示url

Browse Source 
2. 添加全局缓存方法，所有缓存添加小程序版本前缀
This commit is contained in:
范鹏 2024-09-19 11:50:23 +08:00
parent 4b829e56de
commit 5316f1f33c
10 changed files with 64 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
App.vue
View File

@ -1,8 +1,8 @@
<script>
import { useBluetoothStore } from '@/stores/bluetooth'
import { useUserStore } from '@/stores/user'
import { useBasicStore } from '@/stores/basic'
import { mapState, mapActions } from 'pinia'
import { getStorage } from './utils/storage'
let firstCheckSetting = true
export default {
@ -16,14 +16,14 @@
// 小程序版本
envVersion: '',
// 获取环境配置
getEnvConfig() {
const envVersionStorage = uni.getStorageSync('envVersion')
if(envVersionStorage) {
getEnvConfig () {
const envVersionStorage = getStorage('envVersion')
if (envVersionStorage) {
return envVersionStorage
} else {
if(this.envVersion === 'develop') {
if (this.envVersion === 'develop') {
return 'XHJ'
} else if(this.envVersion === 'trial') {
} else if (this.envVersion === 'trial') {
return 'PRE'
} else {
return 'XHJ'

3
config/env.js
View File

@ -1,10 +1,7 @@
import request from '@/utils/request'
let version = '-'
let buildNumber = "-"
uni.getSystemInfo({
success: function (res) {
// console.log('getSystemInfo', res)
version = res.appVersion
buildNumber = res.appVersionCode
}

2
manifest.json
View File

@ -3,7 +3,7 @@
"appid" : "__UNI__933D519",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "16",
"versionCode" : "17",
"transformPx" : false,
/* 小程序特有相关 */
"mp-weixin" : {

11
pages/home/home.vue
View File

@ -99,6 +99,7 @@
import { mapState, mapActions } from 'pinia'
import { deleteKeyRequest } from '@/api/key'
import { deleteLockRequest } from '@/api/lock'
import { setStorage, getStorage } from '../../utils/storage'
export default {
data() {
@ -132,7 +133,7 @@
getApp().globalData.appid = accountInfo.miniProgram.appId
getApp().globalData.envVersion = accountInfo.miniProgram.envVersion
this.deviceInfo = await this.getDeviceInfo()
const token = uni.getStorageSync('token')
const token = getStorage('token')
if(token) {
await Promise.all([
this.getLockList(this.lockSearch),
@ -140,8 +141,8 @@
]).then((res) => {
this.penging = false
uni.hideLoading()
const list = uni.getStorageSync('lockList')
const userInfo = uni.getStorageSync('userInfo')
const list = getStorage('lockList')
const userInfo = getStorage('userInfo')
if(res[0].code === -1 && res[1] === -1 && list && userInfo) {
uni.showToast({
title: '网络访问失败，请检查网络是否正常',
@ -300,9 +301,9 @@
js_code: loginRes.code
})
if(code === 0) {
uni.setStorageSync('openid', data.openid)
setStorage('openid', data.openid)
if(data.accessToken) {
uni.setStorageSync('token', data.accessToken)
setStorage('token', data.accessToken)
that.getLockList(that.lockSearch)
await that.getUserInfo()
that.updateLoginStatus(true)

27
pages/mine/mine.vue
View File

@ -31,9 +31,9 @@
<image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
</view>
</view>
<view class="env">
<view class="env" v-if="env">
<view class="env-text">{{env.name}} {{env.version}}+{{env.buildNumber}}</view>
<view>{{env.webviewBaseUrl}}</view>
<view>{{ env.baseUrl.split('/').slice(0, 3).join('/') }}</view>
<view v-if="envVersion !== 'release' && env" class="env-button" @click="show=true">切换环境</view>
</view>
<label for="changePhone">
@ -45,7 +45,7 @@
<label for="phone">
<view class="button-login">登录</view>
</label>
<view class="env">
<view class="env" v-if="env">
<view class="env-text">{{env.name}} {{env.version}}+{{env.buildNumber}}</view>
<view>{{env.webviewBaseUrl}}</view>
<view v-if="envVersion !== 'release' && env" class="env-button" @click="show=true">切换环境</view>
@ -66,6 +66,7 @@
import { mapState, mapActions } from 'pinia'
import { phoneLoginRequest } from '@/api/user'
import env from '@/config/env'
import { setStorage, getStorage, removeStorage } from '@/utils/storage'
export default {
data() {
@ -83,7 +84,7 @@
},
async onLoad() {
this.buttonInfo = await this.getButtonInfo()
this.env = env[getApp().globalData.getEnvConfig()]
this.env = await env[await getApp().globalData.getEnvConfig()]
this.envVersion = getApp().globalData.envVersion
for (let key in env) {
this.envList.push({
@ -99,11 +100,11 @@
...mapActions(useUserStore, ['updateLoginStatus', 'phoneLogin', 'updateUserInfo', 'getUserInfo',
'checkSession']),
selectEnv(env) {
uni.setStorageSync('envVersion', env.key)
uni.removeStorageSync('token')
uni.removeStorageSync('openid')
uni.removeStorageSync('userInfo')
uni.removeStorageSync('lockList')
setStorage('envVersion', env.key)
removeStorage('token')
removeStorage('openid')
removeStorage('userInfo')
removeStorage('lockList')
uni.reLaunch({
url: '/pages/home/home'
})
@ -120,7 +121,7 @@
})
return
}
const openid = uni.getStorageSync('openid')
const openid = getStorage('openid')
const { code, data, message } = await phoneLoginRequest({
encryptedData: res.detail.encryptedData,
iv: res.detail.iv,
@ -128,9 +129,9 @@
openid
})
if(code === 0) {
uni.removeStorageSync('userInfo')
uni.removeStorageSync('lockList')
uni.setStorageSync('token', data.accessToken)
removeStorage('userInfo')
removeStorage('lockList')
setStorage('token', data.accessToken)
this.updateLockSearch({
...this.lockSearch,
pageNo: 1

4
pages/webview/webview.vue
View File

@ -14,8 +14,8 @@ export default {
env: null
}
},
onLoad: function (options) {
this.env = env[getApp().globalData.getEnvConfig()]
onLoad: async function (options) {
this.env = await env[await getApp().globalData.getEnvConfig()]
const officialAccounts = {
default: {
url: '/app/introduce',

3
stores/lock.js
View File

@ -6,6 +6,7 @@ import { getLockListRequest } from '@/api/lock'
import { getPsaawordListRequest } from '@/api/keyboardPwd'
import { timeFormat } from 'uview-plus'
import { getKeyListRequest } from '@/api/key'
import { setStorage } from '@/utils/storage'
export const useLockStore = defineStore('lock', {
state() {
@ -170,7 +171,7 @@ export const useLockStore = defineStore('lock', {
} else {
this.lockList = this.lockList.concat(data.groupList)
}
uni.setStorageSync('lockList', this.lockList)
setStorage('lockList', this.lockList)
return { code }
} else {
return { code, message }

9
stores/user.js
View File

@ -4,6 +4,7 @@
import { defineStore } from 'pinia'
import { getUserInfoRequest, loginRequest, phoneLoginRequest } from '@/api/user'
import { useLockStore } from '@/stores/lock'
import { setStorage, getStorage } from '@/utils/storage'
export const useUserStore = defineStore('user', {
state() {
@ -25,7 +26,7 @@ export const useUserStore = defineStore('user', {
async getUserInfo() {
const { code, data } = await getUserInfoRequest()
if(code === 0) {
uni.setStorageSync('userInfo', data)
setStorage('userInfo', data)
this.updateUserInfo(data)
this.updateLoginStatus(true)
}
@ -33,10 +34,10 @@ export const useUserStore = defineStore('user', {
},
async phoneLogin(params) {
const { iv, encryptedData } = params
const openid = uni.getStorageSync('openid')
const openid = getStorage('openid')
const { code, data, message } = await phoneLoginRequest({ iv, encryptedData, openid })
if(code === 0) {
uni.setStorageSync('token', data.accessToken)
setStorage('token', data.accessToken)
this.getUserInfo()
useLockStore().updateLockSearch({
...useLockStore().lockSearch,
@ -62,7 +63,7 @@ export const useUserStore = defineStore('user', {
js_code: loginRes.code
})
if (code === 0) {
uni.setStorageSync('openid', data.openid)
setStorage('openid', data.openid)
}
resolve(false)
},

25
utils/request.js
View File

@ -1,4 +1,5 @@
import env from '@/config/env'
import { getStorage, removeStorage } from './storage'
/*
* config
@ -12,10 +13,10 @@ import env from '@/config/env'
const request = (config) => {
let timer
return new Promise((resolve) => {
const baseConfig = env[getApp().globalData.getEnvConfig()]
return new Promise(async (resolve) => {
const baseConfig = await env[getApp().globalData.getEnvConfig()]
const token = config?.token ? config.token : uni.getStorageSync('token')
const token = config?.token ? config.token : getStorage('token')
const headerDefault = {
appid: getApp().globalData.appid,
version: baseConfig.version + '+' + baseConfig.buildNumber,
@ -35,23 +36,23 @@ const request = (config) => {
header,
data,
timeout: 3000,
async success(res) {
async success (res) {
const { statusCode, data } = res
if(timer) {
if (timer) {
clearTimeout(timer)
}
if (statusCode === 200) {
const code = data.errorCode
const message = data.errorMsg
if(code === 403) {
uni.removeStorageSync('token')
if (code === 403) {
removeStorage('token')
getApp().globalData.updateIsLogin(false)
resolve({ code: 403, data, message: '登录已过期' })
uni.showModal({
title: '提示',
content: '登录已过期，请重新登录',
showCancel: false,
success() {
success () {
uni.reLaunch({
url: '/pages/home/home'
})
@ -68,16 +69,16 @@ const request = (config) => {
resolve({ code: -1, data, message: '网络访问失败，请检查网络是否正常' })
}
},
async fail(res) {
async fail (res) {
console.log('网络访问失败', res)
if(timer) {
if (timer) {
clearTimeout(timer)
}
resolve({ code: -1, message: '网络访问失败，请检查网络是否正常' })
},
async complete(res) {
async complete (res) {
console.log(URL.substring(baseConfig.baseUrl.length + 1), {
env: getApp().globalData.getEnvConfig(),
env: await getApp().globalData.getEnvConfig(),
url: URL.substring(baseConfig.baseUrl.length + 1),
req: config?.data || {},
code: res?.data?.errorCode,

15
utils/storage.js Normal file
View File

@ -0,0 +1,15 @@
export function setStorage(key, value) {
return uni.setStorageSync(getPrefix() + key, value)
}
export function getStorage(key) {
return uni.getStorageSync(getPrefix() + key)
}
export function removeStorage(key) {
return uni.removeStorageSync(getPrefix() + key)
}
function getPrefix() {
return `${getApp().globalData.envVersion}:`
}