diff --git a/app/pages.json b/app/pages.json
index aa0894b..7cdbd00 100644
--- a/app/pages.json
+++ b/app/pages.json
@@ -29,17 +29,12 @@
"path": "pages/user/index",
"style": {
//"navigationBarTitleText": "个人中心",
- // #ifdef MP || APP-PLUS
- "navigationBarTextStyle": "black",
- "navigationBarBackgroundColor": "#409EFF",
- // #endif
- "app-plus": {
- // #ifdef APP-PLUS
- "titleNView": {
- "type": "default"
- }
- // #endif
- }
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "navigationBarTextStyle": "black"
+ // #ifdef H5
+ ,
+ "navigationStyle": "custom"
+ // #endif
}
},
{
@@ -100,28 +95,24 @@
"path": "pages/news_list/index",
"style": {
//"navigationBarTitleText": "资讯",
- "navigationBarBackgroundColor": "#409EFF",
- "app-plus": {
- // #ifdef APP-PLUS
- "titleNView": {
- "type": "default"
- }
- // #endif
- }
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "navigationBarTextStyle": "black"
+ // #ifdef H5
+ ,
+ "navigationStyle": "custom"
+ // #endif
}
},
{
"path": "pages/news_details/index",
"style": {
//"navigationBarTitleText": "资讯详情",
- "navigationBarBackgroundColor": "#409EFF",
- "app-plus": {
- // #ifdef APP-PLUS
- "titleNView": {
- "type": "default"
- }
- // #endif
- }
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "navigationBarTextStyle": "black"
+ // #ifdef H5
+ ,
+ "navigationStyle": "custom"
+ // #endif
}
},
//#ifdef H5
@@ -415,7 +406,6 @@
"navigationStyle": "custom"
// #endif
}
- }
},
{
"path": "user_get_coupon/index",
diff --git a/app/pages/index/index.vue b/app/pages/index/index.vue
index 76966cf..1187d5e 100644
--- a/app/pages/index/index.vue
+++ b/app/pages/index/index.vue
@@ -51,7 +51,7 @@
-
+
物业服务
-
+
diff --git a/app/pages/news_list/index.vue b/app/pages/news_list/index.vue
index 6fa8e86..df27c29 100644
--- a/app/pages/news_list/index.vue
+++ b/app/pages/news_list/index.vue
@@ -42,7 +42,7 @@
-
+
diff --git a/app/pages/supply_chain/day_menu/index.vue b/app/pages/supply_chain/day_menu/index.vue
index 859c052..4d70026 100644
--- a/app/pages/supply_chain/day_menu/index.vue
+++ b/app/pages/supply_chain/day_menu/index.vue
@@ -182,6 +182,32 @@ export default {
this.$off('dictChange');
},
methods: {
+ async promptDislikeRemark() {
+ return new Promise((resolve) => {
+ uni.showModal({
+ title: '请输入点踩原因',
+ editable: true,
+ placeholderText: '请填写点踩原因',
+ success: (res) => {
+ if (!res.confirm) {
+ resolve(null);
+ return;
+ }
+ const remark = (res.content || '').trim();
+ if (!remark) {
+ uni.showToast({
+ title: '请输入点踩原因',
+ icon: 'none'
+ });
+ resolve('');
+ return;
+ }
+ resolve(remark);
+ },
+ fail: () => resolve(null)
+ });
+ });
+ },
async loadPageData() {
await Promise.all([this.loadMenuByDate(), this.loadRanking()]);
},
@@ -292,10 +318,16 @@ export default {
item.dislikeCount = Math.max(0, (item.dislikeCount || 0) - 1);
}
} else {
+ let remark = '';
+ if (likeType === '2') {
+ remark = await this.promptDislikeRemark();
+ if (remark === null || remark === '') return;
+ }
uni.showLoading({ title: likeType === '1' ? '点赞中...' : '点踩中...', mask: true });
await likeDailyMenuItem({
menuDtlId: item.id,
- likeType
+ likeType,
+ remark
});
uni.showToast({
title: likeType === '1' ? '点赞成功' : '点踩成功',
diff --git a/app/pages/supply_chain/dispatch/index.vue b/app/pages/supply_chain/dispatch/index.vue
index 5e7f929..e78183c 100644
--- a/app/pages/supply_chain/dispatch/index.vue
+++ b/app/pages/supply_chain/dispatch/index.vue
@@ -31,7 +31,7 @@
{{ getDispatchStatusText(item.status) }}
- {{ item.assignTime }}
+ {{ item.assignTime || '' }}
diff --git a/app/pages/supply_chain/material_receipt/index.vue b/app/pages/supply_chain/material_receipt/index.vue
index 321f9ca..db17433 100644
--- a/app/pages/supply_chain/material_receipt/index.vue
+++ b/app/pages/supply_chain/material_receipt/index.vue
@@ -27,7 +27,7 @@
物资选择
-
+
{{ item.cargoName }} ({{ item.cargoSpec }}) x {{ item.quantity }}
x
@@ -81,26 +81,26 @@
{{ material.cargoName }}
{{ material.cargoSpec }}
-
- -
+
+ -
- +
+ +
-
- ✓
+
+ ✓
@@ -286,7 +286,7 @@ export default {
},
// 切换物资选择状态
toggleMaterial(material) {
- const index = this.tempSelectedMaterials.findIndex(item => item.cargoId === material.cargoId);
+ const index = this.tempSelectedMaterials.findIndex(item => item.id === material.id);
if (index > -1) {
this.tempSelectedMaterials.splice(index, 1);
} else {
@@ -295,31 +295,31 @@ export default {
}
},
// 检查物资是否已选择
- isMaterialSelected(cargoId) {
- return this.tempSelectedMaterials.some(item => item.cargoId === cargoId);
+ isMaterialSelected(id) {
+ return this.tempSelectedMaterials.some(item => item.id === id);
},
// 获取物资数量
- getMaterialQuantity(cargoId) {
- const item = this.tempSelectedMaterials.find(item => item.cargoId === cargoId);
+ getMaterialQuantity(id) {
+ const item = this.tempSelectedMaterials.find(item => item.id === id);
return item ? item.quantity : 1;
},
// 增加数量
- increaseQuantity(cargoId) {
- const item = this.tempSelectedMaterials.find(item => item.cargoId === cargoId);
+ increaseQuantity(id) {
+ const item = this.tempSelectedMaterials.find(item => item.id === id);
if (item) {
item.quantity += 1;
}
},
// 减少数量
- decreaseQuantity(cargoId) {
- const item = this.tempSelectedMaterials.find(item => item.cargoId === cargoId);
+ decreaseQuantity(id) {
+ const item = this.tempSelectedMaterials.find(item => item.id === id);
if (item && item.quantity > 1) {
item.quantity -= 1;
}
},
// 更新数量
- updateQuantity(cargoId, event) {
- const item = this.tempSelectedMaterials.find(item => item.cargoId === cargoId);
+ updateQuantity(id, event) {
+ const item = this.tempSelectedMaterials.find(item => item.id === id);
if (item) {
const value = parseInt(event.target.value) || 1;
item.quantity = Math.max(1, value);
diff --git a/app/pages/supply_chain/repair_handle/index.vue b/app/pages/supply_chain/repair_handle/index.vue
index a0adb17..06e86d7 100644
--- a/app/pages/supply_chain/repair_handle/index.vue
+++ b/app/pages/supply_chain/repair_handle/index.vue
@@ -81,7 +81,7 @@
@@ -119,7 +119,7 @@ export default {
listMaintenanceOrder({
page: pageNo,
limit: pageSize,
- uid: null,
+ uid: '',
}).then((res) => {
const list = res?.data?.list || [];
this.$refs.paging.complete(list);