From f5028477ff21f0146206bfcac6e78cb92e81d90c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 15 一月 2025 17:37:20 +0800
Subject: [PATCH] ll
---
h5/pages/staff/meetingCalendar.vue | 3 ++-
h5/utils/config.js | 4 ++--
h5/pages/login/login.vue | 2 +-
h5/pages/staff/task/vDangetAppr.vue | 2 +-
h5/pages/staff/meetingManager.vue | 5 +++--
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index dc5800c..cac61df 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -41,7 +41,7 @@
export default {
data() {
return {
- code: 'aaa'
+ code: ''
}
},
onLoad(option) {
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index d4edeaf..5646185 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -252,7 +252,8 @@
initData() {
// 褰撴湀鏁版嵁
monthMeetingPage({
- yearMonth: this.currentDate.slice(0, 7)
+ yearMonth: this.currentDate.slice(0, 7),
+ queryType: 1
}).then(res => {
this.monthMark = res.data.filter(i => i.meetingNum > 0).map(j => {
return {
diff --git a/h5/pages/staff/meetingManager.vue b/h5/pages/staff/meetingManager.vue
index b7c7bef..0c68958 100644
--- a/h5/pages/staff/meetingManager.vue
+++ b/h5/pages/staff/meetingManager.vue
@@ -165,7 +165,8 @@
initData() {
// 褰撴湀鏁版嵁
monthMeetingPage({
- yearMonth: this.currentDate.slice(0, 7)
+ yearMonth: this.currentDate.slice(0, 7),
+ queryType: 3
}).then(res => {
this.monthMark = res.data.filter(i => i.meetingNum > 0).map(j => {
return {
@@ -234,7 +235,7 @@
// 褰撳ぉ鎴戝弬涓庣殑浼氳
myMeetingPage({
model: {
- queryType: '1',
+ queryType: '3',
roomsId: activeRoom.id,
queryDate: currentDate
},
diff --git a/h5/pages/staff/task/vDangetAppr.vue b/h5/pages/staff/task/vDangetAppr.vue
index 2e619e1..14fbc1f 100644
--- a/h5/pages/staff/task/vDangetAppr.vue
+++ b/h5/pages/staff/task/vDangetAppr.vue
@@ -506,7 +506,7 @@
getMemList() {
findHiddenAreaMemberList({
...this.transferModel,
- id: this.info.areaId,
+ // id: this.info.areaId,
...this.pagination
}).then(res => {
this.memberList = res.data || []
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 08884a3..05ff784 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,8 +1,8 @@
-export const baseUrl = 'zhyq_interface/'
+// export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
-// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
+export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
--
Gitblit v1.9.3