add order logic

src/pages/order/list.vue

@@ -21,8 +21,9 @@ onReachBottom(()=>{
 })
 
 
-function toOrderDetail(){
-    routeTo('/subpackage/order/pages/detail');
+function toOrderDetail(e){
+    let _qryStr = `brand_id=${e?.brand_id ?? ''}&order_no=${e?.order_no ?? ''}`;
+    routeTo(`/subpackage/order/pages/detail?${_qryStr}`);
 }
 
 function getOrderLs({
@@ -49,7 +50,7 @@ function getOrderLs({
             <tab-bar :tabs="tab.list" v-model:idx="tab.idx"></tab-bar>
         </view>
         <view class="ol-list-content">
-            <view class="ol-item" v-for="(e, i) in orderLs" :key="i" @click="toOrderDetail">
+            <view class="ol-item" v-for="(e, i) in orderLs" :key="i" @click="toOrderDetail(e)">
                 <view class="oi-header">
                     <image class="oh-logo" mode="aspectFit" :src="e.stadium_logo"></image>
                     <view class="oh-name">{{ e.stadium_name ?? '-' }}</view>

src/subpackage/groupon/components/venue_info.vue

@@ -19,11 +19,16 @@ const props = defineProps({
     venueLs: {
         type: Array,
         default: []
+    },
+    gatherLs: {
+        type: Array,
+        default: []
     }
 })
 
 const gatherList = computed({
     get(){
+        if(props?.gatherLs?.length)return props?.gatherLs;
         return formatVenueLs(props.venueLs);
     }
 })
@@ -41,7 +46,7 @@ function formatVenueLs(list){
         if(!v?.length)return;
         let _name, start, end, lastIdx;
         v.forEach(ele=>{
-            let [ _st, _et ] = (ele.time).split('-');
+            let [ _st, _et ] = (ele?.time ?? ele?.duration).split('-');
             if(_name&&ele.index !== (lastIdx + 1)){
                 showArr.push({ name: _name, duration: `${start}-${end}` });
                 start = _st;
@@ -69,14 +74,14 @@ function formatVenueLs(list){
         <view class="sbi-name">预定场次：</view>
         <view class="sbi-time-range">
             <block v-for="(e, i) in gatherList" :key=i>
-                <view class="str-item">{{ e.name || '几号馆' }} {{ e.duration || '时间段' }}</view>
+                <view class="str-item">{{ e.name || '-' }} {{ e.duration ?? e.time ?? '-' }}</view>
             </block>
         </view>
     </view>
     <view class="vmm-line" v-if='isShowSpecificTime'>
         <view>具体场次：</view>
         <view>
-            <view v-for="(e,i) in venueLs" :key="i">{{ e.venue_name ?? '' }} {{ e.time ?? '' }} ({{ e?.price ?? 0 }}元)</view>
+            <view v-for="(e,i) in venueLs" :key="i">{{ e.venue_name ?? '' }} {{ e.time ?? e?.duration ?? '' }} ({{ e?.price ?? 0 }}元)</view>
         </view>
     </view>
     <view class="soi-fold-btn" @click="isShowSpecificTime = !isShowSpecificTime">

src/subpackage/order/components/detail/contact.vue

@@ -2,6 +2,12 @@
 import { onLoad } from '@dcloudio/uni-app';
 import { reactive, ref } from "vue";
 const emits = defineEmits([ 'click:phone', 'click:nav' ]);
+const props = defineProps({
+    address: {
+        type: String,
+        default: ''
+    },
+})
 onLoad(() => {
     
 });
@@ -17,7 +23,7 @@ onLoad(() => {
             </view>
             <view class="dl-line">
                 <view class="dl-icon">&#xe600;</view>
-                <view class="dl-txt">白云区从云路822号城市像素6楼（电梯5楼走到6楼）></view>
+                <view class="dl-txt">{{ address ?? '-' }}></view>
             </view>
         </view>
         <view class="dc-line"></view>

src/subpackage/order/pages/detail.vue

@@ -7,18 +7,19 @@ import detailVerify from "../components/detail/verify.vue";
 import detailContact from "../components/detail/contact.vue";
 import venueInfoAsync from "@/subpackage/groupon/components/venue_info.vue";
 import { orderGet } from "../api";
+import { get_zh_day } from "@/utils";
 const orderInfo = ref({});
 // order_type 0场地 1/2次卡
-onLoad(() => {
+onLoad(options => {
+
     orderGet({
         data: {
-            brand_id: 63,
-            order_no: "CC20250717152050893843"
+            brand_id: options?.brand_id ?? '',
+            order_no: options?.order_no ?? ''
         }
     })
     .then(res=>{
         orderInfo.value = res?.data ?? {};
-        console.warn('CC20250717152050893843', res);
     })
 });
 
@@ -27,7 +28,9 @@ function previewImg(img){
 }
 
 function phoneClick(){
-    
+    if(orderInfo.value?.venue_mobile){
+        uni.makePhoneCall({ phoneNumber: orderInfo.value?.venue_mobile });
+    }
 }
 
 function navClick(){
@@ -56,13 +59,20 @@ function navClick(){
         <view class="od-box">
             <!-- 联系方式/地址 -->
             <detail-contact
+                :address="orderInfo?.venue_addr ?? ''"
                 @click:phone="phoneClick"
                 @click:nav="navClick"
             ></detail-contact>
         </view>
         <view class="od-box od-venue-info" v-if="orderInfo?.order_type === 0">
             <!-- 场次信息 -->
-            <venue-info-async>
+            <venue-info-async
+                :typeName="orderInfo.project"
+                :dateStr="orderInfo.date"
+                :dayStr="get_zh_day(orderInfo?.date ?? '')"
+                :venueLs="orderInfo.sessions"
+                :gatherLs="orderInfo.durations"
+            >
                 <template #title>
                     <view class="od-title">场次信息</view>
                 </template>

src/utils/index.js

@@ -79,4 +79,18 @@ export function jsonStr(data){
 
 export function jsonPar(json){
 	return JSON.parse(decodeURIComponent(decodeURIComponent(json)))
-}
+}
+
+export function get_zh_day(date){
+	if(!date)return '';
+	if(isSameDay(new Date().getTime(),new Date(date).getTime()))return '今天'
+	const Arr = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+	return Arr[new Date(date).getDay()] || '';
+}
+
+// 判断是否同一天
+export function  isSameDay(timeStampA, timeStampB) {
+	let dateA = new Date(timeStampA);
+	let dateB = new Date(timeStampB);
+	return (dateA.setHours(0, 0, 0, 0) == dateB.setHours(0, 0, 0, 0));
+}