outsource/mahjong_group
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui修改.

Browse Source
This commit is contained in:
18631081161 2025-12-09 01:18:51 +08:00
parent 83668500df
commit a3e160ffe1
7 changed files with 1080 additions and 767 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/index/MahjongCard.vue
View File

@ -320,7 +320,7 @@ const handleJoin = () => {
.info-text { .info-text {
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size:18rpx; font-size:24rpx;
color: #575757; color: #575757;
text-align: left; text-align: left;
display: block; display: block;

301
pages/appointment/appointment-page.vue
View File

@ -107,18 +107,19 @@
<card-container marginTop="30rpx"> <card-container marginTop="30rpx">
<label-slect-field label="鸽子费"> <label-slect-field label="鸽子费">
<com-appointment-radio-select :options="depositOptions" v-model="reservationInfo.deposit_fee" /> <com-appointment-radio-select :options="depositOptions" v-model="reservationInfo.deposit_fee" />
</label-slect-field> </label-slect-field>
<view v-if="reservationInfo.deposit_fee === -1" :style="{ height: lineHeight }"></view> <view v-if="reservationInfo.deposit_fee === -1" :style="{ height: lineHeight }"></view>
<label-slect-field v-if="reservationInfo.deposit_fee === -1" label="金额"> <label-slect-field v-if="reservationInfo.deposit_fee === -1" label="金额">
<view class="input-wrapper"> <view class="input-wrapper">
<up-input type="number" placeholder="请输入0-50" v-model="customDeposit" @input="onCustomDepositInput"></up-input> <up-input type="number" placeholder="请输入0-50" v-model="customDeposit"
</view> @input="onCustomDepositInput"></up-input>
</label-slect-field> </view>
<view :style="{ height: lineHeight }"></view> </label-slect-field>
<text class="note-text">鸽子费（保证金），参与人需缴纳鸽子费。若有参与者在预约后没有赴约，其鸽子费由在场的所有人平分。组局成功或失败后鸽子费将全额返还。</text> <view :style="{ height: lineHeight }"></view>
</card-container> <text class="note-text">鸽子费（保证金），参与人需缴纳鸽子费。若有参与者在预约后没有赴约，其鸽子费由在场的所有人平分。组局成功或失败后鸽子费将全额返还。</text>
</card-container>
<view class="action-row"> <view class="action-row">
<view class="center reset-button" @click="resetForm"> <view class="center reset-button" @click="resetForm">
@ -137,34 +138,34 @@
</view> </view>
</view> </view>
<up-datetime-picker :show="datePickerVisible" v-model="datePickerValue" mode="date" <up-datetime-picker :show="datePickerVisible" v-model="datePickerValue" mode="date" :minDate="datePickerMinDate"
:minDate="datePickerMinDate" :maxDate="datePickerMaxDate" title="选择日期" @confirm="onDatePickerConfirm" :maxDate="datePickerMaxDate" title="选择日期" @confirm="onDatePickerConfirm"
@cancel="() => datePickerVisible = false" @close="() => datePickerVisible = false"></up-datetime-picker> @cancel="() => datePickerVisible = false" @close="() => datePickerVisible = false"></up-datetime-picker>
<up-datetime-picker :show="latestDateTimePickerVisible" v-model="latestDateTimePickerValue" mode="time" <up-datetime-picker :show="latestDateTimePickerVisible" v-model="latestDateTimePickerValue" mode="time"
:minHour="latestDateTimeMinHour" :maxHour="latestDateTimeMaxHour" :minHour="latestDateTimeMinHour" :maxHour="latestDateTimeMaxHour" :minMinute="latestDateTimeMinMinute"
:minMinute="latestDateTimeMinMinute" :maxMinute="latestDateTimeMaxMinute" :maxMinute="latestDateTimeMaxMinute" title="选择最晚到店时间" @confirm="onLatestDateTimePickerConfirm"
title="选择最晚到店时间" @confirm="onLatestDateTimePickerConfirm" @cancel="() => latestDateTimePickerVisible = false"
@cancel="() => latestDateTimePickerVisible = false" @close="() => latestDateTimePickerVisible = false"></up-datetime-picker> @close="() => latestDateTimePickerVisible = false"></up-datetime-picker>
<up-picker title="年龄范围选择" :show="agePickerVisible" :columns="agePickerColumns" :keyName="'text'" <up-picker title="年龄范围选择" :show="agePickerVisible" :columns="agePickerColumns" :keyName="'text'"
:defaultIndex="agePickerDefaultIndex" @confirm="onAgePickerConfirm" @cancel="() => agePickerVisible = false" :defaultIndex="agePickerDefaultIndex" @confirm="onAgePickerConfirm" @cancel="() => agePickerVisible = false"
@close="() => agePickerVisible = false"></up-picker> @close="() => agePickerVisible = false"></up-picker>
<uni-popup ref="submitPopupRef" type="center" :isMaskClick="false"> <uni-popup ref="submitPopupRef" type="center" :isMaskClick="false">
<view style="width: 90vw;height:300rpx;background-color: #fff;border-radius: 20rpx;"> <view style="width: 90vw; background-color: #fff; border-radius: 20rpx; padding: 20rpx;">
<view> <view>
<view style="height: 80rpx;"></view> <view style="height: 80rpx;"></view>
<view style="font-size: 32rpx;font-weight: 500;color: #000;text-align: center;">发起预约成功！</view> <view style="font-size: 32rpx;font-weight: 500;color: #000;text-align: center;">发起预约成功！</view>
<view style="height:100rpx;"></view> <view style="height:100rpx;"></view>
<view style="display: flex;width: 100%;height:100rpx;"> <view style="display: flex; width: 100%; height:100rpx;">
<button @click.stop open-type="share" <button @click.stop open-type="share"
style=" background-color:#00AC4E;color: #fff;width: 50%;height: 100%; background-color:#00AC4E;" style="background-color:#00AC4E; color: #fff;width: 45%;height: 100%; margin-left: 0;" class="center"
class="center evaluate-btn" :data-item="reservationData"> :data-item="reservationData">
<text class="evaluate-btn-text">分享给好友</text> <text class="evaluate-btn-text">分享给好友</text>
</button> </button>
<view <view
style="width: 50%;height: 100%;background-color: #f7f7f7;display: flex;align-items: center;justify-content: center;" style="width: 45%; height: 100%;background-color: #f7f7f7;display: flex;align-items: center;justify-content: center; border-radius: 10rpx;"
@click="handleClosePopup"> @click="handleClosePopup">
<text>关闭</text> <text>关闭</text>
</view> </view>
@ -189,7 +190,9 @@
getSubscribeMessage, getSubscribeMessage,
configData configData
} from '@/common/server/config' } from '@/common/server/config'
import { onShareAppMessage } from '@dcloudio/uni-app'; import {
onShareAppMessage
} from '@dcloudio/uni-app';
import { import {
usePay usePay
} from '@/common/server/interface/user' } from '@/common/server/interface/user'
@ -421,11 +424,19 @@
* 获取时间段的时间范围限制 * 获取时间段的时间范围限制
*/ */
const getTimeSlotRange = () => { const getTimeSlotRange = () => {
if (!selectedTimeSlot.value || selectedTimeSlot.value === null || selectedTimeSlot.value === undefined) { if (selectedTimeSlot.value === null || selectedTimeSlot.value === undefined) {
return { minHour: 0, maxHour: 23, minMinute: 0, maxMinute: 59 }; return {
minHour: 0,
maxHour: 23,
minMinute: 0,
maxMinute: 59
};
} }
let minHour = 0, maxHour = 23, minMinute = 0, maxMinute = 59; let minHour = 0,
maxHour = 23,
minMinute = 0,
maxMinute = 59;
switch (selectedTimeSlot.value) { switch (selectedTimeSlot.value) {
case 0: // 凌晨 00:00-05:59 case 0: // 凌晨 00:00-05:59
@ -454,7 +465,12 @@
break; break;
} }
return { minHour, maxHour, minMinute, maxMinute }; return {
minHour,
maxHour,
minMinute,
maxMinute
};
} }
/** /**
@ -469,7 +485,7 @@
return; return;
} }
if (!selectedTimeSlot.value || selectedTimeSlot.value === null || selectedTimeSlot.value === undefined) { if (selectedTimeSlot.value === null || selectedTimeSlot.value === undefined) {
uni.showToast({ uni.showToast({
title: '请先选择时间段', title: '请先选择时间段',
icon: 'none' icon: 'none'
@ -687,8 +703,24 @@
// 处理关闭弹窗，返回上一页 // 处理关闭弹窗，返回上一页
const handleClosePopup = () => { const handleClosePopup = () => {
submitPopupRef.value.close() submitPopupRef.value.close()
refreshPrevPageRoomList()
goBack() goBack()
} }
// 刷新上一页的房间列表（发起预约入口页）
const refreshPrevPageRoomList = () => {
const pages = getCurrentPages()
if (!pages || pages.length < 2) return
const prevPage = pages[pages.length - 2]
const vm = prevPage?.$vm || prevPage
if (vm && typeof vm.loadRoomList === 'function') {
vm.loadRoomList()
return
}
if (vm && typeof vm.loadDates === 'function') {
vm.loadDates()
}
}
const maxPlayerCount = ref(0) const maxPlayerCount = ref(0)
const peopleRange = ref([]) const peopleRange = ref([])
@ -744,34 +776,58 @@
return gameRule ? gameRule.text : ''; return gameRule ? gameRule.text : '';
} }
const smokingOptions = ref([ const smokingOptions = ref([{
{ value: 2, text: '不禁烟' }, value: 2,
{ value: 1, text: '禁烟' }, text: '不禁烟'
]) },
const genderOptions = ref([ {
{ value: 0, text: '不限' }, value: 1,
{ value: 1, text: '男' }, text: '禁烟'
{ value: 2, text: '女' }, },
]) ])
const depositOptions = ref([ const genderOptions = ref([{
{ value: 0, text: '0元' }, value: 0,
{ value: 5, text: '5元' }, text: '不限'
{ value: 10, text: '10元' }, },
{ value: -1, text: '自定义' }, {
]) value: 1,
text: '男'
},
{
value: 2,
text: '女'
},
])
const depositOptions = ref([{
value: 0,
text: '0元'
},
{
value: 5,
text: '5元'
},
{
value: 10,
text: '10元'
},
{
value: -1,
text: '自定义'
},
])
const currentValue = ref(0) const currentValue = ref(0)
const customDeposit = ref('') const customDeposit = ref('')
const onCustomDepositInput = (val) => { const onCustomDepositInput = (val) => {
// 仅保留数字与小数点，但需求是整数金额，按只允许数字处理 // 仅保留数字与小数点，但需求是整数金额，按只允许数字处理
let v = String(val).replace(/[^0-9]/g, '') let v = String(val).replace(/[^0-9]/g, '')
if (v === '') v = '0' if (v === '') v = '0'
let n = Number(v) let n = Number(v)
if (n > 50) n = 50 if (n > 50) n = 50
if (n < 0) n = 0 if (n < 0) n = 0
customDeposit.value = String(n) customDeposit.value = String(n)
} }
const increment = () => { const increment = () => {
if (currentValue.value < 5) { if (currentValue.value < 5) {
@ -927,38 +983,41 @@ const onCustomDepositInput = (val) => {
} }
try { try {
var messageId = await getSubscribeMessage(reservationInfo.value.deposit_fee); var messageId = await getSubscribeMessage(reservationInfo.value.deposit_fee);
console.log("messageId", messageId); console.log("messageId", messageId);
var subscribeMessage = await requestSubscribeMessage(messageId); var subscribeMessage = await requestSubscribeMessage(messageId);
console.log("message", subscribeMessage); console.log("message", subscribeMessage);
// 显示加载状态 // 显示加载状态
uni.showLoading({ uni.showLoading({
title: '提交中...' title: '提交中...'
}) })
// 处理自定义鸽子费 // 处理自定义鸽子费
let finalDeposit = reservationInfo.value.deposit_fee let finalDeposit = reservationInfo.value.deposit_fee
if (finalDeposit === -1) { if (finalDeposit === -1) {
const n = Number(customDeposit.value || 0) const n = Number(customDeposit.value || 0)
if (isNaN(n) || n < 0 || n > 50) { if (isNaN(n) || n < 0 || n > 50) {
uni.showToast({ title: '自定义金额需在0-50之间', icon: 'none' }) uni.showToast({
return title: '自定义金额需在0-50之间',
} icon: 'none'
finalDeposit = n })
} return
}
finalDeposit = n
}
// 准备提交数据 // 准备提交数据
const submitData = { const submitData = {
...reservationInfo.value, ...reservationInfo.value,
// 确保信誉限制同步 // 确保信誉限制同步
credit_limit: currentValue.value, credit_limit: currentValue.value,
deposit_fee: finalDeposit, deposit_fee: finalDeposit,
important_data: {}, important_data: {},
// 添加最晚到店时间参数 // 添加最晚到店时间参数
latestDateTime: latestDateTime.value || null latestDateTime: latestDateTime.value || null
} }
// 将玩法类型和具体规则从数字转换为字符串 // 将玩法类型和具体规则从数字转换为字符串
submitData.game_type = getGameTypeText(submitData.game_type); submitData.game_type = getGameTypeText(submitData.game_type);
@ -979,22 +1038,22 @@ const onCustomDepositInput = (val) => {
return return
} }
var resPay = null; var resPay = null;
if (submitData.deposit_fee > 0) { if (submitData.deposit_fee > 0) {
resPay = await usePay(submitData.deposit_fee); resPay = await usePay(submitData.deposit_fee);
if (resPay == null) { if (resPay == null) {
uni.showToast({ uni.showToast({
title: '鸽子费订单创建失败，请重新提交预约数据！', title: '鸽子费订单创建失败，请重新提交预约数据！',
icon: 'none' icon: 'none'
}) })
return; return;
}
subscribeMessage.result.paymentId = resPay.paymentId;
if (subscribeMessage.result != null) {
important_data = JSON.stringify(subscribeMessage.result);
}
submitData.important_data = important_data;
} }
subscribeMessage.result.paymentId = resPay.paymentId;
if (subscribeMessage.result != null) {
important_data = JSON.stringify(subscribeMessage.result);
}
submitData.important_data = important_data;
}
// TODO: 调用后端API提交预约 // TODO: 调用后端API提交预约
// 调用后端API提交预约 // 调用后端API提交预约
@ -1102,11 +1161,18 @@ const onCustomDepositInput = (val) => {
* 加载房间详情，用于预约页面 * 加载房间详情，用于预约页面
*/ */
const loadRoomDetailForReservation = async (roomId, date) => { const loadRoomDetailForReservation = async (roomId, date) => {
console.log('loadRoomDetailForReservation 调用参数:', { roomId, date, dateType: typeof date }); console.log('loadRoomDetailForReservation 调用参数:', {
roomId,
date,
dateType: typeof date
});
// 验证参数 // 验证参数
if (!roomId || !date) { if (!roomId || !date) {
console.error('loadRoomDetailForReservation 参数无效:', { roomId, date }); console.error('loadRoomDetailForReservation 参数无效:', {
roomId,
date
});
uni.showToast({ uni.showToast({
title: '参数错误', title: '参数错误',
icon: 'none' icon: 'none'
@ -1141,7 +1207,7 @@ const onCustomDepositInput = (val) => {
peopleText.value = "请选择游玩人数"; peopleText.value = "请选择游玩人数";
t.push({ t.push({
value: 1, value: 1,
text:'无需组局' text: '无需组局'
}); });
for (let i = 2; i <= detail.capacity; i++) { for (let i = 2; i <= detail.capacity; i++) {
t.push({ t.push({
@ -1185,17 +1251,32 @@ const onCustomDepositInput = (val) => {
// 时段时间范围映射 // 时段时间范围映射
const timeRangeMap = { const timeRangeMap = {
0: { text: '凌晨', range: '00:00-05:59' }, 0: {
1: { text: '上午', range: '06:00-11:59' }, text: '凌晨',
2: { text: '下午', range: '12:00-17:59' }, range: '00:00-05:59'
3: { text: '晚上', range: '18:00-23:59' } },
1: {
text: '上午',
range: '06:00-11:59'
},
2: {
text: '下午',
range: '12:00-17:59'
},
3: {
text: '晚上',
range: '18:00-23:59'
}
}; };
// 过滤出可预约的时段并生成选项 // 过滤出可预约的时段并生成选项
const availableSlots = timeSlots.filter(slot => slot.status === 'available'); const availableSlots = timeSlots.filter(slot => slot.status === 'available');
timeSlotOptions.value = availableSlots.map(slot => { timeSlotOptions.value = availableSlots.map(slot => {
const slotInfo = timeRangeMap[slot.slot_type] || { text: slot.slot_name, range: '' }; const slotInfo = timeRangeMap[slot.slot_type] || {
text: slot.slot_name,
range: ''
};
// 生成显示文本 // 生成显示文本
let displayText = slotInfo.text; let displayText = slotInfo.text;
if (slotInfo.range) { if (slotInfo.range) {
@ -1382,7 +1463,11 @@ const onCustomDepositInput = (val) => {
} }
// 分享处理函数 // 分享处理函数
onShareAppMessage(({ from, target, webViewUrl }) => { onShareAppMessage(({
from,
target,
webViewUrl
}) => {
console.log('onShareAppMessage', from, target, webViewUrl); console.log('onShareAppMessage', from, target, webViewUrl);
var resid = 0; var resid = 0;
if (target != null && target.dataset && target.dataset.item) { if (target != null && target.dataset && target.dataset.item) {

1325
pages/appointment/book-room-page.vue
View File

File diff suppressed because it is too large Load Diff

4
pages/index/index.vue
View File

@ -55,7 +55,7 @@
<uni-popup ref="userInfo_popup" type="center"> <!-- <uni-popup ref="userInfo_popup" type="center">
<view class="column" style="width: 500rpx; background-color: white; padding: 20rpx;"> <view class="column" style="width: 500rpx; background-color: white; padding: 20rpx;">
@ -97,7 +97,7 @@
</view> </view>
</uni-popup> </uni-popup> -->
</view> </view>

2
pages/index/loading.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="loading-container"> <view class="loading-container">
<image class="logo" src="/static/Logo.jpg" mode="widthFix"></image> <image class="logo" src="/static/logo.png" mode="widthFix"></image>
<view class="spinner"></view> <view class="spinner"></view>
<text class="tip">{{ tips_text }}</text> <text class="tip">{{ tips_text }}</text>
</view> </view>

55
pages/me/me-page.vue
View File

@ -100,10 +100,10 @@
<text style="font-size: 30rpx; margin-top: 26rpx; margin-left: 36rpx;">常用功能</text> <text style="font-size: 30rpx; margin-top: 26rpx; margin-left: 36rpx;">常用功能</text>
<view class="row" style="flex-wrap: wrap; justify-content: flex-start; margin: 40rpx;"> <view class="row" style="flex-wrap: wrap; justify-content: flex-start; margin: 40rpx;">
<view class="column" v-for="item in commonActions" :key="item.label" <view class="column common-action-item" v-for="item in commonActions" :key="item.label"
@click="handleCommonAction(item)" @click="handleCommonAction(item)">
style="width: 25%; align-items: center; margin-bottom: 30rpx;">
<image :src="item.icon" style="width: 50rpx; height: 50rpx;" mode=""></image> <image :src="item.icon" style="width: 50rpx; height: 50rpx;" mode=""></image>
<view v-if="item.action === 'message' && unreadCount > 0" class="red-dot"></view>
<text style="font-size: 24rpx; margin-top: 20rpx;">{{ item.label }}</text> <text style="font-size: 24rpx; margin-top: 20rpx;">{{ item.label }}</text>
</view> </view>
</view> </view>
@ -124,6 +124,7 @@ import {
} from '@/common/server/user' } from '@/common/server/user'
import { navigateToAgreement } from '@/common/system/router' import { navigateToAgreement } from '@/common/system/router'
import { sqInterface } from '@/common/server/interface/sq' import { sqInterface } from '@/common/server/interface/sq'
import { getUnreadCount } from '@/common/server/interface/message'
import ReservationEvaluate from '@/components/com/page/reservation-evaluate.vue' import ReservationEvaluate from '@/components/com/page/reservation-evaluate.vue'
import ContainerBase from '@/components/com/page/container-base.vue' import ContainerBase from '@/components/com/page/container-base.vue'
import { import {
@ -139,6 +140,7 @@ import ReservationItem from '@/components/com/page/reservation-item.vue'
const rateValue = ref(4.5) const rateValue = ref(4.5)
const loading = ref(false) const loading = ref(false)
const _containerBase = ref(null) const _containerBase = ref(null)
const unreadCount = ref(0)
// 当前预约信息 // 当前预约信息
@ -146,16 +148,15 @@ const currentAppointment = ref(null)
// 常用功能 - 动态项 // 常用功能 - 动态项
const commonActions = [ const commonActions = [
{ label: '预约记录', icon: '@@:app/static/me/wodd.png', action: 'appointment' }, { label: '预约记录', icon: '@@:app/static/me/wdyy.png', action: 'appointment' },
{ label: '订单记录', icon: '@@:app/static/me/wodd.png', action: 'payment' }, { label: '订单记录', icon: '@@:app/static/me/wodd.png', action: 'payment' },
{ label: '常见问题', icon: '@@:app/static/me/cjwt.png', action: 'faq' }, { label: '常见问题', icon: '@@:app/static/me/cjwt.png', action: 'faq' },
{ label: '黑名单', icon: '@@:app/static/me/hmd.png', action: 'blacklist' }, { label: '黑名单', icon: '@@:app/static/me/hmd.png', action: 'blacklist' },
{ label: '联系我们', icon: '@@:app/static/me/lxwm.png', action: 'contact' }, { label: '联系我们', icon: '@@:app/static/me/lxwm.png', action: 'contact' },
{ label: '我的消息', icon: '@@:app/static/me/lxwm.png', action: 'message' }, { label: '我的消息', icon: '@@:app/static/me/wdxx.png', action: 'message' },
{ label: '我的收益', icon: '@@:app/static/me/lxwm.png', action: 'revenue' }, { label: '我的收益', icon: '@@:app/static/me/wdsy.png', action: 'revenue' },
] ]
const handleCommonAction = (item) => { const handleCommonAction = (item) => {
@ -294,6 +295,28 @@ const loadCurrentAppointment = async () => {
} }
} }
// 加载未读消息数量并更新红点状态
const loadUnreadCount = async () => {
const _isLogin = await isLogin();
if (!_isLogin) {
unreadCount.value = 0;
uni.hideTabBarRedDot({ index: 2 });
return;
}
try {
const count = await getUnreadCount();
unreadCount.value = count;
if (count > 0) {
uni.showTabBarRedDot({ index: 2 });
} else {
uni.hideTabBarRedDot({ index: 2 });
}
} catch (error) {
console.error('加载未读消息失败:', error);
uni.hideTabBarRedDot({ index: 2 });
}
}
onShareAppMessage(({ from, target, webViewUrl }) => { onShareAppMessage(({ from, target, webViewUrl }) => {
// console.log('onShareAppMessage', from, target, webViewUrl); // console.log('onShareAppMessage', from, target, webViewUrl);
var resid = 0; var resid = 0;
@ -311,6 +334,7 @@ onShow(async () => {
// getUserInfoData(); // getUserInfoData();
loadCurrentAppointment(); loadCurrentAppointment();
await loadUserInfo(); await loadUserInfo();
await loadUnreadCount();
}) })
onLoad(async () => { onLoad(async () => {
@ -336,4 +360,21 @@ onLoad(async () => {
border-radius: 10rpx; border-radius: 10rpx;
z-index: 9999; z-index: 9999;
} }
.common-action-item {
position: relative;
width: 25%;
align-items: center;
margin-bottom: 30rpx;
}
.red-dot {
position: absolute;
top: 0;
right: 35rpx;
width: 14rpx;
height: 14rpx;
border-radius: 50%;
background-color: #ff3b30;
}
</style> </style>

2
pages/me/my-earnings-page.vue
View File

@ -114,7 +114,7 @@
</view> </view>
<view class="center" <view class="center"
style="width: 304rpx; height: 90rpx; background-color: #00AC4E; color: #FFFFFF; margin: 30rpx auto 0; font-size: 32rpx;" style="width: 304rpx; height: 90rpx; background-color: #00AC4E; color: #FFFFFF; margin: 30rpx auto 30rpx; border-radius: 20rpx; font-size: 32rpx;"
@click="submitWithdraw"> @click="submitWithdraw">
申请提现 申请提现
</view> </view>