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

修改代码

Browse Source
This commit is contained in:
wangxiaowei
2026-01-24 23:59:41 +08:00
parent 1e09782256
commit 5e5cd66f21
23 changed files with 228 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/pages/cashier/cashier.vue
View File

@ -17,12 +17,7 @@
<view class="mt-56rpx text-center">
<view class="text-28rpx leading-40rpx text-#606266">{{ title }}</view>
<view class="mt-24rpx">
<!-- 是否是一键续订 -->
<template v-if="renew">
<price-format color="#303133" :first-size="44" :second-size="44" :subscript-size="28" :price="renewPrice"></price-format>
</template>
<!-- 正常订单金额 -->
<template v-if="!renew">
<template>
<price-format color="#303133" :first-size="44" :second-size="44" :subscript-size="28" :price="money"></price-format>
</template>
</view>
@ -52,7 +47,7 @@
import { ITeaSpecialistDetailsFields } from '@/api/types/tea'
import { prePay, balancePay, newPrePay } from '@/api/pay'
import type {IUserInfoVo } from '@/api/types/login'
import { getTeaRoomBalance, getTeaRoomOrderDetail, getTeaRoomPackageOrderDetail, getTeaRoomPackageDetail } from '@/api/tea-room'
import { getTeaRoomBalance, getTeaRoomOrderDetail, getTeaRoomPackageOrderDetail, getTeaRoomPackageDetail, getTeaRoomPayOrderAmount, getRenewTeaRoomPayOrderAmount } from '@/api/tea-room'
import Pay from '@/components/Pay.vue'
import { PayValue, PayValueMap, PayOrderType, PayOrderSource } from '@/utils/pay'
import { toast } from '@/utils/toast'
@ -114,9 +109,6 @@
// 一键续订支付
const renew = ref<string>('')
const renewPrice = ref<number>(0)
// 购买套餐支付
const isGroupBuying = ref<number>(0)
@ -143,7 +135,6 @@
// 一键续订
renew.value = args?.renew || ''
renewPrice.value = Number(args?.renewPrice) || 0
// 获取门店余额
if (args.storeId) {
@ -185,10 +176,13 @@
// 获取订单详情
if (isGroupBuying.value == 0) {
// 茶室预约订单走这个接口，续订的不需要
if (renew.value) return
Cashier.handleGetOrderDetails()
if (renew.value) {
Cashier.handleGetRenewOrderDetails()
} else {
Cashier.handleGetOrderDetails()
}
} else {
Cashier.handleGetRoomPackageDetails()
Cashier.handleGetRoomPackageDetails(args.money)
}
} else if (args.from == OrderType.TeaSpecialist && args.orderId) {
// 获取预定茶艺师订单详情
@ -207,7 +201,6 @@
})
const Cashier = {
/**获取茶艺师订单详情
*
* @param id
@ -230,24 +223,42 @@
*/
handleGetOrderDetails: async () => {
// 获取订单详情接口
const res = await getTeaRoomOrderDetail({
// const res = await getTeaRoomOrderDetail({
// id: orderId.value,
// latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE,
// longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE,
// })
const res = await getTeaRoomPayOrderAmount({
id: orderId.value,
latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE,
longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE,
pay_way: pay.value || PayValue.PlatformBalance
})
console.log("🚀 ~ getTeaRoomPayOrderAmount res:", res)
order.value = res
money.value = Number(res.details.order_amount)
},
/**
* 获取茶室套餐订单详情
* 获取茶室续订订单详情
*/
handleGetRenewOrderDetails: async () => {
const res = await getRenewTeaRoomPayOrderAmount({
id: orderId.value,
pay_way: pay.value || PayValue.PlatformBalance
})
console.log("🚀 ~ getRenewTeaRoomPayOrderAmount res:", res)
order.value = res
money.value = Number(res.details.order_amount)
},
/**
* 获取茶室套餐订单详情(改为args传过来金额)
* @param value
*/
handleGetRoomPackageDetails: async () => {
const res = await getTeaRoomPackageDetail({
id: comboId.value
})
money.value = Number(res.details.discount_price)
handleGetRoomPackageDetails: async (m: number) => {
// const res = await getTeaRoomPackageDetail({
// id: comboId.value
// })
money.value = m
},
/**
@ -256,6 +267,17 @@
*/
handleGetPayValue: (value: number) => {
pay.value = value
// 茶室订单：为了获取不同支付方式下的订单金额
if (from.value == OrderType.TeaRoomOrder && orderId.value && isGroupBuying.value == 0) {
if (renew.value) {
// 续订订单
Cashier.handleGetRenewOrderDetails()
} else {
// 正常茶室订单
Cashier.handleGetOrderDetails()
}
}
},
/**

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

@ -20,7 +20,7 @@
<view class="mt-52rpx mx-30rpx">
<view class="text-[#333] leading-42rpx text-30rpx font-bold">当前定位</view>
<view class="mt-40rpx">
<view class="bg-[#F8F9FA] rounded-28rpx w-162rpx h-56rpx text-[#606266] flex items-center justify-center" @click="City.handleSetCurretCity">
<view class="bg-[#F8F9FA] rounded-28rpx w-162rpx h-56rpx text-[#606266] flex items-center justify-center">
<wd-img width="28rpx" height="28rpx" :src="`${OSS}icon/icon_location2.png`"></wd-img>
<view class="text-26rpx text-[#606266] leading-36rpx">{{ city || LOCATION_DEFAULT_CITY }}</view>
</view>
@ -82,15 +82,6 @@
openCityList.value = res.list
},
/**
* 将缓存设置为当前定位城市
* @param item
*/
handleSetCurretCity: () => {
const params = uni.getStorageSync(LOCATION_CURRENT)
City.handleChooseCity(params)
},
/**
* 选择城市
*/

1
src/pages/index/index.vue
View File

@ -363,6 +363,7 @@
handleToGetCoupon: async () => {
await claimIndexCoupon()
showCoupon.value = false
router.navigateTo('/bundle_b/pages/tea-specialist/list')
},
/**

5
src/pages/login/login.vue
View File

@ -78,7 +78,10 @@
})
const Login = {
// 获取手机号
/**
* 登录
* @param e
*/
handleLogin: async (e: object) => {
if (!agree.value) {
toast.info('请同意服务协议和隐私政策')

1
src/pages/webview/webview.vue
View File

@ -1,6 +1,5 @@
<!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page -->
<route lang="jsonc" type="page">{
"layout": "tabbar",
"style": {
// 'custom' 表示开启自定义导航栏，默认 'default'
"navigationStyle": "custom"