部分问题修复

This commit is contained in:
2026-01-17 17:22:59 +08:00
parent 410b0501af
commit 85354f6296
4 changed files with 23 additions and 5 deletions

View File

@@ -9,6 +9,7 @@ import appConfig from '@/config/appConfig.js';
import { provide, onMounted } from 'vue';
import WebsocketUtil from '@/commons/utils/websocket.js';
console.log('appConfig.wss',appConfig.wss);
const websocketUtil = new WebsocketUtil(appConfig.wss, 5000); // 创建 WebSocket 工具类实例
provide('websocketUtil', websocketUtil); // 提供给所有子组件
onMounted(() => {});

View File

@@ -25,8 +25,8 @@ export function returnBaseUrl(param) {
env,
apiType
} = param
if(!env){
env=ENV
if (!env) {
env = ENV
}
console.log('env', env);
console.log('apiType', apiType);
@@ -70,6 +70,23 @@ export function returnBaseUrl(param) {
}
function returnWss(env) {
// #ifdef H5
if (env === 'test') {
return 'http://192.168.1.42:2348'
} else {
return 'https://czgeatws.sxczgkj.com/wss'
}
// #endif
// #ifndef H5
if (env === 'test') {
return 'ws://192.168.1.42:2348'
} else {
return 'wss://czgeatws.sxczgkj.com/wss'
}
// #endif
}
const appConfig = {
@@ -85,7 +102,7 @@ const appConfig = {
env: {},
// wss: "wss://sockets.sxczgkj.com/wss", //测试环境
wss: "wss://czgeatws.sxczgkj.com/wss", //正式环境
wss: returnWss(), //正式环境
// 环境变量常量
ENV_ENUM: {
DEVELOPMENT: 'development', // 本地调试地址

2
env/config.js vendored
View File

@@ -30,7 +30,7 @@ const processEnv = process.env.NODE_ENV
// 改变env环境
function changeEnv(envMode){
appConfig.env = allEnvMap[envMode || processEnv]
appConfig.wss = allEnvMap[envMode || processEnv].JEEPAY_BASE_URL_WSS
// appConfig.wss = allEnvMap[envMode || processEnv].JEEPAY_BASE_URL_WSS
}
export default { changeEnv: changeEnv }

View File

@@ -43,7 +43,7 @@
</view>
<view class="u-flex u-row-between u-m-t-24 u-col-top">
<view class="no-wrap">打印状态</view>
<view class="u-p-l-32" style="max-width: 522rpx; word-wrap: break-word; color: red">
<view class="u-p-l-32" style="max-width: 522rpx; word-wrap: break-word; color: red" v-if="data.printStatus">
<template v-if="JSON.parse(data.printStatus).length > 0">
打印失败{{
JSON.parse(data.printStatus)