diff --git a/components/base/getphonePopup.vue b/components/base/getphonePopup.vue index fdc5996..b58d483 100644 --- a/components/base/getphonePopup.vue +++ b/components/base/getphonePopup.vue @@ -52,6 +52,7 @@ url: "/pages/register/register", }); } else { + this.$emit('refresh'); await getUserProfile(); } } @@ -60,7 +61,7 @@ url: '/pages/index/index' }); } - this.$emit('closePop') + this.$emit('closePop'); } } } @@ -71,7 +72,7 @@ display: flex; justify-content: center; align-items: center; - padding-bottom: 0; + // padding-bottom: 0; .title { font-size: 36rpx; color: #000; diff --git a/components/base/getphonePopup.vue b/components/base/getphonePopup.vue index fdc5996..b58d483 100644 --- a/components/base/getphonePopup.vue +++ b/components/base/getphonePopup.vue @@ -52,6 +52,7 @@ url: "/pages/register/register", }); } else { + this.$emit('refresh'); await getUserProfile(); } } @@ -60,7 +61,7 @@ url: '/pages/index/index' }); } - this.$emit('closePop') + this.$emit('closePop'); } } } @@ -71,7 +72,7 @@ display: flex; justify-content: center; align-items: center; - padding-bottom: 0; + // padding-bottom: 0; .title { font-size: 36rpx; color: #000; diff --git a/pages/message/message.vue b/pages/message/message.vue index 2f62298..f015474 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -51,7 +51,7 @@ - + @@ -89,8 +89,7 @@ uni.setStorageSync("currentPagePath", this.currentPagePath); this.phone = uni.getStorageSync("registerPhone"); console.log("----------", typeof this.phone); - this.checkphone(); - this.fetchMessageList(); + this.checkphone() this.offset = 1; }, //下拉刷新 @@ -162,7 +161,8 @@ this.nothingMore = true; } }, - async checkphone() { + // 验证手机号 + async checkphone() { //有电话就去验证 if (this.phone) { const res = await verifyPhone(this.phone); @@ -173,6 +173,7 @@ } else { uni.setStorageSync("registerPhone", this.phone); getUserProfile(); + this.refresh(); } } else { //没有电话就弹出授权 @@ -190,6 +191,10 @@ this.loading = true; await this.fetchMessageList(); this.loading = false; + }, + refresh() { + this.offset = 1; + this.fetchMessageList(); } }, }; diff --git a/components/base/getphonePopup.vue b/components/base/getphonePopup.vue index fdc5996..b58d483 100644 --- a/components/base/getphonePopup.vue +++ b/components/base/getphonePopup.vue @@ -52,6 +52,7 @@ url: "/pages/register/register", }); } else { + this.$emit('refresh'); await getUserProfile(); } } @@ -60,7 +61,7 @@ url: '/pages/index/index' }); } - this.$emit('closePop') + this.$emit('closePop'); } } } @@ -71,7 +72,7 @@ display: flex; justify-content: center; align-items: center; - padding-bottom: 0; + // padding-bottom: 0; .title { font-size: 36rpx; color: #000; diff --git a/pages/message/message.vue b/pages/message/message.vue index 2f62298..f015474 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -51,7 +51,7 @@ - + @@ -89,8 +89,7 @@ uni.setStorageSync("currentPagePath", this.currentPagePath); this.phone = uni.getStorageSync("registerPhone"); console.log("----------", typeof this.phone); - this.checkphone(); - this.fetchMessageList(); + this.checkphone() this.offset = 1; }, //下拉刷新 @@ -162,7 +161,8 @@ this.nothingMore = true; } }, - async checkphone() { + // 验证手机号 + async checkphone() { //有电话就去验证 if (this.phone) { const res = await verifyPhone(this.phone); @@ -173,6 +173,7 @@ } else { uni.setStorageSync("registerPhone", this.phone); getUserProfile(); + this.refresh(); } } else { //没有电话就弹出授权 @@ -190,6 +191,10 @@ this.loading = true; await this.fetchMessageList(); this.loading = false; + }, + refresh() { + this.offset = 1; + this.fetchMessageList(); } }, }; diff --git a/store/modules/tabBar.js b/store/modules/tabBar.js index c767eb1..99cbf98 100644 --- a/store/modules/tabBar.js +++ b/store/modules/tabBar.js @@ -5,7 +5,7 @@ import tabBar from '../../utils/tabBar.js'; import { getUserProfile } from '@/utils/auth.js'; -let temp = 'user_manager'; +let temp = 'user_applicant'; if (uni.getStorageSync("userInfo")) { const userInfo = JSON.parse(uni.getStorageSync("userInfo")); if (userInfo.salt === "物业人员") {