wangxiaowei/chazhi_store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对接订单相关接口

Browse Source
This commit is contained in:
wangxiaowei
2025-12-19 01:39:09 +08:00
parent 10aae8ea46
commit eee48dd9aa
13 changed files with 379 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/api/order.ts Normal file
View File

@ -0,0 +1,68 @@
import { http } from '@/http/alova'
/**
* 订单搜索历史
*/
export function getOrderSearchHistory() {
return http.Post<any>('/storeapi/order/orderStoreSearchHistory')
}
/**
* 删除订单搜索历史
*/
export function deleteOrderSearchHistory() {
return http.Post('/storeapi/order/delOrderStoreSearchHistory')
}
/**
* 订单列表页
*/
export interface IGetStoreOrderListParams {
page: number
size: number
store_id: number
order_status?: number|string
search?: string
}
export function getStoreOrderList(data: IGetStoreOrderListParams) {
return http.Post<any>('/storeapi/order/orderStoreList', data)
}
/**
* 续单
* @param id 订单ID
* @param renew_hour 续单小时数
*/
export interface IRenewOrderParams {
id: number
renew_hour: number
}
export function renewOrder(data: IRenewOrderParams) {
return http.Post('/storeapi/store/renewDtime', data)
}
/**
* 释放包间订单
* @param id 订单ID
*/
export function releaseTeaRoomOrder(id: number) {
return http.Post('/storeapi/order/releaseOrderStore', { id })
}
/**
* 取消包间订单
* @param id 订单ID
*/
export function cancelTeaRoomOrder(id: number) {
return http.Post('/storeapi/order/cancelOrderStore', {id})
}
/**
* 删除包间订单
* @param id 订单ID
*/
export function deleteTeaRoomOrder(id: number) {
return http.Post('/storeapi/order/delOrderStore', {id})
}

29
src/api/store.ts
View File

@ -127,3 +127,32 @@ export function openLock(data: {type: number, lock_no: string, room_id: number,
export function openPower(data: {device_id: string, state: number, room_id: number}) { export function openPower(data: {device_id: string, state: number, room_id: number}) {
return http.Post('/storeapi/device/deviceOff_On', data) return http.Post('/storeapi/device/deviceOff_On', data)
} }
/**
* 房间列表-（没有分页）
*/
export function getAllRoomList(store_id: number) {
return http.Post<any>('/storeapi/store/roomSelectList', { store_id })
}
/**
* 包间预定
*/
export interface IReserveRoomParams {
id: number
day_time: string
start_time: string
end_time: string
hours: number
}
export function reserveRoom(data: IReserveRoomParams) {
return http.Post('/storeapi/store/submitStoreOrder', data)
}
/**
* 获取包间详情
*/
export function getStoreOrderDetails(id: number) {
return http.Post<any>('/storeapi/store/roomDetails', { id })
}

2
src/bundle/profile/profile.vue
View File

@ -140,7 +140,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import {toast} from '@/utils/toast' import { toast } from '@/utils/toast'
import { getUserInfo, updateUserInfo } from '@/api/user' import { getUserInfo, updateUserInfo } from '@/api/user'
import type { IUserResult } from '@/api/types/user' import type { IUserResult } from '@/api/types/user'
import { router } from '@/utils/tools' import { router } from '@/utils/tools'

508
src/bundle/tea-room/detail.vue
View File

@ -8,133 +8,38 @@
}</route> }</route>
<template> <template>
<view class="pb-180rpx"> <view class="pb-180rpx">
<!-- 费用明细 -->
<wd-popup v-model="showCostPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" @close="showCostPopup = false" position="bottom">
<view class='bg-[#FBFBFB] py-40rpx realtive'>
<view class="absolute top-18rpx right-30rpx" @click="showCostPopup = false">
<wd-img width="60rpx" height='60rpx' :src="`${OSS}icon/icon_close.png`"></wd-img>
</view>
<view class="text-36rpx text-[#121212] leading-50rpx text-center">费用明细</view>
<view class="mx-30rpx bg-white rounded-16rpx px-30rpx pt-40rpx mt-40rpx pb-30rpx">
<view class="flex justify-between items-center text-30rpx text-[#303133] leading-42rpx">
<view>茶室费</view>
<view>￥{{ bill.service.total }}</view>
</view>
<view class="flex justify-between items-center text-24rpx text-[#909399] leading-34rpx mt-16rpx">
<view>茶室费（￥{{ teaRoomPrice }}元/小时）</view>
<view>x{{ bill.service.num }}</view>
</view>
<view class="mt-52rpx">
<view class="flex justify-between items-center text-30rpx text-[#303133] leading-42rpx">
<view>优惠</view>
<view class="text-[#4C9F44]">-￥{{ bill.totalDiscount }}</view>
</view>
<view class="flex justify-between items-center text-24rpx text-[#909399] leading-34rpx mt-16rpx">
<view>优惠券</view>
<view>-￥{{ bill.coupon || 0 }}</view>
</view>
<view class="flex justify-between items-center text-24rpx text-[#909399] leading-34rpx mt-16rpx">
<view>团购券</view>
<view>-￥{{ bill.groupCoupon || 0 }}</view>
</view>
<view class="flex justify-between items-center text-24rpx text-[#909399] leading-34rpx mt-16rpx">
<view>会员八折</view>
<view>-￥{{ bill.discount || 0 }}</view>
</view>
</view>
<view class="my-30rpx">
<wd-gap height="2rpx" bgColor='#F6F7F9'></wd-gap>
</view>
<view class="flex justify-between items-center text-30rpx text-[#303133] leading-42rpx">
<view>实付金额</view>
<view>￥{{ bill.total }}</view>
</view>
</view>
</view>
</wd-popup>
<!-- 支付 -->
<wd-popup v-model="showPayPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" @close="showPayPopup = false" position="bottom">
<view class='bg-[#FBFBFB] py-40rpx realtive'>
<view class="absolute top-18rpx right-30rpx" @click="showPayPopup = false">
<wd-img width="60rpx" height='60rpx' :src="`${OSS}icon/icon_close.png`"></wd-img>
</view>
<view class="text-36rpx text-[#121212] leading-50rpx text-center">支付</view>
<view class="mx-30rpx bg-white rounded-16rpx px-30rpx pt-40rpx mt-40rpx pb-30rpx">
<wd-radio-group v-model="pay" shape="dot" checked-color="#4C9F44">
<view class="pay" v-for="(item, index) in payList" :key="index" @click="pay = item.id">
<view class="flex justify-between items-center" v-if="pay == item.value" >
<view class="flex items-center">
<wd-img width="50rpx" height="50rpx" :src="item.icon"></wd-img>
<view class="ml-20rpx text-30rpx text-[#303133] leading-42rpx">{{ item.name }}</view>
</view>
<view class="flex items-center">
<wd-radio :value="item.value">
<view class="text-[#303133] text-26rpx leading-36rpx mr-20rpx">可用202.22</view>
</wd-radio>
</view>
</view>
</view>
</wd-radio-group>
</view>
<view class='bg-[#4C9F44] text-[#fff] rounded-8rpx h-90rpx leading-90rpx mx-60rpx box-border text-center mt-170rpx' @click="Detail.handlePay">确定付款</view>
</view>
</wd-popup>
<!-- 选择预定时间 -->
<booking-time v-model="showBookTimePopup" :day="sevenDay" @selectedTime="Detail.handleChooseReserveTime"></booking-time>
<view> <view>
<navbar :title="isGroupBuying ? '团购套餐' : '预定'" custom-class='!bg-[#F6F7F8]'></navbar> <navbar title="包间详情" custom-class='!bg-[#F6F7F8]'></navbar>
</view> </view>
<view> <view>
<view class="mt-20rpx mx-30rpx swiper"> <view class="mt-20rpx mx-30rpx swiper">
<wd-swiper value-key="image" height="320rpx" <wd-swiper value-key="image" height="320rpx"
:indicator="{ type: 'dots-bar' }" :list="swiperList" v-model:current="current" mode="aspectFit"> :indicator="{ type: 'dots-bar' }" :list="swiperList" mode="aspectFit">
</wd-swiper> </wd-swiper>
</view> </view>
<view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx"> <view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx">
<view class="font-bold text-36rpx text-[#303133] leading-50rpx">{{ isGroupBuying ? teaRoomPackage.title : teaRoom.name }}</view> <view class="flex items-center justify-between">
<view class="mt-14rpx flex" v-if="!isGroupBuying"> <price-format color="#FF5951" :first-size="36" :second-size="36" :subscript-size="24" :price="teaRoom.room.price"></price-format>
<view class="font-400 text-22rpx text-[#6A6363] leading-32rpx">已售 {{ teaRoom.room.sold > 10 ? teaRoom.room.sold + '+': teaRoom.room.sold }} </view>
</view>
<view class="font-bold text-36rpx text-[#303133] leading-50rpx mt-20rpx">{{ teaRoom.room.title }}</view>
<view class="mt-14rpx flex">
<template v-for="(label, labelIndex) in teaRoom.label" :key="labelIndex"> <template v-for="(label, labelIndex) in teaRoom.label" :key="labelIndex">
<view class="mr-20rpx flex items-start" v-if="label.category_id == 1"> <view class="mr-20rpx flex items-start">
<wd-tag color="#40AE36" bg-color="#40AE36" plain custom-class="!rounded-4rpx">文艺小清新</wd-tag> <wd-tag
</view> :color="Detail.handleRandomColor(labelIndex)"
<view class="flex items-start" v-if="label.category_id == 2"> :bg-color="Detail.handleRandomColor(labelIndex)"
<wd-tag color="#F55726" bg-color="#F55726" plain>全息投影</wd-tag> plain
custom-class="!rounded-4rpx"
>{{ label.label_name }}</wd-tag>
</view> </view>
</template> </template>
</view> </view>
<view class="flex justify-between items-center" :class="`${ isGroupBuying ? 'mt-24rpx' : ''}`">
<view class="text-[#303133] text-26rpx leading-48rpx font-500" v-if="isGroupBuying">{{ teaRoomPackage.introduce }}</view>
<!-- <view class="text-[#6A6363] flex-1 text-22rpx leading-32rpx text-right">已售 10+</view> -->
</view>
<view v-if="isGroupBuying">
<view class="mt-20rpx mb-24rpx" >
<wd-gap height="2rpx" bgColor="#F6F7F9"></wd-gap>
</view>
<view class="text-[#303133] text-28rpx leading-48rpx">
<rich-text :nodes="teaRoomPackage.details"></rich-text>
<!-- <view>
<text class="font-bold mr-26rpx">须知</text>
<text class="font-500">{{ teaRoomPackage.details }}</text>
</view>
<view class="mt-22rpx">
<text class="font-bold mr-26rpx">保障</text>
<text class="font-500">随时退</text>
</view> -->
</view>
</view>
</view> </view>
<view v-if="!isGroupBuying"> <view >
<!-- 使用说明 --> <!-- 使用说明 -->
<view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx"> <view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx">
<view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">使用说明</view> <view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">使用说明</view>
@ -142,231 +47,28 @@
<rich-text :nodes="teaRoom.textarea1"></rich-text> <rich-text :nodes="teaRoom.textarea1"></rich-text>
</view> </view>
</view> </view>
<!-- 预定时间 -->
<view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx" @click="showBookTimePopup = true">
<view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">预定时间</view>
<view class="flex items-center justify-between">
<view class="text-[26rpx] text-[#606266] leading-36rpx">{{ sevenDay.minimum_time }}小时起订</view>
<view class="flex items-center">
<view class="text-[28rpx] text-[#909399] leading-40rpx w-430rpx line-1 text-right">
<template v-if="reserveTime.length > 0">
{{ reserveTime[0] }} {{ reserveTime[1].join(',') }}
</template>
<template v-else>
请选择
</template>
</view>
<view>
<wd-icon name="chevron-right" size="32rpx" color="#909399"></wd-icon>
</view>
</view>
</view>
</view>
<!-- 优惠券 -->
<view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx" @click="Detail.handleToCoupon(CouponType.Discount)">
<view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">优惠券</view>
<view class="flex items-center justify-between">
<view class="text-[26rpx] text-[#606266] leading-36rpx">优惠券</view>
<view class="flex items-center">
<view class="text-[28rpx] text-[#909399] leading-40rpx">
<template v-if="selectedCoupon?.id > 0">
{{ selectedCoupon.name }}
</template>
<template v-else>
请选择
</template>
</view>
<view class="mt-4rpx">
<wd-icon name="chevron-right" size="22px" color="#909399"></wd-icon>
</view>
</view>
</view>
</view>
<!-- 团购券 -->
<view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx" @click="Detail.handleToCoupon(CouponType.GroupBuy)">
<view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">团购券</view>
<view class="flex items-center justify-between">
<view class="text-[26rpx] text-[#606266] leading-36rpx">团购券</view>
<view class="flex items-center">
<view class="text-[28rpx] text-[#909399] leading-40rpx">
<template v-if="selectedGroupCoupon?.id > 0">
{{ selectedGroupCoupon.name }}
</template>
<template v-else>
请选择
</template>
</view>
<view class="mt-4rpx">
<wd-icon name="chevron-right" size="22px" color="#909399"></wd-icon>
</view>
</view>
</view>
</view>
</view>
<view v-if="isGroupBuying">
<!-- 套餐详情 -->
<view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx">
<view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">套餐详情</view>
<view class="">
<rich-text :nodes="teaRoomPackage.introduce_details"></rich-text>
</view>
</view>
<!-- 购买须知 -->
<view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx">
<view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">购买须知</view>
<view class="">
<rich-text :nodes="teaRoomPackage.buy_details"></rich-text>
</view>
</view>
</view>
<view class="fixed left-0 right-0 bottom-0 z-2 bg-[#fff]"
:style="{ height: '140rpx' }">
<view class="mt-12rpx w-full" v-if="!isGroupBuying">
<wd-gap height="2rpx" bgColor="#ECECEC"></wd-gap>
</view>
<view class="mt-22rpx flex justify-between items-center">
<view class="flex items-center ml-60rpx">
<view class="text-24rpx text-[#303133] leading-34rpx w-72rpx" v-if="!isGroupBuying">合计：</view>
<view class="flex items-center h-56rpx mr-16rpx">
<price-format color="#FF5951" :first-size="40" :second-size="40" :subscript-size="28" :price="isGroupBuying ? teaRoomPackage.discount_price : bill.total"></price-format>
<view class="ml-20rpx" v-if="isGroupBuying">
<price-format color="#909399" :first-size="26" :second-size="26" :subscript-size="26" :price="teaRoomPackage.price" lineThrough></price-format>
</view>
</view>
<view class="flex items-center text-[#4C9F44]" v-if="!isGroupBuying" @click="showCostPopup = true">
<view class="text-24rpx mr-10rpx">费用明细</view>
<wd-icon :name="showCostPopup ? 'arrow-up' : 'arrow-down'" size="24rpx" color="#4C9F44"></wd-icon>
</view>
</view>
<view class="mr-30rpx">
<wd-button custom-class='!bg-[#4C9F44] !rounded-8rpx !h-70rpx' @click='Detail.handleSubmitOrder'>{{ isGroupBuying ? '立即购买' : '立即预定' }}</wd-button>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import {toast} from '@/utils/toast' import { getStoreOrderDetails } from '@/api/store'
import { ReserveServiceCategory, OrderType } from '@/utils/order'
import type { ITeaSpecialistFuture7DaysResult } from '@/api/types/tea'
import { getNext7Days, getTeaRoomBalance, createTeaRoomOrder } from '@/api/tea-room'
import { CouponType } from '@/utils/coupon'
import { router, toTimes, toPlus, toMinus } from '@/utils/tools'
import type { IUserInfoVo } from '@/api/types/login'
import { useUserStore } from '@/store'
import { getTeaRoomDetail, createTeaRoomPackageOrder, getTeaRoomPackageDetail, calculateTeaRoomPrice } from '@/api/tea-room'
import PriceFormat from '@/components/PriceFormat.vue' import PriceFormat from '@/components/PriceFormat.vue'
import BookingTime from '@/components/BookingTime.vue'
import { getUserInfo } from '@/api/user'
const OSS = inject('OSS')
// 用户信息
const userInfo = ref<IUserInfoVo>(null)
const swiperList = ref<string[]>([]) const swiperList = ref<string[]>([])
const current = ref<number>(0)
const html: string = '<p>这里是富文本内容，需要后台传递</p>' const html: string = '<p>这里是富文本内容，需要后台传递</p>'
const isGroupBuying = ref<boolean>(false)// 是否是团购套餐
const pay = ref<number>(1) // 支付方式
const payList = ref<Array<any>>([
{
id: 1,
name: '平台余额',
icon: `${OSS}icon/icon_platform_balance.png`,
balance: 0,
value: 1
},
{
id: 2,
name: '门店余额',
icon: `${OSS}icon/icon_store_balance.png`,
balance: 0,
value: 2
},
{
id: 3,
name: '微信支付',
icon: `${OSS}icon/icon_weichat.png`,
balance: 0,
value: 3
}
])
// 选择预定时间
const showBookTimePopup = ref<boolean>(false)
const sevenDay = reactive<ITeaSpecialistFuture7DaysResult>({
minimum_time: 0,
time: []
})
const reserveTime = ref<Array<any>>([])
// 计算费用明细 service(服务费) coupon(优惠券) discount(会员优惠) totalDiscount(总优惠) total(总费用) groupCoupon(团购券)
const bill = ref<{service: any, discount:number, totalDiscount: number, coupon: number, groupCoupon: number, total: number}>({
service: {
total: 0,
unitPrice: 0,
num: 0,
startTime: 0,
endTime: 0,
dayTime: '',
startHour: '',
endHour: ''
},
discount: 0,
totalDiscount: 0,
coupon: 0,
groupCoupon: 0,
total: 0
})
// 费用明细相关
const showCostPopup = ref<boolean>(false) // 费用明细popup
const showPayPopup = ref<boolean>(false) // 支付popup
// 包间内容 // 包间内容
const storeId = ref<number>(0) // 门店ID const roomId = ref<number>(0) // 门店ID
const id = ref<number>(0) // id
const teaRoom = ref<any>({}) const teaRoom = ref<any>({})
const teaRoomPrice = ref<number>(0)
// 门店余额 // 随机颜色列表
const storeMoney = ref<number>(0) const tagColors = ['#40AE36', '#F55726']
// 选择的优惠券
const selectedCoupon = ref<{id: number, name: string}>({id: 0, name: ''})
const selectedGroupCoupon = ref<{id: number, name: string}>({id: 0, name: ''})
// 用户信息
const user = ref<any>(null)
// 套餐
const teaRoomPackage = ref<any>({})
onLoad((args) => { onLoad((args) => {
storeId.value = Number(args.storeId) roomId.value = Number(args.id)
id.value = Number(args.id)
teaRoomPrice.value = Number(args.price) || 0
if (args.type == ReserveServiceCategory.GroupBuying) {
isGroupBuying.value = true
pay.value = 3
Detail.handleInitGroupBuying()
}
Detail.handleInitReserveRoom() Detail.handleInitReserveRoom()
// 获取用户需求详
getUserInfo().then(res => {
user.value = res
})
}) })
const Detail = { const Detail = {
@ -374,172 +76,20 @@
* 初始包间详情 * 初始包间详情
*/ */
handleInitReserveRoom: async () => { handleInitReserveRoom: async () => {
// 包间详情 const res = await getStoreOrderDetails(roomId.value)
const userStore = useUserStore() console.log("🚀 ~ res:", res)
userInfo.value = userStore.userInfo
const res = await getTeaRoomDetail({
id: storeId.value,
latitude: uni.getStorageSync('latitude'),
longitude: uni.getStorageSync('longitude'),
user_id: userInfo.value.id || 0
})
teaRoom.value = res.details teaRoom.value = res.details
swiperList.value = teaRoom.value.img_arr swiperList.value = teaRoom.value.img_arr
// 预定时间
const next7 = await getNext7Days()
Object.assign(sevenDay, next7)
// 获取门店余额
const balance = await getTeaRoomBalance({ store_id: storeId.value })
storeMoney.value = balance.data.money || 0
},
/*
* 初始化套餐详情
*/
handleInitGroupBuying: async () => {
const res = await getTeaRoomPackageDetail({ id: id.value })
teaRoomPackage.value = res.details
}, },
/** /**
* 选中预定时间 * 根据索引返回伪随机颜色
* @param index 索引
* @returns 颜色值
*/ */
handleChooseReserveTime: (params: any) => { handleRandomColor: (index: number) => {
reserveTime.value = params // 可根据index做伪随机，保证每次渲染一致
return tagColors[index % tagColors.length]
bill.value.service = {
total: 0,
unitPrice: 0,
num: params[3],
startTime: params[2][0],
endTime: params[2][params[2].length - 1],
dayTime: params[0],
startHour: params[1][0],
endHour: params[1][params[1].length - 1]
}
Detail.handleCalculateTeaRoomPrice()
},
/**
* 跳转优惠券页面
*/
handleToCoupon(type) {
if (reserveTime.value.length == 0) {
toast.info('请选择预定时间')
return
}
uni.$on('chooseCoupon', params => {
console.log("🚀 ~ params:", params)
uni.$off('chooseCoupon')
if (type === CouponType.Discount) {
selectedCoupon.value = {id: params.coupon.user_coupon_id, name: `${params.coupon.name}减${params.coupon.coupon_price}` }
bill.value.coupon = params.coupon.coupon_price
} else {
selectedGroupCoupon.value = {id: params.coupon.id, name: `团购券-${params.coupon.tea_store_group.title}` }
bill.value.groupCoupon = params.coupon.coupon_price
}
Detail.handleCalculateTeaRoomPrice()
})
// 获取预定了几个小时
const count = bill.value.service.num
router.navigateTo(`/bundle/coupon/coupon?id=${id.value}&numbers=${count}&type=${type}&storeId=${storeId.value}`)
},
// 选择支付方式
handleGetPayValue: (value: number) => {
pay.value = value
},
/**
* 提交订单
*/
handleSubmitOrder: async () => {
// 只有预定茶室才会选择时间
if (!isGroupBuying.value && bill.value.service.num == 0) {
toast.info('请选择预定时间')
return
}
uni.showLoading({
title: '提交中...'
})
try {
let res: any = null
if (isGroupBuying.value) {
res = await createTeaRoomPackageOrder({
group_id: id.value
})
} else {
res = await createTeaRoomOrder({
store_id: storeId.value,
room_id: id.value,
day_time: bill.value.service.dayTime,
start_time: bill.value.service.startHour,
end_time: bill.value.service.endHour,
user_coupon_id: selectedCoupon.value.id || 0,
hours: bill.value.service.num,
group_coupon_id: selectedGroupCoupon.value.id || 0
})
}
uni.hideLoading()
// 支付后的处理
uni.$on('payment', params => {
setTimeout(() => {
uni.$off("payment")
if (params.result) {
uni.redirectTo({
url: `/pages/notice/reserve?type=${OrderType.TeaRoomOrder}&orderId=${params.orderId}&isGroupBuying=${isGroupBuying.value ? 1 : 0}`
})
} else {
if (isGroupBuying.value) {
router.redirectTo(`/bundle/order/platform/order-list`)
} else {
router.redirectTo(`/bundle/order/tea-room/order-list?isGroupBuying=${isGroupBuying.value ? 1 : 0}`)
}
}
}, 1000)
})
setTimeout(() => {
const name = isGroupBuying.value ? teaRoomPackage.value.title : teaRoom.value.name
router.navigateTo(
`/pages/cashier/cashier?from=${OrderType.TeaRoomOrder}&orderId=${res.id}&name=${name}&storeId=${storeId.value}&isGroupBuying=${isGroupBuying.value ? 1 : 0}`
)
}, 800)
} catch (error) {
uni.hideLoading()
toast.info('订单提交失败，请稍后重试')
return
}
},
/**
* 计算茶室价格
*/
handleCalculateTeaRoomPrice: async () => {
const res = await calculateTeaRoomPrice({
room_id: id.value,
coupon_id: selectedCoupon.value.id || 0,
group_coupon_id: selectedGroupCoupon.value.id,
nums: bill.value.service.num,
})
bill.value.service.total = res.details.room_price // 茶室价格
bill.value.discount = res.details.discount_room_price // 茶室总价
bill.value.totalDiscount = res.details.discount_all_price // 总优惠
bill.value.groupCoupon = res.details.group_price // 团购优惠
bill.value.total = res.details.order_amount // 订单金额
} }
} }
</script> </script>

1
src/bundle/wallet/wallet.vue
View File

@ -118,7 +118,6 @@
import type { IUserResult } from '@/api/types/user' import type { IUserResult } from '@/api/types/user'
import { getUserInfo, getUserTransactionDetails } from '@/api/user' import { getUserInfo, getUserTransactionDetails } from '@/api/user'
import { router } from '@/utils/tools' import { router } from '@/utils/tools'
import { u } from '@tanstack/vue-query/build/legacy/queryClient-CAHOJcvF'
const OSS = inject('OSS') const OSS = inject('OSS')
const userStore = useUserStore() const userStore = useUserStore()

114
src/components/order/ComboCard.vue
View File

@ -137,11 +137,12 @@
<view class="font-bold text-30rpx leading-42rpx text-[#303133] mr-10rpx line-1">{{ order.store_name }}</view> <view class="font-bold text-30rpx leading-42rpx text-[#303133] mr-10rpx line-1">{{ order.store_name }}</view>
</view> </view>
</view> </view>
<view class="font-400 text-28rpx leading-40rpx mt-12rpx text-[#4C9F44]"> <view class="font-400 text-28rpx leading-40rpx mt-12rpx text-[#4C9F44]">
<text v-if="order.order_status === AdminOrderStatus.ToUse" class="text-[#FF5951]" >待使用</text> <text v-if="order.order_status === AdminOrderStatus.ToUse" class="text-[#FF5951]" >待使用</text>
<text v-if="order.order_status === AdminOrderStatus.Consuming">使用中</text> <text v-if="order.order_status === AdminOrderStatus.Consuming">使用中</text>
<text v-if="order.order_status === AdminOrderStatus.Finished" class="text-[#606266]">完成</text> <text v-if="order.order_status === AdminOrderStatus.Finished" class="text-[#606266]">完成</text>
<text v-if="order.order_status === AdminOrderStatus.Cancelled" class="text-[#C9C9C9]">订单取消</text> <text v-if="order.order_status === AdminOrderStatus.Cancelled" class="text-[#C9C9C9]">取消订单</text>
</view> </view>
</view> </view>
<view class="mt-22rpx"> <view class="mt-22rpx">
@ -164,16 +165,16 @@
<template v-if="order.order_status === AdminOrderStatus.ToUse || order.order_status === AdminOrderStatus.Consuming"> <template v-if="order.order_status === AdminOrderStatus.ToUse || order.order_status === AdminOrderStatus.Consuming">
<view class="text-center flex items-center text-28rpx mt-28rpx justify-end"> <view class="text-center flex items-center text-28rpx mt-28rpx justify-end">
<view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#9CA3AF] text-[#303133] mr-28rpx flex items-center justify-center" <view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#9CA3AF] text-[#303133] mr-28rpx flex items-center justify-center"
@click="ComboCard.handleCancelOrder(OrderSource.TeaRoom)">释放时间</view> @click="ComboCard.handleReleaseOrder(order.id)">释放时间</view>
<view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#4C9F44] text-[#4C9F44] flex items-center justify-center" <view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#4C9F44] text-[#4C9F44] flex items-center justify-center"
@click="ComboCard.handleToPayOrder(OrderSource.TeaRoom)">取消订单</view> @click="ComboCard.handleCancelOrder(order.id)">取消订单</view>
</view> </view>
</template> </template>
<template v-if="order.order_status === AdminOrderStatus.Finished || order.order_status === AdminOrderStatus.Cancelled"> <template v-if="order.order_status === AdminOrderStatus.Finished || order.order_status === AdminOrderStatus.Cancelled">
<view class="text-center flex items-center text-28rpx mt-28rpx justify-end"> <view class="text-center flex items-center text-28rpx mt-28rpx justify-end">
<view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#9CA3AF] text-[#303133] mr-28rpx flex items-center justify-center" <view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#9CA3AF] text-[#303133] flex items-center justify-center"
@click="ComboCard.handleCancelOrder(OrderSource.TeaRoom)">删除</view> @click="ComboCard.handleDeleteOrder(order.id)">删除</view>
</view> </view>
</template> </template>
</view> </view>
@ -185,18 +186,19 @@
</template> </template>
<script lang="ts" setup name="ComboCard"> <script lang="ts" setup name="ComboCard">
import { OrderSource, OrderStatus, AdminOrderStatus, TeaRoomPackageOrderStatus } from '@/utils/order' import { OrderSource, AdminOrderStatus } from '@/utils/order'
import { useMessage } from 'wot-design-uni' import { useMessage } from 'wot-design-uni'
import { toast } from '@/utils/toast' import { toast } from '@/utils/toast'
import { handleTRCancelOrderHooks, handleTRDeleteOrderHooks, handleTRToPayHooks, handleToTRStoreHooks, handleTGOrderRefundHooks } from '@/hooks/useOrder' import { handleReleaseTeaRoomOrderHookds, handleCancelOrderHooks, handleDeleteOrderHooks } from '@/hooks/useOrder'
import { StoreType } from '@/utils/tea'
import { router } from '@/utils/tools' import { router } from '@/utils/tools'
import { toTimes, copy } from '@/utils/tools'
// 改价弹窗 // 改价弹窗
const showChangePricePopup = ref<boolean>(false) const showChangePricePopup = ref<boolean>(false)
const changePrice = ref<string>('') const changePrice = ref<string>('')
// 取消订单弹窗
const message = useMessage('wd-message-box-slot')
/** /**
* ComboCard 套餐卡片组件 * ComboCard 套餐卡片组件
* @description 展示订单列表套餐卡片信息 * @description 展示订单列表套餐卡片信息
@ -219,8 +221,8 @@
} }
}) })
// 取消订单弹窗
const message = useMessage('wd-message-box-slot') const emit = defineEmits(['refresh'])
const ComboCard = { const ComboCard = {
/** /**
@ -300,7 +302,7 @@
/** /**
* 删除订单 * 删除订单
*/ */
handleDeleteOrder: (source: string) => { handleDeleteOrder: (orderId: number) => {
message.confirm({ message.confirm({
title: '确定删除订单？', title: '确定删除订单？',
msg: '删除订单后无法恢复，是否确认删除订单？', msg: '删除订单后无法恢复，是否确认删除订单？',
@ -313,22 +315,12 @@
customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx', customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
} }
}).then((res) => { }).then((res) => {
switch (source) { if (res.action == 'confirm') {
case OrderSource.Combo: uni.$on('refreshOrderList', () => {
// TODO 这里调用删除直营订单的接口 emit('refresh')
break; uni.$off('refreshOrderList')
case OrderSource.DouYin: })
// TODO 这里调用删除抖音订单的接口 handleDeleteOrderHooks(orderId)
break;
case OrderSource.TeaRoom:
// 这里调用删除茶室订单的接口
handleTRDeleteOrderHooks(props.order.id)
break;
case OrderSource.TeaSpecialist:
// TODO 这里调用删除茶室订单的接口
break;
default:
break;
} }
}).catch(() => { }).catch(() => {
// 点击取消按钮回调事件 // 点击取消按钮回调事件
@ -338,7 +330,7 @@
/** /**
* 取消订单 * 取消订单
*/ */
handleCancelOrder: (source: string) => { handleCancelOrder: (orderId: number) => {
message.confirm({ message.confirm({
title: '确定取消订单？', title: '确定取消订单？',
msg: '取消订单后无法恢复，优惠券可退回', msg: '取消订单后无法恢复，优惠券可退回',
@ -352,23 +344,11 @@
} }
}).then((res) => { }).then((res) => {
if (res.action == 'confirm') { if (res.action == 'confirm') {
switch (source) { uni.$on('refreshOrderList', () => {
case OrderSource.Combo: emit('refresh')
// TODO 这里调用删除直营订单的接口 uni.$off('refreshOrderList')
break; })
case OrderSource.DouYin: handleCancelOrderHooks(orderId)
// TODO 这里调用删除抖音订单的接口
break;
case OrderSource.TeaRoom:
// 这里调用删除茶室订单的接口
handleTRCancelOrderHooks(props.order.id)
break;
case OrderSource.TeaSpecialist:
// TODO 这里调用删除茶室订单的接口
break;
default:
break;
}
} }
}).catch(() => { }).catch(() => {
// 点击取消按钮回调事件 // 点击取消按钮回调事件
@ -376,26 +356,30 @@
}, },
/** /**
* 支付 * 释放时间
*/ */
handleToPayOrder: (source: string) => { handleReleaseOrder: (orderId: number) => {
switch (source) { message.confirm({
case OrderSource.Combo: title: '释放时间',
router.navigateTo(`/bundle/order/platform/order-detail?orderStatus=${props.orderStatus}&toPay=true`) msg: '释放预约时间后，包间可重新被预定',
break; confirmButtonText: '确定',
case OrderSource.DouYin: cancelButtonText: '取消',
router.navigateTo(`/bundle/order/douyin/douyin-order-detail?orderStatus=${props.orderStatus}&toPay=true`) cancelButtonProps: {
break; customClass: '!bg-[#F6F7F8] !text-[#303133] !text-32rpx !leading-44rpx !rounded-8rpx',
case OrderSource.TeaRoom: },
handleTRToPayHooks(props.order.id, props.order.room_name, props.order.store_id) confirmButtonProps: {
break; customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
case OrderSource.TeaSpecialist: }
router.navigateTo( `/bundle/order/tea-specialist/order-detail?orderStatus=${props.orderStatus}&toPay=true`) }).then((res) => {
break; if (res.action == 'confirm') {
default: uni.$on('refreshOrderList', () => {
break; emit('refresh')
} uni.$off('refreshOrderList')
} })
handleReleaseTeaRoomOrderHookds(orderId)
}
}).catch(() => { })
},
} }
</script> </script>

132
src/hooks/useOrder.ts
View File

@ -3,20 +3,20 @@ import { toast } from '@/utils/toast'
import { import {
cancelTeaRoomOrder, cancelTeaRoomOrder,
deleteTeaRoomOrder, deleteTeaRoomOrder,
confirmTeaRoomOrder releaseTeaRoomOrder
} from '@/api/tea-room' } from '@/api/order'
import { OrderType } from '@/utils/order'
import { ReserveServiceCategory } from '@/utils/order'
/** /**
* 包间-取消订单 * 释放时间
* @param orderId 订单ID * @param id 订单ID
*/ */
export async function handleTRCancelOrderHooks(orderId: number) { export async function handleReleaseTeaRoomOrderHookds (id: number) {
try { try {
await cancelTeaRoomOrder({ id: orderId }) await releaseTeaRoomOrder(id)
uni.$emit('refreshOrderList') uni.$emit('refreshOrderList')
uni.$emit('refreshOrderDetail') uni.$emit('refreshOrderDetail')
toast.info('释放成功')
} catch (error) { } catch (error) {
router.navigateBack() router.navigateBack()
throw error throw error
@ -24,40 +24,28 @@ export async function handleTRCancelOrderHooks(orderId: number) {
} }
/** /**
* 重新支付 * 取消订单
* @param orderId 订单ID * @param orderId 订单ID
* @param teaRoomName 茶室名称
* @param storeId 商家ID
* @returns
*/ */
export function handleTRToPayHooks(orderId: number, teaRoomName: string, storeId: number) { export async function handleCancelOrderHooks(id: number) {
try { try {
uni.$on('payment', params => { await cancelTeaRoomOrder(id)
setTimeout(() => { uni.$emit('refreshOrderList')
uni.$off("payment") uni.$emit('refreshOrderDetail')
uni.$emit('refreshOrderList') toast.info('取消成功')
uni.$emit('refreshOrderDetail')
uni.redirectTo({
url: '/bundle/order/tea-room/order-list?orderStatus=all'
})
}, 1000)
})
setTimeout(() => {
router.navigateTo(`/pages/cashier/cashier?from=${OrderType.TeaRoomOrder}&orderId=${orderId}&name=${teaRoomName}&storeId=${storeId}&isGroupBuying=0`)
}, 800)
} catch (error) { } catch (error) {
toast.info('订单提交失败，请稍后重试') router.navigateBack()
return throw error
} }
} }
/** /**
* 包间-删除订单 * 删除订单
*/ */
export async function handleTRDeleteOrderHooks(orderId: number) { export async function handleDeleteOrderHooks(id: number) {
try { try {
await deleteTeaRoomOrder({ id: orderId }) await deleteTeaRoomOrder(id)
uni.$emit('refreshOrderList') uni.$emit('refreshOrderList')
uni.$emit('refreshOrderDetail') uni.$emit('refreshOrderDetail')
toast.info('删除订单成功') toast.info('删除订单成功')
@ -66,83 +54,3 @@ export async function handleTRDeleteOrderHooks(orderId: number) {
throw error throw error
} }
} }
/**
* 确认(完成)订单
*/
export async function handleTRConfirmOrderHooks(orderId: number) {
try {
await confirmTeaRoomOrder({ id: orderId })
uni.$emit('refreshOrderList')
uni.$emit('refreshOrderDetail')
} catch (error) {
router.navigateBack()
throw error
}
}
/**
* 订单退款
* @param orderId 订单ID
* @param orderType 订单类型
*/
// export async function handleRefundOrderHooks(orderId: number, orderType: string) {
// try {
// const response = await refundTeaSpecialistOrder({ id: orderId, order_type: orderType })
// uni.$emit('refreshOrderList')
// uni.$emit('refreshOrderDetail')
// } catch (error) {
// router.navigateBack()
// throw error
// }
// }
/**
* 跳转到茶室店铺
* @param storeId 门店ID
* @param operationType 门店类型：1-直营 2-加盟
*/
export function handleToTRStoreHooks(storeId: number, operationType: number) {
router.navigateTo(`/bundle/tea-room/room?id=${storeId}&type=${operationType}`)
}
/*************************************************************套餐***********************************************************************/
/**
* 平台团购套餐-订单退款
*/
export async function handleTGOrderRefundHooks(orderId: number) {
// try {
// await confirmTeaRoomOrder({ id: orderId })
// uni.$emit('refreshPackageOrderList')
// uni.$emit('refreshPackageOrderDetail')
// } catch (error) {
// router.navigateBack()
// throw error
// }
}
/**
* 跳转到套餐详情
* @param storeId 门店ID
* @param id 套餐ID
*/
export function handleToTGComboHooks(storeId: number, id: number) {
router.navigateTo(`/bundle/tea-room/detail?storeId=${storeId}&id=${id}&type=${ReserveServiceCategory.GroupBuying}`)
}
/**
* 释放时间
*/
export async function handleReleaseTimeHooks(orderId: number) {
try {
// await releaseTeaRoomOrderTime({ id: orderId })
uni.$emit('refreshOrderList')
uni.$emit('refreshOrderDetail')
} catch (error) {
router.navigateBack()
throw error
}
}

40
src/pages/order/order.vue
View File

@ -17,7 +17,7 @@
<wd-search v-model="keywords" hide-cancel placeholder-left light placeholder="搜索订单信息"></wd-search> <wd-search v-model="keywords" hide-cancel placeholder-left light placeholder="搜索订单信息"></wd-search>
</view> --> </view> -->
<view class="search-box flex items-center ml-26rpx" @click="Order.handleToSearch"> <view class="search-box flex items-center ml-26rpx" @click="Order.handleToSearch">
<wd-search placeholder="搜索茶址名称" hide-cancel disabled :placeholder-left="true" <wd-search placeholder="搜索订单信息" hide-cancel disabled :placeholder-left="true"
placeholderStyle="text-align:left;padding-left: 24rpx;line-heigt: 44rpx;color: #C9C9C9; font-size: 32rpx;font-weight: normal;"> placeholderStyle="text-align:left;padding-left: 24rpx;line-heigt: 44rpx;color: #C9C9C9; font-size: 32rpx;font-weight: normal;">
</wd-search> </wd-search>
</view> </view>
@ -36,10 +36,13 @@
<view class="tabs mt-18rpx mx-30rpx"> <view class="tabs mt-18rpx mx-30rpx">
<mescroll-body ref="mescrollItem0" @init="mescrollInit" @down="downCallback" @up="Order.upCallback" :down="downOption" :up="upOption"> <mescroll-body ref="mescrollItem0" @init="mescrollInit" @down="downCallback" @up="Order.upCallback" :down="downOption" :up="upOption">
<view class="mb-20rpx" v-for="(item, index) in list" :key="index"> <view class="mb-20rpx" v-for="(item, index) in list" :key="index">
<combo-card :type="OrderSource.Admin" :order="item"></combo-card> <combo-card :type="OrderSource.Admin" :order="item" @refresh="Order.handleResetSearch"></combo-card>
</view> </view>
</mescroll-body> </mescroll-body>
</view> </view>
<!-- 弹出框 -->
<wd-message-box></wd-message-box>
</view> </view>
</template> </template>
@ -50,6 +53,10 @@
import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js" import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
import { OrderSource, AdminOrderStatusText, TeaSpecialistOrderStatusText, TeaSpecialistOrderStatusValue } from '@/utils/order' import { OrderSource, AdminOrderStatusText, TeaSpecialistOrderStatusText, TeaSpecialistOrderStatusValue } from '@/utils/order'
import { router } from '@/utils/tools' import { router } from '@/utils/tools'
import { getStoreOrderList} from '@/api/order'
import { useStoreStore } from '@/store'
const useStore = useStoreStore()
/* mescroll */ /* mescroll */
const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
@ -87,21 +94,22 @@
const Order = { const Order = {
// 上拉加载的回调: 其中num:当前页 从1开始, size:每页数据条数,默认10 // 上拉加载的回调: 其中num:当前页 从1开始, size:每页数据条数,默认10
upCallback: (mescroll) => { upCallback: (mescroll) => {
// const filter = { const filter = {
// page: mescroll.num, page: mescroll.num,
// size: mescroll.size, size: mescroll.size,
// order_status: orderStatus.value, store_id: useStore.defaultStore.id,
// search: keywords.value order_status: '',
// } search: keywords.value,
}
// getTeaSpecialistOrderList(filter).then((res) => { getStoreOrderList(filter).then((res) => {
// const curPageData = res.list || [] // 当前页数据 const curPageData = res.list || [] // 当前页数据
// if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表 if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
// list.value = list.value.concat(curPageData) //追加新数据 list.value = list.value.concat(curPageData) //追加新数据
// mescroll.endSuccess(curPageData.length, Boolean(res.more)) mescroll.endSuccess(curPageData.length, Boolean(res.more))
// }).catch(() => { }).catch(() => {
mescroll.endErr() // 请求失败, 结束加载 mescroll.endErr() // 请求失败, 结束加载
// }) })
}, },
/** /**
@ -122,8 +130,6 @@
* 重置搜索 * 重置搜索
*/ */
handleResetSearch: () => { handleResetSearch: () => {
console.log("🚀 ~ location:", 456)
list.value = [] list.value = []
getMescroll().resetUpScroll() getMescroll().resetUpScroll()
}, },

11
src/pages/search/search.vue
View File

@ -1,6 +1,5 @@
<!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page --> <!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page -->
<route lang="jsonc" type="page">{ <route lang="jsonc" type="page">{
"needLogin": true,
"layout": "tabbar", "layout": "tabbar",
"style": { "style": {
// 'custom' 表示开启自定义导航栏，默认 'default' // 'custom' 表示开启自定义导航栏，默认 'default'
@ -24,7 +23,7 @@
hide-cancel hide-cancel
placeholder-left placeholder-left
light light
placeholder="搜索茶址名称" placeholder="搜索订单信息"
placeholderStyle="text-align:left;line-heigt: 44rpx;color: #C9C9C9; font-size: 32rpx;font-weight: normal;" placeholderStyle="text-align:left;line-heigt: 44rpx;color: #C9C9C9; font-size: 32rpx;font-weight: normal;"
@search="Search.handleSearch"> @search="Search.handleSearch">
</wd-search> </wd-search>
@ -42,7 +41,7 @@
</view> </view>
<view class="mt-40rpx flex flex-wrap items-center"> <view class="mt-40rpx flex flex-wrap items-center">
<view class="bg-[#F8F9FA] rounded-28rpx w-112rpx h-56rpx text-center text-[#606266] text-26rpx leading-56rpx mr-20rpx mb-24rpx" v-for="(item, index) in searchHistory" :key="index"> <view class="bg-[#F8F9FA] rounded-28rpx w-112rpx h-56rpx text-center text-[#606266] text-26rpx leading-56rpx mr-20rpx mb-24rpx line-1 px-10rpx" v-for="(item, index) in searchHistory" :key="index">
{{ item.content }} {{ item.content }}
</view> </view>
</view> </view>
@ -55,7 +54,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { getNavBarHeight } from '@/utils/index' import { getNavBarHeight } from '@/utils/index'
import { getTeaRoomSearchHistory, clearTeaRoomSearchHistory } from '@/api/tea-room' import { getOrderSearchHistory, deleteOrderSearchHistory } from '@/api/order'
import { router } from '@/utils/tools' import { router } from '@/utils/tools'
import { useMessage } from 'wot-design-uni' import { useMessage } from 'wot-design-uni'
@ -83,7 +82,7 @@
// 初始化 // 初始化
handleInit: () => { handleInit: () => {
console.log("🚀 ~ Search.handleInit:") console.log("🚀 ~ Search.handleInit:")
getTeaRoomSearchHistory().then( res => { getOrderSearchHistory().then( res => {
searchHistory.value = res.list searchHistory.value = res.list
console.log('搜索历史123', res.list) console.log('搜索历史123', res.list)
}) })
@ -119,7 +118,7 @@
title: '删除中...', title: '删除中...',
mask: true mask: true
}) })
clearTeaRoomSearchHistory().then(() => { deleteOrderSearchHistory().then(() => {
searchHistory.value = [] searchHistory.value = []
uni.hideLoading() uni.hideLoading()
}) })

129
src/pages/store/renew.vue
View File

@ -13,20 +13,20 @@
<view class="mt-38rpx"> <view class="mt-38rpx">
<mescroll-body ref="mescrollItem0" @init="mescrollInit" @down="downCallback" @up="Renew.upCallback" :down="downOption" :up="upOption"> <mescroll-body ref="mescrollItem0" @init="mescrollInit" @down="downCallback" @up="Renew.upCallback" :down="downOption" :up="upOption">
<view class="bg-white rounded-16rpx p-30rpx mx-32rpx relative"> <view class="bg-white rounded-16rpx p-30rpx mx-32rpx relative mb-20rpx" v-for="item in list" :key="item.id">
<view class="absolute top-0 right-0 bg-[#4C9F44] text-[#fff] w-160rpx h-64rpx leading-64rpx text-center xd" @click="showRenewTimePopup = true"> <view class="absolute top-0 right-0 bg-[#4C9F44] text-[#fff] w-160rpx h-64rpx leading-64rpx text-center xd" @click="selectRenewOrderId = item.id; showRenewTimePopup = true">
续单 续单
</view> </view>
<view class="flex items-center"> <view class="flex items-center">
<view class="mr-28rpx"> <view class="mr-28rpx">
<wd-img width="200rpx" height="200rpx" :src="`${OSS}images/home/home_image5.png`"></wd-img> <wd-img width="200rpx" height="200rpx" :src="item.img"></wd-img>
</view> </view>
<view class="flex-1"> <view class="flex-1">
<view @click="ComboCard.handleToOrderDetail"> <view @click="ComboCard.handleToOrderDetail">
<view class="font-bold text-28rpx text-[#303133] leading-40rpx line-2 w-260rpx">这是茶室包间名称换行效果这是茶室包间名称换行效果</view> <view class="font-bold text-28rpx text-[#303133] leading-40rpx line-2 w-260rpx">{{ item.room_name }}</view>
<view class="font-400 leading-36rpx text-26rpx text-[#606266] mt-10rpx"> <view class="font-400 leading-36rpx text-26rpx text-[#606266] mt-10rpx">
<view>预约时间：03/18 08:00-12:00</view> <view>预约时间：{{ item.day_time }} {{ item.start_time }}-{{ item.end_time }}</view>
<view class="mt-18rpx">预约时长：2小时</view> <view class="mt-18rpx">预约时长：{{ item.hours }}小时</view>
</view> </view>
</view> </view>
</view> </view>
@ -35,7 +35,7 @@
</mescroll-body> </mescroll-body>
</view> </view>
<view class="bg-[#4C9F44] w-630rpx h-90rpx text-[#fff] text-center leading-90rpx rounded-8rpx mx-auto mt-50rpx">确定</view> <!-- <view class="bg-[#4C9F44] w-630rpx h-90rpx text-[#fff] text-center leading-90rpx rounded-8rpx mx-auto mt-50rpx">确定</view> -->
<!-- 选择续订时间 --> <!-- 选择续订时间 -->
<renew-time v-model="showRenewTimePopup" @selectedTime="Renew.handleChooseRenewTime"></renew-time> <renew-time v-model="showRenewTimePopup" @selectedTime="Renew.handleChooseRenewTime"></renew-time>
@ -44,18 +44,16 @@
<script lang="ts" setup> <script lang="ts" setup>
import { OrderSource, OrderStatus, TeaRoomOrderStatusText, TeaRoomOrderStatusValue } from '@/utils/order'
import ComboCard from '@/components/order/ComboCard.vue' import ComboCard from '@/components/order/ComboCard.vue'
import { onPageScroll, onReachBottom } from '@dcloudio/uni-app' import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js" import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
import { getTeaRoomOrderList } from '@/api/tea-room'
import { router } from '@/utils/tools' import { router } from '@/utils/tools'
import type { ITeaSpecialistFuture7DaysResult } from '@/api/types/tea' import { getStoreOrderList, renewOrder} from '@/api/order'
import { getNext7Days, renewTeaRoomOrder } from '@/api/tea-room' import { useStoreStore } from '@/store'
import { toast } from '@/utils/toast'
// 续单
const showRenewTimePopup = ref<boolean>(false)
const OSS = inject('OSS')
const useStore = useStoreStore()
// mescroll // mescroll
const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
@ -66,40 +64,12 @@
auto: true, auto: true,
textNoMore: '~ 已经到底啦 ~', //无更多数据的提示 textNoMore: '~ 已经到底啦 ~', //无更多数据的提示
} }
const orderStatus = ref<string>('')
const list = ref<Array<any>>([]) // 茶室列表 const list = ref<Array<any>>([]) // 茶室列表
const keywords = ref<string>('') // 搜索关键词
const OSS = inject('OSS') // 续单
const checked = ref<boolean>(false)
const columns = ref<Array<{label: string, id: number}>>([
{ label: '包厢A', id: 1 },
{ label: '包厢B', id: 2 },
{ label: '包厢C', id: 3 },
])
// tab
const tab = ref<string>('list')
const tabList = ref<Array<{title: string, num: number, name: string}>>([
{ title: '已上架', num: 10, name: 'list'},
{ title: '已下架', num: 11, name: 'delist' },
// { title: '草稿箱', num: 0, name: 'draft' }
])
// 选择预定时间
const showBookTimePopup = ref<boolean>(false)
const sevenDay = reactive<ITeaSpecialistFuture7DaysResult>({
minimum_time: 0,
time: []
})
const reserveTime = ref<Array<any>>([]) const reserveTime = ref<Array<any>>([])
const showRenewTimePopup = ref<boolean>(false)
const form = ref({ const selectRenewOrderId = ref<number>(0)
name: '',
price: '',
})
onLoad(async (args) => { onLoad(async (args) => {
@ -118,46 +88,49 @@
*/ */
upCallback: (mescroll) => { upCallback: (mescroll) => {
// 需要留一下数据为空的时候显示的空数据图标内容 // 需要留一下数据为空的时候显示的空数据图标内容
// const filter = { const filter = {
// page: mescroll.num, page: mescroll.num,
// size: mescroll.size, size: mescroll.size,
// order_status: orderStatus.value, store_id: useStore.defaultStore.id,
// search: keywords.value order_status: '',
// } }
// getTeaRoomOrderList(filter).then((res) => { getStoreOrderList(filter).then((res) => {
// const curPageData = res.list || [] // 当前页数据 const curPageData = res.list || [] // 当前页数据
// if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表 if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
// list.value = list.value.concat(curPageData) //追加新数据 list.value = list.value.concat(curPageData) //追加新数据
// mescroll.endSuccess(curPageData.length, Boolean(res.more)) mescroll.endSuccess(curPageData.length, Boolean(res.more))
// }).catch(() => { }).catch(() => {
mescroll.endErr() // 请求失败, 结束加载 mescroll.endErr() // 请求失败, 结束加载
// }) })
}, },
/**
* 开锁
*/
handleOpenLock: () => {
},
/**
* 选中预定时间
*/
handleChooseReserveTime: (params: any) => {
reserveTime.value = params
console.log("🚀 ~ reserveTime:", reserveTime)
// 一键续订的金额
// totalReserveMoney.value = Number(toTimes(params[3], order.value.room_price))
},
/** /**
* 一键续订时间 * 一键续订时间
*/ */
handleChooseRenewTime: (item) => { handleChooseRenewTime: async (item) => {
uni.showLoading({
title: '操作中...',
mask: true
})
try {
uni.hideLoading()
await renewOrder({
id: selectRenewOrderId.value,
renew_hour: item.value
})
list.value = []
getMescroll().resetUpScroll()
toast.success('续订成功')
} catch (error) {
uni.hideLoading()
toast.info('续订失败，请稍后重试')
return
}
console.log("🚀 ~ item:", item) console.log("🚀 ~ item:", item)
} }
} }

116
src/pages/store/reserve.vue
View File

@ -15,7 +15,7 @@
<view class=""> <view class="">
<view class="text-26rpx leading-32rpx text-[#606266] mb-20rpx">包厢选择</view> <view class="text-26rpx leading-32rpx text-[#606266] mb-20rpx">包厢选择</view>
<view class=""> <view class="">
<wd-picker :columns="columns" value-key="label" value-name="id" v-model="form.name" use-default-slot> <wd-picker :columns="columns" value-key="label" value-name="id" v-model="form.name" use-default-slot @confirm="Reserve.handleConfirmRoom">
<wd-input type="text" v-model="form.name" placeholder="请选择包厢" readonly> <wd-input type="text" v-model="form.name" placeholder="请选择包厢" readonly>
<template #suffix> <template #suffix>
<wd-icon name="arrow-down" size="32rpx" color="#D8D8D8"></wd-icon> <wd-icon name="arrow-down" size="32rpx" color="#D8D8D8"></wd-icon>
@ -28,9 +28,9 @@
<view class="mt-22rpx"> <view class="mt-22rpx">
<view class="text-26rpx leading-32rpx text-[#606266] mb-20rpx">包厢价格</view> <view class="text-26rpx leading-32rpx text-[#606266] mb-20rpx">包厢价格</view>
<view class=""> <view class="">
<wd-input type="text" v-model="form.price" placeholder="请选择包厢" readonly> <wd-input type="text" v-model="form.price" placeholder="请输入包厢价格">
<template #suffix> <template #prefix>
<wd-icon name="arrow-down" size="32rpx" color="#D8D8D8"></wd-icon> <text class="">￥</text>
</template> </template>
</wd-input> </wd-input>
</view> </view>
@ -39,7 +39,7 @@
<view class="mt-22rpx"> <view class="mt-22rpx">
<view class="text-26rpx leading-32rpx text-[#606266] mb-20rpx">预定时间</view> <view class="text-26rpx leading-32rpx text-[#606266] mb-20rpx">预定时间</view>
<view class="" @click="showBookTimePopup = true"> <view class="" @click="showBookTimePopup = true">
<wd-input type="text" v-model="form.name" placeholder="请选择预定时间" readonly no-border> <wd-input type="text" v-model="displayTime" placeholder="请选择预定时间" readonly no-border>
<template #suffix> <template #suffix>
<wd-icon name="arrow-down" size="32rpx" color="#D8D8D8"></wd-icon> <wd-icon name="arrow-down" size="32rpx" color="#D8D8D8"></wd-icon>
</template> </template>
@ -48,41 +48,25 @@
</view> </view>
</view> </view>
<view class="bg-[#4C9F44] w-630rpx h-90rpx text-[#fff] text-center leading-90rpx rounded-8rpx mx-auto mt-50rpx">确定</view> <view class="bg-[#4C9F44] w-630rpx h-90rpx text-[#fff] text-center leading-90rpx rounded-8rpx mx-auto mt-50rpx" @click="Reserve.handleConfirm">确定</view>
<!-- 选择预定时间 --> <!-- 选择预定时间 -->
<!-- <booking-time v-model="showBookTimePopup" :day="sevenDay" @selectedTime="Reserve.handleChooseReserveTime"></booking-time> --> <booking-time v-model="showBookTimePopup" :day="sevenDay" @selectedTime="Reserve.handleChooseReserveTime"></booking-time>
</view> </view>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { OrderSource, OrderStatus, TeaRoomOrderStatusText, TeaRoomOrderStatusValue } from '@/utils/order'
import ComboCard from '@/components/order/ComboCard.vue'
import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
import { getTeaRoomOrderList } from '@/api/tea-room'
import { router } from '@/utils/tools' import { router } from '@/utils/tools'
import type { ITeaSpecialistFuture7DaysResult } from '@/api/types/tea' import type { ITeaSpecialistFuture7DaysResult } from '@/api/types/tea'
import { getNext7Days, renewTeaRoomOrder } from '@/api/tea-room' import { getNext7Days } from '@/api/tea-room'
import { getAllRoomList, reserveRoom } from '@/api/store'
import { useStoreStore } from '@/store'
import { toast } from '@/utils/toast'
const OSS = inject('OSS') const useStore = useStoreStore()
const checked = ref<boolean>(false) const columns = ref<Array<{label: string, id: number}>>([])
const columns = ref<Array<{label: string, id: number}>>([
{ label: '包厢A', id: 1 },
{ label: '包厢B', id: 2 },
{ label: '包厢C', id: 3 },
])
// tab
const tab = ref<string>('list')
const tabList = ref<Array<{title: string, num: number, name: string}>>([
{ title: '已上架', num: 10, name: 'list'},
{ title: '已下架', num: 11, name: 'delist' },
// { title: '草稿箱', num: 0, name: 'draft' }
])
// 选择预定时间 // 选择预定时间
const showBookTimePopup = ref<boolean>(false) const showBookTimePopup = ref<boolean>(false)
@ -93,15 +77,28 @@
const reserveTime = ref<Array<any>>([]) const reserveTime = ref<Array<any>>([])
const form = ref({ const form = ref({
name: '', id: 0, // 包间ID
price: '', name: '', // 包间名称
price: '', // 包间价格
day_time: '', // 预定日期
start_time: '', // 开始时间
end_time: '', // 结束时间
hours: 0, // 预定小时数
}) })
const displayTime = ref<string>('')
onLoad(async (args) => { onLoad(async (args) => {
// 预定时间 // 预定时间
// const next7 = await getNext7Days() const next7 = await getNext7Days()
// Object.assign(sevenDay, next7) Object.assign(sevenDay, next7)
// 获取包厢列表
const res = await getAllRoomList(useStore.defaultStore.id)
columns.value = res.list.map((item: any) => ({
label: item.title,
id: item.id
}))
}) })
onUnload(() => { onUnload(() => {
@ -109,24 +106,65 @@
const Reserve = { const Reserve = {
/** /**
* 开锁 * 选中包厢
* @param params
*/ */
handleOpenLock: () => { handleConfirmRoom: (item) => {
form.value.id = item.selectedItems.id
}, },
/** /**
* 选中预定时间 * 选中预定时间
*/ */
handleChooseReserveTime: (params: any) => { handleChooseReserveTime: (params: any) => {
reserveTime.value = params reserveTime.value = params
console.log("🚀 ~ reserveTime:", reserveTime) displayTime.value = reserveTime.value[0] + ' ' + reserveTime.value[1].join(',')
// 一键续订的金额 // 一键续订的金额
// totalReserveMoney.value = Number(toTimes(params[3], order.value.room_price)) // totalReserveMoney.value = Number(toTimes(params[3], order.value.room_price))
}, },
/**
* 确认预定
*/
handleConfirm: async () => {
if (!form.value.name) {
toast.info('请选择包厢')
return
}
if (!form.value.price) {
toast.info('请输入包厢价格')
return
}
if (reserveTime.value.length === 0) {
toast.info('请选择预定时间')
return
}
const time = reserveTime.value
form.value.day_time = time[0]
form.value.start_time = time[1][0]
form.value.end_time = time[1][time[2].length - 1]
form.value.hours = time[3]
delete form.value.name
uni.showLoading({
title: '操作中...',
mask: true
})
try {
await reserveRoom(form.value)
uni.hideLoading()
toast.info('预定成功')
router.navigateBack(1, 500)
} catch (error) {
uni.hideLoading()
toast.info('预定失败，请重试')
return
}
}
} }
</script> </script>

5
src/pages/store/room-detail.vue
View File

@ -110,12 +110,12 @@
</wd-upload> </wd-upload>
</view> --> </view> -->
<!-- 团购图片 --> <!-- 包间图片 -->
<view class="mt-28rpx"> <view class="mt-28rpx">
<view class="mb-28rpx flex items-center justify-between"> <view class="mb-28rpx flex items-center justify-between">
<view class="flex items-center"> <view class="flex items-center">
<view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx"> <view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx">
团购图片 包间图片
</view> </view>
<view class="flex items-center"> <view class="flex items-center">
<wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" /> <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
@ -484,7 +484,6 @@
index: tagIndex index: tagIndex
} }
}) })
console.log("🚀 ~ form.tags:", tags.value)
// 设置已选择的标签 // 设置已选择的标签
selectedTags.value = [] selectedTags.value = []

32
src/utils/order.ts
View File

@ -167,6 +167,20 @@ export const OrderStatusTitle: Record<OrderSource, Record<OrderStatus, string>>
[OrderStatus.AfterSaleApply]: '申请售后', [OrderStatus.AfterSaleApply]: '申请售后',
[OrderStatus.AfterSaleProcessing]: '申请售后中' [OrderStatus.AfterSaleProcessing]: '申请售后中'
}, },
[OrderSource.Admin]: {
[OrderStatus.Consuming]: '消费中',
[OrderStatus.Reserved]: '已预约',
[OrderStatus.Serving]: '服务中',
[OrderStatus.Pending]: '待付款',
[OrderStatus.Confirm]: '订单待确认',
[OrderStatus.Finished]: '已完结',
[OrderStatus.Cancelled]: '订单取消',
[OrderStatus.ToUse]: '待使用',
[OrderStatus.Used]: '交易完成',
[OrderStatus.Refunded]: '售后完成',
[OrderStatus.AfterSaleApply]: '申请售后',
[OrderStatus.AfterSaleProcessing]: '申请售后中'
},
} }
@ -323,18 +337,20 @@ export const TeaRoomPackageOrderStatusTextValue: Record<TeaRoomPackageOrderStatu
// 管理员-订单管理状态 // 管理员-订单管理状态
export enum AdminOrderStatus { export enum AdminOrderStatus {
ToUse = 0, // 待使用 Pending = 0, // 未支付
Consuming = 1,// 使用中 ToUse = 1, // 待使用（预约单）
Finished = 2, // 已完成 Consuming = 2, // 使用中（消费中）
Cancelled = 3, // 取消订单 Finished = 3, // 已完成（已完结）
Cancelled = 4, // 取消订单（已取消）
} }
// 管理员-订单状态文本 // 管理员-订单状态文本
export enum AdminOrderStatusText { export enum AdminOrderStatusText {
All = 'all', // 全部 All = 'all', // 全部
ToUse = 'toUse', // 待使用 Pending = 'pending', // 未支付
Consuming = 'consuming',// 使用中 ToUse = 'toUse', // 待使用（预约单）
Finished = 'finished', // 已完成 Consuming = 'consuming',// 使用中（消费中）
Cancelled = 'cancelled', // 已取消 Finished = 'finished', // 已完成（已完结）
Cancelled = 'cancelled', // 取消订单（已取消）
} }