Compare commits
No commits in common. "2f8186f675a886451559c5ef49d7c8efabe406ba" and "022b21facd9f86a304793882c7b01f079a7f28f9" have entirely different histories.
2f8186f675
...
022b21facd
@ -1,5 +1,5 @@
|
|||||||
NODE_ENV = development
|
NODE_ENV = development
|
||||||
|
|
||||||
VITE_BASE_URL = https://biz.nianxx.cn
|
VITE_BASE_URL = https://onefeel.brother7.cn/ingress
|
||||||
|
|
||||||
VITE_WSS_URL = wss://biz.nianxx.cn/agent/ws/chat
|
VITE_WSS_URL = wss://onefeel.brother7.cn/ingress/agent/ws/chat
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
NODE_ENV = production
|
NODE_ENV = production
|
||||||
|
|
||||||
VITE_BASE_URL = https://biz.nianxx.cn
|
VITE_BASE_URL = https://onefeel.brother7.cn/ingress
|
||||||
|
|
||||||
VITE_WSS_URL = wss://biz.nianxx.cn/agent/ws/chat
|
VITE_WSS_URL = wss://onefeel.brother7.cn/ingress/agent/ws/chat
|
||||||
@ -1,5 +1,5 @@
|
|||||||
NODE_ENV = staging
|
NODE_ENV = staging
|
||||||
|
|
||||||
VITE_BASE_URL = https://biz.nianxx.cn
|
VITE_BASE_URL = https://onefeel.brother7.cn/ingress
|
||||||
|
|
||||||
VITE_WSS_URL = wss://biz.nianxx.cn/agent/ws/chat
|
VITE_WSS_URL = wss://onefeel.brother7.cn/ingress/agent/ws/chat
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 33 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB |
@ -1,16 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="store-address" @click="openMap">
|
<view class="store-address" @click="openMap">
|
||||||
<view class="text-container">
|
<text class="location-label">位于 [{{ orderData.commodityAddress }}]</text>
|
||||||
<text class="location-label"
|
<text class="address-text">{{ orderData.commodityAddress }}</text>
|
||||||
>位于「{{ orderData.oneLevelAddress }}」
|
|
||||||
</text>
|
|
||||||
<text class="address-text">{{ orderData.commodityAddress }}</text>
|
|
||||||
</view>
|
|
||||||
<image
|
|
||||||
class="loc-icon"
|
|
||||||
src="./images/loc_icon_img.png"
|
|
||||||
mode="aspectFit"
|
|
||||||
></image>
|
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
.store-address {
|
.store-address {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: start;
|
||||||
|
flex-direction: column;
|
||||||
padding: 16px 12px;
|
padding: 16px 12px;
|
||||||
background-color: #f8f9fa;
|
background-color: #f0f0f0;
|
||||||
background-image: url("./images/loc_bg_img.png"); // 预留背景图片位置,用户手动导入
|
background-image: url(""); // 预留背景图片位置,用户手动导入
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
border-radius: 12px;
|
border-radius: 12px;
|
||||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
|
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: #333;
|
color: #333;
|
||||||
position: relative;
|
position: relative;
|
||||||
@ -25,19 +25,9 @@
|
|||||||
z-index: 1;
|
z-index: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 左侧文本容器
|
|
||||||
.text-container {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
flex: 1;
|
|
||||||
position: relative;
|
|
||||||
z-index: 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 确保内容在遮罩层之上
|
// 确保内容在遮罩层之上
|
||||||
.location-label,
|
.location-label,
|
||||||
.address-text,
|
.address-text {
|
||||||
.loc-icon {
|
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
}
|
}
|
||||||
@ -45,20 +35,15 @@
|
|||||||
.location-label {
|
.location-label {
|
||||||
color: #333;
|
color: #333;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
margin-right: 4px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
|
|
||||||
.address-text {
|
.address-text {
|
||||||
margin-top: 4px;
|
margin-top: 4px;
|
||||||
|
flex: 1;
|
||||||
color: #666;
|
color: #666;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 右侧图标样式
|
|
||||||
.loc-icon {
|
|
||||||
width: 24px;
|
|
||||||
height: 24px;
|
|
||||||
margin-left: 12px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,8 +1,6 @@
|
|||||||
const isProd = true;
|
const isProd = true;
|
||||||
|
|
||||||
console.log(import.meta.env);
|
export const BASE_URL = "https://onefeel.brother7.cn/ingress"; //'http://8.138.234.141/ingress'
|
||||||
|
|
||||||
export const BASE_URL = import.meta.env.VITE_BASE_URL;
|
|
||||||
|
|
||||||
// socket地址
|
// socket地址
|
||||||
export const WSS_URL = import.meta.env.VITE_WSS_URL;
|
export const WSS_URL = "wss://onefeel.brother7.cn/ingress/agent/ws/chat";
|
||||||
|
|||||||
@ -297,6 +297,7 @@ const sendMessageAction = (inputText) => {
|
|||||||
if (!inputText.trim()) return;
|
if (!inputText.trim()) return;
|
||||||
handleNoHideKeyboard();
|
handleNoHideKeyboard();
|
||||||
|
|
||||||
|
currentSessionMessageId = IdUtils.generateMessageId();
|
||||||
// 重置消息状态,准备接收新的AI回复
|
// 重置消息状态,准备接收新的AI回复
|
||||||
resetMessageState();
|
resetMessageState();
|
||||||
|
|
||||||
@ -635,7 +636,6 @@ const sendChat = (message, isInstruct = false) => {
|
|||||||
|
|
||||||
const messageType = isInstruct ? 1 : 0;
|
const messageType = isInstruct ? 1 : 0;
|
||||||
const messageContent = isInstruct ? commonType : message;
|
const messageContent = isInstruct ? commonType : message;
|
||||||
currentSessionMessageId = IdUtils.generateMessageId();
|
|
||||||
|
|
||||||
// 重置消息状态,为新消息做准备
|
// 重置消息状态,为新消息做准备
|
||||||
resetMessageState();
|
resetMessageState();
|
||||||
|
|||||||
@ -60,8 +60,15 @@ const sendReply = (text) => {
|
|||||||
padding: 2px 12px;
|
padding: 2px 12px;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
flex-shrink: 0;
|
min-width: 46px;
|
||||||
white-space: nowrap;
|
|
||||||
|
// &:first-child {
|
||||||
|
// margin-left: 12px;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// &:last-child {
|
||||||
|
// margin-right: 12px;
|
||||||
|
// }
|
||||||
|
|
||||||
.more-tips-item-title {
|
.more-tips-item-title {
|
||||||
font-family: PingFang SC, PingFang SC;
|
font-family: PingFang SC, PingFang SC;
|
||||||
@ -70,7 +77,6 @@ const sendReply = (text) => {
|
|||||||
color: #00a6ff;
|
color: #00a6ff;
|
||||||
line-height: 24px;
|
line-height: 24px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
white-space: nowrap;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,9 +5,8 @@
|
|||||||
<image
|
<image
|
||||||
class="top-item-left"
|
class="top-item-left"
|
||||||
:src="initPageImages.welcomeImageUrl"
|
:src="initPageImages.welcomeImageUrl"
|
||||||
mode="aspectFit"
|
|
||||||
></image>
|
></image>
|
||||||
<image class="top-item-right" :src="initPageImages.logoImageUrl" mode="aspectFit"></image>
|
<image class="top-item-right" :src="initPageImages.logoImageUrl"></image>
|
||||||
</view>
|
</view>
|
||||||
<ChatCardAI v-if="welcomeContent.length" :text="welcomeContent" />
|
<ChatCardAI v-if="welcomeContent.length" :text="welcomeContent" />
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -96,7 +96,7 @@ const handleAgreeAndGetPhone = () => {
|
|||||||
|
|
||||||
const onLogin = (e) => {
|
const onLogin = (e) => {
|
||||||
const { code } = e.detail;
|
const { code } = e.detail;
|
||||||
console.info("onLogin code: ", code);
|
console.error("onLogin code", code);
|
||||||
|
|
||||||
loginAuth()
|
loginAuth()
|
||||||
.then(async () => {
|
.then(async () => {
|
||||||
@ -155,4 +155,4 @@ getPrivacyAgreementData();
|
|||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import "./styles/index.scss";
|
@import "./styles/index.scss";
|
||||||
</style>
|
</style>
|
||||||
@ -1,4 +1,4 @@
|
|||||||
import { BASE_URL } from "../../constant/base";
|
// import { BASE_URL } from "../../constant/base";
|
||||||
import { goLogin } from "@/hooks/useGoLogin";
|
import { goLogin } from "@/hooks/useGoLogin";
|
||||||
|
|
||||||
const defaultConfig = {
|
const defaultConfig = {
|
||||||
@ -8,6 +8,9 @@ const defaultConfig = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const BASE_URL = import.meta.env.VITE_BASE_URL;
|
||||||
|
console.log(import.meta.env);
|
||||||
|
|
||||||
function request(url, args = {}, method = "POST", customConfig = {}) {
|
function request(url, args = {}, method = "POST", customConfig = {}) {
|
||||||
// 判断 url 是否以 http 开头
|
// 判断 url 是否以 http 开头
|
||||||
if (!/^http/.test(url)) {
|
if (!/^http/.test(url)) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user