Fix seller all-in-one image and order flows

This commit is contained in:
Chopper711
2026-06-17 16:45:36 +08:00
parent 1c10b20e10
commit c404f663ad
33 changed files with 513 additions and 125 deletions

12
im/.env
View File

@@ -1,10 +1,10 @@
NODE_ENV=production
VUE_APP_PREVIEW=false
VUE_APP_API_BASE_URL=https://im-api.pickmall.cn
VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket
VUE_APP_COMMON=https://common-api.pickmall.cn
VUE_APP_BUYER=https://buyer-api.pickmall.cn
VUE_APP_SELLER=https://store-api.pickmall.cn
VUE_APP_API_BASE_URL=/api
VUE_APP_WEB_SOCKET_URL=/lili/webSocket
VUE_APP_COMMON=/api
VUE_APP_BUYER=/api
VUE_APP_SELLER=/api
VUE_APP_WEBSITE_NAME="LiLi IM"
VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/
VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/
VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/

View File

@@ -1,10 +1,10 @@
NODE_ENV=development
VUE_APP_PREVIEW=false
VUE_APP_API_BASE_URL=https://im-api.pickmall.cn
VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket
VUE_APP_COMMON=https://common-api.pickmall.cn
VUE_APP_BUYER=https://buyer-api.pickmall.cn
VUE_APP_SELLER=https://store-api.pickmall.cn
VUE_APP_API_BASE_URL=/api
VUE_APP_WEB_SOCKET_URL=/lili/webSocket
VUE_APP_COMMON=/api
VUE_APP_BUYER=/api
VUE_APP_SELLER=/api
VUE_APP_WEBSITE_NAME="LiLi IM"
VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/
VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/
VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/

View File

@@ -43,7 +43,7 @@
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
server_name im-api.pickmall.cn;
server_name shop.example.com;
location / {
proxy_pass http://127.0.0.1:8088;
}
@@ -68,4 +68,4 @@
try_files $uri $uri/ /index.html;
root /home/im/im/dist;
}
````
````

View File

@@ -22,13 +22,24 @@ const normalizeUrl = (url) => {
return url.endsWith("/") ? url : `${url}/`;
};
const normalizeWsUrl = (url) => {
if (!url || /^wss?:\/\//.test(url)) {
return url || "";
}
if (typeof window !== "undefined" && url.startsWith("/")) {
const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
return `${protocol}//${window.location.host}${url}`;
}
return url;
};
export default {
// 网站名称
WEBSITE_NAME: process.env.VUE_APP_WEBSITE_NAME || "LiLi IM",
// 默认请求IM的API
BASE_API_URL: runtimeApi || process.env.VUE_APP_API_BASE_URL || "",
// 默认请求的WS
BASE_WS_URL: runtimeBase.IM_WS_URL || process.env.VUE_APP_WEB_SOCKET_URL || "",
BASE_WS_URL: normalizeWsUrl(runtimeBase.IM_WS_URL || process.env.VUE_APP_WEB_SOCKET_URL || ""),
// 默认请求公有接口相关 API
BASE_COMMON: apiProd.common || apiDev.common || process.env.VUE_APP_COMMON || "",
// 默认请求用户相关API