Merge branch 'fix-109' of https://git.nianxx.cn/zoujing/YGChatCS

src/components/Stepper/index.vue

@@ -1,8 +1,10 @@
 <template>
-  <view class="stepper-wrapper">
-    <uni-icons type="minus" size="24" color="#999" @click="decrease" />
-    <text class="stepper-text">{{ value }}</text>
-    <uni-icons type="plus" size="24" color="#999" @click="increase" />
+  <view class="stepper-wrapper border-box flex flex-items-center rounded-8">
+    <uni-icons type="minus" size="24" color="#D1D1D1" @click="decrease" />
+    <text class="stepper-text text-center font-size-14 font-500 color-000">
+      {{ value }} {{ unit }}
+    </text>
+    <uni-icons type="plus" size="24" color="#198CFF" @click="increase" />
   </view>
 </template>
 
@@ -23,6 +25,10 @@ const props = defineProps({
     type: Number,
     default: 100,
   },
+  unit: {
+    type: String,
+    default: "",
+  },
 });
 
 // Emit

src/components/Stepper/styles/index.scss

@@ -1,11 +1,8 @@
 .stepper-wrapper {
-  display: flex;
-  align-items: center;
+  background-color: #f3f9ff;
+  padding: 4px 7px;
 }
 
 .stepper-text {
-  width: 40px;
-  font-size: $uni-font-size-lg;
-  color: $uni-text-color;
-  text-align: center;
+  width: 30px;
 }

src/pages-booking/components/ConactSection/index.vue

@@ -0,0 +1,45 @@
+<template>
+  <!-- 选择数量 -->
+  <view
+    class="border-box bg-white p-12 rounded-12 flex flex-items-center mb-12"
+  >
+    <view class="flex-full">
+      <view class="font-size-16 font-500 color-000 line-height-24"
+        >选择数量</view
+      >
+      <view class="font-size-12 color-A3A3A3 line-height-16">
+        请选择套餐数量
+      </view>
+    </view>
+    <view class="right">
+      <Stepper v-model="quantity" />
+    </view>
+  </view>
+
+  <!-- 联系方式 -->
+  <view class="bg-white rounded-12 overflow-hidden">
+    <view
+      class="border-box border-bottom font-size-16 font-500 color-000 line-height-24 p-12"
+      >联系方式</view
+    >
+    <view class="flex flex-items-center border-box p-12">
+      <view class="font-size-14 font-500 color-525866 mr-12"> 联系手机 </view>
+      <view class="right">
+        <input
+          class="border-box rounded-8 px-4 py-2 font-size-15 color-000 line-height-20"
+          placeholder="请输入联系手机"
+          maxlength="11"
+        />
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import Stepper from "@/components/Stepper/index.vue";
+
+const quantity = ref(1);
+</script>
+
+<style></style>

src/pages-booking/components/UserSection/index.vue

@@ -0,0 +1,45 @@
+<template>
+  <view class="bg-white rounded-12 overflow-hidden mb-12">
+    <view class="flex flex-items-center border-box p-12 border-bottom">
+      <view class="font-size-16 font-500 color-000 line-height-24 flex-full"
+        >入住信息</view
+      >
+      <view class="right">
+        <Stepper v-model="quantity" unit="间" />
+      </view>
+    </view>
+
+    <view class="border-box pl-12 pr-12">
+      <view class="border-box border-bottom pt-12 pb-12 flex flex-items-center">
+        <view class="font-size-14 font-500 color-525866 mr-12"> 住客姓名 </view>
+        <view class="right">
+          <input
+            class="border-box rounded-8 px-4 py-2 font-size-15 color-000 line-height-20"
+            placeholder="请输入姓名"
+            maxlength="11"
+          />
+        </view>
+      </view>
+
+      <view class="flex flex-items-center border-box pt-12 pb-12">
+        <view class="font-size-14 font-500 color-525866 mr-12"> 联系手机 </view>
+        <view class="right">
+          <input
+            class="border-box rounded-8 px-4 py-2 font-size-15 color-000 line-height-20"
+            placeholder="请输入联系手机"
+            maxlength="11"
+          />
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import Stepper from "@/components/Stepper/index.vue";
+
+const quantity = ref(1);
+</script>
+
+<style></style>

src/pages-booking/index.vue

@@ -0,0 +1,61 @@
+<template>
+  <view class="booking h-screen flex flex-col">
+    <TopNavBar
+      titleAlign="center"
+      backgroundColor="#D9EEFF"
+      backIconColor="#000"
+      :shadow="false"
+    >
+      <template #title>
+        {{ title }}
+      </template>
+    </TopNavBar>
+
+    <view class="booking-content flex-full border-box p-12">
+      <!-- 预约内容 -->
+      <view class="border-box bg-white p-12 rounded-12 mb-12">
+        <view class="font-size-16 font-500 color-000 line-height-24"
+          >【温泉季】戏水单人票 +单人简餐</view
+        >
+
+        <view
+          class="border-box border-bottom font-size-12 color-99A0AE line-height-16 pb-12"
+          >温泉早鸟票2张 黄南武辣子鸡2人套餐1份</view
+        >
+
+        <view
+          class="border-box flex flex-items-center flex-justify-between pt-12"
+        >
+          <text class="font-size-12 color-43669A line-height-18"
+            >使用时间:周一至周日9:00-22:00</text
+          >
+          <view class="flex flex-items-center">
+            <text class="font-size-12 color-2D91FF line-height-16"
+              >取消政策</text
+            >
+            <uni-icons type="right" size="15" color="#99A0AE" />
+          </view>
+        </view>
+      </view>
+
+      <!-- 非酒店类型 -->
+      <ContactSection v-if="false" />
+
+      <!-- 酒店类型 -->
+      <UserSection />
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import TopNavBar from "@/components/TopNavBar/index.vue";
+import ContactSection from "./components/ConactSection/index.vue";
+import UserSection from "./components/UserSection/index.vue";
+
+const title = ref("预约");
+</script>
+
+<style scoped lang="scss">
+@import "./styles/index.scss";
+</style>

src/pages-booking/styles/index.scss

@@ -0,0 +1,4 @@
+.booking {
+  background: linear-gradient(180deg, #d9eeff 0%, #f5f7fa 100%) 0 86px / 100%
+    100px no-repeat;
+}

src/pages-quick/components/Card/index.vue

@@ -1,19 +1,22 @@
 <template>
   <view
     class="card bg-white border-box p-8 rounded-12 flex flex-items-start m-12"
-    @click="handleClick(item)"
+    @click.stop="handleClick(item)"
   >
     <image
       class="left rounded-10"
-      :src="item.commodityIcon"
+      :src="item.commodityPhoto"
       mode="aspectFill"
     />
     <view class="right border-box flex-full pl-12">
       <view class="font-size-16 line-height-24 color-171717 mb-4">
         {{ item.commodityName }}
       </view>
-      <view class="font-size-12 line-height-16 color-99A0AE mb-4">
-        1 张 1.8 米大床
+      <view
+        v-if="item.commodityFacility"
+        class="font-size-12 line-height-16 color-99A0AE mb-4"
+      >
+        {{ item.commodityFacility.join(" ") }}
       </view>
       <view class="font-size-12 line-height-18 color-43669A">
         {{ item.commodityTradeRuleList.join(" / ") }}
@@ -23,12 +26,16 @@
         <text
           class="amt font-size-18 font-500 font-family-misans-vf line-height-24 color-FF3D60 mr-4"
         >
-          {{ item.commodityPrice }}
+          {{ item.specificationPrice }}
         </text>
         <text class="font-size-12 line-height-16 color-99A0AE">
           /{{ item.stockUnitLabel }}
         </text>
-        <text class="btn border-box rounded-10 color-white ml-16">订</text>
+        <text
+          class="btn border-box rounded-10 color-white ml-16"
+          @click.stop="handleBooking(item)"
+          >订</text
+        >
       </view>
     </view>
   </view>
@@ -43,10 +50,10 @@ const props = defineProps({
     type: Object,
     required: true,
     default: () => ({
-      commodityIcon: "",
+      commodityPhoto: "",
       commodityId: "",
       commodityName: "",
-      commodityPrice: "",
+      specificationPrice: "",
       commodityServices: [],
       commodityTags: [], // 商品标签
       commodityTradeRuleList: [], // 交易规则列表
@@ -59,6 +66,10 @@ const props = defineProps({
 const handleClick = ({ commodityId }) => {
   uni.navigateTo({ url: `/pages/goods/index?commodityId=${commodityId}` });
 };
+
+const handleBooking = ({ commodityId }) => {
+  uni.navigateTo({ url: `/pages/booking/index?commodityId=${commodityId}` });
+};
 </script>
 
 <style scoped lang="scss">

src/pages-quick/list.vue

@@ -79,22 +79,27 @@ const selectedDate = ref({
   totalDays: 1,
 });
 const dataList = ref([]);
-const commodityGroupDTOList = ref([]);
 const paging = ref(null);
 const currentType = ref("0"); // 当前选中类型
 
 const queryList = async (pageNum = 1, pageSize = 10) => {
   try {
-    const res = await quickBookingList({
+    const params = {
       commodityTypeCode: currentType.value,
       size: pageSize,
       current: pageNum,
-    });
-    console.log("API响应:", res.data.commodityGroupDTOList);
+    };
 
-    if (res && res.data && res.data.commodityGroupDTOList) {
-      commodityGroupDTOList.value = res.data.commodityGroupDTOList;
-      const records = res.data.commodityGroupDTOList[0].commodityList;
+    if (currentType.value === "0") {
+      params.checkInDate = selectedDate.value.startDate;
+      params.checkOutDate = selectedDate.value.endDate;
+    }
+
+    const res = await quickBookingList(params);
+    console.log("API响应:", res.data.records);
+
+    if (res && res.data && res.data.records) {
+      const records = res.data.records;
 
       // 完成数据加载，第二个参数表示是否还有更多数据
       paging.value.complete(records);
@@ -112,13 +117,11 @@ const queryList = async (pageNum = 1, pageSize = 10) => {
 const handleTabChange = ({ item }) => {
   console.log("item", item.value);
   currentType.value = item.value;
-  // 从列表中找到对应的商品列表
-  const { commodityList } =
-    commodityGroupDTOList.value.find(
-      (i) => i.commodityTypeCode === item.value
-    ) || {};
-  dataList.value = commodityList || [];
-  paging.value.complete(commodityList);
+
+  if (currentType.value === "0") {
+  }
+
+  paging.value.reload();
 };
 
 // 处理日历关闭
@@ -131,6 +134,7 @@ const handleDateSelect = (data) => {
   selectedDate.value = data;
   calendarVisible.value = false;
   console.log("选择的日期:", data);
+  paging.value.reload();
 };
 </script>
 

src/pages.json

@@ -64,6 +64,17 @@
           }
         }
       ]
+    },
+    {
+      "root": "pages-booking",
+      "pages": [
+        {
+          "path": "index",
+          "style": {
+            "navigationStyle": "custom"
+          }
+        }
+      ]
     }
   ],
   "globalStyle": {

src/pages/goods/album/index.vue

@@ -8,20 +8,22 @@
     </view>
 
     <scroll-view scroll-y class="scroll-container overflow-auto">
-      <view class="pl-8 pr-8 pb-24">
-        <view class="flex flex-wrap">
+      <view class="pl-4 pr-4 pb-24">
+        <view class="grid-container">
           <view
             class="album-item"
             v-for="(item, index) in albumList"
             :key="index"
           >
-            <image
-              class="album-image"
-              :src="item.photoUrl"
-              mode="aspectFill"
-              @click="handlePreview(item.photoUrl)"
-            ></image>
-            <view class="album-title">{{ item.title }}</view>
+            <view class="album-image-wrapper">
+              <image
+                class="album-image"
+                :src="item.photoUrl"
+                mode="aspectFill"
+                @click="handlePreview(item.photoUrl)"
+              ></image>
+              <view class="album-title">{{ item.name }}</view>
+            </view>
           </view>
         </view>
       </view>
@@ -53,35 +55,49 @@ const handlePreview = (photoUrl) => {
 </script>
 
 <style scoped lang="scss">
-.scroll-container {
-  flex: 1;
-  height: 100%;
+.grid-container {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr); // 每行2列
+  grid-gap: 8px;
+  padding: 12px;
 }
 
 .album-item {
   position: relative;
-  width: calc(50% - 8px);
-  margin: 4px;
+  width: 100%;
+}
+
+.album-image-wrapper {
+  position: relative;
+  width: 100%;
+  aspect-ratio: 1 / 1; // 保持宽高1:1
   border-radius: 8px;
   overflow: hidden;
 }
 
 .album-image {
   width: 100%;
-  height: 150px;
-  border-radius: 8px;
+  height: 100%;
+  object-fit: cover;
 }
 
 .album-title {
   position: absolute;
   bottom: 0;
   left: 0;
-  width: 100%;
+  right: 0;
   padding: 8px;
-  background: linear-gradient(180deg, rgba(144, 144, 144, 0) 0%, #000000 100%);
-  border-radius: 0 0 8px 8px;
+  background: linear-gradient(
+    180deg,
+    rgba(0, 0, 0, 0) 0%,
+    rgba(0, 0, 0, 0.6) 100%
+  );
   color: #fff;
   font-size: 14px;
   font-weight: 500;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  border-radius: 0 0 8px 8px;
 }
 </style>

src/pages/index/components/chat/ChatMainList/index.vue

@@ -540,7 +540,7 @@ const initTypewriterManager = () => {
   }
 
   typewriterManager = new TypewriterManager({
-    typingSpeed: 30,
+    typingSpeed: 10,
     cursorText: "",
   });
 

src/pages/index/components/module/AttachListComponent/styles/index.scss

@@ -16,6 +16,6 @@
 }
 
 .tag-text {
-  color: #00a6ff; /* 蓝色文字，可根据设计调整 */
+  color: #2d91ff; /* 蓝色文字，可根据设计调整 */
   font-size: $uni-font-size-base;
 }

src/uni_modules/zero-markdown-view/components/zero-markdown-view/zero-markdown-view.vue

@@ -35,7 +35,7 @@ export default {
     },
     themeColor: {
       type: String,
-      default: "#00A6FF",
+      default: "#2D91FF",
     },
     codeBgColor: {
       type: String,
@@ -45,6 +45,14 @@ export default {
       type: String,
       default: "PingFang SC, PingFang SC",
     },
+    fontColor: {
+      type: String,
+      default: "#171717",
+    },
+    fontSubColor: {
+      type: String,
+      default: "#4D4D4D",
+    },
     aiMode: {
       type: Boolean,
       default: false,
@@ -97,12 +105,15 @@ export default {
       const themeColor = this.themeColor;
       const codeBgColor = this.codeBgColor;
       const fontFamily = this.fontFamily;
+      const fontColor = this.fontColor;
+      const fontSubColor = this.fontSubColor;
       let zeroStyle = {
         p: `
 				margin:4px 0;
 				font-size: 15px;
-				line-height:1.65;
+				line-height:1.55;
         font-family: ${fontFamily};
+        color: ${fontColor};
 				`,
         // 一级标题
         h1: `
@@ -149,12 +160,14 @@ export default {
 				 `,
         // 列表
         ul: `
+        font-size: 14px;
 				margin: 4px 0;
-				color: #555;
+				color: ${fontSubColor};
 				`,
         li: `
+        font-size: 14px;
 				margin: 4px 0;
-				color: #555;
+				color: ${fontSubColor};
 				`,
         // 链接
         a: `
@@ -168,6 +181,7 @@ export default {
 				`,
         // 斜体
         em: `
+        font-size: 14px;
 				color: ${themeColor};
         font-family: ${fontFamily};
 				letter-spacing:0.3em;
@@ -191,11 +205,11 @@ export default {
 				`,
         th: `
 				border: 1px solid #202121;
-				color: #555;
+				color: ${fontSubColor};
 				`,
         td: `
-				color:#555;
-				border: 1px solid #555555;
+				color: ${fontSubColor};
+				border: 1px solid ${fontSubColor};
 				`,
         pre: `
 				border-radius: 5px;
@@ -211,12 +225,15 @@ export default {
       const themeColor = this.themeColor;
       const codeBgColor = this.codeBgColor;
       const fontFamily = this.fontFamily;
+      const fontColor = this.fontColor;
+      const fontSubColor = this.fontSubColor;
       let zeroStyle = {
         p: `
         margin:4px 0;
 				font-size: 15px;
         line-height:1.55;
         font-family: ${fontFamily};
+        color: ${fontColor};
 				`,
         // 一级标题
         h1: `
@@ -272,11 +289,13 @@ export default {
         // 列表
         ul: `
 				margin: 4px 0;
-				color: #555;
+        font-size: 14px;
+				color: ${fontSubColor};
 				`,
         li: `
 				margin: 4px 0;
-				color: #555;
+        font-size: 14px;
+				color: ${fontSubColor};
 				`,
         // 链接
         a: `
@@ -311,12 +330,12 @@ export default {
 				border-collapse: collapse;
 				`,
         th: `
-				border: 1px solid #202121;
-				color: #555;
+				border: 1px solid ${fontSubColor};
+				color: ${fontSubColor};
 				`,
         td: `
-				color:#555;
-				border: 1px solid #555555;
+				color: ${fontSubColor};
+				border: 1px solid ${fontSubColor};
 				`,
         pre: `
 				border-radius: 5px;

src/utils/TypewriterManager.js

@@ -6,7 +6,7 @@ class TypewriterManager {
   constructor(options = {}) {
     // 配置选项
     this.options = {
-      typingSpeed: 50, // 打字速度（毫秒）
+      typingSpeed: 10, // 打字速度（毫秒）- 调整为更快的速度
       cursorText: "", // 光标样式
       ...options,
     };