Merge remote-tracking branch 'origin/master'

chenyao

2026-01-08 f0b37d3398489ad7cb990ca97ea13552b2c1e892

Merge remote-tracking branch 'origin/master'

 uniapps/work-app/src/api/user/index.js

@@ -26,7 +26,7 @@
// 用户登录接口
export const loginByUsername = (tenantId, deptId, roleId, username, password, type, key, code) => {
  return request({
    url: '/blade-auth/oauth/token',
    url: '/auth/login',
    method: 'post',
    header: {
      'Tenant-Id': tenantId,
@@ -35,10 +35,12 @@
      'Captcha-Key': key,
      'Captcha-Code': code,
    },
    params: {
    data: {
      tenantId,
      username,
      password,
      checkCode:'',
      mobile: false,
      grant_type: 'password',
      scope: 'all',
      type,
@@ -70,6 +72,24 @@
  });
};

// 微信登录接口
export const loginByWechat = (code) => {
  return request({
    url: '/blade-auth/oauth/token',
    method: 'post',
    header: {
      'Tenant-Id': '000000',
    },
    params: {
      tenantId: '000000',
      code,
      grant_type: 'wechat',
      scope: 'all',
      type: 'wechat',
    },
  });
};

// 发送通话信息
export const sendVoiceCallApi = (data) => {
  return request({

 uniapps/work-app/src/config/env.js

@@ -14,10 +14,10 @@
  // 开发环境这里改为自己的
  VITE_APP_WEBVIEW_URL: 'https://wrj.shuixiongit.com/drone-app-web-view/#/webViewWrapper',
  // VITE_APP_WEBVIEW_URL: 'http://localhost:5173/drone-app-web-view/#/webViewWrapper',
  VITE_API_BASE_URL: 'https://wrj.shuixiongit.com/api',
  VITE_API_BASE_URL: 'http://218.202.104.82:8200',
  // VITE_API_BASE_URL: 'https://aisky.org.cn/api',
  VITE_APP_WS_API_URL:'wss://wrj.shuixiongit.com/drone-wss/api/v1/ws',
  

  // 静态资源存放地址'
  VITE_APP_ASSETS_URL: 'https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_app_assets'
}

 uniapps/work-app/src/pages/login/index.vue

@@ -121,14 +121,15 @@
      userInfo.deptId,
      userInfo.roleId,
      userInfo.username,
      md5(userInfo.password),
      // md5(userInfo.password),
      userInfo.password,
      userInfo.type,
      userInfo.key,
      userInfo.code
    );
    userStore.setUserInfo(res.data);
    uni.reLaunch({
      url: "/pages/page/index",
      url: "/pages/work/index",
    });
  } catch (error) {
    const errorMsg =

 uniapps/work-app/src/router/index.js

@@ -11,7 +11,7 @@
import pagesJson from "@/pages.json"

// 路径常量
export const HOME_PATH = "/pages/map/index"
export const HOME_PATH = "/pages/work/index"
export const LOGIN_PATH = "/pages/login/index"
export const ERROR404_PATH = "/pages/common/404/index"