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-20 22:44:32 +08:00
parent fcd1e10129
commit dcf36df5aa
12 changed files with 219 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/App.vue
View File

@ -58,4 +58,13 @@
}
}
}
.booking-time {
:deep() {
.wd-tabs__line--inner,
.wd-tabs__line {
background-color: #4C9F44 !important;
}
}
}
</style>

4
src/api/bank.ts
View File

@ -25,6 +25,6 @@ export function getBankCardList() {
/**
* 提现申请
*/
export function withdrawApply(amount: number, bank_id: number) {
return http.Post('/storeapi/user/submitReflect', { amount, bank_id })
export function withdrawApply(store_id: number, amount: number, bank_id: number) {
return http.Post('/storeapi/user/submitReflect', { store_id, amount, bank_id })
}

4
src/api/tea-room.ts
View File

@ -151,8 +151,8 @@ export function getStoreTeaRoomList(data: IStoreTeaRoomListParams) {
/**
* 获取未来7天时间
*/
export function getNext7Days() {
return http.Post<ITeaSpecialistFuture7DaysResult>('/api/Common/get7Time')
export function getNext7Days(room_id: number, date: string) {
return http.Post<any>('/api/Common/get7Time', {room_id, date})
}
/**

1
src/api/types/bank.ts
View File

@ -4,4 +4,5 @@ export interface IAddBankCardParams {
mobile: number|string
code: number|string
bank_open_name: string
name: string
}

7
src/api/user.ts
View File

@ -72,3 +72,10 @@ export interface IResetPasswordParams {
export function resetPassword(data: IResetPasswordParams) {
return http.Post('/storeapi/storeLogin/resetPassword', data)
}
/**
* 查询用户余额
*/
export function getUserBalance(store_id: number) {
return http.Post<any>('/storeapi/user/checkMoney', {store_id})
}

13
src/bundle/finance/finance.vue
View File

@ -30,7 +30,7 @@
</view>
<view class="flex flex-col items-center justify-start">
<view class="font-400 text-24rpx text-[#606266] text-34rpx">待提现</view>
<view class="font-bold text-32rpx text-[#303133] leading-34rpx mt-14rpx">{{ userFinance.user_money }}</view>
<view class="font-bold text-32rpx text-[#303133] leading-34rpx mt-14rpx">{{ userFinance.balance }}</view>
</view>
</view>
</view>
@ -81,7 +81,7 @@
import { router } from '@/utils/tools'
import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
import { getStoreIncomeList } from '@/api/store'
import { getStoreIncomeList, getStoreDetails } from '@/api/store'
import { useStoreStore } from '@/store'
import { getUserInfo } from '@/api/user'
@ -115,10 +115,10 @@
*/
handleGetFinanceData: async () => {
try {
const res = await getUserInfo()
userFinance.value = res
} catch(e) {
}
const res = await getStoreDetails(useStore.defaultStore.id)
userFinance.value = res.details
console.log("🚀 ~ userFinance.value:", userFinance.value)
} catch(e) { }
},
upCallback: (mescroll) => {
@ -130,7 +130,6 @@
}
getStoreIncomeList(filter).then((res) => {
console.log("🚀 ~ res:", res)
const curPageData = res.list || [] // 当前页数据
if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
list.value = list.value.concat(curPageData) //追加新数据

16
src/bundle/parten/pages/bank-card/add.vue
View File

@ -70,6 +70,21 @@
</view>
</view>
<!-- 提现人名称 -->
<view>
<view class="flex justify-between items-center mx-38rpx">
<view class="text-30rpx leading-42rpx text-#303133">提现人名称</view>
<view class="flex items-center">
<view >
<wd-input v-model="form.name" size="large" placeholder="请输入 提现人名称" no-border custom-input-class="!text-right" placeholderStyle="font-size: 30rpx; line-height: 42rpx; color: #c9c9c9;text-align: right;"></wd-input>
</view>
</view>
</view>
<view>
<wd-gap height="2rpx" bg-color="#F2F2F2"></wd-gap>
</view>
</view>
<!-- 验证码 -->
<view>
<view class="flex justify-between items-center mx-38rpx">
@ -125,6 +140,7 @@
mobile: '',
code: '',
bank_open_name: '',
name: ''
})
const Add = {

7
src/bundle/parten/pages/withdraw/withdraw.vue
View File

@ -99,7 +99,7 @@
<script lang="ts" setup>
import { getBankCardList, withdrawApply } from '@/api/bank'
import { useUserStore } from '@/store'
import { useUserStore, useStoreStore } from '@/store'
import { toast } from '@/utils/toast'
import { amount } from '@/utils/test'
import { router } from '@/utils/tools'
@ -107,6 +107,7 @@
const OSS = inject('OSS')
const useStore = useUserStore()
const store = useStoreStore()
// 选择银行卡
const showBankCardPopup = ref<boolean>(false)
@ -128,7 +129,7 @@
height: 'calc(100vh - var(--window-top) - var(--window-bottom))'
}))
onLoad(() => {
onShow(() => {
Withdraw.getBankCardList()
})
@ -203,7 +204,7 @@
title: '提交中...'
})
try {
await withdrawApply(money, selectBank.value.id)
await withdrawApply(store.defaultStore.id, money, selectBank.value.id)
// 重新获取用户余额
const balance = await getUserInfo()
useStore.setUserMoney(Number(balance.user_money))

199
src/components/BookingTime.vue
View File

@ -9,26 +9,30 @@
<view class="">
<view class="booking-time">
<wd-tabs v-model="selectedDay" color="#4C9F44" @click="BookingTime.handleChangeTimeTab">
<scroll-view scroll-y class="!h-500rpx pb-100rpx">
<block v-for="item in day.time" :key="item">
<scroll-view scroll-y>
<wd-tab :title="`${item.display}`" :name="item.display">
<view class="">
<view class="!h-500rpx mt-30rpx">
<view class=" mt-30rpx">
<view class="grid grid-cols-4 gap-x-20rpx gap-y-20rpx mx-30rpx">
<view v-for="item2 in item.time_slots" :key="item2.start_time"
class="h-72rpx rounded-16rpx flex items-center justify-center text-28rpx leading-40rpx"
:class="[
item2.disabled == 0
item2.disabled == 1
? 'bg-[#F7F7F7] text-[#C9C9C9]' // 禁用高亮
: selectedTime.includes(item2.start_time)
: selectedTime.some(t => t.date === item.date && t.time === item2.start_time)
? 'bg-[#F1F8F0] text-[#4C9F44]' // 选中高亮
: 'bg-[#F7F7F7] text-[#303133]', // 可选高亮
]" @click="item2.disabled == 1 && BookingTime.handleSelectTime(item2.start_time, item2.timestamp, item.time_slots)">
]" @click="item2.disabled == 0 && BookingTime.handleSelectTime(item2.start_time, item2.timestamp, item.time_slots, item.date, item.display)">
{{ item2.start_time }}
</view>
</view>
</view>
</view>
</wd-tab>
</block>
</scroll-view>
</wd-tabs>
<view class="">
<view>
<wd-gap height="2rpx" bg-color="#E5E5E5"></wd-gap>
@ -44,11 +48,6 @@
</view>
</view>
</view>
</wd-tab>
</scroll-view>
</block>
</wd-tabs>
</view>
</view>
</view>
</wd-popup>
@ -78,61 +77,61 @@
// 初始化时间
onMounted(() => {
console.log("🚀 ~ day:", props.day)
})
/** 日期相关 **/
const days = ref<string[]>([])
const selectedDay = ref<number>(0)
const selectedTime = ref<string[]>([])
const selectedTimeStamp = ref<number[]>([])
// 支持跨天选择，结构为 { date, time, timestamp }
const selectedTime = ref<Array<{ date: string, time: string, timestamp: number }>>([])
const countSelectedTime = ref<number>(0)
const selectTimeIndex = ref<number>(0) // 选择的时间tab索引
const BookingTime = {
/**
* 选择时间段逻辑
* 选择时间段逻辑，支持跨天
* @param time 选择的时间字符串 "HH:MM"
* @param timestamp 选择的时间戳
* @param timeSlots 当前日期的所有时间段
* @param date 当前选择的日期 "2025-12-20"
* @param display 当前选择的日期展示 "12/20周六"
*/
handleSelectTime: (time: string, timestamp: number, timeSlots: any[]) => {
// 获取当前tab下所有可选时间段（未禁用）
const availableSlots = timeSlots.filter(slot => slot.disabled == 1)
const times = availableSlots.map(slot => slot.start_time)
const timestamps = availableSlots.map(slot => slot.timestamp)
const idx = times.indexOf(time)
// 当前已选的索引
const selectedIdxArr = selectedTime.value.map(t => times.indexOf(t)).sort((a, b) => a - b)
if (selectedTime.value.length === 0) {
// 没有已选，直接选中
selectedTime.value = [time]
selectedTimeStamp.value = [timestamp]
} else if (selectedTime.value.includes(time)) {
// 如果点击的是已选的端点，则取消该端及之后/之前的所有时间
const minIdx = selectedIdxArr[0]
const maxIdx = selectedIdxArr[selectedIdxArr.length - 1]
if (idx === minIdx) {
// 取消左端
selectedTime.value = times.slice(idx + 1, maxIdx + 1)
selectedTimeStamp.value = timestamps.slice(idx + 1, maxIdx + 1)
} else if (idx === maxIdx) {
// 取消右端
selectedTime.value = times.slice(minIdx, idx)
selectedTimeStamp.value = timestamps.slice(minIdx, idx)
} else {
// 如果点的是中间的，直接只保留左侧
selectedTime.value = times.slice(minIdx, idx)
selectedTimeStamp.value = timestamps.slice(minIdx, idx)
handleSelectTime: (time: string, timestamp: number, timeSlots: any[], date: string, display: string) => {
// 获取当前tab的日期
const currentDate = props.day.time[selectTimeIndex.value].date
const idx = selectedTime.value.findIndex(t => t.date === currentDate && t.time === time)
if (selectedTime.value.length === 0 || selectedTime.value.length > 1) {
// 第一次点击或已选2个及以上，重置为只选当前
selectedTime.value = [{ date: currentDate, time, timestamp }]
} else if (selectedTime.value.length === 1) {
// 第二次点击，做范围选择
const first = selectedTime.value[0]
const second = { date: currentDate, time, timestamp }
// 获取所有可选时间段（含跨天）
let allSlots = []
props.day.time.forEach(dayItem => {
dayItem.time_slots.forEach(slot => {
if (slot.disabled == 0) {
allSlots.push({ date: dayItem.date, time: slot.start_time, timestamp: slot.timestamp })
}
})
})
// 按 timestamp 排序
allSlots = allSlots.sort((a, b) => a.timestamp - b.timestamp)
// 找到 first 和 second 的索引
const idx1 = allSlots.findIndex(t => t.date === first.date && t.time === first.time)
const idx2 = allSlots.findIndex(t => t.date === second.date && t.time === second.time)
if (idx1 > -1 && idx2 > -1) {
const [start, end] = idx1 < idx2 ? [idx1, idx2] : [idx2, idx1]
selectedTime.value = allSlots.slice(start, end + 1)
} else {
// 新选，补全区间
const allIdx = selectedIdxArr.concat(idx)
const minIdx = Math.min(...allIdx)
const maxIdx = Math.max(...allIdx)
selectedTime.value = times.slice(minIdx, maxIdx + 1)
selectedTimeStamp.value = timestamps.slice(minIdx, maxIdx + 1)
// 找不到则只选当前
selectedTime.value = [second]
}
countSelectedTime.value = BookingTime.handleCalcContinuousHours(selectedTime.value)
}
countSelectedTime.value = BookingTime.handleCalcContinuousHours(selectedTime.value.map(t => t.timestamp))
},
// 确认选择的时间
@ -147,44 +146,86 @@
return
}
const data = [
selectedDay.value,
selectedTime.value.sort(),
selectedTimeStamp.value.sort(),
countSelectedTime.value
]
// 返回所有已选的时间段（含日期、时间、timestamp）及所有timestamp数组
const sortedSelected = selectedTime.value.slice().sort((a, b) => a.timestamp - b.timestamp)
const timestamps = sortedSelected.map(t => t.timestamp)
// 格式化时间戳为 2025-12-18 和 周三03/18
function formatDate(ts: number) {
const d = new Date(ts * 1000)
const y = d.getFullYear()
const m = (d.getMonth() + 1).toString().padStart(2, '0')
const day = d.getDate().toString().padStart(2, '0')
return `${y}-${m}-${day}`
}
function formatWeek(ts: number) {
const d = new Date(ts * 1000)
const weekArr = ['周日','周一','周二','周三','周四','周五','周六']
const week = weekArr[d.getDay()]
const m = (d.getMonth() + 1).toString().padStart(2, '0')
const day = d.getDate().toString().padStart(2, '0')
return `${week}${m}/${day}`
}
const formattedStartDates = formatDate(timestamps[0])
const formattedEndtDates = formatDate(timestamps[timestamps.length - 1])
let dayTime = '' // 2025-12-18
if (formattedStartDates == formattedEndtDates) {
dayTime = formattedStartDates
} else {
dayTime = `${formattedStartDates} 至 ${formattedEndtDates}`
}
let dayTitle = '' // 周三03/18
const formattedStartWeeks = formatWeek(timestamps[0])
const formattedEndWeeks = formatWeek(timestamps[timestamps.length - 1])
if (formattedStartWeeks == formattedEndWeeks) {
dayTitle = formattedStartWeeks
} else {
dayTitle = `${formattedStartWeeks} 至 ${formattedEndWeeks}`
}
const data = {
selectedDay: dayTime,
selectedTime: sortedSelected,
selectedTimestamps: timestamps,
dayTitle,
dayTime,
countSelectedTime: countSelectedTime.value
}
emit('selectedTime', data)
showPopup.value = false
},
// 切换时间tab的时候把之前选中的时间重置
handleChangeTimeTab: () => {
selectedTime.value = []
selectedTimeStamp.value = []
countSelectedTime.value = 0
// 切换时间tab的时候不重置已选，实现跨天选择
handleChangeTimeTab: (e: any) => {
selectTimeIndex.value = e.index
// 不重置 selectedTime
},
handleCalcContinuousHours(times: string[]): number {
if (times.length < 2) return 0
// 排序
const sorted = times.slice().sort()
// 计算所有连续区间的小时数总和，timestamps 为时间戳数组
handleCalcContinuousHours(timestamps: number[]): number {
if (timestamps.length < 1) return 0
const sorted = timestamps.slice().sort((a, b) => a - b)
let count = 0
let segment = 1
for (let i = 1; i < sorted.length; i++) {
// 取前后时间的小时数
const [h1, m1] = sorted[i - 1].split(':').map(Number)
const [h2, m2] = sorted[i].split(':').map(Number)
// 如果是连续的1小时（分钟相同且小时差1），则+1
if (m1 === m2 && h2 - h1 === 1) {
count++
if (sorted[i] - sorted[i - 1] === 1800) {
segment++
} else {
count += (segment - 1) * 0.5
segment = 1
}
}
count += (segment - 1) * 0.5
return count
},
// 重置选择的时间
handleResetSelectedTime: () => {
selectedTime.value = []
selectedTimeStamp.value = []
countSelectedTime.value = 0
},
}
@ -200,12 +241,6 @@
export default {}
</script>
<style lang="scss" scoped>
.booking-time {
:deep() {
.wd-tabs__line {
background-color: #4C9F44 !important;
}
}
}
<style lang="scss">
</style>

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

@ -147,13 +147,13 @@
<view class="mt-22rpx">
<view class="flex items-center">
<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="order.img"></wd-img>
</view>
<view class="flex-1">
<view @click="ComboCard.handleToOrderDetail(order.id)">
<view class="font-500 text-30rpx text-[#303133] leading-42rpx line-1 w-400rpx">{{ order.room_name }}</view>
<view class="font-400 leading-36rpx text-26rpx text-[#606266] mt-34rpx">
<view>预约时间：{{ order.day_time }} {{ order.start_time }}-{{ order.end_time }}</view>
<view>预约时间：{{ order.day_title }} {{ order.start_time }}-{{ order.end_time }}</view>
<view class="mt-18rpx">预约时长：{{ order.hours }}小时</view>
</view>
</view>

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

@ -57,10 +57,10 @@
<script lang="ts" setup>
import { router } from '@/utils/tools'
import { router, getCurrentDate } from '@/utils/tools'
import type { ITeaSpecialistFuture7DaysResult } from '@/api/types/tea'
import { getNext7Days } from '@/api/tea-room'
import { getAllRoomList, reserveRoom } from '@/api/store'
import { getNext7Days, getTeaRoomDetail } from '@/api/tea-room'
import { getAllRoomList, reserveRoom, getRoomDetails } from '@/api/store'
import { useStoreStore } from '@/store'
import { toast } from '@/utils/toast'
@ -74,25 +74,25 @@
minimum_time: 0,
time: []
})
const reserveTime = ref<Array<any>>([])
const reserveTime = ref<any>({})
const dayTitle = ref<string>('') // 周三03/18
const dayTime = ref<string>('') // 2024-03-18
const displayTime = ref<string>('') // 预定时长00:00,00:30
const form = ref({
store_id: useStore.defaultStore.id,
id: 0, // 包间ID
name: '', // 包间名称
price: '', // 包间价格
day_time: '', // 预定日期
day_title: '', // 预定日期标题
start_time: '', // 开始时间
end_time: '', // 结束时间
hours: 0, // 预定小时数
timeslot: [], // 预定时间段
})
const displayTime = ref<string>('')
onLoad(async (args) => {
// 预定时间
const next7 = await getNext7Days()
Object.assign(sevenDay, next7)
// 获取包厢列表
const res = await getAllRoomList(useStore.defaultStore.id)
columns.value = res.list.map((item: any) => ({
@ -109,8 +109,14 @@
* 选中包厢
* @param params
*/
handleConfirmRoom: (item) => {
handleConfirmRoom: async (item) => {
form.value.id = item.selectedItems.id
const res = await getRoomDetails(form.value.id)
// 预定时间
const next7 = await getNext7Days(form.value.id, getCurrentDate())
Object.assign(sevenDay, next7.data)
Object.assign(sevenDay, {minimum_time: res.details.room.hours})
},
/**
@ -118,10 +124,13 @@
*/
handleChooseReserveTime: (params: any) => {
reserveTime.value = params
displayTime.value = reserveTime.value[0] + ' ' + reserveTime.value[1].join(',')
dayTime.value = params.dayTime
dayTitle.value = params.dayTitle
// 一键续订的金额
// totalReserveMoney.value = Number(toTimes(params[3], order.value.room_price))
const times = params.selectedTime.map(item => {
return item.time
}).join(',')
displayTime.value = params.dayTime + ',' + times
},
/**
@ -143,11 +152,12 @@
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]
form.value.day_time = reserveTime.value.dayTime
form.value.start_time = reserveTime.value.selectedTime[0].time
form.value.end_time = reserveTime.value.selectedTime[ reserveTime.value.selectedTime.length - 1].time
form.value.hours = reserveTime.value.countSelectedTime
form.value.timeslot = reserveTime.value.selectedTimestamps
form.value.day_title = dayTitle.value,
delete form.value.name
uni.showLoading({

11
src/utils/tools.ts
View File

@ -147,3 +147,14 @@ export function randomLabelColor (index: number) {
return tagColors[index % tagColors.length]
}
/**
* 获取当前年月日，格式：YYYY-MM-DD
*/
export function getCurrentDate() {
const now = new Date();
const year = now.getFullYear();
const month = String(now.getMonth() + 1).padStart(2, '0');
const day = String(now.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
}