diff --git a/src/App.vue b/src/App.vue index ec2a9df..7910d8c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -58,4 +58,13 @@ } } } + + .booking-time { + :deep() { + .wd-tabs__line--inner, + .wd-tabs__line { + background-color: #4C9F44 !important; + } + } + } diff --git a/src/api/bank.ts b/src/api/bank.ts index 138ffd8..104731c 100644 --- a/src/api/bank.ts +++ b/src/api/bank.ts @@ -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 }) } \ No newline at end of file diff --git a/src/api/tea-room.ts b/src/api/tea-room.ts index 9869b28..ad59203 100644 --- a/src/api/tea-room.ts +++ b/src/api/tea-room.ts @@ -151,8 +151,8 @@ export function getStoreTeaRoomList(data: IStoreTeaRoomListParams) { /** * 获取未来7天时间 */ -export function getNext7Days() { - return http.Post('/api/Common/get7Time') +export function getNext7Days(room_id: number, date: string) { + return http.Post('/api/Common/get7Time', {room_id, date}) } /** diff --git a/src/api/types/bank.ts b/src/api/types/bank.ts index ef80d01..2662ae2 100644 --- a/src/api/types/bank.ts +++ b/src/api/types/bank.ts @@ -4,4 +4,5 @@ export interface IAddBankCardParams { mobile: number|string code: number|string bank_open_name: string + name: string } \ No newline at end of file diff --git a/src/api/user.ts b/src/api/user.ts index c80eed7..7c86bee 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -71,4 +71,11 @@ export interface IResetPasswordParams { export function resetPassword(data: IResetPasswordParams) { return http.Post('/storeapi/storeLogin/resetPassword', data) +} + +/** + * 查询用户余额 + */ +export function getUserBalance(store_id: number) { + return http.Post('/storeapi/user/checkMoney', {store_id}) } \ No newline at end of file diff --git a/src/bundle/finance/finance.vue b/src/bundle/finance/finance.vue index 605d1f5..dde121b 100644 --- a/src/bundle/finance/finance.vue +++ b/src/bundle/finance/finance.vue @@ -30,7 +30,7 @@ 待提现 - {{ userFinance.user_money }} + {{ userFinance.balance }} @@ -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) //追加新数据 diff --git a/src/bundle/parten/pages/bank-card/add.vue b/src/bundle/parten/pages/bank-card/add.vue index aef8283..ad40822 100644 --- a/src/bundle/parten/pages/bank-card/add.vue +++ b/src/bundle/parten/pages/bank-card/add.vue @@ -68,6 +68,21 @@ + + + + + + 提现人名称 + + + + + + + + + @@ -125,6 +140,7 @@ mobile: '', code: '', bank_open_name: '', + name: '' }) const Add = { diff --git a/src/bundle/parten/pages/withdraw/withdraw.vue b/src/bundle/parten/pages/withdraw/withdraw.vue index f0f5ca1..56d50cd 100644 --- a/src/bundle/parten/pages/withdraw/withdraw.vue +++ b/src/bundle/parten/pages/withdraw/withdraw.vue @@ -99,7 +99,7 @@ - + \ No newline at end of file diff --git a/src/components/order/ComboCard.vue b/src/components/order/ComboCard.vue index 69b9c30..afa144c 100644 --- a/src/components/order/ComboCard.vue +++ b/src/components/order/ComboCard.vue @@ -147,13 +147,13 @@ - + {{ order.room_name }} - 预约时间:{{ order.day_time }} {{ order.start_time }}-{{ order.end_time }} + 预约时间:{{ order.day_title }} {{ order.start_time }}-{{ order.end_time }} 预约时长:{{ order.hours }}小时 diff --git a/src/pages/store/reserve.vue b/src/pages/store/reserve.vue index 733532d..4daa409 100644 --- a/src/pages/store/reserve.vue +++ b/src/pages/store/reserve.vue @@ -57,10 +57,10 @@