diff --git a/src/App.vue b/src/App.vue
index a1fc523..32db043 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -85,35 +85,11 @@ const tabbar: TabbarItem[] = [
auth: ["merchant"],
},
{
- pagePath: "pages/tabbar/invitation",
- text: "访客邀约",
- iconPath: "/static/tabbar/invitation.png",
- selectedIconPath: "/static/tabbar/invitation-select.png",
- launchParam: ["invitation"],
- auth: [],
- },
- {
- pagePath: "pages/tabbar/invitationRecord",
- text: "邀约记录",
- iconPath: "/static/tabbar/order.png",
- selectedIconPath: "/static/tabbar/order-select.png",
- launchParam: ["invitation"],
- auth: [],
- },
- {
- pagePath: "pages/tabbar/message",
- text: "通知公告",
- iconPath: "/static/tabbar/message.png",
- selectedIconPath: "/static/tabbar/message-select.png",
- launchParam: ["message"],
- auth: [],
- },
- {
- pagePath: "pages/integrated/index",
+ pagePath: "pages/tabbar/integrated",
text: "综合服务",
iconPath: "/static/tabbar/integrated.png",
selectedIconPath: "/static/tabbar/integrated-select.png",
- launchParam: [],
+ launchParam: ["integrated"],
auth: [],
},
{
@@ -121,7 +97,7 @@ const tabbar: TabbarItem[] = [
text: "我的",
iconPath: "/static/tabbar/my.png",
selectedIconPath: "/static/tabbar/my-select.png",
- launchParam: ["canteen", "selfMerchant", "onlineShop", "coopMerchant"],
+ launchParam: ["canteen", "selfMerchant", "onlineShop", "coopMerchant", "integrated"],
auth: ["user", "merchant", "doorAdmin"],
},
]
diff --git a/src/pages.json b/src/pages.json
index 0579678..97de4b1 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -73,23 +73,9 @@
}
},
{
- "path": "pages/tabbar/invitation",
+ "path": "pages/tabbar/integrated",
"style": {
- "navigationBarTitleText": "访客",
- "disableScroll": true
- }
- },
- {
- "path": "pages/tabbar/invitationRecord",
- "style": {
- "navigationBarTitleText": "访客记录",
- "disableScroll": true
- }
- },
- {
- "path": "pages/tabbar/message",
- "style": {
- "navigationBarTitleText": "通知公告",
+ "navigationBarTitleText": "综合服务",
"disableScroll": true
}
},
@@ -414,17 +400,6 @@
}
]
},
- {
- "root": "pages/invitation",
- "pages": [
- {
- "path": "detail",
- "style": {
- "navigationBarTitleText": "访客详情"
- }
- }
- ]
- },
{
"root": "pages/thirdApp",
"pages": [
@@ -439,12 +414,6 @@
{
"root": "pages/integrated",
"pages": [
- {
- "path": "index",
- "style": {
- "navigationBarTitleText": "综合服务"
- }
- },
{
"path": "lostAndFound/index",
"style": {
@@ -494,15 +463,21 @@
}
},
{
- "path": "visitor/index",
+ "path": "visitor/invitation",
"style": {
- "navigationBarTitleText": "访客管理"
+ "navigationBarTitleText": "访客邀约"
+ }
+ },
+ {
+ "path": "visitor/invitationRecord",
+ "style": {
+ "navigationBarTitleText": "邀约记录"
}
},
{
"path": "visitor/detail",
"style": {
- "navigationBarTitleText": "访客详情"
+ "navigationBarTitleText": "邀约详情"
}
},
{
@@ -596,25 +571,7 @@
"selectedIconPath": ""
},
{
- "pagePath": "pages/tabbar/invitation",
- "text": "",
- "iconPath": "",
- "selectedIconPath": ""
- },
- {
- "pagePath": "pages/tabbar/invitationRecord",
- "text": "",
- "iconPath": "",
- "selectedIconPath": ""
- },
- {
- "pagePath": "pages/tabbar/message",
- "text": "",
- "iconPath": "",
- "selectedIconPath": ""
- },
- {
- "pagePath": "pages/integrated/index",
+ "pagePath": "pages/tabbar/integrated",
"text": "",
"iconPath": "",
"selectedIconPath": ""
diff --git a/src/pages/integrated/index.vue b/src/pages/integrated/index.vue
deleted file mode 100644
index d70b890..0000000
--- a/src/pages/integrated/index.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/integrated/visitor/detail.vue b/src/pages/integrated/visitor/detail.vue
index 57368aa..6516294 100644
--- a/src/pages/integrated/visitor/detail.vue
+++ b/src/pages/integrated/visitor/detail.vue
@@ -1,236 +1,105 @@
-
-
-
-
-
- 来访目的:
- {{ getPurposeLabel(detail.purpose) }}
-
-
- 被访人:
- {{ detail.hostName }}
-
-
- 来访时间:
- {{ formatVisitTime(detail.visitDate, detail.visitTime) }}
-
-
- 备注说明:
- {{ detail.remark }}
-
-
-
-
- 拒绝原因
- {{ detail.rejectReason }}
-
-
-
-
+
+
+
+ 访客信息
+
+ 访客姓名:
+ {{ detail.name }}
+
+
+ 访客手机号:
+ {{ detail.mobile }}
+
+
+ 来访公司名称:
+ {{ detail.companyName }}
+
+
+ 来访原因:
+ {{ visitorReasonList.find((item) => item.id == detail.reasonValue)?.title || "" }}
+
+
+ 接待人:
+ {{ detail.userName }}
+
+
+ 来访人数:
+ {{ detail.peopleNumber }}
+
+
+ 是否可随行人员:
+ {{ detail.isOtherPeople == "1" ? "是" : "否" }}
+
+
+ 是否可驾驶车辆:
+ {{ detail.isDrive == "1" ? "是" : "否" }}
+
+
+
+
+ 时间
+
+ 预计来访时间:
+ {{ detail.vendDate }}
+
+
+ 预计离开时间:
+ {{ detail.vstartDate }}
+
+
+
+
+ 其他
+
+ 创建方式:
+ {{ detail.type == "1" ? "主动申请" : detail.type == "2" ? "邀约" : "后台创建" }}
+
+
+ 提交时间:
+ {{ detail.createTime }}
+
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/src/pages/integrated/visitor/index.vue b/src/pages/integrated/visitor/index.vue
deleted file mode 100644
index e2fd1fe..0000000
--- a/src/pages/integrated/visitor/index.vue
+++ /dev/null
@@ -1,438 +0,0 @@
-
-
-
-
- 访客申请
-
- 访客姓名
-
-
-
- 访客手机号
-
-
-
- 来访目的
-
- {{ purposeOptions[purposeIndex].label }}
-
-
-
- 来访时间
-
- {{ visitDate || '请选择来访日期' }}
-
-
-
- 来访时段
-
- {{ timeOptions[timeIndex].label }}
-
-
-
- 被访人
-
-
-
- 备注说明
-
- {{ remark.length }}/200
-
-
-
-
-
-
- 访客记录
-
- 暂无访客记录
-
-
-
-
-
- 来访目的:{{ getPurposeLabel(item.purpose) }}
- 被访人:{{ item.hostName }}
- 来访时间:{{ formatVisitTime(item.visitDate, item.visitTime) }}
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/tabbar/invitation.vue b/src/pages/integrated/visitor/invitation.vue
similarity index 99%
rename from src/pages/tabbar/invitation.vue
rename to src/pages/integrated/visitor/invitation.vue
index eb2d551..a3d5032 100644
--- a/src/pages/tabbar/invitation.vue
+++ b/src/pages/integrated/visitor/invitation.vue
@@ -105,9 +105,6 @@ const _timestr = ref("2025-01-01")
const visitorReasonList = ref<{ title: string; id: string }[]>([])
onLoad(() => {
- const app = getApp()
- app._initTabbar()
-
getVisitorReasonList()
})
diff --git a/src/pages/tabbar/invitationRecord.vue b/src/pages/integrated/visitor/invitationRecord.vue
similarity index 82%
rename from src/pages/tabbar/invitationRecord.vue
rename to src/pages/integrated/visitor/invitationRecord.vue
index 4ab4144..e22caf4 100644
--- a/src/pages/tabbar/invitationRecord.vue
+++ b/src/pages/integrated/visitor/invitationRecord.vue
@@ -59,23 +59,27 @@
已取消
{{ v.vstartDate + " ~ " + v.vendDate }}
-
-
- 来访人:{{ v.name }}
- 手机号:{{ v.mobile }}
+
+
+ {{ v.name }}
+ {{ v.mobile }}
-
- 接待人:{{ v.userName }}
+
拜访原因:{{ visitorReasonList.find((item) => item.id == v.reasonValue)?.title || "" }}
+
+ 接待人:{{ v.userName }}
+
-
-
- 审核通过
-
-
- 审核拒绝
-
+
+
+
+ 审核通过
+
+
+ 审核拒绝
+
+
查看详情
@@ -85,7 +89,7 @@
+
+
\ No newline at end of file
diff --git a/src/pages/integrated/visitor/~index.vue b/src/pages/integrated/visitor/~index.vue
new file mode 100644
index 0000000..53832fc
--- /dev/null
+++ b/src/pages/integrated/visitor/~index.vue
@@ -0,0 +1,421 @@
+
+
+
+
+ 访客申请
+
+ 访客姓名
+
+
+
+ 访客手机号
+
+
+
+ 来访目的
+
+ {{ purposeOptions[purposeIndex].label }}
+
+
+
+ 来访时间
+
+ {{ visitDate || "请选择来访日期" }}
+
+
+
+ 来访时段
+
+ {{ timeOptions[timeIndex].label }}
+
+
+
+ 被访人
+
+
+
+ 备注说明
+
+ {{ remark.length }}/200
+
+
+
+
+
+
+ 访客记录
+ 暂无访客记录
+
+
+
+
+ 来访目的:{{ getPurposeLabel(item.purpose) }}
+ 被访人:{{ item.hostName }}
+ 来访时间:{{ formatVisitTime(item.visitDate, item.visitTime) }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/integrated/visitor/myvisitor.vue b/src/pages/integrated/visitor/~myvisitor.vue
similarity index 100%
rename from src/pages/integrated/visitor/myvisitor.vue
rename to src/pages/integrated/visitor/~myvisitor.vue
diff --git a/src/pages/invitation/detail.vue b/src/pages/invitation/detail.vue
deleted file mode 100644
index 6516294..0000000
--- a/src/pages/invitation/detail.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
-
- 访客信息
-
- 访客姓名:
- {{ detail.name }}
-
-
- 访客手机号:
- {{ detail.mobile }}
-
-
- 来访公司名称:
- {{ detail.companyName }}
-
-
- 来访原因:
- {{ visitorReasonList.find((item) => item.id == detail.reasonValue)?.title || "" }}
-
-
- 接待人:
- {{ detail.userName }}
-
-
- 来访人数:
- {{ detail.peopleNumber }}
-
-
- 是否可随行人员:
- {{ detail.isOtherPeople == "1" ? "是" : "否" }}
-
-
- 是否可驾驶车辆:
- {{ detail.isDrive == "1" ? "是" : "否" }}
-
-
-
-
- 时间
-
- 预计来访时间:
- {{ detail.vendDate }}
-
-
- 预计离开时间:
- {{ detail.vstartDate }}
-
-
-
-
- 其他
-
- 创建方式:
- {{ detail.type == "1" ? "主动申请" : detail.type == "2" ? "邀约" : "后台创建" }}
-
-
- 提交时间:
- {{ detail.createTime }}
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/tabbar/index.vue b/src/pages/tabbar/index.vue
index 5bcf43f..03b5ea3 100644
--- a/src/pages/tabbar/index.vue
+++ b/src/pages/tabbar/index.vue
@@ -40,19 +40,7 @@ const moduleList = [
launchParam: "flowStatistics",
},
{
- pagePath: "/pages/tabbar/invitation",
- text: "访客",
- iconPath: "/static/tabbar/invitation-select.png",
- launchParam: "invitation",
- },
- {
- pagePath: "/pages/tabbar/message",
- text: "通知公告",
- iconPath: "/static/tabbar/message-select.png",
- launchParam: "message",
- },
- {
- pagePath: "/pages/integrated/index",
+ pagePath: "/pages/tabbar/integrated",
text: "综合服务",
iconPath: "/static/tabbar/integrated-select.png",
launchParam: "integrated",
@@ -87,6 +75,10 @@ const jumpByParam = async () => {
uni.setStorageSync("launchParam", launchParam)
uni.switchTab({ url: "/pages/tabbar/coopMerchant" })
break
+ case "integrated": // 综合服务
+ uni.setStorageSync("launchParam", launchParam)
+ uni.switchTab({ url: "/pages/tabbar/integrated" })
+ break
default:
uni.hideTabBar()
break
@@ -117,6 +109,10 @@ const jumpByParam = async () => {
uni.setStorageSync("launchParam", launchParam)
return uni.reLaunch({ url: "/pages/tabbar/coopMerchant" })
}
+ if (launchParam === "integrated") {
+ uni.setStorageSync("launchParam", launchParam)
+ return uni.reLaunch({ url: "/pages/tabbar/integrated" })
+ }
case "doorAdmin":
return uni.switchTab({ url: "/pages/tabbar/cabinet" })
default:
diff --git a/src/pages/tabbar/integrated.vue b/src/pages/tabbar/integrated.vue
new file mode 100644
index 0000000..4e94054
--- /dev/null
+++ b/src/pages/tabbar/integrated.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index d713fe9..ac5a24c 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -408,7 +408,6 @@ const initMenuConfig = () => {
{ text: "dev-第三方应用", icon: "/static/icon/login.png", router: "/pages/thirdApp/happyMall" },
{ text: "dev-登录", icon: "/static/icon/login.png", router: "/pages/user/login" },
{ text: "dev-角色选择", icon: "/static/icon/login.png", router: "/pages/user/userRole" },
- { text: "dev-意见反馈", icon: "/static/icon/service_5.png", router: "/pages/integrated/feedback/index" },
)
}
}
diff --git a/src/pages/tabbar/message.vue b/src/pages/tabbar/~message.vue
similarity index 100%
rename from src/pages/tabbar/message.vue
rename to src/pages/tabbar/~message.vue
diff --git a/src/pages/tabbar/onlineShop-1.vue b/src/pages/tabbar/~onlineShop.vue
similarity index 100%
rename from src/pages/tabbar/onlineShop-1.vue
rename to src/pages/tabbar/~onlineShop.vue