feat: 版本号提交

feat: 调整
feat: 长文本组件的页面滚动问题
2026-04-19 00:13:41 +08:00 · 2026-04-17 17:07:05 +08:00 · 2026-04-17 14:39:55 +08:00 · 2026-04-13 22:33:17 +08:00
4 changed files with 155 additions and 30 deletions
--- a/src/components/Calender/index.vue
+++ b/src/components/Calender/index.vue
@@ -50,7 +50,13 @@
                    {{ dateInfo.label }}
                  </text>
                  <text class="date-number">{{ dateInfo.day }}</text>
-                  <text class="date-price" v-if="dateInfo.price !== null && dateInfo.price !== undefined">¥{{ dateInfo.price }}</text>
+                  <text
+                    class="date-price"
+                    v-if="
+                      dateInfo.price !== null && dateInfo.price !== undefined
+                    "
+                    >¥{{ dateInfo.price }}</text
+                  >
                </template>
              </view>
            </view>
@@ -253,7 +259,7 @@ const generateCalendarGrid = (year, month) => {
  // 填充日期
  for (let day = 1; day <= daysInMonth; day++) {
    const dateStr = `${year}-${String(month).padStart(2, "0")}-${String(
-      day
+      day,
    ).padStart(2, "0")}`;
    const priceItem = getPriceItem(dateStr);
    grid.push({
@@ -344,7 +350,11 @@ const getDateCellClass = (dateInfo) => {
  if (dateInfo.selected) classes.push("date-cell-selected");
  if (dateInfo.inRange) classes.push("date-cell-in-range");
  // 标注无价格但可选的日期（用于视觉区分）
-  if (dateInfo.price === null || dateInfo.price === undefined || dateInfo.price === "-") {
+  if (
+    dateInfo.price === null ||
+    dateInfo.price === undefined ||
+    dateInfo.price === "-"
+  ) {
    classes.push("date-cell-no-price");
  }

@@ -404,13 +414,19 @@ const handleRangeSelection = (dateInfo) => {
  if (!rangeStart.value || (rangeStart.value && rangeEnd.value)) {
    // 开始新的范围选择：当作为价格区间选择器时，开始日必须有价格且有库存
    if (props.rangeRequirePrice) {
-      const hasPrice = dateInfo.price !== null && dateInfo.price !== undefined && dateInfo.price !== "-";
+      const hasPrice =
+        dateInfo.price !== null &&
+        dateInfo.price !== undefined &&
+        dateInfo.price !== "-";
      if (!hasPrice) {
        uni.showToast({ title: "所选日期不可预订，请重新选择", icon: "none" });
        return;
      }
      if (dateInfo.stock !== undefined && Number(dateInfo.stock) <= 0) {
-        uni.showToast({ title: "所选日期库存不足，请选择其他日期", icon: "none" });
+        uni.showToast({
+          title: "所选日期库存不足，请选择其他日期",
+          icon: "none",
+        });
        return;
      }
    }
@@ -421,11 +437,16 @@ const handleRangeSelection = (dateInfo) => {
    return;
  }

-  // 否则为结束日期（完成选择）——结束日允许无价格（如为紧接有价日的下一天），但区间内的夜晚必须有价格
+  // 否则为结束日期（完成选择）
+  if (rangeStart.value === dateInfo.date) {
+    uni.showToast({ title: "离店日期不能与入住日期相同", icon: "none" });
+    return;
+  }
+
  rangeEnd.value = dateInfo.date;
  isRangeSelecting.value = false;

-  // 允许选择相同日期，但确保开始日期不大于结束日期
+  // 确保开始日期不大于结束日期
  if (new Date(rangeStart.value) > new Date(rangeEnd.value)) {
    [rangeStart.value, rangeEnd.value] = [rangeEnd.value, rangeStart.value];
  }
@@ -433,7 +454,11 @@ const handleRangeSelection = (dateInfo) => {
  // 检查日期跨度是否超过28天
  const daysBetween = calculateDaysBetween(rangeStart.value, rangeEnd.value);
  if (daysBetween > 28) {
-    uni.showToast({ title: "预定时间不能超过28天", icon: "none", duration: 3000 });
+    uni.showToast({
+      title: "预定时间不能超过28天",
+      icon: "none",
+      duration: 3000,
+    });
    rangeStart.value = null;
    rangeEnd.value = null;
    isRangeSelecting.value = false;
@@ -443,9 +468,14 @@ const handleRangeSelection = (dateInfo) => {
  // 如果作为价格区间选择器，验证夜晚（不包含离店日）是否都有价格/库存
  if (props.rangeRequirePrice) {
    const nights = generateNightsRange(rangeStart.value, rangeEnd.value);
-    const missing = nights.find((d) => d.price === null || d.price === undefined || d.price === "-");
+    const missing = nights.find(
+      (d) => d.price === null || d.price === undefined || d.price === "-",
+    );
    if (missing) {
-      uni.showToast({ title: "所选区间包含无价格日期，请重新选择", icon: "none" });
+      uni.showToast({
+        title: "所选区间包含无价格日期，请重新选择",
+        icon: "none",
+      });
      rangeStart.value = null;
      rangeEnd.value = null;
      return;
@@ -456,7 +486,10 @@ const handleRangeSelection = (dateInfo) => {
      return item && item.stock !== undefined && Number(item.stock) <= 0;
    });
    if (badStock) {
-      uni.showToast({ title: "所选区间包含库存不足的日期，请重新选择", icon: "none" });
+      uni.showToast({
+        title: "所选区间包含库存不足的日期，请重新选择",
+        icon: "none",
+      });
      rangeStart.value = null;
      rangeEnd.value = null;
      return;
@@ -551,7 +584,7 @@ watch(
      popup.value?.close();
    }
  },
-  { immediate: true }
+  { immediate: true },
 );

 // 生命周期钩子
--- a/src/pages/index/components/module/AnswerComponent/index.vue
+++ b/src/pages/index/components/module/AnswerComponent/index.vue
@@ -124,7 +124,8 @@ const lookDetailAction = () => {
    } catch (e) {}
  });

-  uni.navigateTo({ url: `/pages/long-answer/index?streamId=${encodeURIComponent(streamId)}` });
+  // 传递 finished 参数，完成状态下不自动滚到底部
+  uni.navigateTo({ url: `/pages/long-answer/index?streamId=${encodeURIComponent(streamId)}&finished=${props.finish ? '1' : '0'}` });
 }

 </script>
--- a/src/pages/long-answer/index.vue
+++ b/src/pages/long-answer/index.vue
@@ -6,9 +6,9 @@
    </view>

    <!-- ✅ 滚动区域 -->
-    <scroll-view class="flex-full overflow-hidden" scroll-y :scroll-into-view="scrollIntoViewId" scroll-with-animation>
+    <scroll-view class="flex-full overflow-hidden chat-scroll" scroll-y :scroll-into-view="scrollIntoViewId" scroll-with-animation @scroll="onScroll" @touchstart="onTouchStart" @touchend="onTouchEnd" @touchcancel="onTouchEnd">
      <view class="pt-12 px-12 pb-24 border-box">
-         <!-- ✅ 答案内容，支持markdown -->
+         <!-- ✅ 内容，支持markdown -->
        <ChatMarkdown :text="answerText" />

        <!-- ✅ 底部锚点（必须存在） -->
@@ -40,20 +40,91 @@ let unsubscribe = null;
 /** ✅ scroll-into-view 控制 */
 const scrollIntoViewId = ref("");

+/** 滚动控制状态 */
+const isNearBottom = ref(true);
+const scrollViewHeight = ref(0);
+const SCROLL_THRESHOLD = 150; // px
+
+/** 用户交互状态，用户滚动/触摸时临时禁用自动滚动 */
+const userInteracting = ref(false);
+let interactionTimer = null;
+
+/** 是否已完成（从 URL 参数判断），完成状态下不初始初自动滚到底部 */
+let isFinishedOnInit = false;
+
 /** ✅ 防抖 */
 let scrollTimer = null;

-function scrollToBottom() {
+const measureScrollViewHeight = () => {
+  try {
+    // 使用 uni.createSelectorQuery 获取 scroll-view 的准确高度
+    uni.createSelectorQuery()
+      .select(".chat-scroll")
+      .boundingClientRect((rect) => {
+        if (rect && rect.height) {
+          scrollViewHeight.value = rect.height;
+        }
+      })
+      .exec();
+  } catch (e) { }
+}
+
+/** 生成展示用标题：去除前导 `#` 并截取前 6 字符（超过加省略号） */
+const computeTitle = (text = "") => {
+  const t = (text || "").replace(/^#+\s*/, "");
+  return t.length > 8 ? t.substring(0, 8) + "..." : t;
+}
+
+const onScroll = (e) => {
+  try {
+    const { scrollTop = 0, scrollHeight = 0 } = e.detail || {};
+    
+    // 计算距离底部的距离（使用准确的 scroll-view 高度）
+    const viewHeight = scrollViewHeight.value;
+    const distanceToBottom = scrollHeight - scrollTop - viewHeight;
+    
+    // 判断是否在底部附近（允许 SCROLL_THRESHOLD 的误差范围）
+    // 注意：只更新 isNearBottom，不在滚动时强制改变 userInteracting
+    const atBottom = distanceToBottom <= SCROLL_THRESHOLD;
+    isNearBottom.value = atBottom;
+  } catch (e) { }
+}
+
+const onTouchStart = () => {
+  // 触摸开始时，立即标记为用户交互状态
+  userInteracting.value = true;
+  clearTimeout(interactionTimer);
+}
+
+const onTouchEnd = () => {
+  // 触摸结束后延迟一段时间再取消交互状态
+  // 这样即使用户快速滚动，也不会被中途打断
+  clearTimeout(interactionTimer);
+  interactionTimer = setTimeout(() => {
+    userInteracting.value = false;
+  }, 600);
+}
+
+const scrollToBottom = () => {
  if (scrollTimer) return;
+  if (isFinishedOnInit) return;

  scrollTimer = setTimeout(() => {
    // ❗关键：强制触发滚动（小程序必须这样）
+    // 如果用户正在交互，则跳过本次自动滚动
+    if (userInteracting.value) {
+      scrollTimer = null;
+      return;
+    }
+
    scrollIntoViewId.value = "";

    nextTick(() => {
      // 再次 nextTick + 延迟，兼容 markdown 渲染延迟
      setTimeout(() => {
        scrollIntoViewId.value = "bottom-anchor";
+        // 测量高度以便后续滚动判断准确
+        measureScrollViewHeight();
      }, 50);
    });

@@ -61,32 +132,47 @@ function scrollToBottom() {
  }, 100);
 }

-onLoad(({ message = "", streamId = "" }) => {
+onLoad(({ message = "", streamId = "", finished = "0" }) => {
+  // 记录初始完成状态
+  isFinishedOnInit = finished === "1";
+
+  console.log("LongAnswer onLoad with params:", { message, streamId, finished });
+
+  // 初次测量 scroll-view 高度
+  nextTick(() => {
+    measureScrollViewHeight();
+  });
+
  if (streamId) {
    // ✅ 流式数据
    unsubscribe = StreamManager.subscribe(
      streamId,
      (text = "", finished = false) => {
        answerText.value = text || "";
-
-        if (answerText.value.length > 6) {
-          title.value = answerText.value.substring(0, 6) + "...";
-        }
+        title.value = computeTitle(answerText.value);

        nextTick(() => {
+          // 每次接收数据都重新测量高度（content size 可能变化，比如加载图）
+          measureScrollViewHeight();
+          
+          // 流式完成时强制滚动到底部
+          if (finished) {
            scrollToBottom();
+          } 
+          // 流式中的数据更新：只有在用户未交互且接近底部时才自动滚动
+          else if (!userInteracting.value && isNearBottom.value) {
+            scrollToBottom();
+          }
        });
      }
    );
  } else {
    // ✅ 非流式
    answerText.value = decodeURIComponent(message || "");
-
-    if (answerText.value.length > 6) {
-      title.value = answerText.value.substring(0, 6) + "...";
-    }
+    title.value = computeTitle(answerText.value);

    nextTick(() => {
+      // 只有在初始化为非完成状态时才自动滚到底部
      scrollToBottom();
    });
  }
@@ -96,6 +182,11 @@ onUnload(() => {
  try {
    unsubscribe && unsubscribe();
  } catch (e) { }
+  // 清理定时器，避免内存泄漏
+  try { clearTimeout(scrollTimer); } catch (e) { }
+  try { clearTimeout(interactionTimer); } catch (e) { }
+  scrollTimer = null;
+  interactionTimer = null;
 });
 </script>

--- a/src/request/base/config.js
+++ b/src/request/base/config.js
@@ -4,15 +4,15 @@ import { devUrl, wssDevUrl } from "./baseUrl";
 import { getServiceUrl } from "../api/GetServiceUrlApi";

 /// 版本号， 每次发版本前增加
-const versionValue = "1.0.4";
+const versionValue = "1.1.1";

 /// 是否是测试版本， 测试版本为true， 发布版本为false
-const developVersion = true;
+const developVersion = false;

 // 获取服务地址
 const getEvnUrl = async () => {
-  /// 智念客户端不需要获取环境地址
-  if (isZhiNian || developVersion) {
+  /// 不需要获取环境地址
+  if (developVersion) {
    const appStore = useAppStore();
    appStore.setServerConfig({
      baseUrl: devUrl, // 服务器基础地址
Author	SHA1	Message	Date
zoujing	8ea6546f04	feat: 版本号提交	2026-04-19 00:13:41 +08:00
zoujing	f70920a25c	feat: 调整	2026-04-17 17:07:05 +08:00
zoujing	d666dce813	feat: 长文本组件的页面滚动问题	2026-04-17 14:39:55 +08:00
zoujing	7aa8c72005	feat: 酒店的日期选择调整	2026-04-13 22:33:17 +08:00