From d4b9d450e5b7490bb3b31a27c4a76f290e545d8f Mon Sep 17 00:00:00 2001
From: xinzhedeai <2291006094@qq.com>
Date: Wed, 8 Jan 2025 11:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=20?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=E6=A0=A1=E9=AA=8C=20=E6=89=8B=E6=9C=BA?=
=?UTF-8?q?=E5=8F=B711=E4=BD=8D=20home=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 44 ++++++++++++++++++++++++++++++++++++++-
api/login.js | 7 +++++++
pages/home/blueSearch.vue | 42 ++++++++++++++++++-------------------
pages/home/home.vue | 6 ++++++
pages/user/login.vue | 32 +++++++++++++++++++++-------
5 files changed, 102 insertions(+), 29 deletions(-)
diff --git a/App.vue b/App.vue
index fad6c25..ec72d65 100644
--- a/App.vue
+++ b/App.vue
@@ -4,6 +4,9 @@
} from 'vuex'
export default {
onLaunch: function() {
+ // #ifdef MP-WEIXIN
+ updateApp()
+ // #endif
},
onShow: function() {
console.log('App Show')
@@ -18,10 +21,49 @@
...mapMutations(['setUniverifyErrorMsg', 'setUniverifyLogin'])
}
}
+
+ // #ifdef MP-WEIXIN
+ function updateApp() {
+ const updateManager = uni.getUpdateManager();
+
+ updateManager.onCheckForUpdate(function(res) {
+ // 璇锋眰瀹屾柊鐗堟湰淇℃伅鐨勫洖璋�
+ console.log(res.hasUpdate);
+ });
+
+ updateManager.onUpdateReady(function(res) {
+ uni.showModal({
+ title: '鏇存柊鎻愮ず',
+ content: '鏂扮増鏈凡缁忓噯澶囧ソ锛屾槸鍚﹂噸鍚簲鐢紵',
+ showCancel: false,
+ success(res) {
+ if (res.confirm) {
+ updateManager.onUpdateReady((res) => {
+ // 鏂扮増鏈笅杞藉畬鎴愮殑鍥炶皟,寮哄埗褰撳墠灏忕▼搴忓簲鐢ㄤ笂鏂扮増鏈苟閲嶅惎
+ updateManager.applyUpdate()
+ })
+
+ updateManager.onUpdateFailed((res) => {
+ // 鏂扮増鏈笅杞藉け璐ョ殑鍥炶皟
+ uni.showModal({
+ content: '涓嬭浇澶辫触锛岃鎮ㄥ垹闄ゅ綋鍓嶅皬绋嬪簭锛岄噸鏂版悳绱㈡墦寮€',
+ showCancel: false,
+ confirmText: '鐭ラ亾浜�',
+ })
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷锛屼笉鏇存柊');
+ }
+ }
+ });
+ });
+ }
+ // #endif
</script>
<style lang="scss">
@import '@/uni_modules/uni-scss/index.scss';
+
// *{
// font-family: Source Han Sans SC;
// }
@@ -63,4 +105,4 @@
font-size: 38rpx;
color: #808080;
}
-</style>
+</style>
\ No newline at end of file
diff --git a/api/login.js b/api/login.js
index 3a079f2..079ab65 100644
--- a/api/login.js
+++ b/api/login.js
@@ -13,4 +13,11 @@ export function getPhoneNumber(params) { // 鐧诲綍鑾峰彇token
method: 'get',
data: params.data
})
+}
+export function getExistedUser(params) { // 鐧诲綍鑾峰彇token
+ return request({
+ url: '/weixin/getUser',
+ method: 'get',
+ data: params.data
+ })
}
\ No newline at end of file
diff --git a/pages/home/blueSearch.vue b/pages/home/blueSearch.vue
index 96f43aa..ef0f7cf 100644
--- a/pages/home/blueSearch.vue
+++ b/pages/home/blueSearch.vue
@@ -84,27 +84,27 @@
},
onLoad(options) {},
methods: {
- // gobackDeal(){
- // console.log('XXXXXXXXX****8娉涗細涓婁竴椤�')
- // if(this.$store.state.blueConnectLoading){
- // showCustomModal({
- // content: '楠屾敹浠澶囨鍦ㄨ繛鎺ヤ腑锛屾槸鍚﹁涓柇杩炴帴?',
- // showCancel: true,
- // success: ()=> {
- // this.stopLink({
- // showTip: false
- // })
- // uni.reLaunch({
- // url: '/pages/home/home',
- // });
- // },
- // })
- // return true
- // }
- // uni.reLaunch({
- // url: '/pages/home/home',
- // });
- // },
+ gobackDeal(){
+ // console.log('XXXXXXXXX****8娉涗細涓婁竴椤�')
+ // if(this.$store.state.blueConnectLoading){
+ // showCustomModal({
+ // content: '楠屾敹浠澶囨鍦ㄨ繛鎺ヤ腑锛屾槸鍚﹁涓柇杩炴帴?',
+ // showCancel: true,
+ // success: ()=> {
+ // this.stopLink({
+ // showTip: false
+ // })
+ // uni.reLaunch({
+ // url: '/pages/home/home',
+ // });
+ // },
+ // })
+ // return true
+ // }
+ uni.reLaunch({
+ url: '/pages/home/home',
+ });
+ },
openBluetoothAdapter() {
this.pageLoadText = ''
this.misScanding = false;
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 8e0ee19..5026e54 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -76,6 +76,9 @@
import {
getExportData,
} from '../../api/home.js'
+ import {
+ getDict
+ } from '../../api/blueToothMeasure.js'
import { BASEURL } from "../../common/config.js";
import { mapState } from "vuex";
@@ -92,6 +95,9 @@
*/
onLoad: function(options) {
uni.hideLoading()
+ getDict({
+ type: 'zhuangyao_type'
+ })
},
onShow() {
uni.hideLoading()
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 556d141..060b775 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -7,8 +7,8 @@
</view>
<view class='content' v-if="!hasToken">
<view class="title">鎵嬫満鍙�</view>
- <input class="uni-input" focus placeholder="璇疯緭鍏ユ墜鏈哄彿" v-model="phone" />
-
+ <input class="uni-input" focus placeholder="璇疯緭鍏ユ墜鏈哄彿" maxlength="11" v-model="phone" />
+
<button class="tel-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
<uni-icons type="phone" size="18"></uni-icons>
</button>
@@ -31,7 +31,8 @@
} from '../../common/util.js'
import {
login,
- getPhoneNumber
+ getPhoneNumber,
+ getExistedUser
} from '../../api/login.js'
export default {
onLoad() {
@@ -63,7 +64,8 @@
}
},
mounted() {
- this.hasToken = !!storager.get('token')
+ // this.hasToken = !!storager.get('token')
+ this.getExistedUser() // 鍒ゆ柇鏄惁涓虹涓€娆＄櫥闄�
},
methods: {
async getPhoneNumber(e) {
@@ -129,6 +131,7 @@
});
},
async getToken(code, userInfo) {
+ popuper.hideLoading()
let res = await login({
data: {
"code": code,
@@ -138,15 +141,30 @@
},
})
console.log('res', res)
- popuper.hideLoading()
-
if (res) {
storager.set('token', res.token)
console.log('鑾峰彇token', res.token)
pager.relaunchTo('/pages/home/home')
}
+ },
+ async getExistedUser() {
+ const loginRes = await this.getWxCode()
+ if (!loginRes.code) {
+ showCustomToast({
+ title: 'code鏈幏鍙�'
+ })
+ return
+ }
+ let res = await getExistedUser({
+ data: {
+ "code": loginRes.code,
+ },
+ })
+ console.log('res', res)
+ if (res) {
+ this.hasToken = !!res.boolean
+ }
}
-
}
}
</script>
--
2.22.0