diff --git a/config.js b/config.js index 43388d2..90c861a 100644 --- a/config.js +++ b/config.js @@ -6,8 +6,8 @@ */ export default { // baseUrl: 'http://39.98.44.136:8080', // 测试 - baseUrl: 'https://www.xjksly.cn/api/ks', // 正式环境 - // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试 + // baseUrl: 'https://www.xjksly.cn/api/ks', // 正式环境 + baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试 // LCBaseUrl:'http://10.110.145.145:9100',//内网端口 // LCBaseUrlInner:'http://10.110.145.145:10100',//招聘、培训、帮扶 diff --git a/packageA/pages/chat/chat.vue b/packageA/pages/chat/chat.vue index 4b0e33d..4cfffc6 100644 --- a/packageA/pages/chat/chat.vue +++ b/packageA/pages/chat/chat.vue @@ -3,8 +3,7 @@ - - + @@ -89,7 +88,7 @@ import useUserStore from '@/stores/useUserStore'; import { tabbarManager } from '@/utils/tabbarManager'; import aiPaging from './components/ai-paging.vue'; import { storeToRefs } from 'pinia'; -import WxAuthLogin from '@/components/WxAuthLogin/WxAuthLogin.vue'; + const { isTyping, tabeList, chatSessionID } = storeToRefs(useChatGroupDBStore()); const { userInfo } = storeToRefs(useUserStore()); const isDrawerOpen = ref(false); @@ -97,7 +96,7 @@ const scrollIntoView = ref(false); const searchText = ref(''); const paging = ref(null); -const wxAuthLoginRef = ref(null); + // 实时过滤 const filteredList = computed(() => { @@ -123,7 +122,7 @@ onShow(() => { onMounted(() => { // 监听退出登录事件,显示微信登录弹窗 uni.$on('showLoginModal', () => { - wxAuthLoginRef.value?.open(); + uni.navigateTo({ url: '/pages/login/wx-login' }); }); }); diff --git a/packageRc/pages/jobList/jobList.vue b/packageRc/pages/jobList/jobList.vue index 85a1319..47a4650 100644 --- a/packageRc/pages/jobList/jobList.vue +++ b/packageRc/pages/jobList/jobList.vue @@ -400,11 +400,7 @@ - - + - + + + + + + 短信验证 + + + + + + + + + + + 为了您的账户安全需要您进行验证 + + + + + 验证码将发送至 + {{ formattedPhone }} + + + + + 请输入6位数字验证码 + + + + + + + + + {{ countdown }}秒后重新获取 + + + 重新获取验证码 + + + + + 粘贴验证码 + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/login/wx-login.vue b/pages/login/wx-login.vue new file mode 100644 index 0000000..220b528 --- /dev/null +++ b/pages/login/wx-login.vue @@ -0,0 +1,580 @@ + + + + + \ No newline at end of file diff --git a/pages/mine/company-mine.vue b/pages/mine/company-mine.vue index 19719c0..b4133d9 100644 --- a/pages/mine/company-mine.vue +++ b/pages/mine/company-mine.vue @@ -163,9 +163,9 @@ onShow(() => { onMounted(() => { uni.$on('showLoginModal', () => { // 这里可以显示微信登录弹窗 - // 由于这个页面没有 WxAuthLogin 组件,我们跳转到首页让首页处理 - uni.reLaunch({ - url: '/pages/index/index' + // 跳转到微信登录页面 + uni.navigateTo({ + url: '/pages/login/wx-login' }); }); }); diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index ee7bcba..779c52c 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -175,9 +175,9 @@ onShow(() => { onMounted(() => { uni.$on('showLoginModal', () => { // 这里可以显示微信登录弹窗 - // 由于这个页面没有 WxAuthLogin 组件,我们跳转到首页让首页处理 - uni.reLaunch({ - url: '/pages/index/index' + // 跳转到微信登录页面 + uni.navigateTo({ + url: '/pages/login/wx-login' }); }); }); diff --git a/pages/msglog/msglog.vue b/pages/msglog/msglog.vue index 84231cb..54b2d35 100644 --- a/pages/msglog/msglog.vue +++ b/pages/msglog/msglog.vue @@ -31,8 +31,7 @@ - - + @@ -46,14 +45,14 @@ import Tabbar from '@/components/tabbar/midell-box.vue'; import ReadComponent from './read.vue'; import UnreadComponent from './unread.vue'; import { tabbarManager } from '@/utils/tabbarManager'; -import WxAuthLogin from '@/components/WxAuthLogin/WxAuthLogin.vue'; + const loadedMap = reactive([false, false]); const swiperRefs = [ref(null), ref(null)]; const components = [ReadComponent, UnreadComponent]; import { storeToRefs } from 'pinia'; import { useReadMsg } from '@/stores/useReadMsg'; const { unreadCount } = storeToRefs(useReadMsg()); -const wxAuthLoginRef = ref(null); + onShow(() => { // 获取消息列表 @@ -71,7 +70,7 @@ onMounted(() => { // 监听退出登录事件,显示微信登录弹窗 uni.$on('showLoginModal', () => { - wxAuthLoginRef.value?.open(); + uni.navigateTo({ url: '/pages/login/wx-login' }); }); }); diff --git a/utils/loginHelper.js b/utils/loginHelper.js index 7197b5f..4f19bb3 100644 --- a/utils/loginHelper.js +++ b/utils/loginHelper.js @@ -44,22 +44,11 @@ export function navigateToLoginPage(options = {}) { switch (platform) { case 'mp-weixin': - // 小程序端使用微信授权登录,直接显示微信授权弹窗 - uni.$emit('showLoginModal', { loginType: 'wechat' }); - return; - - case 'h5': - uni.showToast({ - title: '请先登录', - icon: 'none', - duration: 2000 - }); - return; - case 'app': - // App端使用微信授权登录 - uni.$emit('showLoginModal', { loginType: 'wechat' }); - return; + case 'h5': + // 跳转到微信登录页面 + loginPage = '/pages/login/wx-login'; + break; default: loginPage = '/pages/login/h5-login';