diff --git a/src/App.vue b/src/App.vue
index d753c33..b2deb52 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,52 +4,8 @@
// onShow(() => {})
// onHide(() => {})
-interface TabbarItem {
- pagePath: string
- text: string
- iconPath: string
- selectedIconPath: string
- launchParam: string[]
- auth: string[]
-}
-
-const tabbar: TabbarItem[] = []
-
-// 获取启动参数
-const getLaunchParam = () => {
- return new URL(window.location.href).searchParams.get("launchParam")
-}
-
-// 设置tabbar项目
-const setTabbarItem = (index: number, item: TabbarItem, visible: boolean) => {
- uni.setTabBarItem({
- index,
- pagePath: item.pagePath,
- text: item.text,
- iconPath: item.iconPath,
- selectedIconPath: item.selectedIconPath,
- visible,
- })
-}
-
-// 根据启动参数设置tabbar项目
-const setTabbarByLaunchParam = (launchParam: string) => {
- tabbar.forEach((item, index) => {
- const visible = item.launchParam.includes(launchParam)
- setTabbarItem(index, item, visible)
- })
-}
-
-// 根据用户角色设置tabbar项目
-const setTabbarByUserRole = (role: string) => {
- tabbar.forEach((item, index) => {
- const visible = item.auth.includes(role)
- setTabbarItem(index, item, visible)
- })
-}
-
export default {
- async onLaunch() {
+ onLaunch() {
// 检查登录状态
const token = uni.getStorageSync("token")
if (!token) {
diff --git a/src/pages/integrated/visitor/index.vue b/src/pages/integrated/visitor/index.vue
index daa933f..f61afea 100644
--- a/src/pages/integrated/visitor/index.vue
+++ b/src/pages/integrated/visitor/index.vue
@@ -2,9 +2,6 @@
@@ -13,7 +10,7 @@
- ℹ
+ !
入园预约请填写以下信息:
@@ -21,13 +18,13 @@
您的姓名
- *必填
+ *
联系方式
- *必填
+ *
@@ -44,7 +41,7 @@
{{ formData.reasonLabel || "请选择拜访原因" }}
- >
+ >
@@ -96,7 +93,7 @@
接待人
- *必填
+ *
{{ selectedUserName || "请选择" }}
>
@@ -105,7 +102,7 @@
到访时间
- *必填
+ *
{{ selectedTime || "请选择" }}
>
@@ -221,21 +218,6 @@
-
-
- {{ user.name }}
-
-
- {{ searchKeyword ? "未找到相关接待人" : "暂无接待人数据" }}
-
-
-
@@ -754,6 +736,7 @@ onMounted(async () => {
color: #323233;
font-weight: 500;
letter-spacing: 0.5rpx;
+ margin: 0 auto;
}
.right-placeholder {
@@ -826,7 +809,6 @@ onMounted(async () => {
}
.select-item {
- display: flex;
justify-content: space-between;
align-items: center;
}
diff --git a/src/pages/integrated/visitor/myvisitor.vue b/src/pages/integrated/visitor/myvisitor.vue
index bb1c96e..6cca321 100644
--- a/src/pages/integrated/visitor/myvisitor.vue
+++ b/src/pages/integrated/visitor/myvisitor.vue
@@ -1,93 +1,72 @@
-
-
-
-
- {{ tab }}
-
-
+
+
+
+
+ {{ tab }}
+
+
-
-
-
-
-
-
- 接待人:
- {{ item.userName }}
-
-
- 联系方式:
- {{ item.mobile }}
-
-
- 预约时间:
- {{ formatCreateTime(item.createTime) }}
-
-
- 备注:
- {{ item.description }}
-
-
- 审核意见:
- {{ item.checkReason }}
-
-
-
-
+
+
+
+
+
+
+ 接待人:
+ {{ item.userName }}
+
+
+ 联系方式:
+ {{ item.mobile }}
+
+
+ 预约时间:
+ {{ formatCreateTime(item.createTime) }}
+
+
+ 备注:
+ {{ item.description }}
+
+
+ 审核意见:
+ {{ item.checkReason }}
+
+
+
+
-
- 加载中...
- 没有更多数据了
-
- 暂无访客记录
-
-
-
+
+ 加载中...
+ 没有更多数据了
+ 暂无访客记录
+
+
\ No newline at end of file
+
diff --git a/src/pages/integrated/visitor/myyyvisitor.vue b/src/pages/integrated/visitor/myyyvisitor.vue
index 001ff1f..5e2e99c 100644
--- a/src/pages/integrated/visitor/myyyvisitor.vue
+++ b/src/pages/integrated/visitor/myyyvisitor.vue
@@ -1,672 +1,649 @@
-
-
+
+
-
-
- 访客姓名*
-
-
+
+
+ 访客姓名*
+
+
-
- 访客手机号*
-
-
+
+ 访客手机号*
+
+
-
- 来访公司名称
-
-
+
+ 来访公司名称
+
+
-
- 拜访时间*
-
- {{ selectedTime || '请选择' }}
- >
-
-
+
+ 拜访时间*
+
+ {{ selectedTime || "请选择" }}
+ >
+
+
-
- 拜访部门*
-
- {{ selectedDeptName || '请选择' }}
- >
-
-
+
+ 拜访部门*
+
+ {{ selectedDeptName || "请选择" }}
+ >
+
+
-
- 拜访原因*
-
-
- {{ form.reasonLabel || '请选择拜访原因' }}
- >
-
-
-
+
+ 拜访原因*
+
+
+ {{ form.reasonLabel || "请选择拜访原因" }}
+ >
+
+
+
-
- 是否可随行人员
-
-
-
+
+ 是否可随行人员
+
+
+
-
-
-
+
+
+
-
+
-
-
+
+
\ No newline at end of file
+
diff --git a/src/pages/integrated/visitor/verify.vue b/src/pages/integrated/visitor/verify.vue
index 0b795e8..f59c072 100644
--- a/src/pages/integrated/visitor/verify.vue
+++ b/src/pages/integrated/visitor/verify.vue
@@ -1,226 +1,180 @@
-
-
-
+
+
+
+
+ 📷
+ 扫描访客二维码
+
+
-
-
-
- 📷
- 扫描访客二维码
-
-
-
-
-
- 最近核销记录
-
-
-
- {{ item.name }}
- {{ formatDateTime(item.verifyTime) }}
-
-
- {{ item.deptName }}
- 已核销
-
-
-
-
-
+
+
+ 最近核销记录
+
+
+
+ {{ item.name }}
+ {{ formatDateTime(item.verifyTime) }}
+
+
+ {{ item.deptName }}
+ 已核销
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/pages/integrated/visitor/visitorDetail.vue b/src/pages/integrated/visitor/visitorDetail.vue
index 4b16131..1b81b65 100644
--- a/src/pages/integrated/visitor/visitorDetail.vue
+++ b/src/pages/integrated/visitor/visitorDetail.vue
@@ -1,486 +1,486 @@
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
- {{ formatDate(detail.vstartDate) }} {{ formatTime(detail.vstartDate) }}
- {{ detail.deptName }}
-
-
+
+
+ {{ formatDate(detail.vstartDate) }} {{ formatTime(detail.vstartDate) }}
+ {{ detail.deptName }}
+
+
-
-
-
- 邀请人
- {{ detail.name }}
-
-
- 访客
- {{ detail.userName }}
-
-
+
+
+
+ 邀请人
+ {{ detail.name }}
+
+
+ 访客
+ {{ detail.userName }}
+
+
-
-
-
- 请于门卫或前台进行预访登记
-
-
+
+
+
+ 请于门卫或前台进行预访登记
+
+
-
-
- {{ isExpanded ? '收起' : '查看详细信息' }}
- {{ isExpanded ? '∧' : '∨' }}
-
+
+
+ {{ isExpanded ? "收起" : "查看详细信息" }}
+ {{ isExpanded ? "∧" : "∨" }}
+
-
-
-
-
- 基本信息
-
- 拜访时间
- {{ formatDateTime(detail.vstartDate) }} - {{ formatDateTime(detail.vendDate, true) }}
-
-
- 访客姓名
- {{ detail.name }}
-
-
- 联系方式
- {{ detail.mobile }}
-
-
- 所属公司
- {{ detail.companyName }}
-
-
- 拜访对象
- {{ detail.userName }}
-
-
+
+
+
+
+ 基本信息
+
+ 拜访时间
+ {{ formatDateTime(detail.vstartDate) }} - {{ formatDateTime(detail.vendDate, true) }}
+
+
+ 访客姓名
+ {{ detail.name }}
+
+
+ 联系方式
+ {{ detail.mobile }}
+
+
+ 所属公司
+ {{ detail.companyName }}
+
+
+ 拜访对象
+ {{ detail.userName }}
+
+
-
-
- 随行人员信息
-
-
- 访客姓名
- {{ person.name }}
-
-
- 手机号码
- {{ person.mobile }}
-
-
-
+
+
+ 随行人员信息
+
+
+ 访客姓名
+ {{ person.name }}
+
+
+ 手机号码
+ {{ person.mobile }}
+
+
+
-
-
- 车辆信息
-
- 车牌号
- {{ car.carNumber }}
-
-
+
+
+ 车辆信息
+
+ 车牌号
+ {{ car.carNumber }}
+
+
-
-
- 审核信息
-
- 审核意见
- {{ detail.checkReason }}
-
-
+
+
+ 审核信息
+
+ 审核意见
+ {{ detail.checkReason }}
+
+
-
-
-
- 提交时间
- {{ formatDateTime(detail.createTime) }}
-
-
-
-
+
+
+
+ 提交时间
+ {{ formatDateTime(detail.createTime) }}
+
+
+
+
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 4b32651..24cc345 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -21,103 +21,35 @@
-
-
-
-
- {{ v.text }}
-
+
+
+ 核销
-
-
-
-
diff --git a/src/pages/test/login.vue b/src/pages/test/login.vue
index 92c8578..3ad4c57 100644
--- a/src/pages/test/login.vue
+++ b/src/pages/test/login.vue
@@ -94,9 +94,6 @@ const login = async () => {
code: result.code,
}
- console.log("result.code", result.code) // 0e3XvSll2ptntf4bg3ol2BdVFH1XvSlM
- console.log("params", params)
-
const res: any = await request({
url: "/auth/oauth2/token?grant_type=mobile",
method: "post",
diff --git a/src/sheep/api/user.ts b/src/sheep/api/user.ts
index 5306ac9..31c8602 100644
--- a/src/sheep/api/user.ts
+++ b/src/sheep/api/user.ts
@@ -2,8 +2,7 @@ import request from "@/sheep/utils/request"
import { encryption } from "@/sheep/utils/encryption"
// 将 Basic Auth 字符串提取为常量
-// const BASIC_AUTH = "Basic " + window.btoa(import.meta.env.VITE_OAUTH2_APP_CLIENT)
-const BASIC_AUTH = "Basic " + import.meta.env.VITE_OAUTH2_APP_CLIENT
+const BASIC_AUTH = "Basic " + window.btoa(import.meta.env.VITE_OAUTH2_APP_CLIENT)
// 定义接口类型
interface LoginParams {
diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts
index 6f2b154..3df787d 100644
--- a/src/sheep/utils/request.ts
+++ b/src/sheep/utils/request.ts
@@ -78,6 +78,7 @@ function handleSuccessMessage(response: any) {
// 创建请求实例
const http = new Request({
baseURL: import.meta.env.VITE_API_URL,
+ // baseURL: import.meta.env.VITE_APP_PROD_SERVICE,
timeout: 15000,
method: "GET",
header: {