一体机登录功能开发

components/CustomTabBar/CustomTabBar.vue

@@ -26,6 +26,7 @@ import { ref, computed, watch, onMounted } from 'vue';
 import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
 import { useReadMsg } from '@/stores/useReadMsg';
+import { checkLoginAndNavigate } from '@/utils/loginHelper';
 
 const props = defineProps({
     currentPage: {
@@ -157,77 +158,75 @@ watch(() => userInfo.value, (newUserInfo, oldUserInfo) => {
 const switchTab = (item, index) => {
     console.log('switchTab called', item, index);
     
-    // 检查是否为"发布岗位"页面，需要判断企业信息是否完整
-    if (item.path === '/pages/job/publishJob') {
-        // 检查用户是否已登录
-        const token = uni.getStorageSync('token') || '';
-        const hasLogin = userStore.hasLogin;
-        
-        if (!token || !hasLogin) {
-            // 未登录，发送事件显示登录弹窗
-            uni.$emit('showLoginModal');
-            return; // 不进行页面跳转
-        }
-        
-        // 已登录，检查企业信息是否完整
-        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-        const storeUserInfo = userInfo.value || {};
-        const currentUserInfo = storeUserInfo.id ? storeUserInfo : cachedUserInfo;
-        
-        // 判断企业信息字段company是否为null或undefined
-        if (!currentUserInfo.company || currentUserInfo.company === null) {
-            // 企业信息为空，跳转到企业信息补全页面
-            uni.navigateTo({
-                url: '/pages/complete-info/company-info',
-            });
-        } else {
-            // 企业信息完整，跳转到发布岗位页面
-            uni.navigateTo({
-                url: '/pages/job/publishJob',
-            });
-        }
-        
-        currentItem.value = item.id;
-        return;
-    }
+    // 检查是否为需要登录的页面
+    const loginRequiredPages = [
+        '/pages/job/publishJob',
+        '/pages/mine/mine',
+        '/pages/mine/company-mine'
+    ];
     
-    // 检查是否为"我的"页面，需要登录验证和用户类型判断
-    if (item.path === '/pages/mine/mine') {
+    if (loginRequiredPages.includes(item.path)) {
         // 检查用户是否已登录
         const token = uni.getStorageSync('token') || '';
         const hasLogin = userStore.hasLogin;
         
         if (!token || !hasLogin) {
-            // 未登录，发送事件显示登录弹窗
-            uni.$emit('showLoginModal');
+            // 未登录，根据平台类型跳转到对应的登录页面
+            checkLoginAndNavigate();
             return; // 不进行页面跳转
         }
         
-        // 已登录，根据用户类型跳转到不同的"我的"页面
-        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-        const storeIsCompanyUser = userInfo.value?.isCompanyUser;
-        const cachedIsCompanyUser = cachedUserInfo.isCompanyUser;
-        
-        // 获取用户类型
-        const userType = Number(storeIsCompanyUser !== undefined ? storeIsCompanyUser : (cachedIsCompanyUser !== undefined ? cachedIsCompanyUser : 1));
-        
-        let targetPath = '/pages/mine/mine'; // 默认求职者页面
-        
-        if (userType === 0) {
-            // 企业用户，跳转到企业我的页面
-            targetPath = '/pages/mine/company-mine';
-        } else {
-            // 求职者或其他用户类型，跳转到普通我的页面
-            targetPath = '/pages/mine/mine';
+        // 已登录，处理特定页面的逻辑
+        if (item.path === '/pages/job/publishJob') {
+            // 检查企业信息是否完整
+            const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+            const storeUserInfo = userInfo.value || {};
+            const currentUserInfo = storeUserInfo.id ? storeUserInfo : cachedUserInfo;
+            
+            // 判断企业信息字段company是否为null或undefined
+            if (!currentUserInfo.company || currentUserInfo.company === null) {
+                // 企业信息为空，跳转到企业信息补全页面
+                uni.navigateTo({
+                    url: '/pages/complete-info/company-info',
+                });
+            } else {
+                // 企业信息完整，跳转到发布岗位页面
+                uni.navigateTo({
+                    url: '/pages/job/publishJob',
+                });
+            }
+            
+            currentItem.value = item.id;
+            return;
         }
         
-        // 跳转到对应的页面
-        uni.navigateTo({
-            url: targetPath,
-        });
-        
-        currentItem.value = item.id;
-        return;
+        if (item.path === '/pages/mine/mine') {
+            // 根据用户类型跳转到不同的"我的"页面
+            const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+            const storeIsCompanyUser = userInfo.value?.isCompanyUser;
+            const cachedIsCompanyUser = cachedUserInfo.isCompanyUser;
+            
+            // 获取用户类型
+            const userType = Number(storeIsCompanyUser !== undefined ? storeIsCompanyUser : (cachedIsCompanyUser !== undefined ? cachedIsCompanyUser : 1));
+            
+            let targetPath = '/pages/mine/mine'; // 默认求职者页面
+            
+            if (userType === 0) {
+                // 企业用户，跳转到企业我的页面
+                targetPath = '/pages/mine/company-mine';
+            } else {
+                // 求职者或其他用户类型，跳转到普通我的页面
+                targetPath = '/pages/mine/mine';
+            }
+            
+            // 跳转到对应的页面
+            uni.navigateTo({
+                url: targetPath,
+            });
+            
+            currentItem.value = item.id;
+            return;
+        }
     }
     
     // 判断是否为 tabBar 页面

components/wxAuthLogin/WxAuthLogin.vue

@@ -9,7 +9,7 @@
                 
                 <!-- Logo和标题 -->
                 <view class="auth-header">
-                    <image class="auth-logo" src="@/static/logo.png" mode="aspectFit"></image>
+                    <image class="auth-logo" src="@/static/logo2-S.png" mode="aspectFit"></image>
                     <view class="auth-title">欢迎使用就业服务</view>
                     <view class="auth-subtitle">需要您授权手机号登录</view>
                 </view>
@@ -227,65 +227,12 @@ const wxLogin = () => {
     }
     
     // #ifdef H5
-    // H5网页微信登录逻辑
-    uni.showLoading({ title: '登录中...' });
-    
-    // 获取微信授权code
-    uni.login({
-        provider: 'weixin',
-        success: (loginRes) => {
-            console.log('微信登录成功：', loginRes);
-            
-            // 调用后端接口进行登录
-            $api.createRequest('/app/appLogin', {
-                code: loginRes.code,
-                userType: userType.value
-            }, 'post').then((resData) => {
-                uni.hideLoading();
-                
-                if (resData.token) {
-                    loginSetToken(resData.token).then((resume) => {
-                        console.log(resData, 'resData.isCompanyUser');
-                        // 更新用户类型到缓存
-                        if (resData.isCompanyUser) {
-                            console.log(resData.isCompanyUser, 'resData.isCompanyUser');
-                            const userInfo = uni.getStorageSync('userInfo') || {};
-                            userInfo.isCompanyUser = Number(resData.isCompanyUser); // 0-企业用户，1-求职者
-                            uni.setStorageSync('userInfo', userInfo);
-                        }
-                        
-                        $api.msg('登录成功');
-                        close();
-                        emit('success');
-                        
-                        if (!resume.data.jobTitleId) {
-                            if (userType.value === 1) {
-                                // 求职者跳转到个人信息补全页面
-                                uni.navigateTo({
-                                    url: '/pages/complete-info/complete-info?step=1'
-                                });
-                            } else if (userType.value === 0) {
-                                // 招聘者跳转到企业信息补全页面
-                                uni.navigateTo({
-                                    url: '/pages/complete-info/company-info'
-                                });
-                            }
-                        }
-                    });
-                } else {
-                    $api.msg('登录失败，请重试');
-                }
-            }).catch((err) => {
-                uni.hideLoading();
-                $api.msg(err.msg || '登录失败，请重试');
-            });
-        },
-        fail: (err) => {
-            uni.hideLoading();
-            console.error('微信登录失败：', err);
-            $api.msg('微信登录失败');
-        }
+    // H5端跳转到H5登录页面
+    close();
+    uni.navigateTo({
+        url: '/pages/login/h5-login'
     });
+    return;
     // #endif
     
     // #ifdef APP-PLUS
@@ -561,4 +508,3 @@ defineExpose({
 button::after
     border: none
 </style>
-