zoujing/YGChatCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.brother7.cn/zoujing/YGChatCS

Browse Source
This commit is contained in:
zoujing
2025-08-10 21:27:46 +08:00
parent 4c8dd62090 77936898f6
commit d1557fea04
7 changed files with 230 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
pages/chat/ChatCardAI.vue
View File

@@ -1,73 +1,73 @@
<template>
<view class="container">
<view class="chat-ai">
<ChatMarkdown
:key="textKey"
:text="processedText"
></ChatMarkdown>
<slot name="content"></slot>
</view>
<slot name="footer"></slot>
</view>
<view class="container">
<view class="chat-ai">
<ChatMarkdown :key="textKey" :text="processedText" />
<slot name="content"></slot>
</view>
<slot name="footer"></slot>
</view>
</template>
<script setup>
import { defineProps, computed, ref, watch } from "vue";
import ChatMarkdown from "./ChatMarkdown.vue";
const props = defineProps({
text: {
type: String,
default: ''
}
});
// 用于强制重新渲染的key
const textKey = ref(0);
// 处理文本内容
const processedText = computed(() => {
if (!props.text) {
return '';
}
// 确保文本是字符串类型
const textStr = String(props.text);
// 处理加载状态的文本
if (textStr.includes('加载中') || textStr.includes('...')) {
return textStr;
}
return textStr;
});
// 监听text变化，强制重新渲染
watch(() => props.text, (newText, oldText) => {
if (newText !== oldText) {
textKey.value++;
}
}, { immediate: true });
import { defineProps, computed, ref, watch } from "vue";
import ChatMarkdown from "./ChatMarkdown.vue";
const props = defineProps({
text: {
type: String,
default: "",
},
});
// 用于强制重新渲染的key
const textKey = ref(0);
// 处理文本内容
const processedText = computed(() => {
if (!props.text) {
return "";
}
// 确保文本是字符串类型
const textStr = String(props.text);
// 处理加载状态的文本
if (textStr.includes("加载中") || textStr.includes("...")) {
return textStr;
}
return textStr;
});
// 监听text变化，强制重新渲染
watch(
() => props.text,
(newText, oldText) => {
if (newText !== oldText) {
textKey.value++;
}
},
{ immediate: true }
);
</script>
<style lang="scss" scoped>
.container {
display: flex;
flex-direction: column;
max-width: 100%; // ✅ 限制最大宽度
overflow-x: hidden; // ✅ 防止横向撑开
.chat-ai {
margin: 6px 12px;
padding: 0 12px;
min-width: 80px;
background: rgba(255,255,255,0.4);
box-shadow: 2px 2px 6px 0px rgba(0,0,0,0.1);
border-radius: 4px 20px 20px 20px;
border: 1px solid;
border-color: #FFFFFF;
}
}
.container {
display: flex;
flex-direction: column;
max-width: 100%; // ✅ 限制最大宽度
overflow-x: hidden; // ✅ 防止横向撑开
.chat-ai {
margin: 6px 12px;
padding: 0 12px;
min-width: 80px;
background: rgba(255, 255, 255, 0.4);
box-shadow: 2px 2px 6px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px 20px 20px 20px;
border: 1px solid;
border-color: #ffffff;
}
}
</style>

1
pages/goods/index.vue
View File

@@ -8,6 +8,7 @@
:border-radius="0"
:height="300"
:images="goodsData.commodityPhotoList"
thumbnailBottom="36px"
/>
<view class="goods-content">

1
pages/login/styles/index.scss
View File

@@ -22,6 +22,7 @@
.login-title {
width: 137px;
height: 32px;
margin: 6px auto;
}

51
pages/module/booking/QuickBookingCalender.vue
View File

@@ -14,7 +14,11 @@
<!-- 日历按钮 -->
<view class="calendar-btn btn-bom" @click="openCalendar">
<image src="/static/booking_calendar.png" mode="widthFix" class="calendar-img" />
<image
src="/static/booking_calendar.png"
mode="widthFix"
class="calendar-img"
/>
<text class="calendar-text">日历</text>
</view>
</view>
@@ -30,33 +34,33 @@
</template>
<script setup>
import { ref, onMounted } from 'vue';
const emit = defineEmits(['update:date']); // 声明事件
import Calender from '@/components/Calender/index.vue';
import { ref, onMounted } from "vue";
const emit = defineEmits(["update:date"]); // 声明事件
import Calender from "@/components/Calender/index.vue";
const activeIndex = ref(2); // 默认今天
const dates = ref([]);
const calendarVisible = ref(false)
const selectedDate = ref('')
const calendarVisible = ref(false);
const selectedDate = ref("");
// 处理日历关闭
const handleCalendarClose = () => {
calendarVisible.value = false
}
calendarVisible.value = false;
};
// 处理日期选择
const handleDateSelect = (data) => {
selectedDate.value = data.date
calendarVisible.value = false
console.log('选择的日期:', data.date)
emit('update:date', { fullDate: selectedDate.value}); // 传回父组件
}
selectedDate.value = data.date;
calendarVisible.value = false;
console.log("选择的日期:", data.date);
emit("update:date", { fullDate: selectedDate.value }); // 传回父组件
};
// 初始化日期（前天、昨天、今天、明天、后天）
const initDates = () => {
const today = new Date();
const labels = ['前天', '昨天', '今天', '明天', '后天'];
const labels = ["前天", "昨天", "今天", "明天", "后天"];
for (let i = -2; i <= 2; i++) {
const d = new Date(today);
d.setDate(today.getDate() + i);
@@ -65,18 +69,20 @@ const initDates = () => {
dates.value.push({
label: labels[i + 2],
date: `${month}/${day}`,
fullDate: `${d.getFullYear()}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`
fullDate: `${d.getFullYear()}-${String(month).padStart(2, "0")}-${String(
day
).padStart(2, "0")}`,
});
}
};
const selectDate = (index) => {
activeIndex.value = index;
emit('update:date', dates.value[index]); // 传回父组件
activeIndex.value = index;
emit("update:date", dates.value[index]); // 传回父组件
};
const openCalendar = () => {
calendarVisible.value = true
calendarVisible.value = true;
};
onMounted(() => {
@@ -88,8 +94,10 @@ onMounted(() => {
.date-picker {
background: rgba(140, 236, 255, 0.24);
padding: 8rpx 0;
border-radius: 8rpx;
margin-top: 12px;
border-radius: 16rpx;
margin: 12px 0 6px;
min-width: 325px;
box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.1); /* 阴影 */
}
.date-list {
@@ -118,7 +126,7 @@ onMounted(() => {
}
.date-item.active {
background-color: #00A6FF;
background-color: #00a6ff;
}
.date-item.active .label,
.date-item.active .date {
@@ -130,7 +138,6 @@ onMounted(() => {
background: #fff;
border-radius: 0 16rpx 16rpx 0;
margin: -8rpx 0;
box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.1); /* 阴影 */
}
.calendar-img {
width: 16px;

126
pages/module/booking/QuickBookingComponent.vue
View File

@@ -1,78 +1,74 @@
<template>
<view class="container">
<QuickBookingCalender class="calendar" @update:date="onDateSelected" />
<view v-for="item in commodityGroupDTOList" :key="commodityGroupKey(item.title)">
<QuickBookingContentList :commodityDTO="item" />
</view>
</view>
<view class="container">
<QuickBookingCalender class="calendar" @update:date="onDateSelected" />
<view
v-for="item in commodityGroupDTOList"
:key="commodityGroupKey(item.title)"
>
<QuickBookingContentList :commodityDTO="item" />
</view>
</view>
</template>
<script setup>
import QuickBookingCalender from './QuickBookingCalender.vue'
import QuickBookingContentList from './QuickBookingContentList.vue'
import { ref, nextTick } from 'vue'
import { onMounted } from 'vue'
import { quickBookingComponent } from '@/request/api/MainPageDataApi'
import { SCROLL_TO_BOTTOM } from '@/constant/constant'
import QuickBookingCalender from "./QuickBookingCalender.vue";
import QuickBookingContentList from "./QuickBookingContentList.vue";
import { ref, nextTick } from "vue";
import { onMounted } from "vue";
import { quickBookingComponent } from "@/request/api/MainPageDataApi";
import { SCROLL_TO_BOTTOM } from "@/constant/constant";
const selectedDate = ref({});
const selectedDate = ref({});
const commodityGroupDTOList = ref([])
const formattedDate = ref('')
const commodityGroupDTOList = ref([]);
const formattedDate = ref("");
const loadQuickBookingComponent = async () => {
formattedDate.value = formatDate(selectedDate.value.fullDate || new Date());
const res = await quickBookingComponent(formattedDate.value)
if(res.code === 0 && res.data) {
commodityGroupDTOList.value = res.data.commodityGroupDTOList
nextTick(() => {
setTimeout(() => {
uni.$emit(SCROLL_TO_BOTTOM, true)
}, 300)
});
}
}
const onDateSelected = (date) => {
console.log('Selected date:', date);
selectedDate.value = date;
loadQuickBookingComponent();
};
const loadQuickBookingComponent = async () => {
formattedDate.value = formatDate(selectedDate.value.fullDate || new Date());
const res = await quickBookingComponent(formattedDate.value);
if (res.code === 0 && res.data) {
commodityGroupDTOList.value = res.data.commodityGroupDTOList;
nextTick(() => {
setTimeout(() => {
uni.$emit(SCROLL_TO_BOTTOM, true);
}, 300);
});
}
};
// 格式化日期为 yyyy-MM-dd
const formatDate = (date) => {
const d = new Date(date);
const year = d.getFullYear();
const month = String(d.getMonth() + 1).padStart(2, '0');
const day = String(d.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
};
const commodityGroupKey = (title) => {
return `${title}${formattedDate.value}`
}
const onDateSelected = (date) => {
console.log("Selected date:", date);
selectedDate.value = date;
loadQuickBookingComponent();
};
onMounted(() => {
console.log('=============')
loadQuickBookingComponent()
})
// 格式化日期为 yyyy-MM-dd
const formatDate = (date) => {
const d = new Date(date);
const year = d.getFullYear();
const month = String(d.getMonth() + 1).padStart(2, "0");
const day = String(d.getDate()).padStart(2, "0");
return `${year}-${month}-${day}`;
};
const commodityGroupKey = (title) => {
return `${title}${formattedDate.value}`;
};
onMounted(() => {
console.log("=============");
loadQuickBookingComponent();
});
</script>
<style scoped lang="scss">
.container {
width: 100%;
flex: 1;
margin-bottom: 12px;
.calendar {
width: 100%;
height: 58px;
margin: 12px 0 6px;
}
}
.container {
width: 100%;
flex: 1;
margin-bottom: 12px;
.calendar {
width: 100%;
}
}
</style>