diff --git a/App.vue b/App.vue index 54b79b5..742be3b 100644 --- a/App.vue +++ b/App.vue @@ -17,10 +17,10 @@ // if(currTime>=time){ // uni.removeStorageSync(val); // uni.removeStorageSync("token"); - // uni.removeStorageSync("clientID"); + // uni.removeStorageSync("clientID"); // } // } - // else if(val=="token" || val=="clientID"){ + // else if(val=="token" || val=="clientID" || val=='phone'){ // console.log("忽略登陆信息"); // }else{ // uni.removeStorageSync(val); diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue index e3ebd90..be789a4 100644 --- a/pages/common/addBLE/addEquip.vue +++ b/pages/common/addBLE/addEquip.vue @@ -561,10 +561,7 @@ } - 50% { - opacity: 0.5; - /* 增加中间过渡 */ - } + 100% { width: 18.75rem; diff --git a/pages/common/login/index.vue b/pages/common/login/index.vue index 43fd215..87a60b3 100644 --- a/pages/common/login/index.vue +++ b/pages/common/login/index.vue @@ -101,9 +101,11 @@ uni.removeStorageSync("token") uni.removeStorageSync("clientID") uni.removeStorageSync("tokenTime") + this.phone= uni.getStorageInfoSync('phone'); } } + }, methods: { // 验证码密码切换 @@ -237,6 +239,7 @@ uni.setStorageSync('token', res.data.access_token) // 缓存token uni.setStorageSync('clientID', res.data.client_id) // 缓存token uni.setStorageSync('tokenTime', new Date().getTime() + 86400000); //过期时间 + uni.setStorageSync('phone',this.phone); uni.showToast({ title: '登录成功', icon: 'success' diff --git a/pages/common/user/index.vue b/pages/common/user/index.vue index 05db0eb..aa5feb1 100644 --- a/pages/common/user/index.vue +++ b/pages/common/user/index.vue @@ -7,7 +7,7 @@ 武汉星汉 - ID:123456 + ID:{{phone?phone:'123456'}} @@ -24,7 +24,7 @@ - 关于我们 + 关于我们 ({{appVersion}}) @@ -65,8 +65,27 @@ export default { data() { return { - showAgreement: false // 控制弹窗显示 + showAgreement: false, // 控制弹窗显示 + appVersion:'', + phone:'' } + }, + onLoad() { + var these=this; + uni.getSystemInfo({ + success(res) { + if(res.uniPlatform=='app'){ + plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => { + const currentVersion = widgetInfo.version; + these.appVersion=currentVersion; + }); + } + } + }); + this.phone= uni.getStorageSync('phone') + + + }, methods: { // 取消