添加账号密码登录页面的跳转逻辑，优化登录方式选择；更新项目配置以支持不同登录方式，提升用户体验。

zuoxiao

2025-05-12 5db0b5a4ae6124624d197bcebff28b3a9ed46400

 pages/home/home.js

@@ -50,17 +50,45 @@

  openValve: function (e) {
    const app = getApp();
    if (app.globalData.isLoggedIn) {
      wx.navigateTo({
        url: '/pages/waterIntake/waterIntake',
      })
    } else {
      wx.showToast({
        title: '请先登录',
        icon: 'error'
      })
    // 检查当前项目是否需要登录
    const currentProject = app.globalData.selectedProject;
    if (currentProject && PROJECT_CONFIG[currentProject] && PROJECT_CONFIG[currentProject].needLogin) {
      // 需要登录的项目，检查是否已登录
      if (!app.globalData.isLoggedIn) {
        // 未登录，显示提示并阻止操作
        wx.showToast({
          title: '请先登录',
          icon: 'error',
          duration: 2000
        });
        
        // 获取项目配置
        const projectConfig = PROJECT_CONFIG[currentProject];
        if (projectConfig) {
          // 询问用户是否前往登录
          wx.showModal({
            title: '提示',
            content: '您需要登录后才能使用开阀功能，是否立即登录？',
            confirmText: '前往登录',
            cancelText: '取消',
            success: (res) => {
              if (res.confirm) {
                // 用户点击确认，直接调用wxLogin方法
                this.wxLogin();
              }
            }
          });
        }
        return;
      }
    }
    
    // 已登录或不需要登录的项目，执行开阀操作
    wx.navigateTo({
      url: '/pages/waterIntake/waterIntake',
    })
  },

  // calculateScrollViewHeight: function () {
  //     wx.createSelectorQuery().selectAll('.list-item').boundingClientRect((rects) => {
  //         let totalHeight = rects.reduce((sum, rect) => sum + rect.height, 0);
@@ -424,16 +452,43 @@
  },
  openValveList() {
    const app = getApp();
    if (app.globalData.isLoggedIn) {
      wx.navigateTo({
        url: '/pages/valveList/valveList',
      })
    } else {
      wx.showToast({
        title: '请先登录',
        icon: 'error'
      })
    // 检查当前项目是否需要登录
    const currentProject = app.globalData.selectedProject;
    if (currentProject && PROJECT_CONFIG[currentProject] && PROJECT_CONFIG[currentProject].needLogin) {
      // 需要登录的项目，检查是否已登录
      if (!app.globalData.isLoggedIn) {
        // 未登录，显示提示并阻止操作
        wx.showToast({
          title: '请先登录',
          icon: 'error',
          duration: 2000
        });
        
        // 获取项目配置
        const projectConfig = PROJECT_CONFIG[currentProject];
        if (projectConfig) {
          // 询问用户是否前往登录
          wx.showModal({
            title: '提示',
            content: '您需要登录后才能查看开关阀记录，是否立即登录？',
            confirmText: '前往登录',
            cancelText: '取消',
            success: (res) => {
              if (res.confirm) {
                // 用户点击确认，直接调用wxLogin方法
                this.wxLogin();
              }
            }
          });
        }
        return;
      }
    }
    
    // 已登录或不需要登录的项目，执行查看记录操作
    wx.navigateTo({
      url: '/pages/valveList/valveList',
    })
  },
  feedBack() {
    wx.showToast({
@@ -487,18 +542,45 @@
      });
    }
  },
  //轮灌
  irrigation() {
    if (getApp().globalData.isLoggedIn) {
      wx.navigateTo({
        url: '/pages/irrigation/irrigation',
      })
    } else {
      wx.showToast({
        title: '请先登录',
        icon: 'error'
      })
    const app = getApp();
    // 检查当前项目是否需要登录
    const currentProject = app.globalData.selectedProject;
    if (currentProject && PROJECT_CONFIG[currentProject] && PROJECT_CONFIG[currentProject].needLogin) {
      // 需要登录的项目，检查是否已登录
      if (!app.globalData.isLoggedIn) {
        // 未登录，显示提示并阻止操作
        wx.showToast({
          title: '请先登录',
          icon: 'error',
          duration: 2000
        });
        
        // 获取项目配置
        const projectConfig = PROJECT_CONFIG[currentProject];
        if (projectConfig) {
          // 询问用户是否前往登录
          wx.showModal({
            title: '提示',
            content: '您需要登录后才能使用轮灌功能，是否立即登录？',
            confirmText: '前往登录',
            cancelText: '取消',
            success: (res) => {
              if (res.confirm) {
                // 用户点击确认，直接调用wxLogin方法
                this.wxLogin();
              }
            }
          });
        }
        return;
      }
    }
    
    // 已登录或不需要登录的项目，执行轮灌操作
    wx.navigateTo({
      url: '/pages/irrigation/irrigation',
    })
  },
  handleChange(e) {
    const item = e.currentTarget.dataset.item;
@@ -747,6 +829,41 @@
   * 扫码开阀
   */
  scenCode() {
    const app = getApp();
    // 检查当前项目是否需要登录
    const currentProject = app.globalData.selectedProject;
    if (currentProject && PROJECT_CONFIG[currentProject] && PROJECT_CONFIG[currentProject].needLogin) {
      // 需要登录的项目，检查是否已登录
      if (!app.globalData.isLoggedIn) {
        // 未登录，显示提示并阻止扫码
        wx.showToast({
          title: '请先登录',
          icon: 'error',
          duration: 2000
        });
        
        // 获取项目配置
        const projectConfig = PROJECT_CONFIG[currentProject];
        if (projectConfig) {
          // 询问用户是否前往登录
          wx.showModal({
            title: '提示',
            content: '您需要登录后才能使用扫码开阀功能，是否立即登录？',
            confirmText: '前往登录',
            cancelText: '取消',
            success: (res) => {
              if (res.confirm) {
                // 用户点击确认，直接调用wxLogin方法
                this.wxLogin();
              }
            }
          });
        }
        return;
      }
    }
    
    // 已登录或不需要登录的项目，执行扫码操作
    const that = this;
    wx.scanCode({
      success(res) {
@@ -1309,7 +1426,7 @@
    }

    // 如果当前已在登录页，不再跳转
    if (currentRoute === 'pages/login/login') {
    if (currentRoute === 'pages/login/login' || currentRoute === 'pages/accountLogin/accountLogin') {
      console.log('当前已在登录页，不再跳转');
      return;
    }
@@ -1364,11 +1481,26 @@
            wx.setStorageSync('_attempted_login_redirect', 'true');
          } catch (e) {}

          // wx.navigateTo({
          //   url: `/pages/login/login?project=${this.data.selectedProject}`,
          //   success: () => console.log('成功跳转到登录页'),
          //   fail: (err) => console.error('跳转到登录页失败:', err)
          // });
          // 根据项目配置的loginType决定跳转到哪个登录页面
          // 此处不做跳转，注释掉原有代码
          // const projectInfo = PROJECT_CONFIG[currentProject];
          // const loginType = projectInfo?.loginType || 'code'; // 默认使用验证码登录
          
          // if (loginType === 'account') {
          //   // 账号密码登录
          //   wx.navigateTo({
          //     url: `/pages/accountLogin/accountLogin?project=${currentProject}`,
          //     success: () => console.log('成功跳转到账号密码登录页'),
          //     fail: (err) => console.error('跳转到账号密码登录页失败:', err)
          //   });
          // } else {
          //   // 验证码登录
          //   wx.navigateTo({
          //     url: `/pages/login/login?project=${currentProject}`,
          //     success: () => console.log('成功跳转到验证码登录页'),
          //     fail: (err) => console.error('跳转到验证码登录页失败:', err)
          //   });
          // }
        }
      })
      .catch(err => {
@@ -1391,12 +1523,26 @@
          return;
        }

        // 出错时也跳转到登录页
        // wx.navigateTo({
        //   url: `/pages/login/login?project=${this.data.selectedProject}`,
        //   success: () => console.log('错误后成功跳转到登录页'),
        //   fail: (err) => console.error('错误后跳转到登录页失败:', err)
        // });
        // 出错时也跳转到登录页，根据loginType决定跳转目标
        // 此处不做跳转，注释掉原有代码
        // const projectInfo = PROJECT_CONFIG[currentProject];
        // const loginType = projectInfo?.loginType || 'code'; // 默认使用验证码登录
        
        // if (loginType === 'account') {
        //   // 账号密码登录
        //   wx.navigateTo({
        //     url: `/pages/accountLogin/accountLogin?project=${currentProject}`,
        //     success: () => console.log('错误后成功跳转到账号密码登录页'),
        //     fail: (err) => console.error('错误后跳转到账号密码登录页失败:', err)
        //   });
        // } else {
        //   // 验证码登录
        //   wx.navigateTo({
        //     url: `/pages/login/login?project=${currentProject}`,
        //     success: () => console.log('错误后成功跳转到验证码登录页'),
        //     fail: (err) => console.error('错误后跳转到验证码登录页失败:', err)
        //   });
        // }
      });
  },

@@ -1503,11 +1649,21 @@
              wx.hideLoading();
              if (response.code === "0001") {
                if (response.content.client.clientId === "") {
                  // 未绑定账号，跳转到登录页面并传递当前项目信息
                  // 未绑定账号，根据项目配置的loginType跳转到相应的登录页面
                  const projectInfo = PROJECT_CONFIG[this.data.selectedProject];
                  wx.navigateTo({
                    url: `/pages/login/login?project=${this.data.selectedProject}&projectName=${projectInfo.displayName}`
                  });
                  const loginType = projectInfo?.loginType || 'code'; // 默认使用验证码登录
                  
                  if (loginType === 'account') {
                    // 账号密码登录
                    wx.navigateTo({
                      url: `/pages/accountLogin/accountLogin?project=${this.data.selectedProject}&projectName=${projectInfo.displayName}`
                    });
                  } else {
                    // 验证码登录
                    wx.navigateTo({
                      url: `/pages/login/login?project=${this.data.selectedProject}&projectName=${projectInfo.displayName}`
                    });
                  }
                } else {
                  this.setData({
                    userName: response.content.client.clientName,
@@ -1553,11 +1709,21 @@

                }
              } else if (response.code === "1003") {
                // 未绑定账号，跳转到登录页面并传递当前项目信息
                // 未绑定账号，根据项目配置的loginType跳转到相应的登录页面
                const projectInfo = PROJECT_CONFIG[this.data.selectedProject];
                wx.navigateTo({
                  url: `/pages/login/login?project=${this.data.selectedProject}&projectName=${projectInfo.displayName}`
                });
                const loginType = projectInfo?.loginType || 'code'; // 默认使用验证码登录
                
                if (loginType === 'account') {
                  // 账号密码登录
                  wx.navigateTo({
                    url: `/pages/accountLogin/accountLogin?project=${this.data.selectedProject}&projectName=${projectInfo.displayName}`
                  });
                } else {
                  // 验证码登录
                  wx.navigateTo({
                    url: `/pages/login/login?project=${this.data.selectedProject}&projectName=${projectInfo.displayName}`
                  });
                }
              } else {
                wx.showToast({
                  title: '登录失败',
@@ -1569,11 +1735,21 @@
              wx.hideLoading();
              console.error('登录请求失败:', error);
              if(error.code==="1003"){
                // 未绑定账号，跳转到登录页面并传递当前项目信息
                // 未绑定账号，根据项目配置的loginType跳转到相应的登录页面
                const projectInfo = PROJECT_CONFIG[this.data.selectedProject];
                wx.navigateTo({
                  url: `/pages/login/login?project=${this.data.selectedProject}&projectName=${projectInfo.displayName}`
                });
                const loginType = projectInfo?.loginType || 'code'; // 默认使用验证码登录
                
                if (loginType === 'account') {
                  // 账号密码登录
                  wx.navigateTo({
                    url: `/pages/accountLogin/accountLogin?project=${this.data.selectedProject}&projectName=${projectInfo.displayName}`
                  });
                } else {
                  // 验证码登录
                  wx.navigateTo({
                    url: `/pages/login/login?project=${this.data.selectedProject}&projectName=${projectInfo.displayName}`
                  });
                }
              }else{
                wx.showToast({
                  title: '登录失败，请重试',
@@ -1815,49 +1991,65 @@
  },

  // 切换项目
  switchProject(e) {
    const project = e.currentTarget.dataset.project;

    if (config.setBaseUrl(project)) {
      this.setData({
        selectedProject: project
      });

      // 保存选择到本地存储
      try {
        wx.setStorageSync('selectedProject', project);
      } catch (e) {
        console.error('保存项目选择失败:', e);
      }

      // 更新全局变量
      const app = getApp();
      if (app && app.globalData) {
        app.globalData.selectedProject = project;

        // 根据项目配置设置相关参数
        const projectConfig = PROJECT_CONFIG[project];
        if (projectConfig) {
          app.globalData.tag = projectConfig.tag;
          if (!projectConfig.needLogin) {
            app.globalData.operator = projectConfig.operatorId;
            app.globalData.clientId = projectConfig.operatorId;
            app.globalData.isLoggedIn = true;
            app.globalData.sessionId = projectConfig.operatorId;
            // 如果有vcId，也设置
            if (projectConfig.vcId) {
              app.globalData.vcId = projectConfig.vcId;
            }
          }
  switchProject() {
    // 显示二次确认弹窗
    wx.showModal({
      title: '切换项目',
      content: '确定要切换项目吗？切换后需要重新登录。',
      confirmText: '确认切换',
      confirmColor: '#1890FF',
      cancelText: '取消',
      success: (res) => {
        if (res.confirm) {
          // 用户点击确认，显示项目选择弹窗
          this.setData({
            showProjectDialog: true
          });
        }
      }
    });
  },

      // 重新加载页面数据
      this.initData();
  // 添加用户点击头像或用户名登录的处理逻辑
  handleUserTap() {
    const app = getApp();
    // 如果已登录，不需要跳转到登录页面
    if (app.globalData.isLoggedIn) {
      return;
    }

    // 检查当前项目是否需要登录
    const currentProject = app.globalData.selectedProject;
    if (currentProject && PROJECT_CONFIG[currentProject]) {
      const projectConfig = PROJECT_CONFIG[currentProject];
      
      if (!projectConfig.needLogin) {
        console.log('handleUserTap: 当前项目不需要登录:', currentProject);
        // 不需要登录的项目，显示项目名称
        this.setData({
          userName: projectConfig.displayName
        });
        return;
      }
      
      // 根据项目配置的loginType决定跳转到哪个登录页面
      const loginType = projectConfig.loginType || 'code'; // 默认使用验证码登录
      
      if (loginType === 'account') {
        // 账号密码登录
        wx.navigateTo({
          url: `/pages/accountLogin/accountLogin?project=${currentProject}&projectName=${projectConfig.displayName}`
        });
      } else {
        // 验证码登录
        wx.navigateTo({
          url: `/pages/login/login?project=${currentProject}&projectName=${projectConfig.displayName}`
        });
      }
    } else {
      wx.showToast({
        title: '切换项目失败',
        icon: 'none'
      // 如果没有当前项目配置，默认跳转到验证码登录
      wx.navigateTo({
        url: '/pages/login/login'
      });
    }
  },