From 935bbce8526044e4deaa3231c2e9d46c457a4787 Mon Sep 17 00:00:00 2001 From: aihe <961836564@qq.com> Date: Wed, 16 Apr 2025 00:40:23 +0800 Subject: [PATCH] uu --- common/componentEventHandle.js | 11 +++++++++++ components/buns-api/login/com-login.vue | 3 +++ components/buns-api/login/index.vue | 1 + components/buns-api/login/mp-login.vue | 6 +++--- components/tpx-page/tpx-page.vue | 5 ++++- pages/post/post.vue | 9 ++++++--- pages/tabBar/sending/sending.vue | 10 +++++++--- 7 files changed, 35 insertions(+), 10 deletions(-) diff --git a/common/componentEventHandle.js b/common/componentEventHandle.js index af3ea40..760b911 100644 --- a/common/componentEventHandle.js +++ b/common/componentEventHandle.js @@ -14,6 +14,17 @@ export const goLogin = ()=> { // #endif } +// 校验用户信息 +export const handleCheckUserInfo = async()=> { + let bl = false + const $loginRef = getApp().globalData.$loginRef + if($loginRef?.handleCheckUserInfo) { + bl = await $loginRef?.handleCheckUserInfo() + } + return bl +} + + // 唤起消息订阅 export const triggerSubscribeMessage = ()=> { uni.$emit(sysEventNames.subMessage, { }) diff --git a/components/buns-api/login/com-login.vue b/components/buns-api/login/com-login.vue index 7c7eaab..26fbb1e 100644 --- a/components/buns-api/login/com-login.vue +++ b/components/buns-api/login/com-login.vue @@ -98,6 +98,9 @@ }, async loginSucceed(){ this.$emit("succeedBack") + }, + handleCheckUserInfo(){ + return true } } } diff --git a/components/buns-api/login/index.vue b/components/buns-api/login/index.vue index 1d63403..7a3274a 100644 --- a/components/buns-api/login/index.vue +++ b/components/buns-api/login/index.vue @@ -35,6 +35,7 @@ uni.$on(sysEventNames.login, this.triggerLogin) }, mounted(){ + }, unmounted(){ uni.$off(sysEventNames.login, this.triggerLogin) diff --git a/components/buns-api/login/mp-login.vue b/components/buns-api/login/mp-login.vue index 3e7590d..c24afd4 100644 --- a/components/buns-api/login/mp-login.vue +++ b/components/buns-api/login/mp-login.vue @@ -143,9 +143,9 @@ const res = await apiService.getInfoByApp({ _loading: true }) let userInfo = res?.user || {} Object.assign(this.submitLogin , { - // nickName: userInfo.nickName, - // avatarUrl: userInfo.avatar, - // phoneNumber: userInfo.phonenumber, + nickName: userInfo.nickName, + avatarUrl: userInfo.avatar, + phoneNumber: userInfo.phonenumber, }) try{ await checkParams(this.submitLogin, this.submitValidConfig, false) diff --git a/components/tpx-page/tpx-page.vue b/components/tpx-page/tpx-page.vue index d416a61..0357a46 100644 --- a/components/tpx-page/tpx-page.vue +++ b/components/tpx-page/tpx-page.vue @@ -22,7 +22,10 @@ } }, created() { - + }, + mounted(){ + // 初始化全局组件 + getApp().globalData.$loginRef = this.$refs.loginRef }, onHide() { diff --git a/pages/post/post.vue b/pages/post/post.vue index eefa0cf..93db4d2 100644 --- a/pages/post/post.vue +++ b/pages/post/post.vue @@ -245,9 +245,10 @@ import BpeCheckagreeTmp from "@/components/buns-post-edit-templates/bpe-checkagree-tmp" import dayjs from "dayjs" import { debounce } from "@/common/util" - import { triggerSubscribeMessage } from "@/common/componentEventHandle" + import { triggerSubscribeMessage, handleCheckUserInfo } from "@/common/componentEventHandle" import * as apiService from "@/common/api" - import { getOrderModels, initDefaultModel, setBindTsm, getBindTsm, checkSubmitParams } from "./model" + import { getOrderModels, initDefaultModel, setBindTsm, getBindTsm, checkSubmitParams } from "./model" + const pageTypeEnum = { create: 'create', @@ -439,7 +440,9 @@ errmgs.length > 0 && this.showToast(errmgs[0]) return !Boolean(errmgs.length) }, - async handleSave(type) { + async handleSave(type) { + let chkUserBl = await handleCheckUserInfo() + if(!chkUserBl) { return } triggerSubscribeMessage() // 唤起消息订阅 let saveServerHand = apiService.submitOrder if(this.isEdit) { } diff --git a/pages/tabBar/sending/sending.vue b/pages/tabBar/sending/sending.vue index 63427e8..6406c1d 100644 --- a/pages/tabBar/sending/sending.vue +++ b/pages/tabBar/sending/sending.vue @@ -65,7 +65,8 @@ import getCdnUrl from "@/common/getCdnUrl" import { goto, scanCode } from "@/common/untool" - import * as apiService from "@/common/api" + import * as apiService from "@/common/api" + import { handleCheckUserInfo } from "@/common/componentEventHandle" export default { props: { @@ -112,8 +113,11 @@ async handleToolItemClict(item) { if(item.url == 'action:scan') { this.handleCheckOpenPost() - } else if(item.url == 'action:kefu') { - this.gotoWebview({ url: `${this.kefuH5Url}` }) + } else if(item.url == 'action:kefu') { + let bl = await handleCheckUserInfo() + if(bl){ + this.gotoWebview({ url: `${this.kefuH5Url}` }) + } } else { goto(item.url) }