diff --git a/src/subpackage/groupon/components/site/footer.vue b/src/subpackage/groupon/components/site/footer.vue
index b90f5bb..4f6fa26 100644
--- a/src/subpackage/groupon/components/site/footer.vue
+++ b/src/subpackage/groupon/components/site/footer.vue
@@ -1,8 +1,8 @@
@@ -54,6 +59,7 @@ const totalAmount = computed(_=>{
{{ selectedData.length ? '确定' : '请选择场地' }}
diff --git a/src/subpackage/groupon/components/venue_info.vue b/src/subpackage/groupon/components/venue_info.vue
index bf64164..e4cc90c 100644
--- a/src/subpackage/groupon/components/venue_info.vue
+++ b/src/subpackage/groupon/components/venue_info.vue
@@ -1,26 +1,82 @@
- 羽毛球
- 2019年05月17日(周五)
+ {{ typeName ?? '' }}
+ {{ dateStr ?? '' }}({{ dayStr ?? '' }})
预定场次:
-
- {{ e.name || '几号馆' }} {{ e.time || '时间段' }}
+
+ {{ e.name || '几号馆' }} {{ e.duration || '时间段' }}
具体场次:
- {{ 'venue_name' }} {{ 'duration' }} ({{ 0 }}元)
+ {{ e.venue_name ?? '' }} {{ e.time ?? '' }} ({{ e?.price ?? 0 }}元)
@@ -28,8 +84,8 @@ const isShowSpecificTime = ref(false);
- 小计(共{{0}}场)
- ¥{{ 0}}
+ 小计(共{{ venueLs?.length }}场)
+ ¥{{ totalAmount }}
diff --git a/src/subpackage/groupon/pages/confirm_order/venue.vue b/src/subpackage/groupon/pages/confirm_order/venue.vue
index 40c9c6a..b0a74a9 100644
--- a/src/subpackage/groupon/pages/confirm_order/venue.vue
+++ b/src/subpackage/groupon/pages/confirm_order/venue.vue
@@ -1,27 +1,46 @@
-
+
-
+
产品信息:
-
+
团购券 (已选1张)
团购券抵扣6小时,-¥600.00
@@ -29,7 +48,10 @@ onLoad(() => {
团购券信息:
-
+
温馨提示:团购券需一次性使用完,一经使用不退不换
@@ -73,7 +95,6 @@ onLoad(() => {
flex-shrink: 0;
width: 40upx;
height: 40upx;
- background: skyblue;
}
.tti-right{
flex-grow: 1;
diff --git a/src/subpackage/groupon/pages/site_select.vue b/src/subpackage/groupon/pages/site_select.vue
index 3617302..9c835e7 100644
--- a/src/subpackage/groupon/pages/site_select.vue
+++ b/src/subpackage/groupon/pages/site_select.vue
@@ -15,6 +15,7 @@ const currentVenueType = ref({}); // 当前场地类型
const bookDateData = ref([]); // 日期列表
const currentBookDate = ref({}); // 当前选中日期
const isShowTypeRuleTxt = ref(false);
+
const stadiumInfo = ref({}); // 场馆信息
const ticketInfo = null; // 票券信息
@@ -40,6 +41,7 @@ onMounted(() =>{
const instance = getCurrentInstance().proxy
const eventChannel = instance.getOpenerEventChannel();
eventChannel.on('dataFromGrouponStadiums', data => {
+ console.log(`site select onload dataFromGrouponStadiums-->`, data);
ticketInfo = data?.ticket || {};
stadiumInfo.value = data?.stadium || {};
if(!stadiumInfo.value?.id)return showModal({ content: '无效的场馆信息' });
@@ -160,6 +162,32 @@ async function setScrollViewSize(){
let _otherHeight = _headerInfo?.height + _footerInfo?.height + _dateBarInfo?.height;
scrollHeight.value = _sysInfo?.windowHeight - (_otherHeight || 0);
}
+
+function submitClick(venues){
+ uni.navigateTo({
+ url: `/subpackage/groupon/pages/confirm_order/venue`,
+ success: res => {
+ res.eventChannel.emit('dataFromGrouponSiteSelect', {
+ stadium: stadiumInfo.value,
+ ticket: ticketInfo,
+ venueInfo: {
+ typeName: currentVenueType.value?.name ?? '',
+ date: (currentBookDate.value?.date ?? '').slice(0, 10),
+ zh_day: currentBookDate.value?._zh_day,
+ venues: venues.map(e=>({
+ time: e?.time ?? '',
+ venue_name: e?._venue_name ?? '',
+ venue_id: e?._venue_id ?? '',
+ price: e?.price ?? '',
+ date: e?.date ?? '',
+ index: e?.index ?? '',
+ }))
+ },
+ })
+ }
+ });
+
+}
@@ -201,7 +229,11 @@ async function setScrollViewSize(){
>