diff --git a/apps/hand-factory/api/system/config.js b/apps/hand-factory/api/system/config.js
new file mode 100644
index 0000000..02f0cfc
--- /dev/null
+++ b/apps/hand-factory/api/system/config.js
@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+
+// 查询参数列表
+export function listConfig(query) {
+ return request({
+ url: '/system/config/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询参数详细
+export function getConfig(configId) {
+ return request({
+ url: '/system/config/' + configId,
+ method: 'get'
+ })
+}
+
+// 根据参数键名查询参数值
+export function getConfigKey(configKey) {
+ return request({
+ url: '/system/config/configKey/' + configKey,
+ method: 'get'
+ })
+}
+
+// 新增参数配置
+export function addConfig(data) {
+ return request({
+ url: '/system/config',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改参数配置
+export function updateConfig(data) {
+ return request({
+ url: '/system/config',
+ method: 'put',
+ data: data
+ })
+}
+
+// 修改参数配置
+export function updateConfigByKey(key, value) {
+ return request({
+ url: '/system/config/updateByKey',
+ method: 'put',
+ data: {
+ configKey: key,
+ configValue: value
+ }
+ })
+}
+
+// 删除参数配置
+export function delConfig(configId) {
+ return request({
+ url: '/system/config/' + configId,
+ method: 'delete'
+ })
+}
+
+// 刷新参数缓存
+export function refreshCache() {
+ return request({
+ url: '/system/config/refreshCache',
+ method: 'delete'
+ })
+}
+
diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js
index fbd4007..1dc5e8c 100644
--- a/apps/hand-factory/config.js
+++ b/apps/hand-factory/config.js
@@ -9,7 +9,7 @@ module.exports = {
// 应用名称
name: "ruoyi-app",
// 应用版本
- version: "1.3.29",
+ version: "1.3.30",
// 应用logo
logo: "/static/logo.jpg",
// 官方网站
diff --git a/apps/hand-factory/pages/fahuo/fahuo.vue b/apps/hand-factory/pages/fahuo/fahuo.vue
index 2d84354..14d96bb 100644
--- a/apps/hand-factory/pages/fahuo/fahuo.vue
+++ b/apps/hand-factory/pages/fahuo/fahuo.vue
@@ -252,9 +252,6 @@
* @param {Boolean} isRefresh 是否刷新(重置页码)
*/
async fetchList(isRefresh = false) {
- if (!this.hasMore) {
- return;
- }
try {
// 刷新时重置页码和加载状态
if (isRefresh) {
@@ -299,9 +296,6 @@
* @param {Boolean} isRefresh 是否刷新(重置页码)
*/
async fetchDeliveryPlan(isRefresh = false) {
- if (!this.planHasMore) {
- return;
- }
try {
if (isRefresh) {
this.planPageNum = 1;
diff --git a/apps/hand-factory/pages/meal/meal.vue b/apps/hand-factory/pages/meal/meal.vue
index 90943ce..415e558 100644
--- a/apps/hand-factory/pages/meal/meal.vue
+++ b/apps/hand-factory/pages/meal/meal.vue
@@ -4,31 +4,19 @@
餐别:
-
+
报餐日期:
-
+
-
+
截止时间:
-
+
{{ formattedDeadlineTime }}
@@ -52,7 +40,7 @@
总人数
{{ validTotal + invalidTotal }}
-
+
有效堂食人数
@@ -66,7 +54,7 @@
有效总人数
{{ validTotal }}
-
+
无效堂食人数
@@ -94,43 +82,28 @@
-
+
时
-
+
-
+
分
-
+
-
+
秒
-
+
@@ -139,370 +112,413 @@
\ No newline at end of file
diff --git a/apps/hand-factory/utils/update.js b/apps/hand-factory/utils/update.js
index 01e96b8..febeae5 100644
--- a/apps/hand-factory/utils/update.js
+++ b/apps/hand-factory/utils/update.js
@@ -73,7 +73,7 @@ function checkStorageSpace() {
function checkUpdate(forceCheck = false) {
// 1. 准备本地版本信息
const localVersion = plus.runtime.version; // 基座版本
- const staticVersion = '1.3.29'; // 静态默认版本
+ const staticVersion = '1.3.30'; // 静态默认版本
// const localWgtVersion = staticVersion;
const localWgtVersion = uni.getStorageSync('wgtVersion') || staticVersion; // 本地wgt版本(从存储获取或用默认)
const currentVersion = compareVersion(localWgtVersion, localVersion) > 0
diff --git a/apps/hand-factory/version.json b/apps/hand-factory/version.json
index a07f917..a7bbde5 100644
--- a/apps/hand-factory/version.json
+++ b/apps/hand-factory/version.json
@@ -1,5 +1,5 @@
{
- "version": "klp 1.3.29",
+ "version": "klp 1.3.30",
"wgtUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.wgt",
"apkUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.apk"
}
\ No newline at end of file