feat: 每日菜单点赞点踩;bigint转字符串

property-only-app
wx-jincw 1 month ago
parent d8ec421905
commit 86b51c1d23

@ -46,6 +46,16 @@ export function likeDailyMenuItem(data) {
); );
} }
// 菜单取消点赞/点踩
export function cancelLikeDailyMenuItem(data) {
return request.post(
'autogencode/pmdailymenudtllike/cancelLike',
data,
{ useAdminUrl: true },
data
);
}
// 菜品排行(点赞/点踩) // 菜品排行(点赞/点踩)
export function getDailyMenuRanking(params) { export function getDailyMenuRanking(params) {
return request.get( return request.get(

@ -71,8 +71,8 @@
ref="calendar" ref="calendar"
:insert="false" :insert="false"
:range="false" :range="false"
:start-date="'2020-01-01'" :start-date="'2026-01-01'"
:end-date="'2030-12-31'" :end-date="'2099-12-31'"
@confirm="confirm" @confirm="confirm"
></uni-calendar> ></uni-calendar>
</z-paging> </z-paging>

@ -3,14 +3,52 @@
<view class="date-card"> <view class="date-card">
<view class="date-row"> <view class="date-row">
<view class="date-btn" @click="changeDateBy(-1)"></view> <view class="date-btn" @click="changeDateBy(-1)"></view>
<picker mode="date" :value="selectedDate" @change="onDatePicked"> <view class="date-picker-container">
<view class="date-text">{{ selectedDate }}</view> <view class="date-text" @click="openCalendar">
</picker> <text>{{ selectedDate }}</text>
<text class="iconfont icon-xiangxia"></text>
</view>
</view>
<view class="date-btn" @click="changeDateBy(1)"></view> <view class="date-btn" @click="changeDateBy(1)"></view>
</view> </view>
<view class="date-tip">默认当天可切换查看不同日期菜单</view> <view class="date-tip">默认当天可切换查看不同日期菜单</view>
</view> </view>
<!-- 食堂筛选 -->
<view class="canteen-tabs" v-if="canteens && canteens.length > 1">
<view class="canteen-tabs-container">
<view
v-for="canteen in canteens"
:key="canteen.value"
class="canteen-tab"
:class="selectedCanteen === canteen.value ? 'active' : ''"
@click="switchCanteen(canteen.value)"
>
{{ canteen.label }}
</view>
</view>
</view>
<!-- 日历组件 -->
<uni-calendar
ref="calendar"
:insert="false"
:range="false"
:start-date="'2026-01-01'"
:end-date="'2099-12-31'"
@confirm="confirm"
></uni-calendar>
<!-- 排行榜日期范围选择器 -->
<uni-calendar
ref="rankingCalendar"
:insert="false"
:range="true"
:start-date="'2026-01-01'"
:end-date="'2099-12-31'"
@confirm="confirmRankingDate"
></uni-calendar>
<view class="section"> <view class="section">
<view class="section-title">当日菜单</view> <view class="section-title">当日菜单</view>
@ -19,18 +57,21 @@
<view v-if="meal.list.length"> <view v-if="meal.list.length">
<view class="dish-item" v-for="item in meal.list" :key="item.id"> <view class="dish-item" v-for="item in meal.list" :key="item.id">
<view class="dish-main"> <view class="dish-main">
<view class="dish-info">
<view class="dish-name">{{ item.itemName || '未命名菜品' }}</view> <view class="dish-name">{{ item.itemName || '未命名菜品' }}</view>
<view class="dish-desc" v-if="item.remark">{{ item.remark }}</view>
<view class="dish-price" v-if="item.itemPrice !== undefined && item.itemPrice !== null"> <view class="dish-price" v-if="item.itemPrice !== undefined && item.itemPrice !== null">
{{ item.itemPrice }} {{ item.itemPrice }}
</view> </view>
</view> </view>
</view>
<view class="action-row"> <view class="action-row">
<view class="action like" @click="submitLike(item, '1')"> <view class="action like" @click="submitLike(item, '1')">
👍 {{ item.likeCount || 0 }} <image :src="item.isLiked ? '/static/images/wg/like_.png' : '/static/images/wg/like.png'" class="action-icon" />
<span>{{ item.likeCount || 0 }}</span>
</view> </view>
<view class="action dislike" @click="submitLike(item, '2')"> <view class="action dislike" @click="submitLike(item, '2')">
👎 {{ item.dislikeCount || 0 }} <image :src="item.isDisliked ? '/static/images/wg/dislike_.png' : '/static/images/wg/dislike.png'" class="action-icon" />
<span>{{ item.dislikeCount || 0 }}</span>
</view> </view>
</view> </view>
</view> </view>
@ -59,6 +100,21 @@
</view> </view>
</view> </view>
</view> </view>
<view class="rank-date-range">
<view class="date-range-container">
<view class="date-range-btn">
<view v-if="rankingDateRange.startDate && rankingDateRange.endDate" class="clear-btn" @click.stop="clearRankingDate">
</view>
<view class="date-text" @click="openRankingDatePicker">
{{ rankingDateRange.startDate && rankingDateRange.endDate ? `${rankingDateRange.startDate}${rankingDateRange.endDate}` : '选择日期范围' }}
</view>
<view class="icon" @click="openRankingDatePicker">
<text class="iconfont icon-xiangxia"></text>
</view>
</view>
</view>
</view>
<view v-if="rankingList.length"> <view v-if="rankingList.length">
<view class="rank-item" v-for="(item, index) in rankingList" :key="item.id || index"> <view class="rank-item" v-for="(item, index) in rankingList" :key="item.id || index">
@ -66,9 +122,10 @@
<text class="rank-no" :class="index < 3 ? 'top' : ''">{{ index + 1 }}</text> <text class="rank-no" :class="index < 3 ? 'top' : ''">{{ index + 1 }}</text>
<text class="rank-name">{{ item.itemName || '未命名菜品' }}</text> <text class="rank-name">{{ item.itemName || '未命名菜品' }}</text>
</view> </view>
<view class="rank-right"> <view class="rank-right" :class="rankingType">
<text v-if="rankingType === 'like'">👍 {{ item.likeCount || 0 }}</text> <image v-if="rankingType === 'like'" :src="'/static/images/wg/like.png'" class="rank-icon" />
<text v-else>👎 {{ item.dislikeCount || 0 }}</text> <image v-else :src="'/static/images/wg/dislike.png'" class="rank-icon" />
<span>{{ rankingType === 'like' ? (item.likeCount || 0) : (item.dislikeCount || 0) }}</span>
</view> </view>
</view> </view>
</view> </view>
@ -81,10 +138,12 @@
import { import {
listDailyMenuDetails, listDailyMenuDetails,
likeDailyMenuItem, likeDailyMenuItem,
cancelLikeDailyMenuItem,
getDailyMenuRanking getDailyMenuRanking
} from '@/api/property.js'; } from '@/api/property.js';
export default { export default {
dicts: ['canteen_name'],
data() { data() {
return { return {
selectedDate: '', selectedDate: '',
@ -95,21 +154,53 @@ export default {
{ key: 'breakfast', label: '早餐', list: [] }, { key: 'breakfast', label: '早餐', list: [] },
{ key: 'lunch', label: '中餐', list: [] }, { key: 'lunch', label: '中餐', list: [] },
{ key: 'dinner', label: '晚餐', list: [] } { key: 'dinner', label: '晚餐', list: [] }
] ],
canteens: [],
selectedCanteen: '',
rankingDateRange: {
startDate: '',
endDate: ''
},
showRankingDatePicker: false
}; };
}, },
onLoad() { onLoad() {
this.selectedDate = this.formatDate(new Date()); this.selectedDate = this.formatDate(new Date());
this.rankingDateRange.startDate = this.selectedDate;
this.rankingDateRange.endDate = this.selectedDate;
this.loadCanteens();
this.loadPageData(); this.loadPageData();
}, },
mounted() {
//
this.$on('dictChange', () => {
this.loadCanteens();
});
},
beforeUnmount() {
this.$off('dictChange');
},
methods: { methods: {
async loadPageData() { async loadPageData() {
await Promise.all([this.loadMenuByDate(), this.loadRanking()]); await Promise.all([this.loadMenuByDate(), this.loadRanking()]);
}, },
loadCanteens() {
const canteenDict = this.dict.get('canteen_name') || [];
this.canteens = canteenDict.map(item => ({
value: item.dictValue,
label: item.dictLabel
}));
if (this.canteens.length > 0 && !this.selectedCanteen) {
this.selectedCanteen = this.canteens[0].value;
}
},
async loadMenuByDate() { async loadMenuByDate() {
try { try {
uni.showLoading({ title: '加载菜单中...', mask: true }); uni.showLoading({ title: '加载菜单中...', mask: true });
const res = await listDailyMenuDetails({ menuDate: this.selectedDate }); const res = await listDailyMenuDetails({
menuDate: this.selectedDate,
canteenName: this.selectedCanteen
});
const list = res?.data || []; const list = res?.data || [];
this.menuList = list; this.menuList = list;
this.groupMeals(list); this.groupMeals(list);
@ -147,14 +238,37 @@ export default {
normalizeMealType(type) { normalizeMealType(type) {
if (!type) return ''; if (!type) return '';
const v = String(type).trim(); const v = String(type).trim();
if (v === '早餐' || v === '0' || v.toLowerCase() === 'breakfast') return 'breakfast'; if (v === '早餐' || v === '1' || v.toLowerCase() === 'breakfast') return 'breakfast';
if (v === '中餐' || v === '午餐' || v === '1' || v.toLowerCase() === 'lunch') return 'lunch'; if (v === '中餐' || v === '午餐' || v === '2' || v.toLowerCase() === 'lunch') return 'lunch';
if (v === '晚餐' || v === '2' || v.toLowerCase() === 'dinner') return 'dinner'; if (v === '晚餐' || v === '3' || v.toLowerCase() === 'dinner') return 'dinner';
return ''; return '';
}, },
async submitLike(item, likeType) { async submitLike(item, likeType) {
if (!item || !item.id) return; if (!item || !item.id) return;
try { try {
// /
const isLiked = likeType === '1' && item.isLiked === '1';
const isDisliked = likeType === '2' && item.isDisliked === '1';
if (isLiked || isDisliked) {
uni.showLoading({ title: likeType === '1' ? '取消点赞中...' : '取消点踩中...', mask: true });
await cancelLikeDailyMenuItem({
menuDtlId: item.id,
likeType
});
uni.showToast({
title: likeType === '1' ? '取消点赞成功' : '取消点踩成功',
icon: 'success'
});
//
if (likeType === '1') {
item.isLiked = '0';
item.likeCount = Math.max(0, (item.likeCount || 0) - 1);
} else {
item.isDisliked = '0';
item.dislikeCount = Math.max(0, (item.dislikeCount || 0) - 1);
}
} else {
uni.showLoading({ title: likeType === '1' ? '点赞中...' : '点踩中...', mask: true }); uni.showLoading({ title: likeType === '1' ? '点赞中...' : '点踩中...', mask: true });
await likeDailyMenuItem({ await likeDailyMenuItem({
menuDtlId: item.id, menuDtlId: item.id,
@ -164,7 +278,18 @@ export default {
title: likeType === '1' ? '点赞成功' : '点踩成功', title: likeType === '1' ? '点赞成功' : '点踩成功',
icon: 'success' icon: 'success'
}); });
await Promise.all([this.loadMenuByDate(), this.loadRanking()]); //
if (likeType === '1') {
item.isLiked = '1';
item.isDisliked = '0';
item.likeCount = (item.likeCount || 0) + 1;
} else {
item.isDisliked = '1';
item.isLiked = '0';
item.dislikeCount = (item.dislikeCount || 0) + 1;
}
}
// await Promise.all([this.loadMenuByDate(), this.loadRanking()]);
} catch (e) { } catch (e) {
uni.showToast({ uni.showToast({
title: typeof e === 'string' ? e : '操作失败', title: typeof e === 'string' ? e : '操作失败',
@ -177,10 +302,10 @@ export default {
async loadRanking() { async loadRanking() {
try { try {
const res = await getDailyMenuRanking({ const res = await getDailyMenuRanking({
limit: 10, limit: 20,
rankingType: this.rankingType, rankingType: this.rankingType,
startDate: this.selectedDate, startDate: this.rankingDateRange.startDate,
endDate: this.selectedDate endDate: this.rankingDateRange.endDate
}); });
this.rankingList = res?.data?.list || []; this.rankingList = res?.data?.list || [];
} catch (e) { } catch (e) {
@ -192,21 +317,44 @@ export default {
this.rankingType = type; this.rankingType = type;
await this.loadRanking(); await this.loadRanking();
}, },
async onDatePicked(e) { //
this.selectedDate = e.detail.value; openCalendar() {
await this.loadPageData(); this.$refs.calendar.open();
},
//
async confirm(e) {
this.selectedDate = e.fulldate;
await this.loadMenuByDate();
}, },
async changeDateBy(step) { async changeDateBy(step) {
const d = new Date(this.selectedDate.replace(/-/g, '/')); const d = new Date(this.selectedDate.replace(/-/g, '/'));
d.setDate(d.getDate() + step); d.setDate(d.getDate() + step);
this.selectedDate = this.formatDate(d); this.selectedDate = this.formatDate(d);
await this.loadPageData(); await this.loadMenuByDate();
}, },
formatDate(date) { formatDate(date) {
const y = date.getFullYear(); const y = date.getFullYear();
const m = `${date.getMonth() + 1}`.padStart(2, '0'); const m = `${date.getMonth() + 1}`.padStart(2, '0');
const d = `${date.getDate()}`.padStart(2, '0'); const d = `${date.getDate()}`.padStart(2, '0');
return `${y}-${m}-${d}`; return `${y}-${m}-${d}`;
},
async switchCanteen(canteenValue) {
if (this.selectedCanteen === canteenValue) return;
this.selectedCanteen = canteenValue;
await this.loadPageData();
},
openRankingDatePicker() {
this.$refs.rankingCalendar.open();
},
async confirmRankingDate(e) {
this.rankingDateRange.startDate = e.range.before;
this.rankingDateRange.endDate = e.range.after;
await this.loadRanking();
},
async clearRankingDate() {
this.rankingDateRange.startDate = '';
this.rankingDateRange.endDate = '';
await this.loadRanking();
} }
} }
}; };
@ -219,6 +367,98 @@ export default {
padding: 24rpx; padding: 24rpx;
} }
/* 食堂筛选 */
.canteen-tabs {
margin-bottom: 20rpx;
overflow-x: auto;
white-space: nowrap;
-webkit-overflow-scrolling: touch;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
.canteen-tabs-container {
display: inline-flex;
background: #fff;
border-radius: 16rpx;
padding: 8rpx;
}
.canteen-tab {
padding: 12rpx 24rpx;
margin: 0 4rpx;
border-radius: 999rpx;
font-size: 26rpx;
color: #6b7280;
transition: all 0.3s;
&.active {
background: #3b82f6;
color: #fff;
font-weight: 600;
}
}
}
/* 排行榜日期范围选择 */
.rank-date-range {
margin-bottom: 18rpx;
display: flex;
justify-content: flex-end;
}
.date-range-container {
display: flex;
align-items: center;
gap: 12rpx;
}
.date-range-btn {
display: flex;
align-items: center;
padding: 10rpx 16rpx;
background: #f3f4f6;
border-radius: 999rpx;
font-size: 24rpx;
color: #6b7280;
cursor: pointer;
gap: 12rpx;
.clear-btn {
font-size: 20rpx;
color: #9ca3af;
cursor: pointer;
padding: 0 4rpx;
&:hover {
color: #ef4444;
}
}
.date-text {
flex: 1;
font-size: 24rpx;
color: #6b7280;
font-weight: normal;
}
.icon {
.iconfont {
font-size: 18rpx;
}
}
}
.rank-tabs {
display: flex;
background: #f3f4f6;
border-radius: 999rpx;
padding: 4rpx;
}
.date-card, .date-card,
.section, .section,
.meal-card { .meal-card {
@ -248,12 +488,30 @@ export default {
font-size: 26rpx; font-size: 26rpx;
} }
.date-picker-container {
display: flex;
align-items: center;
}
.date-text { .date-text {
min-width: 260rpx; min-width: 260rpx;
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
color: #1f2d3d; color: #1f2d3d;
font-weight: 600; font-weight: 600;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
text {
margin-right: 10rpx;
}
.iconfont {
font-size: 20rpx;
color: #666;
}
} }
.date-tip { .date-tip {
@ -290,34 +548,55 @@ export default {
.dish-item { .dish-item {
padding: 16rpx 0; padding: 16rpx 0;
border-bottom: 1rpx solid #f2f3f7; border-bottom: 1rpx solid #f2f3f7;
display: flex;
align-items: flex-start;
gap: 16rpx;
} }
.dish-item:last-child { .dish-item:last-child {
border-bottom: none; border-bottom: none;
} }
.dish-main {
flex: 1;
min-width: 0;
}
.dish-info {
display: flex;
align-items: center;
gap: 16rpx;
margin-bottom: 4rpx;
}
.dish-name { .dish-name {
font-size: 28rpx; font-size: 28rpx;
color: #1f2937; color: #1f2937;
font-weight: 500; font-weight: 500;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.dish-desc { .dish-desc {
margin-top: 8rpx;
color: #6b7280; color: #6b7280;
font-size: 24rpx; font-size: 20rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.dish-price { .dish-price {
margin-top: 8rpx;
color: #ef4444; color: #ef4444;
font-size: 24rpx; font-size: 24rpx;
white-space: nowrap;
} }
.action-row { .action-row {
margin-top: 12rpx;
display: flex; display: flex;
gap: 16rpx; gap: 16rpx;
white-space: nowrap;
align-self: center;
} }
.action { .action {
@ -326,6 +605,15 @@ export default {
padding: 0 20rpx; padding: 0 20rpx;
border-radius: 26rpx; border-radius: 26rpx;
font-size: 24rpx; font-size: 24rpx;
display: flex;
align-items: center;
gap: 8rpx;
}
.action-icon {
width: 28rpx;
height: 28rpx;
vertical-align: middle;
} }
.like { .like {
@ -342,6 +630,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 18rpx;
} }
.rank-tabs { .rank-tabs {
@ -401,7 +690,26 @@ export default {
.rank-right { .rank-right {
font-size: 26rpx; font-size: 26rpx;
color: #111827; color: #6b7280;
display: flex;
align-items: center;
gap: 8rpx;
border-radius: 4rpx;
padding: 2rpx 4rpx;
}
.rank-right.like {
color: #16a34a;
}
.rank-right.dislike {
color: #dc2626;
}
.rank-icon {
width: 28rpx;
height: 28rpx;
vertical-align: middle;
} }
.empty { .empty {

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 788 B

@ -11,7 +11,7 @@ import {
} from '../libs/login'; } from '../libs/login';
import store from '../store'; import store from '../store';
import JSONBig from 'json-bigint'; import JSONBig from 'json-bigint';
const JSONbigString = JSONBig({ storeAsString: true });
/** /**
* 发送请求 * 发送请求
@ -47,16 +47,18 @@ function baseRequest(url, method, data, {
method: method || 'GET', method: method || 'GET',
header: header, header: header,
data: requestData, data: requestData,
dataType: 'json', dataType: 'text',
responseType: 'text', responseType: 'text',
success: (res) => { success: (res) => {
let data = res.data; let data = res.data;
try { try {
// 使用 JSONBig 解析响应数据,处理大数值 data = JSONbigString.parse(res.data);
data = JSONBig.parse(res.data);
} catch (e) { } catch (e) {
// JSONBig 解析失败时,使用原数据 // JSONBig 解析失败时,使用原数据
console.warn('JSONBig 解析失败:', e);
data = JSON.parse(res.data);
} }
console.debug('接口返回数据:', data);
if (noVerify) if (noVerify)
reslove(data, res); reslove(data, res);
else if (data.code == 200) else if (data.code == 200)

Loading…
Cancel
Save