From c6271e9f4b892258a7c18bb28ffeb0f7b93e4f9e Mon Sep 17 00:00:00 2001
From: duanshuwen <duanshuwen@gogpay.cn>
Date: Tue, 5 Aug 2025 21:36:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=A5=E5=8E=86=E7=BB=84=E4=BB=B6|?=
 =?UTF-8?q?=E5=A4=8D=E9=80=89=E6=A1=86=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Calender/index.vue                |  30 +++++++++++++------
 components/CheckBox/images/checked.png       | Bin 805 -> 0 bytes
 components/CheckBox/images/unchecked.png     | Bin 1171 -> 0 bytes
 components/CheckBox/index.vue                |  17 ++++++++---
 components/CheckBox/styles/index.scss        |   8 ++---
 pages/goods/components/GoodConfirm/index.vue |   2 +-
 pages/goods/index.vue                        |  22 +++++++++++++-
 request/api/GoodsApi.js                      |   7 ++++-
 8 files changed, 65 insertions(+), 21 deletions(-)
 delete mode 100644 components/CheckBox/images/checked.png
 delete mode 100644 components/CheckBox/images/unchecked.png

diff --git a/components/Calender/index.vue b/components/Calender/index.vue
index 717fc73..9a2ffa8 100644
--- a/components/Calender/index.vue
+++ b/components/Calender/index.vue
@@ -46,9 +46,9 @@
                 @tap="handleDateClick(dateInfo)"
               >
                 <template v-if="dateInfo">
-                  <text class="date-label" v-if="dateInfo.label">{{
-                    dateInfo.label
-                  }}</text>
+                  <text class="date-label" v-if="dateInfo.label">
+                    {{ dateInfo.label }}
+                  </text>
                   <text class="date-number">{{ dateInfo.day }}</text>
                   <text class="date-price" v-if="dateInfo.price"
                     >¥{{ dateInfo.price }}</text
@@ -90,10 +90,12 @@ const props = defineProps({
     required: true,
   },
 
-  // 价格数据对象
+  // 价格数据数组
   priceData: {
-    type: Object,
-    default: () => ({}),
+    type: Array,
+    default: () => [
+      {date: '', price: '-', stock: '0'}
+    ],
   },
 
   // 默认选中日期
@@ -202,6 +204,16 @@ const getFirstDayOfMonth = (year, month) => {
   return day === 0 ? 6 : day - 1; // 转换为周一开始 (0=周一, 6=周日)
 };
 
+// 获取指定日期的价格
+const getPriceForDate = (dateStr) => {
+  if (!props.priceData || !Array.isArray(props.priceData)) {
+    return null;
+  }
+  
+  const priceItem = props.priceData.find(item => item.date === dateStr);
+  return priceItem ? priceItem.price : null;
+};
+
 // 生成日历网格数据
 const generateCalendarGrid = (year, month) => {
   const daysInMonth = getDaysInMonth(year, month);
@@ -221,7 +233,7 @@ const generateCalendarGrid = (year, month) => {
     grid.push({
       date: dateStr,
       day: day,
-      price: props.priceData[dateStr] || null,
+      price: getPriceForDate(dateStr),
       disabled: isDateDisabled(dateStr),
       selected: isDateSelected(dateStr),
       inRange: isDateInRange(dateStr),
@@ -378,8 +390,8 @@ const handleRangeSelection = (dateInfo) => {
     emit("range-select", {
       startDate: rangeStart.value,
       endDate: rangeEnd.value,
-      startPrice: props.priceData[rangeStart.value],
-      endPrice: props.priceData[rangeEnd.value],
+      startPrice: getPriceForDate(rangeStart.value),
+      endPrice: getPriceForDate(rangeEnd.value),
       totalDays: daysBetween,
     });
   }
diff --git a/components/CheckBox/images/checked.png b/components/CheckBox/images/checked.png
deleted file mode 100644
index aa31d9aacec1b8e018c732aff67e5a8e62a549d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00001b5ch_0Itp)
z=>Px%-$_J4R7gwBmP<%faTLaXXGZgtEgEc5n;?2YQC7ApFgL9t#S&*kT^KD~jMSn{
zEpy|dNJv_wprRvEV6+M(1Y2cKTJ&1gW}v~9sE9N7)Sc^e=W*}cI~Lhp&iv2$&iDP#
z|C~?QqEEI6m(qZrX$_0iBQzj{(nTwaC<}ym%XwM$OT-)aiPo~hK_H5938->OzKSqO
zk|8SiNSmw{E5aRkT7#@}lmLAgv?A2{Vxue(U=)L4BD_aLo#NbqC-gMJD6k(0`U15N
z8Ne5mZaU<pKVVf;um<2M!mbhlbB`-OfD4rKnl?#g|5?a*LXRWFfJ1)-Y6pKp3DY6(
z+<~XHiWCDVy+GhE0jChgsV2%rS<2+hWjwAY2r%cnkqRqI0t>)C$hs!0;hG4`D`()C
zK1Au+B-13q4BLpZ#t~pJ=ekVRVd*LawuVEZ$UF6_XO;@OXq7l4T1O>QKvP!GDk17J
zL&lbRQqKVMj@gAI2Ihd+4h7TBly{C0&FQ4mx|1aLfp&*nXNkxQ^LHCKrq@vJxX>Cw
znMb&_aetX(w!9|OnC?Xx04}=_xK3E^<^oUYZ47QY1WZxGRn}Nxos)U*+m_d2`T(H?
zrOXjHKtJtb7N5n~9e5d~ncd8BPLfy?Z4CHMh!!96+BG-=7neGYL6kkrkU&XMPmpi4
zNy1a!+^OLpb+P8Mg5xM%bja-QTz=%u)!d=E{5>aI_5?eMbg$DDyF4fJXiUdYIz1k2
z9HAej5z_nF-zN+cmMd<P>l6mheT+=gX;k`Nm*&VcXrxo#I0IX5V{n6YsXN$>x$$eg
z4iV%=wk!Eh)}mRnWqI-kg}-~uKb0{85f<_-kRR)FU=zF9bQ@nwvp$)sEemvv06iFV
z`)D{T(%QX`F}O!LAM!1ab8|TfYPym&4pT-iO2ot7K1%Q5YCdPX4X3o;zB)VVpBnnj
jwUuX7X^cJ7`9JUzj71ABh(iMX00000NkvXXu0mjfW^ikb

diff --git a/components/CheckBox/images/unchecked.png b/components/CheckBox/images/unchecked.png
deleted file mode 100644
index 1aba8b0e491cf2560e2478eab3283cff0ba3812b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1171
zcmV;E1Z?|>P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00001b5ch_0Itp)
z=>Px(O-V#SR7gwBmS0R;bri?H=hxng5M`@`C~^8=bj%QS$p1p2mr8+x@lRqg8XpX9
zW--2P4|_10O%wG+eIxoX!_3@R;<6ZlQpRnew73w7CNnWh)I}u|oTHA7^|tqS<l;!6
z6e!qa-p6~-?|jbp{J!`6euUff&~4)4{|#nlF)%h(q#9~T%5HWMQ#lBgU=#!R1B93W
zE~dbzS(v}HyIg+~5pUGZO%?09erE!C-2{3X#1&v%0_Xw=GX$PvMj<inVB%^pN+9Sv
zV)I1GCeQjB8)w&pZwL<P(LDe@0iyztQ^a&6C5#^m6(v4B?MV3jWya*>qyj*>a^-pv
zDavjT4oQZK2&2Mof4#+3{Zl6Ry5L|q`lysR24I&UdNX<BYOl}dOJrllfF9`v#9=T<
zCAGutuJ|#%^%=pplzz^@HOY9}*X#^u16+>j>+7=>7T>QC_#*(4C0=dwIM1)lu?B4I
zse!zH0(OH_T`ihxbTgx5DvFt@KQvxphxiIWL`D8SO)H;Uj$H+|+#3kR-XQQhQqul*
zkMoPID9scb2*ujL{3S`e==C_yWCZt*juzWY<rE<QZq@3a`L9rGy{=E~G_dd~5tYu(
z{95k!`%UZpD#gRY6OWm8ImRYh()VP$MOZBlhGQ=<&_l$}dz<Qq)_?~?<L?rS4!h(I
zkH`7@c46u3g5lUBQpx}c@wK<9?!X#wK#%qlC|;nL`x_b>uH_1>>$=@QUIaj4e0IlP
z>;GTX>Od$u1JKD`#f1mU%F2vffvr44dh9p|)s$4KTUsjPtHFAdiEza0cD|KM=n^;-
zd!L#85Vq#lrkbDA!IuFXSCKfZX<90m@WGMj2_jUgNK|W@HkaP&GsHBn;N}5M)8=yt
z4uqnk1S(Sa=Hr&ARp4MK`hm%KQYd$HdK;dY&J}oIBvLAb7=q;C*5>-|HLe~AjaLat
zgA(w!H#^Ve3LFT>UV`Kvka(`uT^n2jUYcA|IYrEdS97-I0vw4%?z(P>9sso}B}$jQ
zlRm2{7#i=EEIuYeSA6!jf#ngm-6DoYCVULpOGF2~THR+EXSMb6-+68C1@Mpr?Q3(_
zhPQJ%S-FNo<5eb;<>o2FX1><xa$Q{)Y<&ohoqtfKQr1jeNI|~Rp*2iyRq-w8F)$o#
zr>EK)>%Lu?W8E8wu21eUVDtefhTtw$7JTn^?~QMy-Z~Hhv6zDra02)ci~`tfFSj<;
zjHDO7E_f-)NUVwk4gu&~G{>M2IGs%KH~GT2ls;gF!V?cenl%jST09M#h%hJxy_c?Z
z!&a}X&N@$%azSH(qYOL%;4cC$6X>D@#|d;Vvn(OdE+#mLF-t^84SVYB%010maeAP2
zkJ@?9eI7tO%aWTGliQeC1&}17BuhB~VLPevf}YK|-Sl3a$y9xP7gUF1Az!NI-KxA{
lIdwi8SXSoRs*AT8{|_so*e*334PF2M002ovPDHLkV1m=NCNKa1

diff --git a/components/CheckBox/index.vue b/components/CheckBox/index.vue
index b11ada9..f0471db 100644
--- a/components/CheckBox/index.vue
+++ b/components/CheckBox/index.vue
@@ -1,14 +1,18 @@
 <template>
   <view class="checkbox-wrapper" @click="onChange">
-    <image class="checkbox-icon" :src="isChecked" mode="aspectFit" />
+    <uni-icons
+      class="checkbox-icon"
+      :type="isChecked"
+      :checked="isChecked"
+      :color="iconColor"
+      size="24"
+    />
     <slot></slot>
   </view>
 </template>
 
 <script setup>
 import { computed, defineEmits } from "vue";
-import uncheckedIcon from "./images/unchecked.png";
-import checkedIcon from "./images/checked.png";
 
 const props = defineProps({
   modelValue: {
@@ -21,7 +25,12 @@ const emit = defineEmits(["update:modelValue"]);
 
 // 计算属性，确定当前是否选中
 const isChecked = computed(() => {
-  return props.modelValue ? checkedIcon : uncheckedIcon;
+  return props.modelValue ? "checkbox-filled" : "circle";
+});
+
+// 计算图标颜色
+const iconColor = computed(() => {
+  return props.modelValue ? "#1890FF" : "#00A6FF";
 });
 
 // 切换选中状态
diff --git a/components/CheckBox/styles/index.scss b/components/CheckBox/styles/index.scss
index 16c16a9..114e2e7 100644
--- a/components/CheckBox/styles/index.scss
+++ b/components/CheckBox/styles/index.scss
@@ -1,10 +1,8 @@
 .checkbox-wrapper {
   display: flex;
   align-items: center;
-  
+
   .checkbox-icon {
-    width: 20px;
-    height: 20px;
-    margin-right: 8px;
+    margin-right: 6px;
   }
-}
\ No newline at end of file
+}
diff --git a/pages/goods/components/GoodConfirm/index.vue b/pages/goods/components/GoodConfirm/index.vue
index 71480b3..33080ec 100644
--- a/pages/goods/components/GoodConfirm/index.vue
+++ b/pages/goods/components/GoodConfirm/index.vue
@@ -147,7 +147,7 @@ const isDeleting = ref(false); // 标志位，防止删除时watch冲突
 
 // 计算属性
 const totalPrice = computed(() => {
-  const price = props.goodsData.price || 399;
+  const price = props.goodsData.specificationPrice || 399;
   return (price * quantity.value).toFixed(0);
 });
 
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index a102930..f69ad5f 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -40,6 +40,7 @@
     <!-- 日历组件 -->
     <Calender
       :visible="calendarVisible"
+      :price-data="priceData"
       mode="range"
       @close="handleCalendarClose"
       @range-select="handleDateSelect"
@@ -50,7 +51,11 @@
 <script setup>
 import { ref } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
-import { goodsDetail, orderPay } from "@/request/api/GoodsApi";
+import {
+  goodsDetail,
+  commodityDailyPriceList,
+  orderPay,
+} from "@/request/api/GoodsApi";
 import TopNavBar from "@/components/TopNavBar/index.vue";
 import ImageSwiper from "@/components/ImageSwiper/index.vue";
 import GoodInfo from "./components/GoodInfo/index.vue";
@@ -62,12 +67,27 @@ const calendarVisible = ref(false);
 const goodsData = ref({});
 const goodConfirmRef = ref(null);
 const selectedDate = ref("");
+const priceData = ref([]);
 
 // 获取商品详情数据
 const goodsInfo = async (params) => {
   const res = await goodsDetail(params);
 
   goodsData.value = res.data;
+
+  // 判断是酒店类型订单再获取获取商品日价格及库存
+  if (goodsData.value.commodityTypeCode === "0") {
+    getGoodsDailyPrice({
+      commodityId: goodsData.value.commodityId,
+    });
+  }
+};
+
+// 获取商品日价格及库存
+const getGoodsDailyPrice = async (params) => {
+  const res = await commodityDailyPriceList(params);
+
+  priceData.value = res.data;
 };
 
 // 显示确认弹窗
diff --git a/request/api/GoodsApi.js b/request/api/GoodsApi.js
index c6518cd..8285ff9 100644
--- a/request/api/GoodsApi.js
+++ b/request/api/GoodsApi.js
@@ -9,4 +9,9 @@ const orderPay = (args) => {
   return request.post("/hotelBiz/trade/order", args);
 };
 
-export { goodsDetail, orderPay };
+// 获取商品日价格及库存
+const commodityDailyPriceList = (args) => {
+  return request.post("/hotelBiz/commodity/commodityDailyPriceList", args);
+};
+
+export { goodsDetail, commodityDailyPriceList, orderPay };