diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 09356c3..19e036a 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -23,7 +23,7 @@ class="content" v-for="item in list" :key="item.id" - v-if="status === '已提交' && isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true"> + v-if="status === '已提交' && (isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true)"> {{item.name}} {{item.value}} @@ -120,7 +120,7 @@ value: '' }, ], - status: '已提交', + status: '', name: '', time: '', place: '', @@ -206,7 +206,7 @@ } .message-text-css { margin-top: 100rpx; - letter-spacing: 5rpx; + line-height: 72rpx; } .title-area { display: flex; diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 09356c3..19e036a 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -23,7 +23,7 @@ class="content" v-for="item in list" :key="item.id" - v-if="status === '已提交' && isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true"> + v-if="status === '已提交' && (isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true)"> {{item.name}} {{item.value}} @@ -120,7 +120,7 @@ value: '' }, ], - status: '已提交', + status: '', name: '', time: '', place: '', @@ -206,7 +206,7 @@ } .message-text-css { margin-top: 100rpx; - letter-spacing: 5rpx; + line-height: 72rpx; } .title-area { display: flex; diff --git a/pages/index/index.vue b/pages/index/index.vue index 798608d..f9c31af 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -58,10 +58,6 @@ }; }, mounted() { - // console.log('88888888'); - // console.log(this.$route); - // console.log('88888888'); - // this.currentPagePath = this.$route.meta.pagePath; this.phone = uni.getStorageSync("registerPhone"); getLogin(); }, @@ -99,6 +95,7 @@ url: "/pages/register/register", }); } else { + uni.setStorageSync("registerPhone", this.phone); getUserProfile(); if (this.active === "submit") { wx.navigateTo({ diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 09356c3..19e036a 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -23,7 +23,7 @@ class="content" v-for="item in list" :key="item.id" - v-if="status === '已提交' && isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true"> + v-if="status === '已提交' && (isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true)"> {{item.name}} {{item.value}} @@ -120,7 +120,7 @@ value: '' }, ], - status: '已提交', + status: '', name: '', time: '', place: '', @@ -206,7 +206,7 @@ } .message-text-css { margin-top: 100rpx; - letter-spacing: 5rpx; + line-height: 72rpx; } .title-area { display: flex; diff --git a/pages/index/index.vue b/pages/index/index.vue index 798608d..f9c31af 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -58,10 +58,6 @@ }; }, mounted() { - // console.log('88888888'); - // console.log(this.$route); - // console.log('88888888'); - // this.currentPagePath = this.$route.meta.pagePath; this.phone = uni.getStorageSync("registerPhone"); getLogin(); }, @@ -99,6 +95,7 @@ url: "/pages/register/register", }); } else { + uni.setStorageSync("registerPhone", this.phone); getUserProfile(); if (this.active === "submit") { wx.navigateTo({ diff --git a/pages/list/list.vue b/pages/list/list.vue index 63846da..c19853f 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -93,44 +93,64 @@ @select="statusSelect" > + + + + + @@ -517,3 +564,11 @@ color: #fff; } + + diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 09356c3..19e036a 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -23,7 +23,7 @@ class="content" v-for="item in list" :key="item.id" - v-if="status === '已提交' && isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true"> + v-if="status === '已提交' && (isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true)"> {{item.name}} {{item.value}} @@ -120,7 +120,7 @@ value: '' }, ], - status: '已提交', + status: '', name: '', time: '', place: '', @@ -206,7 +206,7 @@ } .message-text-css { margin-top: 100rpx; - letter-spacing: 5rpx; + line-height: 72rpx; } .title-area { display: flex; diff --git a/pages/index/index.vue b/pages/index/index.vue index 798608d..f9c31af 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -58,10 +58,6 @@ }; }, mounted() { - // console.log('88888888'); - // console.log(this.$route); - // console.log('88888888'); - // this.currentPagePath = this.$route.meta.pagePath; this.phone = uni.getStorageSync("registerPhone"); getLogin(); }, @@ -99,6 +95,7 @@ url: "/pages/register/register", }); } else { + uni.setStorageSync("registerPhone", this.phone); getUserProfile(); if (this.active === "submit") { wx.navigateTo({ diff --git a/pages/list/list.vue b/pages/list/list.vue index 63846da..c19853f 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -93,44 +93,64 @@ @select="statusSelect" > + + + + + @@ -517,3 +564,11 @@ color: #fff; } + + diff --git a/pages/message/message.vue b/pages/message/message.vue index 91c953a..67f8fbd 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -41,6 +41,22 @@ + + + + + @@ -49,6 +65,8 @@ import { js_date_time } from '../../common/formatTime.js'; import { getMessageList } from '@/api/message.js'; import { dateToString, getDateTime } from '@/common/utils.js'; + import { verifyPhone } from "@/api/index.js"; + import { getLogin, getUserProfile } from "@/utils/auth.js"; export default { components: { TabBar, @@ -56,7 +74,10 @@ data() { return { isManager: false, - list: [] + list: [], + phone: '', + show: false, + inputValue: "", } }, onShow() { @@ -65,15 +86,19 @@ const curPage = pages[pages.length - 1]; this.currentPagePath = curPage.route; uni.setStorageSync('currentPagePath', this.currentPagePath); + this.phone = uni.getStorageSync("registerPhone"); + console.log('----------', typeof this.phone); + this.checkphone(); this.fetchMessageList(); }, mounted() { - const userInfo = JSON.parse(uni.getStorageSync('userInfo')); - console.log('----------', userInfo); - if(userInfo.salt === '物业人员') { - this.isManager = true; - } else { - this.isManager = false; + if(uni.getStorageSync('userInfo')) { + const userInfo = JSON.parse(uni.getStorageSync('userInfo')); + if(userInfo.salt === '物业人员') { + this.isManager = true; + } else { + this.isManager = false; + } } }, methods: { @@ -82,6 +107,11 @@ url: `/pages/checkMessageDetail/checkMessageDetail?id=${id}` }) }, + confirmPhone() { + this.phone = this.inputValue; + this.show = false; + this.checkphone(); + }, //获取消息列表 async fetchMessageList() { const res = await getMessageList(); @@ -97,6 +127,22 @@ messageTime: getDateTime(new Date(Number(item.send_time)).getTime()), } }) + }, + async checkphone() { + //有电话就去验证 + if(this.phone) { + const res = await verifyPhone(this.phone); + if (res === "用户未注册") { + wx.reLaunch({ + url: "/pages/register/register", + }); + } else { + uni.setStorageSync("registerPhone", this.phone); + getUserProfile(); + } + } else { //没有电话就弹出授权 + this.show = true; + } } } } @@ -196,3 +242,10 @@ } } + \ No newline at end of file diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 09356c3..19e036a 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -23,7 +23,7 @@ class="content" v-for="item in list" :key="item.id" - v-if="status === '已提交' && isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true"> + v-if="status === '已提交' && (isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true)"> {{item.name}} {{item.value}} @@ -120,7 +120,7 @@ value: '' }, ], - status: '已提交', + status: '', name: '', time: '', place: '', @@ -206,7 +206,7 @@ } .message-text-css { margin-top: 100rpx; - letter-spacing: 5rpx; + line-height: 72rpx; } .title-area { display: flex; diff --git a/pages/index/index.vue b/pages/index/index.vue index 798608d..f9c31af 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -58,10 +58,6 @@ }; }, mounted() { - // console.log('88888888'); - // console.log(this.$route); - // console.log('88888888'); - // this.currentPagePath = this.$route.meta.pagePath; this.phone = uni.getStorageSync("registerPhone"); getLogin(); }, @@ -99,6 +95,7 @@ url: "/pages/register/register", }); } else { + uni.setStorageSync("registerPhone", this.phone); getUserProfile(); if (this.active === "submit") { wx.navigateTo({ diff --git a/pages/list/list.vue b/pages/list/list.vue index 63846da..c19853f 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -93,44 +93,64 @@ @select="statusSelect" > + + + + + @@ -517,3 +564,11 @@ color: #fff; } + + diff --git a/pages/message/message.vue b/pages/message/message.vue index 91c953a..67f8fbd 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -41,6 +41,22 @@ + + + + + @@ -49,6 +65,8 @@ import { js_date_time } from '../../common/formatTime.js'; import { getMessageList } from '@/api/message.js'; import { dateToString, getDateTime } from '@/common/utils.js'; + import { verifyPhone } from "@/api/index.js"; + import { getLogin, getUserProfile } from "@/utils/auth.js"; export default { components: { TabBar, @@ -56,7 +74,10 @@ data() { return { isManager: false, - list: [] + list: [], + phone: '', + show: false, + inputValue: "", } }, onShow() { @@ -65,15 +86,19 @@ const curPage = pages[pages.length - 1]; this.currentPagePath = curPage.route; uni.setStorageSync('currentPagePath', this.currentPagePath); + this.phone = uni.getStorageSync("registerPhone"); + console.log('----------', typeof this.phone); + this.checkphone(); this.fetchMessageList(); }, mounted() { - const userInfo = JSON.parse(uni.getStorageSync('userInfo')); - console.log('----------', userInfo); - if(userInfo.salt === '物业人员') { - this.isManager = true; - } else { - this.isManager = false; + if(uni.getStorageSync('userInfo')) { + const userInfo = JSON.parse(uni.getStorageSync('userInfo')); + if(userInfo.salt === '物业人员') { + this.isManager = true; + } else { + this.isManager = false; + } } }, methods: { @@ -82,6 +107,11 @@ url: `/pages/checkMessageDetail/checkMessageDetail?id=${id}` }) }, + confirmPhone() { + this.phone = this.inputValue; + this.show = false; + this.checkphone(); + }, //获取消息列表 async fetchMessageList() { const res = await getMessageList(); @@ -97,6 +127,22 @@ messageTime: getDateTime(new Date(Number(item.send_time)).getTime()), } }) + }, + async checkphone() { + //有电话就去验证 + if(this.phone) { + const res = await verifyPhone(this.phone); + if (res === "用户未注册") { + wx.reLaunch({ + url: "/pages/register/register", + }); + } else { + uni.setStorageSync("registerPhone", this.phone); + getUserProfile(); + } + } else { //没有电话就弹出授权 + this.show = true; + } } } } @@ -196,3 +242,10 @@ } } + \ No newline at end of file diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index fb360e7..924a9f1 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -15,12 +15,30 @@ 账号设置 + + + + + @@ -517,3 +564,11 @@ color: #fff; } + + diff --git a/pages/message/message.vue b/pages/message/message.vue index 91c953a..67f8fbd 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -41,6 +41,22 @@ + + + + + @@ -49,6 +65,8 @@ import { js_date_time } from '../../common/formatTime.js'; import { getMessageList } from '@/api/message.js'; import { dateToString, getDateTime } from '@/common/utils.js'; + import { verifyPhone } from "@/api/index.js"; + import { getLogin, getUserProfile } from "@/utils/auth.js"; export default { components: { TabBar, @@ -56,7 +74,10 @@ data() { return { isManager: false, - list: [] + list: [], + phone: '', + show: false, + inputValue: "", } }, onShow() { @@ -65,15 +86,19 @@ const curPage = pages[pages.length - 1]; this.currentPagePath = curPage.route; uni.setStorageSync('currentPagePath', this.currentPagePath); + this.phone = uni.getStorageSync("registerPhone"); + console.log('----------', typeof this.phone); + this.checkphone(); this.fetchMessageList(); }, mounted() { - const userInfo = JSON.parse(uni.getStorageSync('userInfo')); - console.log('----------', userInfo); - if(userInfo.salt === '物业人员') { - this.isManager = true; - } else { - this.isManager = false; + if(uni.getStorageSync('userInfo')) { + const userInfo = JSON.parse(uni.getStorageSync('userInfo')); + if(userInfo.salt === '物业人员') { + this.isManager = true; + } else { + this.isManager = false; + } } }, methods: { @@ -82,6 +107,11 @@ url: `/pages/checkMessageDetail/checkMessageDetail?id=${id}` }) }, + confirmPhone() { + this.phone = this.inputValue; + this.show = false; + this.checkphone(); + }, //获取消息列表 async fetchMessageList() { const res = await getMessageList(); @@ -97,6 +127,22 @@ messageTime: getDateTime(new Date(Number(item.send_time)).getTime()), } }) + }, + async checkphone() { + //有电话就去验证 + if(this.phone) { + const res = await verifyPhone(this.phone); + if (res === "用户未注册") { + wx.reLaunch({ + url: "/pages/register/register", + }); + } else { + uni.setStorageSync("registerPhone", this.phone); + getUserProfile(); + } + } else { //没有电话就弹出授权 + this.show = true; + } } } } @@ -196,3 +242,10 @@ } } + \ No newline at end of file diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index fb360e7..924a9f1 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -15,12 +15,30 @@ 账号设置 + + + + +