Compare commits
2 Commits
c166bb6519
...
69b0dce2bd
| Author | SHA1 | Date | |
|---|---|---|---|
| 69b0dce2bd | |||
| cb9950a4d7 |
@ -32,6 +32,8 @@ export interface IUserAddressListResult {
|
|||||||
district_id: number
|
district_id: number
|
||||||
address: string
|
address: string
|
||||||
is_default: number
|
is_default: number
|
||||||
|
latitude?: number
|
||||||
|
longitude?: number
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -152,7 +152,7 @@
|
|||||||
|
|
||||||
<view class="fixed left-0 right-0 bottom-0 z-2 bg-[#fff] flex items-center justify-center" :style="{ height: '140rpx' }">
|
<view class="fixed left-0 right-0 bottom-0 z-2 bg-[#fff] flex items-center justify-center" :style="{ height: '140rpx' }">
|
||||||
<view class="text-32rpx leading-44rpx flex items-center justify-center leading-90rpx text-center">
|
<view class="text-32rpx leading-44rpx flex items-center justify-center leading-90rpx text-center">
|
||||||
<view class="w-630rpx h-90rpx bg-[#4C9F44] rounded-8rpx text-[#fff]">立即预约</view>
|
<view class="w-630rpx h-90rpx bg-[#4C9F44] rounded-8rpx text-[#fff]" @click="Detail.handleReserve">立即预约</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -161,371 +161,44 @@
|
|||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { toast } from '@/utils/toast'
|
import { toast } from '@/utils/toast'
|
||||||
import { ReserveServiceCategory, OrderType } from '@/utils/order'
|
import { router, previewImage, replaceNewLine } from '@/utils/tools'
|
||||||
import type { ITeaSpecialistFuture7DaysResult } from '@/api/types/tea'
|
|
||||||
import { getNext7Days, getTeaRoomBalance, createTeaRoomOrder } from '@/api/tea-room'
|
|
||||||
import { CouponType } from '@/utils/coupon'
|
|
||||||
import { router, randomLabelColor, previewImage, replaceNewLine } 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'
|
|
||||||
import { getTeaRoomGroupCouponList } from '@/api/tea-room'
|
|
||||||
|
|
||||||
const OSS = inject('OSS')
|
const OSS = inject('OSS')
|
||||||
|
|
||||||
// 获取当前年月日，格式：YYYY-MM-DD
|
|
||||||
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');
|
|
||||||
const currentDate = `${year}-${month}-${day}`;
|
|
||||||
|
|
||||||
// 用户信息
|
|
||||||
const userInfo = ref<IUserInfoVo>(null)
|
|
||||||
|
|
||||||
const swiperList = ref<string[]>([])
|
const swiperList = ref<string[]>([])
|
||||||
const current = ref<number>(0)
|
const current = ref<number>(0)
|
||||||
const html: string = '<p>这里是富文本内容，需要后台传递</p>'
|
|
||||||
const isGroupBuying = ref<boolean>(false)// 是否是团购套餐
|
|
||||||
|
|
||||||
// 选择预定时间
|
const teaRoomPackage = reactive({
|
||||||
const showBookTimePopup = ref<boolean>(false)
|
introduce: '',
|
||||||
const sevenDay = reactive<ITeaSpecialistFuture7DaysResult>({
|
hour: 0,
|
||||||
minimum_time: 0,
|
pl_number: 0,
|
||||||
time: []
|
returd_details: ''
|
||||||
})
|
})
|
||||||
const reserveTime = ref<Array<any>>([])
|
|
||||||
const timeSlots = ref<Array<string>>([]) // 连续选择的预约时间
|
|
||||||
const dayTitle = ref<string>('') // 周三03/18
|
|
||||||
const dayTime = ref<string>('') // 2024-03-18
|
|
||||||
const dayHours = ref<string>('') // 预定时长00:00,00:30
|
|
||||||
|
|
||||||
// 计算费用明细 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 id = ref<number>(0) // id
|
|
||||||
const teaRoom = ref<any>({
|
|
||||||
order: {
|
|
||||||
hours: 0
|
|
||||||
},
|
|
||||||
room: {
|
|
||||||
title: ''
|
|
||||||
}
|
|
||||||
})
|
|
||||||
const teaRoomPrice = ref<number>(0)
|
|
||||||
|
|
||||||
// 门店余额
|
|
||||||
const storeMoney = ref<number>(0)
|
|
||||||
|
|
||||||
// 选择的优惠券
|
|
||||||
const selectedCoupon = ref<{ id: number, name: string }>({ id: 0, name: '' })
|
|
||||||
const selectedGroupCoupon = ref<{ id: number, name: string }>({ id: 0, name: '' })
|
|
||||||
const selectCouponId = ref<number>(0)
|
|
||||||
const selectGroupCouponId = ref<number>(0)
|
|
||||||
|
|
||||||
// 用户信息
|
|
||||||
const user = ref<any>(null)
|
|
||||||
|
|
||||||
// 套餐
|
|
||||||
const teaRoomPackage = ref<any>({})
|
|
||||||
|
|
||||||
// 页面类型
|
|
||||||
const pageType = ref<string>('')
|
|
||||||
|
|
||||||
// 防止重复提交
|
|
||||||
const isSubmitting = ref(false)
|
|
||||||
|
|
||||||
// 团购套餐列表
|
|
||||||
const groupCouponList = ref<Array<any>>([])
|
|
||||||
|
|
||||||
onLoad((args) => {
|
onLoad((args) => {
|
||||||
storeId.value = Number(args.storeId)
|
Detail.handleInit(args)
|
||||||
id.value = Number(args.id) // 在茶室下这个id是包间ID，在团购下是套餐ID
|
|
||||||
teaRoomPrice.value = Number(args.price) || 0
|
|
||||||
pageType.value = args.type || ''
|
|
||||||
console.log("🚀 ~ pageType.value:", pageType.value)
|
|
||||||
|
|
||||||
if (args.type == ReserveServiceCategory.GroupBuying) {
|
|
||||||
isGroupBuying.value = true
|
|
||||||
Detail.handleInitGroupBuying()
|
|
||||||
}
|
|
||||||
Detail.handleInitReserveRoom()
|
|
||||||
|
|
||||||
// 获取用户需求详
|
|
||||||
getUserInfo().then(res => {
|
|
||||||
user.value = res
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
// 防止重复提交
|
// 防止重复提交
|
||||||
|
|
||||||
const Detail = {
|
const Detail = {
|
||||||
/**
|
/**
|
||||||
* 初始包间详情
|
* 初始包间详情
|
||||||
*/
|
*/
|
||||||
handleInitReserveRoom: async () => {
|
handleInit: async (args) => {
|
||||||
// 包间详情
|
// 包间详情
|
||||||
const userStore = useUserStore()
|
|
||||||
userInfo.value = userStore.userInfo
|
|
||||||
|
|
||||||
const res = await getTeaRoomDetail({
|
|
||||||
id: storeId.value,
|
|
||||||
latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE,
|
|
||||||
longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE,
|
|
||||||
user_id: userInfo.value.id || 0,
|
|
||||||
room_id: id.value
|
|
||||||
})
|
|
||||||
teaRoom.value = res.details
|
|
||||||
|
|
||||||
// 处理使用说明的换行问题
|
|
||||||
if (teaRoom.value.room.other_describe) {
|
|
||||||
teaRoom.value.room.other_describe = replaceNewLine(teaRoom.value.room.other_describe)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pageType.value == ReserveServiceCategory.ReserveRoom) {
|
|
||||||
swiperList.value = teaRoom.value.room.room_arr
|
|
||||||
|
|
||||||
// 预定时间
|
|
||||||
const next7 = await getNext7Days(id.value, currentDate)
|
|
||||||
// disabled = 0 可预约 1不可逾越
|
|
||||||
Object.assign(sevenDay, next7.data)
|
|
||||||
Object.assign(sevenDay, { minimum_time: teaRoom.value.room.hours })
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取门店余额
|
|
||||||
const balance = await getTeaRoomBalance({ store_id: storeId.value })
|
|
||||||
storeMoney.value = balance.data.money || 0
|
|
||||||
|
|
||||||
// 获取团购券
|
|
||||||
const group = await getTeaRoomGroupCouponList({ store_id: storeId.value, room_id: id.value })
|
|
||||||
groupCouponList.value = group.list
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/*
|
|
||||||
* 初始化套餐详情
|
|
||||||
*/
|
|
||||||
handleInitGroupBuying: async () => {
|
|
||||||
const res = await getTeaRoomPackageDetail({ id: id.value })
|
|
||||||
teaRoomPackage.value = res.details
|
|
||||||
|
|
||||||
// 处理使用说明的换行问题
|
|
||||||
if (teaRoomPackage.value.introduce) {
|
|
||||||
teaRoom.value.introduce = replaceNewLine(teaRoom.value.introduce)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (teaRoomPackage.value.rests_introduce) {
|
|
||||||
teaRoom.value.rests_introduce = replaceNewLine(teaRoom.value.rests_introduce)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (teaRoomPackage.value.room_name) {
|
|
||||||
teaRoom.value.room_name = replaceNewLine(teaRoom.value.room_name)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (teaRoomPackage.value.returd_details) {
|
|
||||||
teaRoom.value.returd_details = replaceNewLine(teaRoom.value.returd_details)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pageType.value == ReserveServiceCategory.GroupBuying) {
|
|
||||||
swiperList.value = teaRoomPackage.value.img
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 选中预定时间
|
|
||||||
*/
|
|
||||||
handleChooseReserveTime: (params: any) => {
|
|
||||||
reserveTime.value = params
|
|
||||||
console.log("🚀 ~ params:", params)
|
|
||||||
|
|
||||||
timeSlots.value = params.selectedTimestamps
|
|
||||||
dayTitle.value = params.dayTitle
|
|
||||||
dayTime.value = params.dayTime
|
|
||||||
const times = params.selectedTime.map(item => {
|
|
||||||
return item.time
|
|
||||||
}).join(',')
|
|
||||||
dayHours.value = times
|
|
||||||
|
|
||||||
bill.value.service = {
|
|
||||||
total: 0,
|
|
||||||
unitPrice: 0,
|
|
||||||
num: params.countSelectedTime,
|
|
||||||
startHour: params.selectedTime[0].time,
|
|
||||||
endHour: params.selectedTime[params.selectedTime.length - 1].time
|
|
||||||
}
|
|
||||||
|
|
||||||
Detail.handleCalculateTeaRoomPrice()
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 跳转优惠券页面
|
|
||||||
*/
|
|
||||||
handleToCoupon(type) {
|
|
||||||
if (reserveTime.value.length == 0) {
|
|
||||||
toast.info('请选择预定时间')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 在选择优惠券之前需要先选择团购券
|
|
||||||
if (type === CouponType.Discount && groupCouponList.value.length > 0 && selectedGroupCoupon.value.id == 0) {
|
|
||||||
toast.info('请先选择团购券')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 如果选择优惠券之前订单金额已经是0的话则不用再选择优惠券
|
|
||||||
if (type === CouponType.Discount && selectedGroupCoupon.value.id > 0 && bill.value.total <= 0) {
|
|
||||||
toast.info('当前订单金额已为0，无需选择优惠券')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
uni.$off('chooseCoupon');
|
|
||||||
uni.$on('chooseCoupon', params => {
|
|
||||||
console.log("🚀 ~ params:", params)
|
|
||||||
uni.$off('chooseCoupon')
|
|
||||||
if (params.coupon) {
|
|
||||||
if (type === CouponType.Discount) {
|
|
||||||
selectedCoupon.value = { id: params.coupon.id, name: `${params.coupon.name}减${params.coupon.coupon_price}` }
|
|
||||||
bill.value.coupon = params.coupon.coupon_price
|
|
||||||
selectCouponId.value = params.coupon.id // 这里的ID是在数据表自增的ID，保存下来是为了回显列表的,没有其他作用
|
|
||||||
} else {
|
|
||||||
selectedGroupCoupon.value = { id: params.coupon.id, name: `团购券-${params.coupon?.title}` }
|
|
||||||
bill.value.groupCoupon = params.coupon.coupon_price
|
|
||||||
selectGroupCouponId.value = params.coupon.id // 这里的ID是在数据表自增的ID，保存下来是为了回显列表的,没有其他作用
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// 清空选择
|
|
||||||
if (type === CouponType.Discount) {
|
|
||||||
selectedCoupon.value = { id: 0, name: '' }
|
|
||||||
bill.value.coupon = 0
|
|
||||||
selectCouponId.value = 0
|
|
||||||
} else {
|
|
||||||
selectedGroupCoupon.value = { id: 0, name: '' }
|
|
||||||
bill.value.groupCoupon = 0
|
|
||||||
selectGroupCouponId.value = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Detail.handleCalculateTeaRoomPrice()
|
|
||||||
})
|
|
||||||
|
|
||||||
// 获取预定了几个小时
|
|
||||||
const count = bill.value.service.num
|
|
||||||
|
|
||||||
router.navigateTo(`/bundle/coupon/coupon?id=${id.value}&price=${bill.value.total}&numbers=${count}&type=${type}&storeId=${storeId.value}&couponId=${selectCouponId.value}&groupCouponId=${selectGroupCouponId.value}`)
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 提交订单
|
* 提交订单
|
||||||
*/
|
*/
|
||||||
handleSubmitOrder: async () => {
|
handleReserve: async () => {
|
||||||
if (isSubmitting.value) return
|
router.navigateTo('/bundle/package/service')
|
||||||
// 只有预定茶室才会选择时间
|
|
||||||
if (!isGroupBuying.value && bill.value.service.num == 0) {
|
|
||||||
toast.info('请选择预定时间')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
isSubmitting.value = true
|
|
||||||
try {
|
|
||||||
let res: any = null
|
|
||||||
if (isGroupBuying.value) {
|
|
||||||
// 团购套餐ID
|
|
||||||
res = await createTeaRoomPackageOrder({
|
|
||||||
group_id: id.value,
|
|
||||||
room_id: 0
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
const params = {
|
|
||||||
store_id: storeId.value,
|
|
||||||
room_id: id.value,
|
|
||||||
day_title: dayTitle.value,
|
|
||||||
day_time: dayTime.value,
|
|
||||||
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,
|
|
||||||
timeslot: timeSlots.value.join(',')
|
|
||||||
}
|
|
||||||
res = await createTeaRoomOrder(params)
|
|
||||||
}
|
|
||||||
// uni.hideLoading()
|
|
||||||
|
|
||||||
// 支付后的处理
|
|
||||||
uni.$on('payment', params => {
|
|
||||||
setTimeout(() => {
|
|
||||||
uni.$off("payment")
|
|
||||||
isSubmitting.value = false
|
|
||||||
if (params.result) {
|
|
||||||
//支付成功提示
|
|
||||||
uni.redirectTo({
|
|
||||||
url: `/pages/notice/reserve?type=${OrderType.TeaRoomOrder}&orderId=${params.orderId}&isGroupBuying=${isGroupBuying.value ? 1 : 0}&storeId=${storeId.value}&storeType=${teaRoom.value.operation_type}`
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
// 支付失败跳转订单列表
|
|
||||||
if (!isGroupBuying.value) {
|
|
||||||
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
|
|
||||||
const money = isGroupBuying.value ? res.order_amount : 0 // 团购套餐支付金额会在创建订单的时候返回
|
|
||||||
|
|
||||||
router.navigateTo(
|
|
||||||
`/pages/cashier/cashier?from=${OrderType.TeaRoomOrder}&orderId=${res.id}&name=${name}&storeId=${storeId.value}&isGroupBuying=${isGroupBuying.value ? 1 : 0}&cmoboId=${id.value || 0}&money=${money}`
|
|
||||||
)
|
|
||||||
}, 500)
|
|
||||||
} catch (error) {
|
|
||||||
isSubmitting.value = false
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// 正常流程下，isSubmitting.value 会在支付回调中重置
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 计算茶室价格
|
|
||||||
*/
|
|
||||||
handleCalculateTeaRoomPrice: async () => {
|
|
||||||
const res = await calculateTeaRoomPrice({
|
|
||||||
room_id: id.value,
|
|
||||||
coupon_id: selectedCoupon.value.id || 0,
|
|
||||||
group_coupon_id: selectedGroupCoupon.value.id || 0,
|
|
||||||
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 // 订单金额
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
1067
src/bundle/package/reserve.vue
Normal file
1067
src/bundle/package/reserve.vue
Normal file
File diff suppressed because it is too large
Load Diff
285
src/bundle/package/service.vue
Normal file
285
src/bundle/package/service.vue
Normal file
@ -0,0 +1,285 @@
|
|||||||
|
<route lang="jsonc" type="page">{
|
||||||
|
"needLogin": true,
|
||||||
|
"layout": "default",
|
||||||
|
"style": {
|
||||||
|
"navigationStyle": "custom"
|
||||||
|
}
|
||||||
|
}</route>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<view class="pb-100rpx">
|
||||||
|
<navbar title="选择服务方式" custom-class='!bg-[#F6F7F8]'></navbar>
|
||||||
|
|
||||||
|
<view class="pb-100rpx">
|
||||||
|
<view class="mx-30rpx mt-38rpx">
|
||||||
|
<!-- 服务方式 -->
|
||||||
|
<view class="bg-white rounded-16rpx px-30rpx py-28rpx">
|
||||||
|
<view class="flex justify-between items-center">
|
||||||
|
<view class="flex items-center">
|
||||||
|
<view class="text-32rpx leading-44rpx text-#303133 mr-10rpx">服务方式</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="flex items-center">
|
||||||
|
<wd-radio-group v-model="serviceType" size="large" shape="dot" checked-color="#4C9F44"
|
||||||
|
inline @change="Service.handleChangeServiceType">
|
||||||
|
<wd-radio :value="1" border>
|
||||||
|
<view class="leading-36rpx font-400 text-30rpx ml-12rpx mr-60rpx">到店服务</view>
|
||||||
|
</wd-radio>
|
||||||
|
<wd-radio :value="2" border>
|
||||||
|
<view class="leading-36rpx font-400 text-30rpx ml-12rpx">上门服务</view>
|
||||||
|
</wd-radio>
|
||||||
|
</wd-radio-group>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="bg-white rounded-16rpx mt-30rpx px-30rpx py-28rpx mx-30rpx">
|
||||||
|
<!-- 商家信息 -->
|
||||||
|
<template v-if="serviceType === 1">
|
||||||
|
<view class="text-34rpx font-bold leading-48rpx text-#303133">商家信息</view>
|
||||||
|
<view class="mt-32rpx">
|
||||||
|
<mescroll-body @init="mescrollInit" @down="downCallback" @up="Service.upCallback"
|
||||||
|
:up="upOption">
|
||||||
|
<wd-radio-group v-model="storeIndex" size="large" shape="dot" checked-color="#4C9F44">
|
||||||
|
<view v-for="(item, index) in list" :key="index">
|
||||||
|
<wd-radio :value="index">
|
||||||
|
<view class="flex items-center justify-between mb-32rpx">
|
||||||
|
<view class="mr-32rpx">
|
||||||
|
<wd-img width="80rpx" height='80rpx'
|
||||||
|
:src="`${OSS}icon/icon_location3.png`"></wd-img>
|
||||||
|
</view>
|
||||||
|
<view class="flex-1">
|
||||||
|
<view class="text-left">{{ item.name }}</view>
|
||||||
|
<view
|
||||||
|
class="text-28rpx leading-40rpx text-[#909399] flex items-center mt-10rpx">
|
||||||
|
<view class="w-136rpx line-1">距您{{ item.distance }}km</view>
|
||||||
|
<view>
|
||||||
|
<wd-divider vertical />
|
||||||
|
</view>
|
||||||
|
<view class="w-300rpx line-1">{{ item.address }}</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</wd-radio>
|
||||||
|
</view>
|
||||||
|
</wd-radio-group>
|
||||||
|
</mescroll-body>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<!-- 地址 -->
|
||||||
|
<template v-if="serviceType === 2">
|
||||||
|
<view class="h-1088rpx">
|
||||||
|
<view class="flex items-center justify-between">
|
||||||
|
<view class="text-34rpx font-bold leading-48rpx text-#303133">地址</view>
|
||||||
|
<view class="text-28rpx font-400 leading-40rpx text-#4C9F44"
|
||||||
|
@click="Service.handleAddAddress">新增地址</view>
|
||||||
|
</view>
|
||||||
|
<view clas>
|
||||||
|
<view v-if="addressList.length === 0">
|
||||||
|
<!-- 地址为空显示 -->
|
||||||
|
<view class="text-center">
|
||||||
|
<view class="mt-278rpx">
|
||||||
|
<wd-img width="290rpx" height='200rpx'
|
||||||
|
:src="`${OSS}images/h5/address/address_image1.png`"></wd-img>
|
||||||
|
</view>
|
||||||
|
<view class="font-500 text-32rpx leading-44rpx text-#909399 mt-50rpx">未填写收货地址</view>
|
||||||
|
</view>
|
||||||
|
<view
|
||||||
|
class="mt-36rpx bg-#fff text-#4C9F44 border-1rpx border-solid border-[#4C9F44] font-400 text-28rpx leading-40rpx mx-auto w-398rpx h-80rpx leading-80rpx text-center rounded-8rpx"
|
||||||
|
@click="Service.handleAddAddress">添加地址</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<!-- 地址列表 -->
|
||||||
|
<view class="pt-22rpx" v-if="addressList.length > 0">
|
||||||
|
<view class="rounded-16rpx p-34rpx box-border flex items-center mb-20rpx"
|
||||||
|
:class="addressIndex === index ? 'border-1rpx border-solid border-[#4C9F44] bg-#FAFFF9' : 'border-1rpx border-solid border-[#F6F7F8] bg-#F6F7F8'"
|
||||||
|
v-for="(item, index) in addressList" :key="index">
|
||||||
|
<view @click="addressIndex = index">
|
||||||
|
<view class="flex items-center justify-between">
|
||||||
|
<view class="flex items-center">
|
||||||
|
<view class="mr-10rpx">
|
||||||
|
<wd-tag color="#4C9F44" bg-color="#F3F3F3"
|
||||||
|
custom-class="!rounded-4rpx !px-10rpx"
|
||||||
|
v-if="item.is_default">默认</wd-tag>
|
||||||
|
</view>
|
||||||
|
<view class="flex items-center justify-between">
|
||||||
|
<view class="text-30rpx leading-42rpx text-#303133">
|
||||||
|
<text class="mr-16rpx">{{ item.contact }}</text>
|
||||||
|
<text>{{ item.telephone }}</text>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view @click.stop="Service.handleAddAddress(item.id)">
|
||||||
|
<wd-icon name="edit-outline" size="32rpx" color="#666666"></wd-icon>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="w-562rpx line-1 text-26rpx leading-34rpx text-#909399 mt-10rpx">{{
|
||||||
|
item.address }}</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
</template>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="fixed left-0 right-0 bottom-0 z-2 bg-[#fff] flex items-center justify-center"
|
||||||
|
:style="{ height: '140rpx' }">
|
||||||
|
<view class="text-32rpx leading-44rpx flex items-center justify-center leading-90rpx text-center">
|
||||||
|
<view class="w-630rpx h-90rpx bg-[#4C9F44] rounded-8rpx text-[#fff]" @click="Service.handleNext">下一步
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
|
||||||
|
import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
|
||||||
|
import { router } from '@/utils/tools'
|
||||||
|
import { getHomeTeaStoreList } from '@/api/tea-room'
|
||||||
|
import type { ITeaHouseListResult } from '@/api/types/tea'
|
||||||
|
import type { IUserAddressListResult } from '@/api/types/user'
|
||||||
|
import { getUserAddress } from '@/api/user'
|
||||||
|
|
||||||
|
const OSS = inject('OSS')
|
||||||
|
|
||||||
|
// 服务方式
|
||||||
|
const serviceType = ref<number>(1)
|
||||||
|
const storeIndex = ref<number>(-1) // 选择的门店索引
|
||||||
|
|
||||||
|
// 地址列表
|
||||||
|
const addressList = ref<IUserAddressListResult[]>([])
|
||||||
|
const addressIndex = ref<number>(-1)
|
||||||
|
|
||||||
|
// 分页
|
||||||
|
const list = ref<Array<any>>([])
|
||||||
|
const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
|
||||||
|
const storeName = ref<string>('') // 搜索的门店名称
|
||||||
|
const upOption = {
|
||||||
|
textNoMore: '~ 已经到底啦 ~', //无更多数据的提示
|
||||||
|
}
|
||||||
|
|
||||||
|
onLoad((args) => {
|
||||||
|
// 初始化地址列表
|
||||||
|
Service.handleInitAddress()
|
||||||
|
})
|
||||||
|
|
||||||
|
const Service = {
|
||||||
|
// 上拉加载的回调: 其中num:当前页 从1开始, size:每页数据条数,默认10
|
||||||
|
upCallback: (mescroll) => {
|
||||||
|
const filter = {
|
||||||
|
page: mescroll.num,
|
||||||
|
size: mescroll.size,
|
||||||
|
latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE,
|
||||||
|
longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE,
|
||||||
|
search: storeName.value
|
||||||
|
}
|
||||||
|
|
||||||
|
getHomeTeaStoreList(filter).then((res: ITeaHouseListResult) => {
|
||||||
|
const curPageData = res.list || [] // 当前页数据
|
||||||
|
if (mescroll.num == 1) list.value = [] // 第一页需手动制空列表
|
||||||
|
list.value = list.value.concat(curPageData) //追加新数据
|
||||||
|
mescroll.endSuccess(curPageData.length, Boolean(res.more))
|
||||||
|
}).catch(() => {
|
||||||
|
mescroll.endErr() // 请求失败, 结束加载
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 初始化地址列表
|
||||||
|
*/
|
||||||
|
handleInitAddress: async () => {
|
||||||
|
const res = await getUserAddress()
|
||||||
|
addressList.value = Array.isArray(res) ? res : []
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 跳转地址添加/编辑页面
|
||||||
|
* @param id 地址ID，0表示添加，非0表示编辑
|
||||||
|
*/
|
||||||
|
handleAddAddress: (id: number = 0) => {
|
||||||
|
uni.$on('refreshAddressList', () => {
|
||||||
|
Service.handleInitAddress()
|
||||||
|
uni.$off('refreshAddressList')
|
||||||
|
})
|
||||||
|
|
||||||
|
if (id > 0) {
|
||||||
|
router.navigateTo(`/bundle_b/pages/tea-specialist/address/add?id=${id}`)
|
||||||
|
} else {
|
||||||
|
router.navigateTo('/bundle_b/pages/tea-specialist/address/add')
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 切换服务方式
|
||||||
|
*/
|
||||||
|
handleChangeServiceType: () => {
|
||||||
|
// 切换服务方式时重置选择
|
||||||
|
storeIndex.value = -1
|
||||||
|
addressIndex.value = -1
|
||||||
|
},
|
||||||
|
|
||||||
|
handleNext: () => {
|
||||||
|
let address = {}
|
||||||
|
|
||||||
|
if (serviceType.value === 1) {
|
||||||
|
// 到店服务
|
||||||
|
if (storeIndex.value === -1) {
|
||||||
|
uni.showToast({
|
||||||
|
title: '请选择门店',
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const selectedStore = list.value[storeIndex.value]
|
||||||
|
address = {
|
||||||
|
serviceType: 1, // 服务方式：1-到店服务
|
||||||
|
id: selectedStore.id, // 门店ID
|
||||||
|
name: selectedStore.name, // 门店名称
|
||||||
|
image: selectedStore.image, // 门店图片
|
||||||
|
address: selectedStore.address, // 门店地址
|
||||||
|
longitude: selectedStore.longitude, // 门店经度
|
||||||
|
latitude: selectedStore.latitude, // 门店纬度
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 上门服务
|
||||||
|
if (addressIndex.value === -1) {
|
||||||
|
uni.showToast({
|
||||||
|
title: '请选择地址',
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const selectedAddress = addressList.value[addressIndex.value]
|
||||||
|
address = {
|
||||||
|
serviceType: 2, // 服务方式：2-上门服务
|
||||||
|
id: selectedAddress.id, // 地址ID
|
||||||
|
name: selectedAddress.contact, // 联系人名称
|
||||||
|
image: '', // 地址图片
|
||||||
|
telephone: selectedAddress.telephone, // 联系人电话
|
||||||
|
address: selectedAddress.address, // 地址
|
||||||
|
longitude: selectedAddress.longitude, // 地址经度
|
||||||
|
latitude: selectedAddress.latitude, // 地址纬度
|
||||||
|
is_default: selectedAddress.is_default // 是否默认地址
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uni.setStorageSync('selectedPackageService', address) // 将选择的服务信息存储到本地，供下一个页面使用
|
||||||
|
router.navigateTo('/bundle/package/tea-specialist')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
page {
|
||||||
|
background: $cz-page-background;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
197
src/bundle/package/tea-specialist.vue
Normal file
197
src/bundle/package/tea-specialist.vue
Normal file
@ -0,0 +1,197 @@
|
|||||||
|
<route lang="jsonc" type="page">{
|
||||||
|
"needLogin": true,
|
||||||
|
"layout": "default",
|
||||||
|
"style": {
|
||||||
|
"navigationStyle": "custom"
|
||||||
|
}
|
||||||
|
}</route>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<view class="pb-160rpx min-h-100vh bg-[#fff]">
|
||||||
|
<navbar title="选择茶艺师" custom-class='!bg-[#fff]'></navbar>
|
||||||
|
|
||||||
|
<!-- 茶艺师列表部分 -->
|
||||||
|
<view class="bg-[#fff] px-30rpx pt-20rpx pb-40rpx">
|
||||||
|
<view class="text-30rpx font-bold text-[#303133]">茶艺师</view>
|
||||||
|
<view class="text-24rpx text-[#818CA9] mt-12rpx mb-32rpx font-500">匹配心动茶艺师</view>
|
||||||
|
|
||||||
|
<view class="flex flex-wrap justify-between">
|
||||||
|
<view class="w-216rpx mb-30rpx relative" v-for="(item, index) in list" :key="index"
|
||||||
|
@click="TeaSpecialist.handleSelect(index)">
|
||||||
|
<view class="relative w-216rpx h-216rpx rounded-16rpx overflow-hidden">
|
||||||
|
<wd-img :src="item.avatar" width="216rpx" height="216rpx" mode="aspectFill"></wd-img>
|
||||||
|
<view class="absolute bottom-0 left-0 z-10">
|
||||||
|
<!-- 选中的样式 -->
|
||||||
|
<view
|
||||||
|
class="w-40rpx h-40rpx rounded-full bg-[#4C9F44] flex items-center justify-center border-2rpx border-solid border-[#4C9F44]"
|
||||||
|
v-if="selectedIndex === index">
|
||||||
|
<wd-icon name="check-bold" size="24rpx" color="#fff"></wd-icon>
|
||||||
|
</view>
|
||||||
|
<!-- 未选中的样式 -->
|
||||||
|
<view
|
||||||
|
class="w-40rpx h-40rpx rounded-full bg-[rgba(255,255,255,0.9)] border-2rpx border-solid border-[#d4d4d4]"
|
||||||
|
v-else></view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="text-28rpx text-[#2A3B56] mt-12rpx line-1">{{ item.name }}</view>
|
||||||
|
<view class="text-24rpx text-[#F55B02] mt-6rpx">{{ item.level }}</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="flex justify-center mt-10rpx">
|
||||||
|
<view class="flex items-center justify-center bg-[#F6F7F8] rounded-34rpx h-100rpx w-320rpx"
|
||||||
|
@click="TeaSpecialist.handleMore">
|
||||||
|
<wd-img :src="`${OSS}icon/icon_more.png`" width="36rpx" height="36rpx"></wd-img>
|
||||||
|
<text
|
||||||
|
class="text-26rpx text-[#606266] ml-24rpx mr-8rpx font-400 text-28rpx leading-40rpx">查看更多</text>
|
||||||
|
<wd-icon name="arrow-down" size="28rpx" color="#606266"></wd-icon>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<!-- 茶艺师详细信息模块 -->
|
||||||
|
<view class="mx-28rpx mt-20rpx mb-30rpx relative border-2rpx border-solid border-[#F6F4F4]" v-if="selectedSpecialist">
|
||||||
|
<view class="flex justify-between items-start bg-[#F5F7FF] rounded-t-16rpx p-30rpx">
|
||||||
|
<view>
|
||||||
|
<view class="text-36rpx font-bold text-[#303133] mb-12rpx">{{ selectedSpecialist.name }}</view>
|
||||||
|
<view class="text-28rpx text-[#120D26] mb-12rpx">{{ selectedSpecialist.title }}</view>
|
||||||
|
<view class="flex items-center text-24rpx text-[#909399] mb-16rpx">
|
||||||
|
<wd-img :src="`${OSS}icon/icon_store_cert.png`" width="36rpx" height="36rpx"
|
||||||
|
class="mr-8rpx"></wd-img>
|
||||||
|
<text>商家认证的名称</text>
|
||||||
|
</view>
|
||||||
|
<view class="flex items-center">
|
||||||
|
<wd-rate v-model="selectedSpecialist.rating" readonly active-color="#FF5951" allow-half
|
||||||
|
active-icon="star-filled" icon="star" space="4rpx" />
|
||||||
|
<text class="text-24rpx text-[#606266] ml-10rpx">{{ selectedSpecialist.rating }} 推荐</text>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="w-120rpx h-120rpx" @click="TeaSpecialist.handleChat">
|
||||||
|
<wd-img :src="`${OSS}icon/icon_msg.png`" width="120rpx" height="120rpx" placeholder="icon"></wd-img>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="bg-[#FCFCFE] rounded-b-16rpx p-30rpx">
|
||||||
|
<!-- 服务方式 -->
|
||||||
|
|
||||||
|
<view class="bg-[#EBFBF7] h-64rpx rounded-12rpx p-14rpx flex items-center mt-22rpx text-[#35C1A0]">
|
||||||
|
<wd-img :src="`${OSS}icon/icon_heart.png`" width="36rpx" height="36rpx"></wd-img>
|
||||||
|
<text class="font-bold text-24rpx leading-34rpx ml-16rpx">服务方式</text>
|
||||||
|
<text class="ml-20rpx font-400 text-24rpx leading-34rpx">到店服务</text>
|
||||||
|
<text class="ml-20rpx font-400 text-24rpx leading-34rpx">上门服务</text>
|
||||||
|
<!-- <text class="ml-20rpx font-400 text-24rpx leading-34rpx" v-if="info.server_type == 1 || info.server_type == 3">到店服务</text>
|
||||||
|
<text class="ml-20rpx font-400 text-24rpx leading-34rpx" v-if="info.server_type == 2 || info.server_type == 3">上门服务</text> -->
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<!-- 基本属性 -->
|
||||||
|
<view class="mt-36rpx grid grid-cols-2 gap-y-24rpx px-10rpx">
|
||||||
|
<view class="flex items-center text-28rpx text-[#606266]">
|
||||||
|
<wd-img width="40rpx" height="40rpx" :src="`${OSS}icon/icon_gender.png`"
|
||||||
|
class="mr-16rpx"></wd-img>
|
||||||
|
<text class="mr-16rpx">性别:</text>
|
||||||
|
<text class="text-[#303133]">女</text>
|
||||||
|
</view>
|
||||||
|
<view class="flex items-center text-28rpx text-[#606266]">
|
||||||
|
<wd-img width="40rpx" height="40rpx" :src="`${OSS}icon/icon_born.png`"
|
||||||
|
class="mr-16rpx"></wd-img>
|
||||||
|
<text class="mr-16rpx">年龄:</text>
|
||||||
|
<text class="text-[#303133]">21岁</text>
|
||||||
|
</view>
|
||||||
|
<view class="flex items-center text-28rpx text-[#606266]">
|
||||||
|
<wd-img width="40rpx" height="40rpx" :src="`${OSS}icon/icon_height.png`"
|
||||||
|
class="mr-16rpx"></wd-img>
|
||||||
|
<text class="mr-16rpx">身高:</text>
|
||||||
|
<text class="text-[#303133]">165cm</text>
|
||||||
|
</view>
|
||||||
|
<view class="flex items-center text-28rpx text-[#606266]">
|
||||||
|
<wd-img width="40rpx" height="40rpx" :src="`${OSS}icon/icon_weight.png`"
|
||||||
|
class="mr-16rpx"></wd-img>
|
||||||
|
<text class="mr-16rpx">体重:</text>
|
||||||
|
<text class="text-[#303133]">53kg</text>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<!-- 标签 -->
|
||||||
|
<view class="mt-36rpx border border-solid border-[#F0F2F5] rounded-14rpx p-24rpx pb-8rpx bg-[#FFFFFF]">
|
||||||
|
<view class="flex flex-wrap">
|
||||||
|
<view class="flex flex-wrap items-center">
|
||||||
|
<view class="mr-8rpx bg-[#4C9F44] text-[#fff] px-10rpx leading-34rpx font-400 text-24rpx rounded-4rpx">123</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<!-- 底部按钮 -->
|
||||||
|
<view class="fixed left-0 right-0 bottom-0 z-2 bg-[#fff] flex items-center justify-center"
|
||||||
|
:style="{ height: '140rpx' }">
|
||||||
|
<view class="text-32rpx flex items-center justify-center leading-90rpx text-center w-full px-60rpx">
|
||||||
|
<view class="flex-1 w-full h-90rpx bg-[#4C9F44] rounded-8rpx text-[#fff]" @click="TeaSpecialist.handleNext">下一步</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { inject, ref, computed } from 'vue'
|
||||||
|
import { router } from '@/utils/tools'
|
||||||
|
|
||||||
|
const OSS = inject('OSS')
|
||||||
|
|
||||||
|
// 模拟数据列表
|
||||||
|
const list = ref([
|
||||||
|
{ name: '春风', level: '初级茶艺师', title: '清风茶艺师', avatar: 'https://picsum.photos/400/400?radom=1', rating: 4.5 },
|
||||||
|
{ name: '春风', level: '初级茶艺师', title: '清风茶艺师', avatar: 'https://picsum.photos/400/400?radom=2', rating: 4.8 },
|
||||||
|
{ name: '夏雪', level: '初级茶艺师', title: '清风茶艺师', avatar: 'https://picsum.photos/400/400?radom=3', rating: 5.0 },
|
||||||
|
{ name: '春风', level: '初级茶艺师', title: '清风茶艺师', avatar: 'https://picsum.photos/400/400?radom=4', rating: 4.2 },
|
||||||
|
{ name: '春风', level: '初级茶艺师', title: '清风茶艺师', avatar: 'https://picsum.photos/400/400?radom=5', rating: 4.5 },
|
||||||
|
{ name: '夏雪', level: '初级茶艺师', title: '清风茶艺师', avatar: 'https://picsum.photos/400/400?radom=6', rating: 4.5 }
|
||||||
|
])
|
||||||
|
|
||||||
|
const selectedIndex = ref(0)
|
||||||
|
const selectedSpecialist = computed(() => list.value[selectedIndex.value])
|
||||||
|
|
||||||
|
const TeaSpecialist = {
|
||||||
|
/**
|
||||||
|
* 选中某个茶艺师
|
||||||
|
*/
|
||||||
|
handleSelect: (index: number) => {
|
||||||
|
selectedIndex.value = index
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 加载更多茶艺师
|
||||||
|
*/
|
||||||
|
handleMore: () => {
|
||||||
|
uni.showToast({
|
||||||
|
title: '加载更多',
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 点击聊天
|
||||||
|
*/
|
||||||
|
handleChat: () => {
|
||||||
|
uni.showToast({
|
||||||
|
title: '打开聊天',
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下一步
|
||||||
|
*/
|
||||||
|
handleNext: () => {
|
||||||
|
router.navigateTo('/bundle/package/reserve?id=439')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
page {
|
||||||
|
background-color: #fff;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@ -50,14 +50,14 @@
|
|||||||
<view class="text-32rpx leading-44rpx text-#303133">
|
<view class="text-32rpx leading-44rpx text-#303133">
|
||||||
预定日期 <text class="text-[#FF3B30] ml-10rpx">*</text>
|
预定日期 <text class="text-[#FF3B30] ml-10rpx">*</text>
|
||||||
</view>
|
</view>
|
||||||
<wd-calendar v-model="form.reserve_date" type="date" :min-date="minDate" use-default-slot @confirm="TeaRoom.handleConfirmDate">
|
<wd-datetime-picker v-model="form.reserve_date" type="date" :min-date="minDate" :max-date="maxDate" use-default-slot @confirm="TeaRoom.handleConfirmDate">
|
||||||
<view class="flex items-center">
|
<view class="flex items-center">
|
||||||
<view class="text-30rpx mr-8rpx" :class="form.reserve_date ? 'text-#303133' : 'text-#C9C9C9'">
|
<view class="text-30rpx mr-8rpx" :class="form.reserve_date ? 'text-#303133' : 'text-#C9C9C9'">
|
||||||
{{ reserveDateStr || '请选择' }}
|
{{ reserveDateStr || '请选择' }}
|
||||||
</view>
|
</view>
|
||||||
<wd-icon name="arrow-right" size="32rpx" color="#C9C9C9"></wd-icon>
|
<wd-icon name="arrow-right" size="32rpx" color="#C9C9C9"></wd-icon>
|
||||||
</view>
|
</view>
|
||||||
</wd-calendar>
|
</wd-datetime-picker>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@ -216,9 +216,10 @@ const status = ref<number>(-1) // 0待审核 1审核成功 2审核失败 3未提
|
|||||||
const reserveDateStr = computed(() => {
|
const reserveDateStr = computed(() => {
|
||||||
if (!form.value.reserve_date) return ''
|
if (!form.value.reserve_date) return ''
|
||||||
const d = new Date(form.value.reserve_date)
|
const d = new Date(form.value.reserve_date)
|
||||||
return `${d.getMonth() + 1}月${d.getDate()}日`
|
return `${d.getFullYear()}年${d.getMonth() + 1}月${d.getDate()}日`
|
||||||
})
|
})
|
||||||
const minDate = ref<number>(new Date(new Date().setHours(0, 0, 0, 0)).getTime())
|
const minDate = ref<number>(new Date(new Date().setHours(0, 0, 0, 0)).getTime())
|
||||||
|
const maxDate = ref<number>(new Date(new Date().getFullYear(), 11, 31, 23, 59, 59).getTime())
|
||||||
|
|
||||||
onLoad(async () => {
|
onLoad(async () => {
|
||||||
const res = await getJoinCooperationStatus()
|
const res = await getJoinCooperationStatus()
|
||||||
|
|||||||
@ -111,7 +111,6 @@
|
|||||||
const form = reactive<IAddUserAddressParams>({
|
const form = reactive<IAddUserAddressParams>({
|
||||||
contact: '',
|
contact: '',
|
||||||
telephone: '',
|
telephone: '',
|
||||||
city_id: 0,
|
|
||||||
longitude: 0,
|
longitude: 0,
|
||||||
latitude: 0,
|
latitude: 0,
|
||||||
address: '',
|
address: '',
|
||||||
@ -149,10 +148,10 @@
|
|||||||
/**
|
/**
|
||||||
* 确认选择的地址
|
* 确认选择的地址
|
||||||
*/
|
*/
|
||||||
handleConfirmAddress: (e: any) => {
|
// handleConfirmAddress: (e: any) => {
|
||||||
form.city_id = Number(e.value)
|
// form.city_id = Number(e.value)
|
||||||
city.value = e.selectedItems.label || ''
|
// city.value = e.selectedItems.label || ''
|
||||||
},
|
// },
|
||||||
|
|
||||||
|
|
||||||
// 获取地址详情
|
// 获取地址详情
|
||||||
@ -164,6 +163,9 @@
|
|||||||
form.contact = res.address_details.contact
|
form.contact = res.address_details.contact
|
||||||
form.telephone = res.address_details.telephone
|
form.telephone = res.address_details.telephone
|
||||||
form.address = res.address_details.address
|
form.address = res.address_details.address
|
||||||
|
form.longitude = res.address_details.longitude
|
||||||
|
form.latitude = res.address_details.latitude
|
||||||
|
console.log("🚀 ~ form:", form)
|
||||||
|
|
||||||
// form.city_id = res.address_details.city_id,
|
// form.city_id = res.address_details.city_id,
|
||||||
|
|
||||||
|
|||||||
@ -231,7 +231,7 @@
|
|||||||
<!-- 茶艺师信息 -->
|
<!-- 茶艺师信息 -->
|
||||||
<view class="flex items-center bg-white p-20rpx rounded-10rpx mb-20rpx mt-20rpx">
|
<view class="flex items-center bg-white p-20rpx rounded-10rpx mb-20rpx mt-20rpx">
|
||||||
<view class="mr-28rpx relative">
|
<view class="mr-28rpx relative">
|
||||||
<wd-img width="200rpx" height="200rpx" :src="info.image"></wd-img>
|
<wd-img width="200rpx" height="200rpx" radius="10rpx" :src="info.image"></wd-img>
|
||||||
</view>
|
</view>
|
||||||
<view class="">
|
<view class="">
|
||||||
<view class="font-bold text-[#303133] text-30rpx leading-42rpx mr-14rpx">
|
<view class="font-bold text-[#303133] text-30rpx leading-42rpx mr-14rpx">
|
||||||
|
|||||||
@ -251,6 +251,33 @@
|
|||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"path": "package/reserve",
|
||||||
|
"type": "page",
|
||||||
|
"needLogin": true,
|
||||||
|
"layout": "tabbar",
|
||||||
|
"style": {
|
||||||
|
"navigationStyle": "custom"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "package/service",
|
||||||
|
"type": "page",
|
||||||
|
"needLogin": true,
|
||||||
|
"layout": "default",
|
||||||
|
"style": {
|
||||||
|
"navigationStyle": "custom"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "package/tea-specialist",
|
||||||
|
"type": "page",
|
||||||
|
"needLogin": true,
|
||||||
|
"layout": "default",
|
||||||
|
"style": {
|
||||||
|
"navigationStyle": "custom"
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "profile/profile",
|
"path": "profile/profile",
|
||||||
"type": "page",
|
"type": "page",
|
||||||
|
|||||||
@ -67,7 +67,8 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="mx-30rpx pb-30rpx flex justify-between">
|
<view class="mx-30rpx pb-30rpx flex justify-between">
|
||||||
<view class="w-216rpx rounded-20rpx pb-20rpx box-border" style="background: linear-gradient( 180deg, #EAFFF9 0%, #F6F7F9 100%);">
|
<view class="w-216rpx rounded-20rpx pb-20rpx box-border" style="background: linear-gradient( 180deg, #EAFFF9 0%, #F6F7F9 100%);"
|
||||||
|
@click="router.navigateTo(`/bundle/package/detail`)">
|
||||||
<view class="px-10rpx pt-10rpx flex justify-center">
|
<view class="px-10rpx pt-10rpx flex justify-center">
|
||||||
<wd-img width="204rpx" height="124rpx" :src="`${OSS}images/home/home_image_16.png`" radius="16rpx" mode="aspectFill" />
|
<wd-img width="204rpx" height="124rpx" :src="`${OSS}images/home/home_image_16.png`" radius="16rpx" mode="aspectFill" />
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -35,6 +35,15 @@
|
|||||||
</template>
|
</template>
|
||||||
</reserve-notice>
|
</reserve-notice>
|
||||||
</view>
|
</view>
|
||||||
|
<view v-if="type == OrderType.ReserveGroup">
|
||||||
|
<reserve-notice title="团体茶艺师预约成功" desc="团体茶艺师预约成功">
|
||||||
|
<template #layout>
|
||||||
|
<view class="pb-22rpx mt-40rpx mx-30rpx flex justify-between items-center text-[32rpx] text-center">
|
||||||
|
<view class='bg-[#4C9F44] text-[#fff] rounded-8rpx h-90rpx leading-90rpx w-632rpx' @click="reserve.handleRoomDone">完成</view>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
</reserve-notice>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|||||||
@ -210,6 +210,7 @@ export const TeaSpecialistOrderStatusValue: Record<TeaSpecialistOrderStatusText,
|
|||||||
export const OrderType = {
|
export const OrderType = {
|
||||||
TeaRoomOrder: 'teaRoomOrder',
|
TeaRoomOrder: 'teaRoomOrder',
|
||||||
TeaSpecialist: 'teaSpecialist',
|
TeaSpecialist: 'teaSpecialist',
|
||||||
|
ReserveGroup: 'reserveGroup',
|
||||||
}
|
}
|
||||||
|
|
||||||
// 包间订单状态数字(根据UI图还缺已退款、待接单、售后中、售后完成)
|
// 包间订单状态数字(根据UI图还缺已退款、待接单、售后中、售后完成)
|
||||||
|
|||||||
Reference in New Issue
Block a user