From bc28a17e01721755dcd3d69aede632b784deae4a Mon Sep 17 00:00:00 2001
From: hb <hb@git.com>
Date: Wed, 23 Jul 2025 22:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AD=BE=E5=88=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                 |   2 +
 src/api/base/server.ts                       |  81 ++
 src/pages.json                               |  44 +
 src/pages/base/service/index.vue             |   7 +
 src/pages/view/notice/publish.vue            | 112 ++-
 src/pages/view/routine/qd/confirm.vue        | 630 ++++++++++++++
 src/pages/view/routine/qd/detail.vue         | 438 ++++++++++
 src/pages/view/routine/qd/index.vue          | 558 ++++++++++++
 src/pages/view/routine/qd/publish.vue        | 515 +++++++++++
 src/pages/view/routine/qd/push-list.vue      | 304 +++++++
 src/pages/view/routine/qd/qr-code.vue        | 443 ++++++++++
 src/pages/view/routine/qd/selectTeachers.vue | 844 +++++++++++++++++++
 src/static/base/details.png                  | Bin 0 -> 9951 bytes
 src/static/base/push.png                     | Bin 0 -> 7741 bytes
 src/static/base/qr-code.png                  | Bin 0 -> 5373 bytes
 15 files changed, 3944 insertions(+), 34 deletions(-)
 create mode 100644 src/pages/view/routine/qd/confirm.vue
 create mode 100644 src/pages/view/routine/qd/detail.vue
 create mode 100644 src/pages/view/routine/qd/index.vue
 create mode 100644 src/pages/view/routine/qd/publish.vue
 create mode 100644 src/pages/view/routine/qd/push-list.vue
 create mode 100644 src/pages/view/routine/qd/qr-code.vue
 create mode 100644 src/pages/view/routine/qd/selectTeachers.vue
 create mode 100644 src/static/base/details.png
 create mode 100644 src/static/base/push.png
 create mode 100644 src/static/base/qr-code.png

diff --git a/package.json b/package.json
index 85393ce..b7b4126 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
 		"lodash": "4.17.21",
 		"pinia": "2.0.23",
 		"pinia-plugin-persist-uni": "1.2.0",
+		"qrcode": "^1.5.3",
 		"uview-plus": "3.1.20",
 		"vconsole": "3.15.1",
 		"vue": "3.2.45",
@@ -72,6 +73,7 @@
 		"@types/html5plus": "1.0.2",
 		"@types/lodash": "4.14.191",
 		"@types/node": "18.11.15",
+		"@types/qrcode": "^1.5.5",
 		"@types/uni-app": "1.4.4",
 		"sass": "1.56.0",
 		"sass-loader": "10.1.1",
diff --git a/src/api/base/server.ts b/src/api/base/server.ts
index 75fe4b0..1cc16a9 100644
--- a/src/api/base/server.ts
+++ b/src/api/base/server.ts
@@ -64,6 +64,26 @@ export const jsdfindJsByPhoneApi = async (params: any) => {
   return await get("/api/js/findJsByPhone", params);
 };
 
+// 根据年级/班级ID查询教师
+export const jsFindByNjIdOrBjIdApi = async (params: { njOrBjId: string }) => {
+  return await get(`/api/js/findByNjIdOrBjId?njOrBjId=${params.njOrBjId}`);
+};
+
+// 根据科目ID查询教师
+export const jsFindByKmIdApi = async (params: { kmId: string }) => {
+  return await get(`/api/js/findByKmId?kmId=${params.kmId}`);
+};
+
+// 根据班主任年级ID查询教师
+export const jsFindByBzrNjIdApi = async (params: { njId: string }) => {
+  return await get(`/api/js/findByBzrNjId?njId=${params.njId}`);
+};
+
+// 根据职务ID查询教师
+export const jsFindByZwIdApi = async (params: { zwId: string; zwType: string }) => {
+  return await get(`/api/js/findByZwId?zwId=${params.zwId}&zwType=${params.zwType}`);
+};
+
 // 选课列表
 export const jsdXkListApi = async (params: any) => {
   return await get("/mobile/js/xk/list", params);
@@ -208,3 +228,64 @@ export const drpkkbApi = async (params: any) => {
 export const getRzRjApi = async (params: any) => {
   return await get("/mobile/js/getRzRj", params);
 };
+
+// 签到发布相关API
+// 获取签到发布列表
+export const qdzxFindPageApi = async (params: any) => {
+  return await get("/api/qdzx/findPage", params);
+};
+
+// 保存签到发布（新增/编辑）
+export const qdzxSaveApi = async (params: any) => {
+  return await post("/api/qdzx/save", params);
+};
+
+// 根据签到ID查询签到执行情况（教师列表）
+export const qdzxFindByQdParamsApi = async (params: { qdId: string }) => {
+  return await get("/api/qdzx/findByQdParams", params);
+};
+
+export const qdzxFindByQdAndJsApi = async (params: { qdId: string; jsId: string }) => {
+  return await get("/api/qdzx/findByQdAndJs", params);
+};
+
+// 保存签到消息推送
+export const xxtsSaveByQdzxParamsApi = async (params: { qdId: string }) => {
+  return await post("/api/xxts/saveByQdzxParams", params);
+};
+
+// 签到主表相关API
+// 获取签到列表
+export const qdFindPageApi = async (params: any) => {
+  return await get("/api/qd/findPage", params);
+};
+
+// 保存签到（新增/编辑）
+export const qdSaveApi = async (params: any) => {
+  return await post("/api/qd/save", params);
+};
+
+// 根据ID获取签到详情
+export const qdFindByIdApi = async (params: { id: string }) => {
+  return await get(`/api/qd/findById?id=${params.id}`);
+};
+
+// 签到执行相关API
+export const qdzxSignInApi = async (params: any) => {
+  return await post("/api/qdzx/signIn", params);
+};
+
+// 生成签到二维码
+export const generateQRCodeApi = async (params: { qdId: string }) => {
+  return await post("/api/qdzx/generateQRCode", params);
+};
+
+// 年级相关API
+export const findAllNj = async () => {
+  return await get("/api/nj/findAllNj");
+};
+
+// 职务相关API
+export const zwFindAllApi = async () => {
+  return await get("/api/zw/findAll");
+};
diff --git a/src/pages.json b/src/pages.json
index bbc55e7..0a7fa50 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -493,6 +493,50 @@
         "navigationBarTitleText": "学生请假审批",
         "enablePullDownRefresh": false
       }
+    },
+    {
+      "path": "pages/view/routine/qd/index",
+      "style": {
+        "navigationBarTitleText": "签到发布"
+      }
+    },
+    {
+      "path": "pages/view/routine/qd/publish",
+      "style": {
+        "navigationBarTitleText": "新增签到"
+      }
+    },
+    {
+      "path": "pages/view/routine/qd/push-list",
+      "style": {
+        "navigationBarTitleText": "推送清单"
+      }
+    },
+    {
+      "path": "pages/view/routine/qd/detail",
+      "style": {
+        "navigationBarTitleText": "签到详情"
+      }
+    },
+    {
+      "path": "pages/view/routine/qd/selectTeachers",
+      "style": {
+        "navigationBarTitleText": "选择教师"
+      }
+    },
+    {
+      "path": "pages/view/routine/qd/qr-code",
+      "style": {
+        "navigationBarTitleText": "签到二维码",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/view/routine/qd/confirm",
+      "style": {
+        "navigationBarTitleText": "确认签到",
+        "navigationStyle": "custom"
+      }
     }
   ],
   "globalStyle": {
diff --git a/src/pages/base/service/index.vue b/src/pages/base/service/index.vue
index d726a4a..4b0bf35 100644
--- a/src/pages/base/service/index.vue
+++ b/src/pages/base/service/index.vue
@@ -232,6 +232,13 @@ const sections = reactive<Section[]>([
         show: true,
         path: "/pages/view/notice/index",
       },
+      {
+        id: "r10",
+        icon: "draftfill",
+        text: "签到发布",
+        show: true,
+        path: "/pages/view/routine/qd/index",
+      },
     ],
   },
   {
diff --git a/src/pages/view/notice/publish.vue b/src/pages/view/notice/publish.vue
index 071c68e..cc78f6e 100644
--- a/src/pages/view/notice/publish.vue
+++ b/src/pages/view/notice/publish.vue
@@ -295,7 +295,7 @@ const signatureStatusText = computed(() => {
 });
 
 // 树形数据
-const treeData = ref<any[]>([]);
+const treeData = ref([]);
 const treeRef = ref();
 
 // 学生显示相关
@@ -310,23 +310,19 @@ const displayNames = computed(() => {
 // 添加 ref 来引用封面上传组件
 const coverUploadRef = ref();
 
-// 统一接口返回类型声明
-interface ApiResponse<T = any> {
-  resultCode: number;
-  result?: T;
-  resultMsg?: string;
-  data?: any;
-  [key: string]: any;
-}
-
 // 加载树形数据
 const loadTreeData = async () => {
   try {
-    const res = await findAllNjBjTree() as ApiResponse<any[]>;
-    if (res && res.resultCode === 1 && res.result) {
+    const res = await findAllNjBjTree();
+    if (res.resultCode === 1 && res.result) {
+      // 添加调试信息，查看原始数据
+      console.log("=== 后端返回的原始树形数据 ===");
+      console.log("res.result:", res.result);
+      console.log("================================");
+
       // 递归转换数据格式以适配 BasicTree 组件，同时保留 njmcId 字段
-      const convertTreeData = (items: Array<{ key: string; title: string; njmcId?: string; children?: any[] }>): any[] => {
-        return items.map((item) => ({
+      const convertTreeData = (items: any[]): any[] => {
+        return items.map((item: any) => ({
           key: item.key,
           title: item.title,
           njmcId: item.njmcId, // 保留 njmcId 字段
@@ -335,6 +331,11 @@ const loadTreeData = async () => {
       };
 
       treeData.value = convertTreeData(res.result);
+      
+      // 添加调试信息，查看转换后的数据
+      console.log("=== 转换后的树形数据 ===");
+      console.log("treeData.value:", treeData.value);
+      console.log("==========================");
     }
   } catch (error) {
     uni.showToast({ title: "加载班级数据失败", icon: "error" });
@@ -408,7 +409,9 @@ const resetForm = () => {
 const loadJlData = async (jlId: string) => {
   try {
     uni.showLoading({ title: "加载数据中..." });
-    const response = await jlFindByIdApi({ id: jlId }) as ApiResponse<any>;
+
+    // 调用获取接龙详情的接口
+    const response = await jlFindByIdApi({ id: jlId });
 
     if (response && response.resultCode === 1 && response.result) {
       const jlData = response.result;
@@ -426,10 +429,10 @@ const loadJlData = async (jlId: string) => {
       // 处理附件
       if (jlData.jlfj) {
         const attachmentUrls = jlData.jlfj.split(",");
-        formData.attachments = attachmentUrls.map((url: string) => ({
+        formData.attachments = attachmentUrls.map(url => ({
           name: url.split("/").pop() || "附件",
           type: "file",
-          url: url as string
+          url: url
         }));
       }
 
@@ -596,7 +599,7 @@ const getAttachmentIcon = (type: string): string => {
 const previewAttachment = (attachment: Attachment) => {
   // 如果是图片类型，可以预览
   if (attachment.type === "image") {
-    const fullUrl = imagUrl(attachment.url as string);
+    const fullUrl = imagUrl(attachment.url);
     uni.previewImage({
       urls: [fullUrl],
       current: fullUrl,
@@ -617,11 +620,11 @@ const showClassTree = () => {
 };
 
 // 树形选择确认
-const onTreeConfirm = async (selectedItems: Array<any>) => {
+const onTreeConfirm = async (selectedItems: any[]) => {
 
   if (selectedItems.length > 0) {
     // 处理多选情况
-    const classNames = selectedItems.map((item: any) => item.title);
+    const classNames = selectedItems.map((item) => item.title);
     formData.targetClass = classNames.join(", ");
     formData.targetNames = [];
     formData.targetStudentIds = [];
@@ -638,7 +641,7 @@ const onTreeConfirm = async (selectedItems: Array<any>) => {
       const bjIds: string[] = [];
       const gradeNames: string[] = []; // 用于存储年级名称，用于错误提示
 
-      selectedItems.forEach((item: any) => {
+      selectedItems.forEach((item) => {
         // 如果选择的是班级（有parents表示是班级）
         if (item.parents && item.parents.length > 0) {
           const parent = item.parents[0]; // 年级信息
@@ -649,13 +652,23 @@ const onTreeConfirm = async (selectedItems: Array<any>) => {
 
           // 通过年级key从treeData中查找对应的njmcId
           let njmcId: string | undefined;
-          for (const grade of treeData.value || []) {
+          for (const grade of treeData.value) {
             if (grade.key === njId) {
               njmcId = grade.njmcId;
               break;
             }
           }
 
+          // 添加调试信息
+          console.log("=== 年级信息调试 ===");
+          console.log("item:", item);
+          console.log("parent:", parent);
+          console.log("njId:", njId);
+          console.log("njmcId (从treeData查找):", njmcId);
+          console.log("bjId:", bjId);
+          console.log("gradeName:", gradeName);
+          console.log("====================");
+
           // 确保年级信息完整
           if (njId && bjId && gradeName) {
             njIds.push(njId);
@@ -689,6 +702,14 @@ const onTreeConfirm = async (selectedItems: Array<any>) => {
         const uniqueNjIds = [...new Set(njIds)];
         const uniqueNjmcIds = [...new Set(njmcIds)];
 
+        // 添加调试信息
+        console.log("=== 最终设置调试 ===");
+        console.log("njIds:", njIds);
+        console.log("njmcIds:", njmcIds);
+        console.log("uniqueNjIds:", uniqueNjIds);
+        console.log("uniqueNjmcIds:", uniqueNjmcIds);
+        console.log("====================");
+
         // 保存选择的年级ID、年级名称ID和班级ID到formData中
         formData.targetNjIds = uniqueNjIds;
         formData.targetNjmcIds = uniqueNjmcIds;
@@ -700,7 +721,7 @@ const onTreeConfirm = async (selectedItems: Array<any>) => {
           bjId: bjIds.join(","),
         };
 
-        const response = await mobilejlstudentListApi(params) as ApiResponse<any[]>;
+        const response = await mobilejlstudentListApi(params);
 
         if (response && response.resultCode === 1 && response.result) {
           // 提取学生姓名，尝试多个可能的字段名
@@ -730,6 +751,7 @@ const onTreeConfirm = async (selectedItems: Array<any>) => {
         icon: "success",
       });
     } catch (error) {
+      console.error("获取学生列表失败:", error);
       uni.hideLoading();
       uni.showToast({ title: "获取学生列表失败", icon: "error" });
 
@@ -844,6 +866,14 @@ const buildJlDto = (status: string) => {
   const user = userData.value;
   const js = jsData.value;
 
+  // 添加调试信息
+  console.log("=== buildJlDto 调试信息 ===");
+  console.log("formData.targetNjIds:", formData.targetNjIds);
+  console.log("formData.targetNjmcIds:", formData.targetNjmcIds);
+  console.log("formData.targetBjIds:", formData.targetBjIds);
+  console.log("targetNjmcIds.join(','):", formData.targetNjmcIds.join(","));
+  console.log("==========================");
+
   return {
     id: formData.id || "", // 接龙ID，新增时为空
     jlmc: formData.title.trim(), // 接龙名称
@@ -878,13 +908,13 @@ const saveDraft = async () => {
     const jlDto = buildJlDto("B"); // B表示暂存
 
     // 调用后端接口
-    const response = await jlSaveApi(jlDto) as ApiResponse<any>;
+    const response = await jlSaveApi(jlDto);
 
     uni.hideLoading();
 
     if (response && response.resultCode === 1) {
       // 获取接龙ID
-      const jlId = response.result || (response as any).data || jlDto.id;
+      const jlId = response.result || response.data || jlDto.id;
 
       // 更新表单中的ID
       if (jlId) {
@@ -903,12 +933,15 @@ const saveDraft = async () => {
       }, 2000);
     } else {
       uni.showToast({
-        title: (response as any)?.resultMsg || "保存草稿失败",
+        title: response?.resultMsg || "保存草稿失败",
         icon: "error"
       });
     }
   } catch (error) {
     uni.hideLoading();
+    console.error("保存草稿失败:", error);
+
+    // 处理数据验证错误
     if (error instanceof Error) {
       uni.showToast({
         title: error.message,
@@ -941,7 +974,7 @@ const publishNotice = async () => {
   // 如果有ID，检查接龙是否已存在且已发布
   if (formData.id) {
     try {
-      const response = await jlFindByIdApi({ id: formData.id }) as ApiResponse<any>;
+      const response = await jlFindByIdApi({ id: formData.id });
       if (response && response.resultCode === 1 && response.result) {
         const jlData = response.result;
         if (jlData.jlStatus === 'A') {
@@ -949,7 +982,9 @@ const publishNotice = async () => {
           return;
         }
       }
-    } catch (error) {}
+    } catch (error) {
+      console.error("检查接龙状态失败:", error);
+    }
   }
 
   try {
@@ -959,21 +994,27 @@ const publishNotice = async () => {
     // 准备发布数据，构建 JlDto 对象
     const jlDto = buildJlDto("A"); // A表示已发布
 
+    // 添加调试信息
+    console.log("=== 发布接龙调试信息 ===");
+    console.log("jlDto:", jlDto);
+    console.log("==========================");
+
     // 调用后端接口，设置超时处理
     const response = await Promise.race([
-      jlSaveApi(jlDto) as Promise<ApiResponse<any>>,
+      jlSaveApi(jlDto),
       new Promise((_, reject) => 
         setTimeout(() => reject(new Error("请求超时")), 300000) // 5分钟超时
       )
-    ]) as ApiResponse<any>;
+    ]);
 
     uni.hideLoading();
 
     if (response && response.resultCode === 1) {
       // 获取接龙ID，优先使用返回的ID，如果没有则使用请求中的ID
-      const jlId = response.result || (response as any).data || jlDto.id;
+      const jlId = response.result || response.data || jlDto.id;
 
       if (!jlId) {
+        console.error("发布成功但未获取到接龙ID");
         uni.showToast({
           title: "发布成功，但获取接龙ID失败",
           icon: "error"
@@ -1001,7 +1042,7 @@ const publishNotice = async () => {
       }, 2000);
     } else {
       // 处理业务错误
-      const errorMsg = (response as any)?.resultMsg || (response as any)?.message || "发布失败";
+      const errorMsg = response?.resultMsg || response?.message || "发布失败";
       uni.showToast({
         title: errorMsg,
         icon: "none",
@@ -1010,6 +1051,9 @@ const publishNotice = async () => {
     }
   } catch (error) {
     uni.hideLoading();
+    console.error("发布接龙失败:", error);
+
+    // 处理不同类型的错误
     if (error instanceof Error) {
       if (error.message === "请求超时") {
         uni.showToast({
@@ -1025,7 +1069,7 @@ const publishNotice = async () => {
       }
     } else if (error && typeof error === 'object' && 'errMsg' in error) {
       // uni-app 错误对象
-      if ((error as any).errMsg && (error as any).errMsg.includes('timeout')) {
+      if (error.errMsg && error.errMsg.includes('timeout')) {
         uni.showToast({
           title: "请求超时，请检查网络连接或稍后重试",
           icon: "none",
@@ -1033,7 +1077,7 @@ const publishNotice = async () => {
         });
       } else {
         uni.showToast({
-          title: (error as any).errMsg || "发布失败，请重试",
+          title: error.errMsg || "发布失败，请重试",
           icon: "error"
         });
       }
diff --git a/src/pages/view/routine/qd/confirm.vue b/src/pages/view/routine/qd/confirm.vue
new file mode 100644
index 0000000..9379db6
--- /dev/null
+++ b/src/pages/view/routine/qd/confirm.vue
@@ -0,0 +1,630 @@
+<template>
+  <view class="confirm-page">
+    <!-- 确认签到阶段 -->
+    <view v-if="currentStep === 'confirm'" class="confirm-step">
+      <view class="confirm-header">
+        <text class="confirm-title">确认签到</text>
+      </view>
+      
+      <view class="meeting-info">
+        <view class="info-item">
+          <text class="info-label">会议名称：</text>
+          <text class="info-value">{{ meetingInfo?.qdmc || '未设置' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="info-label">会议时间：</text>
+          <text class="info-value">{{ formatTime(meetingInfo?.qdkstime) }} - {{ formatTime(meetingInfo?.qdjstime) }}</text>
+        </view>
+        <view class="info-item">
+          <text class="info-label">会议地点：</text>
+          <text class="info-value">{{ meetingInfo?.qdwz || '未设置' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="info-label">签到人员：</text>
+          <text class="info-value">{{ userInfo?.jsxm || '未设置' }}</text>
+        </view>
+      </view>
+      
+      <view v-if="sign_file" class="signature-preview">
+        <text class="preview-label">签名预览：</text>
+        <image :src="sign_file" class="signature-preview-img" />
+      </view>
+      
+      <button @click="submitSignIn" class="submit-btn">确认签到</button>
+    </view>
+
+    <!-- 签到成功阶段 -->
+    <view v-else-if="currentStep === 'success'" class="success-step">
+      <view class="success-content">
+        <u-icon name="checkmark-circle" size="80" color="#67C23A" />
+        <text class="success-title">签到成功</text>
+        <text class="success-time">{{ formatTime(new Date()) }}</text>
+        <text class="success-tip">您已成功完成签到</text>
+      </view>
+    </view>
+
+    <!-- 不在签到名单阶段 -->
+    <view v-else-if="currentStep === 'notInList'" class="not-in-list-step">
+      <view class="not-in-list-content">
+        <u-icon name="close-circle" size="80" color="#F56C6C" />
+        <text class="not-in-list-title">您不在签到名单中</text>
+        <text class="not-in-list-subtitle">抱歉，您没有在此次会议的签到名单中</text>
+        <text class="not-in-list-tip">请联系会议组织者确认您的参会资格</text>
+        
+        <view class="meeting-info-card">
+          <text class="card-title">会议信息</text>
+          <view class="info-item">
+            <text class="info-label">会议名称：</text>
+            <text class="info-value">{{ meetingInfo?.qdmc || '未设置' }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">会议时间：</text>
+            <text class="info-value">{{ formatTime(meetingInfo?.qdkstime) }} - {{ formatTime(meetingInfo?.qdjstime) }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">会议地点：</text>
+            <text class="info-value">{{ meetingInfo?.qdwz || '未设置' }}</text>
+          </view>
+        </view>
+        
+        <button @click="goBack" class="back-btn">返回</button>
+      </view>
+    </view>
+
+    <!-- 签到时间已结束阶段 -->
+    <view v-else-if="currentStep === 'timeExpired'" class="time-expired-step">
+      <view class="time-expired-content">
+        <u-icon name="clock" size="80" color="#E6A23C" />
+        <text class="time-expired-title">签到时间已结束</text>
+        <text class="time-expired-subtitle">抱歉，本次签到的时间已经结束</text>
+        <text class="time-expired-tip">请关注下次签到通知</text>
+        
+        <view class="meeting-info-card">
+          <text class="card-title">会议信息</text>
+          <view class="info-item">
+            <text class="info-label">会议名称：</text>
+            <text class="info-value">{{ meetingInfo?.qdmc || '未设置' }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">会议时间：</text>
+            <text class="info-value">{{ formatTime(meetingInfo?.qdkstime) }} - {{ formatTime(meetingInfo?.qdjstime) }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">会议地点：</text>
+            <text class="info-value">{{ meetingInfo?.qdwz || '未设置' }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">当前时间：</text>
+            <text class="info-value">{{ formatTime(new Date()) }}</text>
+          </view>
+        </view>
+        
+        <button @click="goBack" class="back-btn">返回</button>
+      </view>
+    </view>
+
+    <!-- 二维码过期阶段 -->
+    <view v-else-if="currentStep === 'qrExpired'" class="qr-expired-step">
+      <view class="qr-expired-content">
+        <u-icon name="close-circle" size="80" color="#F56C6C" />
+        <text class="qr-expired-title">二维码已过期</text>
+        <text class="qr-expired-subtitle">抱歉，您扫描的二维码已经过期</text>
+        <text class="qr-expired-tip">请重新扫描最新的二维码</text>
+        
+        <view class="qr-info-card">
+          <text class="card-title">二维码信息</text>
+          <view class="info-item">
+            <text class="info-label">二维码有效期：</text>
+            <text class="info-value">60秒</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">当前时间：</text>
+            <text class="info-value">{{ formatTime(new Date()) }}</text>
+          </view>
+        </view>
+        
+        <button @click="goBack" class="back-btn">返回</button>
+      </view>
+    </view>
+  </view>
+  
+  <!-- 签名组件 -->
+  <BasicSign v-if="showSignature" ref="signCompRef" :title="signTitle"></BasicSign>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, onMounted, onUnmounted, nextTick } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { qdFindByIdApi, qdzxSignInApi, qdzxFindByQdParamsApi, qdzxFindByQdAndJsApi } from '@/api/base/server';
+import { useUserStore } from '@/store/modules/user';
+
+// 页面参数
+const qdId = ref('');
+const qdzxId = ref('');
+
+// 当前步骤
+const currentStep = ref<'sign' | 'confirm' | 'success' | 'notInList' | 'timeExpired' | 'qrExpired'>('confirm');
+
+// 用户信息
+const userInfo = ref<any>(null);
+
+// 会议信息
+const meetingInfo = ref<any>(null);
+
+// 签到执行记录
+const qdzxRecord = ref<any>(null);
+
+// 签名组件相关
+const signCompRef = ref<any>(null);
+const signTitle = ref<string>("签到签名");
+const sign_file = ref<string>("");
+const showSignature = ref<boolean>(false);
+
+// 获取用户store
+const userStore = useUserStore();
+
+onLoad(async (options) => {
+  if (options?.qdId) {
+    qdId.value = options.qdId;
+  }
+  if (options?.qdzxId) {
+    qdzxId.value = options.qdzxId;
+  }
+  
+  // 第一步：获取缓存的教师信息
+  const jsData = userStore.getJs;
+  if (jsData && Object.keys(jsData).length > 0) {
+    userInfo.value = jsData;
+    console.log('获取到教师信息:', jsData);
+  } else {
+    console.error('未找到教师信息，请先登录');
+    uni.showToast({ title: '请先登录', icon: 'none' });
+    // 跳转到登录页面
+    setTimeout(() => {
+      uni.navigateTo({
+        url: '/pages/system/login/login'
+      });
+    }, 1500);
+    return;
+  }
+  
+  // 验证二维码时间戳是否过期
+  if (options?.timestamp) {
+    const qrTimestamp = parseInt(options.timestamp);
+    const currentTimestamp = Date.now();
+    const timeDiff = currentTimestamp - qrTimestamp;
+    const maxValidTime = 60 * 1000; // 60秒有效期
+    
+    console.log('二维码时间戳验证:', {
+      qrTimestamp,
+      currentTimestamp,
+      timeDiff,
+      maxValidTime
+    });
+    
+    if (timeDiff > maxValidTime) {
+      console.error('二维码已过期');
+      currentStep.value = 'qrExpired';
+      return;
+    }
+  }
+  
+  // 第二步：通过qdId和教师ID查询该教师是否能签到
+  await checkTeacherSignInPermission();
+});
+
+// 检查教师签到权限
+const checkTeacherSignInPermission = async () => {
+  try {
+    const result = await qdzxFindByQdAndJsApi({ 
+      qdId: qdId.value, 
+      jsId: userInfo.value.id 
+    });
+    
+    if (result && result.resultCode === 1 && result.result) {
+      // 找到签到记录
+      qdzxRecord.value = result.result;
+      qdzxId.value = result.result.id;
+      console.log('找到教师签到记录:', result.result);
+      
+      // 第三步：获取签到详情，验证是否需要签名
+      await loadMeetingInfo();
+    } else {
+      // 没有找到签到记录，显示"不在签到名单中"界面
+      currentStep.value = 'notInList';
+      await loadMeetingInfo(); // 仍然加载会议信息用于显示
+    }
+  } catch (error) {
+    console.error('查询教师签到权限失败:', error);
+    uni.showToast({ title: '查询签到权限失败', icon: 'none' });
+  }
+};
+
+// 加载会议信息
+const loadMeetingInfo = async () => {
+  try {
+    const result = await qdFindByIdApi({ id: qdId.value });
+    if (result && result.resultCode === 1) {
+      meetingInfo.value = result.result;
+      
+      // 1. 验证签到时间是否已结束
+      const currentTime = new Date();
+      const endTime = meetingInfo.value?.qdjstime ? new Date(meetingInfo.value.qdjstime) : null;
+      
+      if (endTime && currentTime > endTime) {
+        // 签到时间已结束，显示"签到时间已结束"界面
+        currentStep.value = 'timeExpired';
+        return;
+      }
+      
+      // 只有在找到qdzxId时才检查是否需要签名
+      if (qdzxId.value) {
+        // 检查是否需要签名
+        if (meetingInfo.value?.mdqz === '1') {
+          // 需要签名，调用签名组件
+          await handleSignature();
+        } else {
+          // 不需要签名，直接到确认界面
+          currentStep.value = 'confirm';
+        }
+      }
+    }
+  } catch (error) {
+    console.error('加载会议信息失败:', error);
+    uni.showToast({ title: '加载会议信息失败', icon: 'none' });
+  }
+};
+
+// 处理签名
+const handleSignature = async () => {
+  try {
+    showSignature.value = true;
+    sign_file.value = '';
+    signTitle.value = "签到签名";
+    
+    // 等待组件渲染完成
+    await nextTick();
+    const data = await signCompRef.value.getSyncSignature();
+    sign_file.value = data.base64;
+    showSignature.value = false;
+    
+    // 签名完成后，跳转到确认界面
+    currentStep.value = 'confirm';
+  } catch (error) {
+    showSignature.value = false;
+    console.error('签名失败:', error);
+    uni.showToast({ title: '签名失败', icon: 'none' });
+  }
+};
+
+// 提交签到
+const submitSignIn = async () => {
+  try {
+    const params: any = {
+      qdzxId: qdzxId.value,
+      signInTime: new Date().toISOString() // 转换为ISO字符串格式
+    };
+    
+    // 如果有签名文件，添加到参数中
+    if (sign_file.value) {
+      params.signatureImage = sign_file.value;
+    }
+    
+    console.log('提交签到参数:', JSON.stringify(params, null, 2));
+    console.log('参数类型检查:', {
+      qdzxId: typeof params.qdzxId,
+      signInTime: typeof params.signInTime,
+      signatureImage: typeof params.signatureImage
+    });
+    
+    const result = await qdzxSignInApi(params);
+    console.log('签到结果:', result);
+    
+    if (result && result.resultCode === 1) {
+      currentStep.value = 'success';
+    } else {
+      const errorMsg = result?.msg || result?.message || '签到失败';
+      uni.showToast({ title: errorMsg, icon: 'none' });
+    }
+  } catch (error) {
+    console.error('签到失败:', error);
+    uni.showToast({ title: '网络异常，请重试', icon: 'none' });
+  }
+};
+
+// 格式化时间
+const formatTime = (time: string | Date) => {
+  if (!time) return '未设置';
+  const date = new Date(time);
+  return date.toLocaleString('zh-CN', {
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit'
+  });
+};
+
+// 返回上一页
+const goBack = () => {
+  uni.navigateBack();
+};
+</script>
+
+<style lang="scss" scoped>
+.confirm-page {
+  min-height: 100vh;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+// 确认签到阶段
+.confirm-step {
+  background: white;
+  border-radius: 16px;
+  padding: 24px;
+  margin-top: 40px;
+}
+
+.confirm-header {
+  text-align: center;
+  margin-bottom: 24px;
+  
+  .confirm-title {
+    font-size: 24px;
+    font-weight: 600;
+    color: #333;
+  }
+}
+
+.meeting-info {
+  margin-bottom: 24px;
+  
+  .info-item {
+    display: flex;
+    margin-bottom: 12px;
+    
+    .info-label {
+      font-size: 14px;
+      color: #666;
+      min-width: 80px;
+    }
+    
+    .info-value {
+      font-size: 14px;
+      color: #333;
+      flex: 1;
+    }
+  }
+}
+
+.signature-preview {
+  margin-bottom: 24px;
+  
+  .preview-label {
+    display: block;
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 8px;
+  }
+  
+  .signature-preview-img {
+    width: 100%;
+    height: 100px;
+    border: 1px solid #ddd;
+    border-radius: 8px;
+  }
+}
+
+.submit-btn {
+  width: 100%;
+  height: 44px;
+  background: linear-gradient(135deg, #67C23A 0%, #85ce61 100%);
+  color: white;
+  border: none;
+  border-radius: 8px;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+// 签到成功阶段
+.success-step {
+  background: white;
+  border-radius: 16px;
+  padding: 40px 24px;
+  margin-top: 40px;
+  text-align: center;
+}
+
+.success-content {
+  .success-title {
+    display: block;
+    font-size: 24px;
+    font-weight: 600;
+    color: #333;
+    margin: 16px 0 8px;
+  }
+  
+  .success-time {
+    display: block;
+    font-size: 16px;
+    color: #666;
+    margin-bottom: 16px;
+  }
+  
+  .success-tip {
+    font-size: 14px;
+    color: #999;
+  }
+}
+
+// 不在签到名单阶段
+.not-in-list-step {
+  background: white;
+  border-radius: 16px;
+  padding: 24px;
+  margin-top: 40px;
+  text-align: center;
+}
+
+.not-in-list-content {
+  .not-in-list-title {
+    display: block;
+    font-size: 24px;
+    font-weight: 600;
+    color: #333;
+    margin: 16px 0 8px;
+  }
+  
+  .not-in-list-subtitle {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 16px;
+  }
+  
+  .not-in-list-tip {
+    font-size: 14px;
+    color: #999;
+    margin-bottom: 24px;
+  }
+}
+
+.meeting-info-card {
+  background: #f9f9f9;
+  border-radius: 8px;
+  padding: 16px;
+  margin-bottom: 24px;
+  
+  .card-title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #333;
+    margin-bottom: 12px;
+    padding-bottom: 8px;
+    border-bottom: 1px solid #eee;
+  }
+  
+  .info-item {
+    display: flex;
+    margin-bottom: 8px;
+    
+    .info-label {
+      font-size: 14px;
+      color: #666;
+      min-width: 80px;
+    }
+    
+    .info-value {
+      font-size: 14px;
+      color: #333;
+      flex: 1;
+    }
+  }
+}
+
+.back-btn {
+  width: 100%;
+  height: 44px;
+  background: #f5f5f5;
+  color: #666;
+  border: none;
+  border-radius: 8px;
+  font-size: 16px;
+}
+
+/* 签到时间已结束阶段 */
+.time-expired-step {
+  background: white;
+  border-radius: 16px;
+  padding: 40px 24px;
+  margin-top: 40px;
+  text-align: center;
+}
+
+.time-expired-content {
+  .time-expired-title {
+    display: block;
+    font-size: 24px;
+    font-weight: 600;
+    color: #333;
+    margin: 16px 0 8px;
+  }
+  
+  .time-expired-subtitle {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 16px;
+  }
+  
+  .time-expired-tip {
+    font-size: 14px;
+    color: #999;
+    margin-bottom: 24px;
+  }
+}
+
+/* 二维码过期阶段 */
+.qr-expired-step {
+  background: white;
+  border-radius: 16px;
+  padding: 40px 24px;
+  margin-top: 40px;
+  text-align: center;
+}
+
+.qr-expired-content {
+  .qr-expired-title {
+    display: block;
+    font-size: 24px;
+    font-weight: 600;
+    color: #333;
+    margin: 16px 0 8px;
+  }
+  
+  .qr-expired-subtitle {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 16px;
+  }
+  
+  .qr-expired-tip {
+    font-size: 14px;
+    color: #999;
+    margin-bottom: 24px;
+  }
+}
+
+.qr-info-card {
+  background: #f9f9f9;
+  border-radius: 8px;
+  padding: 16px;
+  margin-bottom: 24px;
+  
+  .card-title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #333;
+    margin-bottom: 12px;
+    padding-bottom: 8px;
+    border-bottom: 1px solid #eee;
+  }
+  
+  .info-item {
+    display: flex;
+    margin-bottom: 8px;
+    
+    .info-label {
+      font-size: 14px;
+      color: #666;
+      min-width: 80px;
+    }
+    
+    .info-value {
+      font-size: 14px;
+      color: #333;
+      flex: 1;
+    }
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/view/routine/qd/detail.vue b/src/pages/view/routine/qd/detail.vue
new file mode 100644
index 0000000..89fbac1
--- /dev/null
+++ b/src/pages/view/routine/qd/detail.vue
@@ -0,0 +1,438 @@
+<template>
+  <BasicLayout>
+    <scroll-view scroll-y class="detail-scroll-view">
+      <view class="detail-container">
+        <!-- 签到基本信息 -->
+        <view class="info-card">
+          <view class="card-header">
+            <text class="qd-title">{{ qdInfo.qdmc }}</text>
+            <text class="qd-status" :class="getStatusClass(qdInfo.qdStatus)">
+              {{ getStatusText(qdInfo.qdStatus) }}
+            </text>
+          </view>
+          
+          <view class="info-list">
+            <view class="info-item">
+              <text class="info-label">签到地点：</text>
+              <text class="info-value">{{ qdInfo.qdwz || '未设置' }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">开始时间：</text>
+              <text class="info-value">{{ formatTime(qdInfo.qdkstime) }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">结束时间：</text>
+              <text class="info-value">{{ formatTime(qdInfo.qdjstime) }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">发布者：</text>
+              <text class="info-value">{{ qdInfo.jsxm || '未知' }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">发布时间：</text>
+              <text class="info-value">{{ formatTime(qdInfo.qdFbtime) }}</text>
+            </view>
+          </view>
+        </view>
+
+        <!-- 签到人员统计 -->
+        <view class="stats-card">
+          <view class="stats-header">
+            <text class="stats-title">签到统计</text>
+          </view>
+          <view class="stats-content">
+            <view class="stat-item">
+              <text class="stat-number">{{ totalCount }}</text>
+              <text class="stat-label">总人数</text>
+            </view>
+            <view class="stat-item">
+              <text class="stat-number signed">{{ signedCount }}</text>
+              <text class="stat-label">已签到</text>
+            </view>
+            <view class="stat-item">
+              <text class="stat-number unsigned">{{ unsignedCount }}</text>
+              <text class="stat-label">未签到</text>
+            </view>
+          </view>
+        </view>
+
+        <!-- 签到人员列表 -->
+        <view class="teacher-list-card">
+          <view class="list-header">
+            <text class="list-title">签到人员</text>
+          </view>
+          <view class="teacher-list">
+            <view 
+              v-for="teacher in teacherList" 
+              :key="teacher.id"
+              class="teacher-item"
+            >
+              <view class="teacher-info">
+                <text class="teacher-name">{{ teacher.jsxm }}</text>
+                <text class="teacher-position">{{ teacher.dzzw || '' }} {{ teacher.qtzw || '' }}</text>
+              </view>
+              <view class="teacher-status">
+                <text class="status-text" :class="getStatusClass(teacher.qdStatus)">
+                  {{ getStatusText(teacher.qdStatus) }}
+                </text>
+                <text v-if="teacher.qdwctime" class="sign-time">
+                  {{ formatTime(teacher.qdwctime) }}
+                </text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 底部操作 -->
+    <template #bottom>
+      <view class="bottom-actions">
+        <button class="action-btn back-btn" @click="handleBack">
+          返回列表
+        </button>
+      </view>
+    </template>
+  </BasicLayout>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, onMounted } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import { qdFindByIdApi, qdzxFindByQdParamsApi } from "@/api/base/server";
+
+interface QdInfo {
+  id: string;
+  qdmc: string;
+  qdwz: string;
+  qdStatus: string;
+  jsId: string;
+  jsxm: string;
+  qdFbtime: string;
+  qdkstime: string;
+  qdjstime: string;
+  qdry: string;
+}
+
+interface TeacherInfo {
+  id: string;
+  jsId: string;
+  jsxm: string;
+  dzzw: string;
+  qtzw: string;
+  qdStatus: string;
+  qdwctime: string;
+}
+
+const qdId = ref<string>('');
+const qdInfo = ref<QdInfo>({} as QdInfo);
+const teacherList = ref<TeacherInfo[]>([]);
+
+const totalCount = computed(() => teacherList.value.length);
+const signedCount = computed(() => teacherList.value.filter(t => t.qdStatus === '1').length);
+const unsignedCount = computed(() => totalCount.value - signedCount.value);
+
+onLoad((options) => {
+  if (options && options.id) {
+    qdId.value = options.id;
+    loadQdDetail();
+    loadTeacherList();
+  } else {
+    uni.showToast({ title: "缺少签到ID参数", icon: "error" });
+    setTimeout(() => {
+      uni.navigateBack();
+    }, 1500);
+  }
+});
+
+const loadQdDetail = async () => {
+  try {
+    const result = await qdFindByIdApi({ id: qdId.value });
+    if (result.resultCode === 1 && result.result) {
+      qdInfo.value = result.result;
+    }
+  } catch (error) {
+    console.error('加载签到详情失败:', error);
+  }
+};
+
+const loadTeacherList = async () => {
+  try {
+    const result = await qdzxFindByQdParamsApi({ qdId: qdId.value });
+    if (result.resultCode === 1 && result.result) {
+      teacherList.value = result.result;
+    }
+  } catch (error) {
+    console.error('加载教师列表失败:', error);
+  }
+};
+
+const getStatusClass = (status: string) => {
+  switch (status) {
+    case 'A':
+      return 'status-pending';
+    case 'B':
+      return 'status-draft';
+    case 'C':
+      return 'status-pushed';
+    case '1':
+      return 'status-signed';
+    case '0':
+    default:
+      return 'status-unsigned';
+  }
+};
+
+const getStatusText = (status: string) => {
+  switch (status) {
+    case 'A':
+      return '待推送';
+    case 'B':
+      return '暂存';
+    case 'C':
+      return '已推送';
+    case '1':
+      return '已签到';
+    case '0':
+    default:
+      return '未签到';
+  }
+};
+
+const formatTime = (time: string) => {
+  if (!time) return '未设置';
+  return new Date(time).toLocaleString('zh-CN', {
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit'
+  });
+};
+
+const handleBack = () => {
+  uni.navigateBack();
+};
+</script>
+
+<style lang="scss" scoped>
+.detail-scroll-view {
+  height: calc(100vh - 120px);
+}
+
+.detail-container {
+  padding: 15px;
+}
+
+.info-card {
+  background: white;
+  border-radius: 12px;
+  padding: 20px;
+  margin-bottom: 15px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+}
+
+.qd-title {
+  font-size: 20px;
+  font-weight: 600;
+  color: #333;
+  flex: 1;
+}
+
+.qd-status {
+  padding: 6px 12px;
+  border-radius: 16px;
+  font-size: 12px;
+  font-weight: 500;
+}
+
+.status-pending {
+  background: #fff3cd;
+  color: #856404;
+}
+
+.status-draft {
+  background: #d1ecf1;
+  color: #0c5460;
+}
+
+.status-pushed {
+  background: #d4edda;
+  color: #155724;
+}
+
+.status-signed {
+  background: #d4edda;
+  color: #155724;
+}
+
+.status-unsigned {
+  background: #f8d7da;
+  color: #721c24;
+}
+
+.info-list {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.info-item {
+  display: flex;
+  align-items: center;
+}
+
+.info-label {
+  font-size: 14px;
+  color: #666;
+  min-width: 80px;
+  font-weight: 500;
+}
+
+.info-value {
+  font-size: 14px;
+  color: #333;
+  flex: 1;
+}
+
+.stats-card {
+  background: white;
+  border-radius: 12px;
+  padding: 20px;
+  margin-bottom: 15px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.stats-header {
+  margin-bottom: 20px;
+}
+
+.stats-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #333;
+}
+
+.stats-content {
+  display: flex;
+  justify-content: space-around;
+}
+
+.stat-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 8px;
+}
+
+.stat-number {
+  font-size: 24px;
+  font-weight: 700;
+  color: #333;
+  
+  &.signed {
+    color: #28a745;
+  }
+  
+  &.unsigned {
+    color: #dc3545;
+  }
+}
+
+.stat-label {
+  font-size: 14px;
+  color: #666;
+}
+
+.teacher-list-card {
+  background: white;
+  border-radius: 12px;
+  padding: 20px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.list-header {
+  margin-bottom: 15px;
+}
+
+.list-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #333;
+}
+
+.teacher-list {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.teacher-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px;
+  background: #f8f9fa;
+  border-radius: 8px;
+}
+
+.teacher-info {
+  flex: 1;
+}
+
+.teacher-name {
+  display: block;
+  font-size: 16px;
+  font-weight: 500;
+  color: #333;
+  margin-bottom: 4px;
+}
+
+.teacher-position {
+  font-size: 14px;
+  color: #666;
+}
+
+.teacher-status {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  gap: 4px;
+}
+
+.status-text {
+  font-size: 14px;
+  font-weight: 500;
+  padding: 2px 8px;
+  border-radius: 8px;
+}
+
+.sign-time {
+  font-size: 12px;
+  color: #999;
+}
+
+.bottom-actions {
+  padding: 15px;
+  background: white;
+  border-top: 1px solid #f0f0f0;
+}
+
+.back-btn {
+  width: 100%;
+  padding: 12px;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  color: white;
+  border: none;
+  border-radius: 8px;
+  font-size: 16px;
+  font-weight: 500;
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/view/routine/qd/index.vue b/src/pages/view/routine/qd/index.vue
new file mode 100644
index 0000000..0e9c19a
--- /dev/null
+++ b/src/pages/view/routine/qd/index.vue
@@ -0,0 +1,558 @@
+<!-- src/pages/view/routine/qd/index.vue -->
+<template>
+  <view class="qd-list-page">
+    <!-- 查询组件 -->
+    <view class="query-component">
+      <view class="search-card">
+        <view class="search-item">
+          <picker
+            mode="date"
+            :value="searchForm.startTime"
+            @change="onStartTimeChange"
+            class="date-picker"
+          >
+            <view class="picker-text">{{ searchForm.startTime || '开始时间' }}</view>
+          </picker>
+          <text class="date-separator">~</text>
+          <picker
+            mode="date"
+            :value="searchForm.endTime"
+            @change="onEndTimeChange"
+            class="date-picker"
+          >
+            <view class="picker-text">{{ searchForm.endTime || '结束时间' }}</view>
+          </picker>
+        </view>
+        <view class="search-actions">
+          <u-button
+            text="查询"
+            type="primary"
+            size="small"
+            @click="handleSearch"
+            class="search-btn"
+          />
+          <u-button
+            text="重置"
+            type="info"
+            size="small"
+            @click="handleReset"
+            class="reset-btn"
+          />
+        </view>
+      </view>
+    </view>
+
+    <!-- 列表组件 -->
+    <view class="list-component">
+      <scroll-view scroll-y class="list-scroll-view">
+        <view v-if="isLoading" class="loading-indicator">加载中...</view>
+        <template v-else-if="dataList.length > 0">
+          <view v-for="data in dataList" :key="data.id" class="qd-card">
+            <view class="card-header">
+              <text class="qd-title">{{ data.qdmc }}</text>
+              <text class="qd-status" :class="getStatusClass(data.qdStatus)">
+                {{ getStatusText(data.qdStatus) }}
+              </text>
+            </view>
+            <view class="card-body">
+              <view class="qd-info">
+                <view class="info-item">
+                  <text class="info-label">签到地点：</text>
+                  <text class="info-value">{{ data.qdwz || '未设置' }}</text>
+                </view>
+                <view class="info-item">
+                  <text class="info-label">开始时间：</text>
+                  <text class="info-value">{{ formatTime(data.qdkstime) }}</text>
+                </view>
+                <view class="info-item">
+                  <text class="info-label">结束时间：</text>
+                  <text class="info-value">{{ formatTime(data.qdjstime) }}</text>
+                </view>
+                <view class="info-item">
+                  <text class="info-label">发布者：</text>
+                  <text class="info-value">{{ data.jsxm || '未知' }}</text>
+                </view>
+                <view class="info-item">
+                  <text class="info-label">发布时间：</text>
+                  <text class="info-value">{{ formatTime(data.qdFbtime) }}</text>
+                </view>
+              </view>
+            </view>
+            <view class="card-footer">
+              <view class="footer-actions">
+                <image
+                  src="/static/base/qr-code.png"
+                  class="footer-action-icon qr-icon"
+                  @click="goToQRCode(data.id)"
+                />
+                <image
+                  src="/static/base/details.png"
+                  class="footer-action-icon details-icon"
+                  @click="goToFeedback(data.id)"
+                />
+                <image
+                  v-if="data.qdStatus === 'A'"
+                  src="/static/base/push.png"
+                  class="footer-action-icon push-icon"
+                  @click="goToPush(data.id)"
+                />
+              </view>
+            </view>
+          </view>
+        </template>
+        <view v-else class="empty-state">暂无签到数据</view>
+      </scroll-view>
+    </view>
+
+    <!-- 新增按钮 - 固定在底部 -->
+    <view class="add-button-fixed">
+      <u-button
+        text="新增签到"
+        type="primary"
+        @click="goToPublish"
+        class="add-btn"
+      />
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { qdFindPageApi } from "@/api/base/server";
+import { ref, reactive, onMounted } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+
+interface QdItem {
+  id: string;
+  qdmc: string; // 签到名称
+  qdwz: string; // 签到地点
+  qdStatus: string; // 发布状态：A待推送，B暂存，C已推送
+  jsId: string; // 发布人ID
+  jsxm: string; // 发布人姓名
+  qdFbtime: string; // 发布时间
+  qdkstime: string; // 签到开始时间
+  qdjstime: string; // 签到结束时间
+  qdry: string; // 签到人员
+}
+
+// 搜索表单
+const searchForm = reactive({
+  startTime: '',
+  endTime: ''
+});
+
+// 数据列表
+const dataList = ref<QdItem[]>([]);
+const isLoading = ref(false);
+
+// 开始时间选择
+const onStartTimeChange = (e: any) => {
+  searchForm.startTime = e.detail.value;
+};
+
+// 结束时间选择
+const onEndTimeChange = (e: any) => {
+  searchForm.endTime = e.detail.value;
+};
+
+// 处理搜索
+const handleSearch = () => {
+  getQdList();
+};
+
+// 重置搜索
+const handleReset = () => {
+  searchForm.startTime = '';
+  searchForm.endTime = '';
+  getQdList();
+};
+
+// 获取签到列表
+const getQdList = async () => {
+  isLoading.value = true;
+  try {
+    const res = await qdFindPageApi({
+      qdkstime: searchForm.startTime,
+      qdjstime: searchForm.endTime,
+      page: 1,
+      rows: 100
+    });
+    dataList.value = res.rows || [];
+  } catch (error) {
+    console.error('获取签到列表失败:', error);
+    dataList.value = [];
+  } finally {
+    isLoading.value = false;
+  }
+};
+
+// 获取状态样式类
+const getStatusClass = (status: string) => {
+  switch (status) {
+    case 'A':
+      return 'status-pending';
+    case 'B':
+      return 'status-draft';
+    case 'C':
+      return 'status-pushed';
+    default:
+      return 'status-default';
+  }
+};
+
+// 获取状态文本
+const getStatusText = (status: string) => {
+  switch (status) {
+    case 'A':
+      return '待推送';
+    case 'B':
+      return '暂存';
+    case 'C':
+      return '已推送';
+    default:
+      return '未知';
+  }
+};
+
+// 格式化时间
+const formatTime = (time: string) => {
+  if (!time) return '未设置';
+  return new Date(time).toLocaleString('zh-CN', {
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit'
+  });
+};
+
+// 跳转到签到详情
+const goToFeedback = (id: string) => {
+  uni.navigateTo({
+    url: `/pages/view/routine/qd/detail?id=${id}`
+  });
+};
+
+// 跳转到推送页面
+const goToPush = (id: string) => {
+  uni.navigateTo({
+    url: `/pages/view/routine/qd/push-list?qdId=${id}`
+  });
+};
+
+// 跳转到新增页面
+const goToPublish = () => {
+  uni.navigateTo({
+    url: '/pages/view/routine/qd/publish'
+  });
+};
+
+// 跳转到二维码页面
+const goToQRCode = (id: string) => {
+  uni.navigateTo({
+    url: `/pages/view/routine/qd/qr-code?qdId=${id}`
+  });
+};
+
+// 页面显示时刷新数据
+onShow(() => {
+  getQdList();
+});
+
+// 页面加载时也调用一次
+onMounted(() => {
+  getQdList();
+});
+</script>
+
+<style lang="scss" scoped>
+.qd-list-page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background-color: #f5f7fa;
+}
+
+// 查询组件
+.query-component {
+  padding: 12px;
+  background-color: #fff;
+  border-bottom: 1px solid #eee;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.04);
+  flex-shrink: 0;
+}
+
+.search-card {
+  background-color: #ffffff;
+  border-radius: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+  border: 1px solid #f0f0f0;
+}
+
+.search-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+  gap: 8px;
+
+  .date-picker {
+    flex: 1;
+    min-width: 120px;
+  }
+
+  .picker-text {
+    background-color: #f8f9fa;
+    border: 1px solid #e9ecef;
+    border-radius: 8px;
+    padding: 8px 12px;
+    font-size: 14px;
+    color: #495057;
+    text-align: center;
+  }
+
+  .date-separator {
+    font-size: 16px;
+    color: #6c757d;
+    margin: 0 8px;
+    font-weight: bold;
+  }
+}
+
+.search-actions {
+  display: flex;
+  gap: 12px;
+  justify-content: center;
+
+  .search-btn, .reset-btn {
+    flex: 1;
+    max-width: 120px;
+  }
+}
+
+// 列表组件
+.list-component {
+  flex: 1;
+  overflow-y: auto;
+  padding: 12px;
+  padding-bottom: 80px; // 为底部按钮留出空间
+  box-sizing: border-box;
+  background-color: #f5f7fa;
+}
+
+.list-scroll-view {
+  height: 100%;
+}
+
+.loading-indicator,
+.empty-state {
+  text-align: center;
+  color: #999;
+  padding: 30px 15px;
+  font-size: 14px;
+}
+
+.qd-card {
+  background-color: #ffffff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 12px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+  border: 1px solid #f0f0f0;
+  transition: all 0.3s ease;
+  position: relative;
+  overflow: hidden;
+
+  &:active {
+    transform: translateY(1px);
+    box-shadow: 0 1px 6px rgba(0, 0, 0, 0.12);
+  }
+
+  &::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    width: 4px;
+    background: linear-gradient(135deg, #007aff 0%, #0056cc 100%);
+    border-radius: 2px;
+  }
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 12px;
+  gap: 12px;
+
+  .qd-title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #2c3e50;
+    flex: 1;
+    line-height: 1.4;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    word-break: break-word;
+  }
+
+  .qd-status {
+    padding: 4px 8px;
+    border-radius: 12px;
+    font-size: 12px;
+    font-weight: 500;
+    white-space: nowrap;
+    flex-shrink: 0;
+  }
+}
+
+.status-pending {
+  background: #fff3cd;
+  color: #856404;
+}
+
+.status-draft {
+  background: #d1ecf1;
+  color: #0c5460;
+}
+
+.status-pushed {
+  background: #d4edda;
+  color: #155724;
+}
+
+.status-default {
+  background: #f8f9fa;
+  color: #6c757d;
+}
+
+.card-body {
+  margin-bottom: 12px;
+
+  .qd-info {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+  }
+
+  .info-item {
+    display: flex;
+    align-items: center;
+
+    .info-label {
+      font-size: 14px;
+      color: #666;
+      min-width: 80px;
+    }
+
+    .info-value {
+      font-size: 14px;
+      color: #333;
+      flex: 1;
+    }
+  }
+}
+
+.card-footer {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  padding-top: 12px;
+  border-top: 1px solid #f0f0f0;
+
+  .footer-actions {
+    display: flex;
+    gap: 10px;
+
+    .footer-action-icon {
+      padding: 5px;
+    }
+    
+    .qr-icon {
+      width: 22px;
+      height: 22px;
+      cursor: pointer;
+    }
+    
+    .details-icon {
+      width: 22px;
+      height: 22px;
+      cursor: pointer;
+    }
+    
+    .push-icon {
+      width: 22px;
+      height: 22px;
+      cursor: pointer;
+    }
+  }
+}
+
+// 新增按钮 - 固定在底部
+.add-button-fixed {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding: 15px;
+  background-color: #fff;
+  box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.1);
+  z-index: 10;
+  border-top: 1px solid #eee;
+  
+  .add-btn {
+    width: 100%;
+    background: linear-gradient(135deg, #007aff 0%, #0056cc 100%);
+    border-radius: 12px;
+    padding: 12px 24px;
+    box-shadow: 0 4px 16px rgba(0, 122, 255, 0.3);
+    font-weight: 600;
+    font-size: 16px;
+    
+    &:active {
+      transform: translateY(1px);
+    }
+  }
+}
+
+// 响应式优化
+@media (max-width: 375px) {
+  .query-component {
+    padding: 8px;
+  }
+
+  .qd-card {
+    padding: 12px;
+    margin-bottom: 8px;
+  }
+
+  .card-header .qd-title {
+    font-size: 15px;
+  }
+
+  .card-footer .footer-item {
+    max-width: 150px;
+    font-size: 12px;
+  }
+}
+
+// 加载动画
+.qd-card {
+  animation: fadeInUp 0.3s ease-out;
+}
+
+@keyframes fadeInUp {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/view/routine/qd/publish.vue b/src/pages/view/routine/qd/publish.vue
new file mode 100644
index 0000000..cbd69b8
--- /dev/null
+++ b/src/pages/view/routine/qd/publish.vue
@@ -0,0 +1,515 @@
+<template>
+  <BasicLayout>
+    <scroll-view scroll-y class="form-scroll-view">
+      <view class="form-container">
+        <!-- 签到名称 -->
+        <view class="info-card">
+          <view class="form-item">
+            <uni-easyinput
+              type="textarea"
+              autoHeight
+              v-model="formData.qdmc"
+              placeholder="请输入签到名称 (必填)"
+              :inputBorder="false"
+              placeholder-style="font-weight:bold; font-size: 18px; color: #999;"
+              class="title-input"
+            ></uni-easyinput>
+          </view>
+        </view>
+
+        <!-- 签到地点 -->
+        <view class="info-card">
+          <view class="form-item">
+            <uni-easyinput
+              type="textarea"
+              autoHeight
+              v-model="formData.qdwz"
+              placeholder="请输入签到地点 (必填)"
+              :inputBorder="false"
+              class="content-input"
+            ></uni-easyinput>
+          </view>
+        </view>
+
+        <!-- 签到人员 -->
+        <view class="info-card">
+          <view class="card-header picker-header" @click="showTeacherTree">
+            <text class="section-title">签到人员</text>
+            <view class="target-class">
+              <text :class="{ placeholder: !formData.targetTeachers.length }">
+                {{ formData.targetTeachers.length ? `已选择${formData.targetTeachers.length}人` : "请选择教师" }}
+              </text>
+              <uni-icons type="right" size="16" color="#999"></uni-icons>
+            </view>
+          </view>
+          <view class="name-tags">
+            <text
+              v-for="(teacher, index) in displayTeachers"
+              :key="teacher.id + index"
+              class="name-tag"
+            >{{ teacher.jsxm }}</text>
+          </view>
+          <view
+            v-if="formData.targetTeachers.length > maxDisplayCount"
+            class="more-btn-container"
+          >
+            <button size="mini" class="more-btn-full" @click="showAllTeachers">
+              更多({{ formData.targetTeachers.length - maxDisplayCount }})
+            </button>
+          </view>
+        </view>
+
+        <!-- 是否启用签名 -->
+        <view class="info-card list-item-card">
+          <picker
+            mode="selector"
+            :range="signatureOptions"
+            @change="handleSignatureChange"
+          >
+            <view class="list-item-row">
+              <text class="list-label">按名单签字</text>
+              <view class="list-value">
+                <text>{{ signatureStatusText }}</text>
+                <uni-icons type="right" size="16" color="#999"></uni-icons>
+              </view>
+            </view>
+          </picker>
+        </view>
+
+        <!-- 签到开始时间 -->
+        <view class="info-card list-item-card">
+          <uni-datetime-picker type="datetime" v-model="formData.qdkstime">
+            <view class="list-item-row">
+              <text class="list-label">开始时间</text>
+              <view class="list-value">
+                <text :class="{ placeholder: !formData.qdkstime }">
+                  {{ formData.qdkstime || '请选择开始时间' }}
+                </text>
+                <uni-icons type="right" size="16" color="#999"></uni-icons>
+              </view>
+            </view>
+          </uni-datetime-picker>
+        </view>
+
+        <!-- 签到结束时间 -->
+        <view class="info-card list-item-card">
+          <uni-datetime-picker type="datetime" v-model="formData.qdjstime">
+            <view class="list-item-row">
+              <text class="list-label">结束时间</text>
+              <view class="list-value">
+                <text :class="{ placeholder: !formData.qdjstime }">
+                  {{ formData.qdjstime || '请选择结束时间' }}
+                </text>
+                <uni-icons type="right" size="16" color="#999"></uni-icons>
+              </view>
+            </view>
+          </uni-datetime-picker>
+        </view>
+
+        <!-- 发布人 -->
+        <view class="info-card list-item-card">
+          <view class="list-item-row">
+            <text class="list-label">发布人</text>
+            <view class="list-value">
+              <text>{{ formData.jsxm }}</text>
+            </view>
+          </view>
+        </view>
+
+        <!-- 发布时间 -->
+        <view class="info-card list-item-card">
+          <view class="list-item-row">
+            <text class="list-label">发布时间</text>
+            <view class="list-value">
+              <text>{{ formData.qdFbtime }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <template #bottom>
+      <view class="bottom-actions">
+        <button class="action-btn cancel-btn" @click="handleCancel">
+          取消
+        </button>
+        <button class="action-btn confirm-btn" @click="handlePublish" :disabled="isPublishing">
+          {{ isPublishing ? '发布中...' : '立即发布' }}
+        </button>
+      </view>
+    </template>
+  </BasicLayout>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, onMounted, onUnmounted } from "vue";
+import { onLoad, onShow } from "@dcloudio/uni-app";
+import { qdSaveApi } from "@/api/base/server";
+import { useUserStore } from "@/store/modules/user";
+
+const { getJs } = useUserStore();
+
+interface TeacherInfo {
+  id: string;
+  jsxm: string;
+  jsId: string;
+}
+
+const formData = reactive({
+  qdmc: '',
+  qdwz: '',
+  qdry: '',
+  mdqz: '0',
+  qdkstime: '',
+  qdjstime: '',
+  jsxm: '',
+  qdFbtime: '',
+  targetTeachers: [] as TeacherInfo[]
+});
+
+const isPublishing = ref(false);
+const maxDisplayCount = 5;
+
+const signatureOptions = ['不启用', '启用'];
+const signatureStatusText = computed(() => {
+  return signatureOptions[parseInt(formData.mdqz)];
+});
+
+const displayTeachers = computed(() => {
+  return formData.targetTeachers.slice(0, maxDisplayCount);
+});
+
+// 监听教师选择事件
+const handleTeacherSelected = (teachers: TeacherInfo[]) => {
+  console.log('接收到教师选择事件:', teachers);
+  formData.targetTeachers = teachers;
+};
+
+// 初始化表单数据
+onMounted(() => {
+  const js = getJs;
+  formData.jsxm = js.jsxm;
+  formData.qdFbtime = formatDateTime(new Date().toISOString());
+  
+  // 监听教师选择事件
+  uni.$on('teacherSelected', handleTeacherSelected);
+});
+
+// 清理事件监听
+onUnmounted(() => {
+  uni.$off('teacherSelected', handleTeacherSelected);
+});
+
+// 页面显示时也尝试读取本地存储（但只在没有接收到事件数据时）
+onShow(() => {
+  // 页面显示时的处理逻辑（如果需要的话）
+});
+
+const handleSignatureChange = (e: any) => {
+  formData.mdqz = e.detail.value.toString();
+};
+
+const showTeacherTree = () => {
+  uni.navigateTo({
+    url: '/pages/view/routine/qd/selectTeachers'
+  });
+};
+
+const showAllTeachers = () => {
+  uni.showModal({
+    title: '签到人员',
+    content: formData.targetTeachers.map(t => t.jsxm).join('、'),
+    showCancel: false
+  });
+};
+
+const handleCancel = () => {
+  uni.navigateBack();
+};
+
+// 格式化时间为后台期望的格式
+const formatDateTime = (dateTime: string) => {
+  if (!dateTime) return '';
+  const date = new Date(dateTime);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  const seconds = String(date.getSeconds()).padStart(2, '0');
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+};
+
+const handlePublish = async () => {
+  const requestStartTime = new Date().toISOString();
+  console.log('=== handlePublish 开始 ===', requestStartTime);
+  console.log('当前表单数据:', formData);
+  console.log('选中的教师数量:', formData.targetTeachers.length);
+  console.log('选中的教师列表:', formData.targetTeachers);
+  
+  // 防重复提交检查 - 移到最前面
+  if (isPublishing.value) {
+    console.log('正在发布中，忽略重复点击', requestStartTime);
+    return;
+  }
+  
+  if (!formData.qdmc.trim()) {
+    uni.showToast({ title: '请输入签到名称', icon: 'none' });
+    return;
+  }
+  
+  if (!formData.qdwz.trim()) {
+    uni.showToast({ title: '请输入签到地点', icon: 'none' });
+    return;
+  }
+  
+  if (!formData.qdkstime) {
+    uni.showToast({ title: '请选择开始时间', icon: 'none' });
+    return;
+  }
+  
+  if (!formData.qdjstime) {
+    uni.showToast({ title: '请选择结束时间', icon: 'none' });
+    return;
+  }
+  
+  if (formData.targetTeachers.length === 0) {
+    uni.showToast({ title: '请选择签到人员', icon: 'none' });
+    return;
+  }
+
+  // 设置发布状态
+  isPublishing.value = true;
+  console.log('设置发布状态为true', requestStartTime);
+  
+  try {
+    const js = getJs;
+    
+    // 检查教师ID是否有重复
+    const teacherIds = formData.targetTeachers.map(t => t.jsId);
+    const uniqueIds = [...new Set(teacherIds)];
+    console.log('教师ID列表:', teacherIds);
+    console.log('去重后的教师ID列表:', uniqueIds);
+    console.log('是否有重复ID:', teacherIds.length !== uniqueIds.length);
+    
+    if (teacherIds.length !== uniqueIds.length) {
+      console.warn('发现重复的教师ID，将进行去重处理');
+    }
+    
+    const params = {
+      qdmc: formData.qdmc,
+      qdwz: formData.qdwz,
+      qdry: uniqueIds.join(','), // 使用去重后的ID列表
+      mdqz: formData.mdqz,
+      qdkstime: formatDateTime(formData.qdkstime),
+      qdjstime: formatDateTime(formData.qdjstime),
+      jsId: js.id,
+      jsxm: formData.jsxm,
+      qdFbtime: formData.qdFbtime,
+      qdStatus: 'A',
+      status: 'A'
+    };
+
+    console.log('准备发送的参数:', params);
+    console.log('qdry字段长度:', params.qdry.length);
+    console.log('qdry字段内容:', params.qdry);
+    console.log('开始调用API', requestStartTime);
+
+    const result = await qdSaveApi(params);
+    
+    console.log('API返回结果:', result);
+    console.log('API调用完成', new Date().toISOString());
+    
+    if (result.resultCode === 1) {
+      uni.showToast({ title: '发布成功', icon: 'success' });
+      // 跳转到推送清单页面
+      setTimeout(() => {
+        uni.redirectTo({
+          url: `/pages/view/routine/qd/push-list?qdId=${result.result}`
+        });
+      }, 1500);
+    } else {
+      uni.showToast({ title: '发布失败', icon: 'none' });
+    }
+  } catch (error) {
+    console.error('发布失败:', error);
+    console.error('发布失败时间:', new Date().toISOString());
+    uni.showToast({ title: '发布失败，请重试', icon: 'none' });
+  } finally {
+    isPublishing.value = false;
+    console.log('=== handlePublish 结束 ===', new Date().toISOString());
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.form-scroll-view {
+  height: calc(100vh - 120px);
+}
+
+.form-container {
+  padding: 15px;
+}
+
+.info-card {
+  background: white;
+  border-radius: 12px;
+  margin-bottom: 15px;
+  padding: 15px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.form-item {
+  margin-bottom: 15px;
+}
+
+.title-input {
+  font-size: 18px;
+  font-weight: bold;
+  color: #333;
+  
+  :deep(.uni-easyinput__content) {
+    background: transparent;
+  }
+  
+  :deep(.uni-easyinput__content-input) {
+    color: #333;
+  }
+  
+  :deep(.uni-easyinput__placeholder-class) {
+    color: #999;
+  }
+}
+
+.content-input {
+  font-size: 16px;
+  color: #333;
+  
+  :deep(.uni-easyinput__content) {
+    background: transparent;
+  }
+  
+  :deep(.uni-easyinput__content-input) {
+    color: #333;
+  }
+  
+  :deep(.uni-easyinput__placeholder-class) {
+    color: #999;
+  }
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 15px;
+}
+
+.section-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+
+.target-class {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  color: #666;
+  font-size: 14px;
+}
+
+.placeholder {
+  color: #999;
+}
+
+.name-tags {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-bottom: 10px;
+}
+
+.name-tag {
+  background: #e3f2fd;
+  color: #1976d2;
+  padding: 4px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+
+.more-btn-container {
+  text-align: center;
+}
+
+.more-btn-full {
+  background: #f5f5f5;
+  color: #666;
+  border: none;
+  border-radius: 16px;
+  font-size: 12px;
+  padding: 4px 12px;
+}
+
+.list-item-card {
+  padding: 0;
+}
+
+.list-item-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.list-item-row:last-child {
+  border-bottom: none;
+}
+
+.list-label {
+  font-size: 16px;
+  color: #333;
+  font-weight: 500;
+}
+
+.list-value {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  color: #666;
+  font-size: 14px;
+}
+
+.bottom-actions {
+  display: flex;
+  gap: 15px;
+  padding: 15px;
+  background: white;
+  border-top: 1px solid #f0f0f0;
+}
+
+.action-btn {
+  flex: 1;
+  padding: 10px;
+  border-radius: 8px;
+  font-size: 14px;
+  font-weight: 500;
+  border: none;
+}
+
+.cancel-btn {
+  background: #f5f5f5;
+  color: #666;
+}
+
+.confirm-btn {
+  background: linear-gradient(135deg, #007aff 0%, #0056cc 100%);
+  color: white;
+  box-shadow: 0 2px 8px rgba(0, 122, 255, 0.3);
+}
+
+.confirm-btn:disabled {
+  opacity: 0.6;
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/view/routine/qd/push-list.vue b/src/pages/view/routine/qd/push-list.vue
new file mode 100644
index 0000000..3211a8f
--- /dev/null
+++ b/src/pages/view/routine/qd/push-list.vue
@@ -0,0 +1,304 @@
+<template>
+  <BasicLayout>
+    <scroll-view scroll-y class="push-list-scroll-view">
+      <view class="push-list-container">
+        <!-- 页面标题 -->
+        <view class="page-header">
+          <text class="page-title">推送清单</text>
+          <text class="teacher-count">共 {{ teacherList.length }} 名教师</text>
+        </view>
+
+        <!-- 教师信息卡片列表 -->
+        <view class="teacher-cards">
+          <view 
+            v-for="(teacher, index) in teacherList" 
+            :key="teacher.id || teacher.jsId || index"
+            class="teacher-card"
+          >
+            <view class="teacher-main-info">
+              <text class="teacher-name">{{ teacher.jsxm || '未知姓名' }}</text>
+              <text class="teacher-position">{{ teacher.dzzw || '' }} {{ teacher.qtzw || '' }}</text>
+            </view>
+            <view class="teacher-status">
+              <text class="status-label">状态：</text>
+              <text class="status-value" :class="getStatusClass(teacher.qdStatus)">
+                {{ getStatusText(teacher.qdStatus) }}
+              </text>
+            </view>
+          </view>
+        </view>
+
+        <!-- 空状态 -->
+        <view v-if="teacherList.length === 0" class="empty-state">
+          <uni-icons type="info" size="60" color="#ccc"></uni-icons>
+          <text class="empty-text">暂无教师信息</text>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- Bottom slot -->
+    <template #bottom>
+      <view class="bottom-actions">
+        <button class="action-btn cancel-btn" @click="handleCancel">
+          取消
+        </button>
+        <button class="action-btn confirm-btn" @click="handleConfirmPush" :disabled="isPushing">
+          {{ isPushing ? '推送中...' : '确认推送' }}
+        </button>
+      </view>
+    </template>
+  </BasicLayout>
+</template>
+
+<script lang="ts" setup>
+import { ref } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import { qdzxFindByQdParamsApi, xxtsSaveByQdzxParamsApi } from "@/api/base/server";
+
+interface TeacherInfo {
+  id: string;
+  jsId: string;
+  jsxm: string;
+  dzzw: string;
+  qtzw: string;
+  qdStatus: string;
+  qdId: string;
+  qdmc: string;
+}
+
+const qdId = ref<string>('');
+const teacherList = ref<TeacherInfo[]>([]);
+const isPushing = ref(false);
+
+onLoad((options) => {
+  if (options && options.qdId && options.qdId !== 'null' && options.qdId !== 'undefined') {
+    qdId.value = options.qdId;
+    loadTeacherList();
+  } else {
+    uni.showToast({ title: "缺少签到ID参数", icon: "error" });
+    setTimeout(() => {
+      uni.navigateBack();
+    }, 1500);
+  }
+});
+
+const loadTeacherList = async () => {
+  try {
+    uni.showLoading({ title: "加载教师信息中..." });
+    
+    console.log('开始调用API，qdId:', qdId.value);
+    const result = await qdzxFindByQdParamsApi({ qdId: qdId.value });
+    
+    uni.hideLoading();
+    
+    console.log('API返回结果:', result);
+    console.log('result.rows:', result?.rows);
+    console.log('result.rows类型:', typeof result?.rows);
+    console.log('result.rows是否为数组:', Array.isArray(result?.rows));
+    console.log('result.rows长度:', result?.rows?.length);
+    
+    // 直接处理Page对象，不依赖resultCode
+    if (result && result.rows && Array.isArray(result.rows)) {
+      teacherList.value = result.rows;
+      console.log('成功从rows字段获取到教师数据:', result.rows.length, '条');
+      console.log('教师数据详情:', result.rows);
+    } else {
+      console.warn('未找到有效的教师数据，API返回结构:', result);
+      console.warn('result的所有字段:', Object.keys(result || {}));
+      teacherList.value = [];
+      uni.showToast({ title: "未找到教师数据", icon: "none" });
+    }
+    
+    console.log('最终teacherList.value:', teacherList.value);
+    console.log('teacherList.value长度:', teacherList.value.length);
+    
+  } catch (error) {
+    uni.hideLoading();
+    console.error('加载教师列表失败:', error);
+    uni.showToast({ title: "加载教师列表失败", icon: "none" });
+  }
+};
+
+const getStatusClass = (status: string) => {
+  switch (status) {
+    case '1':
+      return 'status-signed';
+    case '0':
+    default:
+      return 'status-unsigned';
+  }
+};
+
+const getStatusText = (status: string) => {
+  switch (status) {
+    case '1':
+      return '已推送';
+    case '0':
+    default:
+      return '未推送';
+  }
+};
+
+const handleCancel = () => {
+  uni.navigateBack();
+};
+
+const handleConfirmPush = async () => {
+  isPushing.value = true;
+  
+  try {
+    const result = await xxtsSaveByQdzxParamsApi({ qdId: qdId.value });
+    
+    if (result.resultCode === 1) {
+      uni.showToast({ title: '推送成功', icon: 'success' });
+      setTimeout(() => {
+        // 跳转回签到发布列表页面
+        uni.redirectTo({
+          url: '/pages/view/routine/qd/index'
+        });
+      }, 1500);
+    } else {
+      uni.showToast({ title: '推送失败', icon: 'none' });
+    }
+  } catch (error) {
+    console.error('推送失败:', error);
+    uni.showToast({ title: '推送失败，请重试', icon: 'none' });
+  } finally {
+    isPushing.value = false;
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.push-list-scroll-view {
+  height: calc(100vh - 120px);
+}
+
+.push-list-container {
+  padding: 15px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+  padding: 15px;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  border-radius: 12px;
+  color: white;
+}
+
+.page-title {
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.teacher-count {
+  font-size: 14px;
+  opacity: 0.9;
+}
+
+.teacher-cards {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.teacher-card {
+  background: white;
+  border-radius: 12px;
+  padding: 15px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.teacher-main-info {
+  margin-bottom: 10px;
+}
+
+.teacher-name {
+  display: block;
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 4px;
+}
+
+.teacher-position {
+  font-size: 14px;
+  color: #666;
+}
+
+.teacher-status {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.status-label {
+  font-size: 14px;
+  color: #666;
+}
+
+.status-value {
+  font-size: 14px;
+  font-weight: 500;
+  padding: 2px 8px;
+  border-radius: 8px;
+}
+
+.status-signed {
+  background: #d4edda;
+  color: #155724;
+}
+
+.status-unsigned {
+  background: #f8d7da;
+  color: #721c24;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 60px 20px;
+  color: #999;
+}
+
+.empty-text {
+  margin-top: 15px;
+  font-size: 16px;
+}
+
+.bottom-actions {
+  display: flex;
+  gap: 15px;
+  padding: 15px;
+  background: white;
+  border-top: 1px solid #f0f0f0;
+}
+
+.action-btn {
+  flex: 1;
+  padding: 12px;
+  border-radius: 8px;
+  font-size: 16px;
+  font-weight: 500;
+  border: none;
+}
+
+.cancel-btn {
+  background: #f5f5f5;
+  color: #666;
+}
+
+.confirm-btn {
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  color: white;
+}
+
+.confirm-btn:disabled {
+  opacity: 0.6;
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/view/routine/qd/qr-code.vue b/src/pages/view/routine/qd/qr-code.vue
new file mode 100644
index 0000000..eda6df9
--- /dev/null
+++ b/src/pages/view/routine/qd/qr-code.vue
@@ -0,0 +1,443 @@
+<template>
+  <view class="qr-code-page">
+    <view class="qr-container">
+      <!-- 页面头部 -->
+      <view class="page-header">
+        <text class="page-title">签到二维码</text>
+        <text class="page-subtitle">请使用微信扫描二维码进行签到</text>
+      </view>
+
+      <!-- 二维码显示区域 -->
+      <view class="qr-display">
+        <view class="qr-card">
+          <view class="qr-header">
+            <text class="qr-title">{{ meetingInfo?.qdmc || '签到二维码' }}</text>
+            <view class="qr-timer">
+              <text class="timer-text">{{ qrTimer }}s</text>
+            </view>
+          </view>
+          
+          <view class="qr-content">
+            <canvas 
+              canvas-id="qrcode" 
+              class="qr-canvas"
+              :style="{ width: qrSize + 'px', height: qrSize + 'px' }"
+            ></canvas>
+          </view>
+          
+          <view class="qr-info">
+            <view class="info-item">
+              <text class="info-label">会议时间：</text>
+              <text class="info-value">{{ formatTime(meetingInfo?.qdkstime) }} - {{ formatTime(meetingInfo?.qdjstime) }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">会议地点：</text>
+              <text class="info-value">{{ meetingInfo?.qdwz || '未设置' }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 操作按钮 -->
+      <view class="action-buttons">
+        <button @click="refreshQRCode" class="refresh-btn">
+          <u-icon name="reload" size="16" color="#409EFF" />
+          <text class="btn-text">刷新二维码</text>
+        </button>
+        <button @click="goBack" class="back-btn">
+          <u-icon name="arrow-left" size="16" color="#666" />
+          <text class="btn-text">返回</text>
+        </button>
+      </view>
+
+      <!-- 使用说明 -->
+      <view class="usage-tips">
+        <view class="tips-header">
+          <u-icon name="info-circle" size="16" color="#409EFF" />
+          <text class="tips-title">使用说明</text>
+        </view>
+        <view class="tips-content">
+          <text class="tip-item">1. 二维码有效期为60秒，请及时扫描</text>
+          <text class="tip-item">2. 使用微信扫一扫功能扫描二维码</text>
+          <text class="tip-item">3. 扫描后将跳转到签到确认页面</text>
+          <text class="tip-item">4. 请确保网络连接正常</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted, onUnmounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { qdFindByIdApi, generateQRCodeApi } from '@/api/base/server';
+
+// 页面参数
+const qdId = ref('');
+
+// 会议信息
+const meetingInfo = ref<any>(null);
+
+// 二维码相关
+const qrTimer = ref(60);
+const qrSize = ref(200);
+let qrTimerInterval: any = null;
+let qrCanvas: any = null;
+
+onLoad((options) => {
+  if (options?.qdId) {
+    qdId.value = options.qdId;
+  }
+  loadMeetingInfo();
+});
+
+onMounted(() => {
+  initQRCode();
+});
+
+// 加载会议信息
+const loadMeetingInfo = async () => {
+  try {
+    const result = await qdFindByIdApi({ id: qdId.value });
+    if (result && result.resultCode === 1) {
+      meetingInfo.value = result.result;
+    }
+  } catch (error) {
+    console.error('加载会议信息失败:', error);
+  }
+};
+
+// 初始化二维码
+const initQRCode = async () => {
+  try {
+    // 生成二维码数据，只传递qdId
+    const result = await generateQRCodeApi({ 
+      qdId: qdId.value
+    });
+    
+    if (result && result.resultCode === 1) {
+      // 确保二维码数据是字符串格式
+      const qrData = result.result || '';
+      console.log('二维码数据:', qrData);
+      generateQRCodeImage(qrData);
+    } else {
+      throw new Error('生成二维码失败');
+    }
+    
+    // 启动倒计时
+    startTimer();
+  } catch (error) {
+    console.error('生成二维码失败:', error);
+    uni.showToast({ title: '生成二维码失败', icon: 'none' });
+  }
+};
+
+// 生成二维码图片
+const generateQRCodeImage = (qrData: string) => {
+  try {
+    // 使用qrcode库生成真正的二维码
+    import('qrcode').then((QRCode) => {
+      // 使用回调函数方式避免类型错误
+      (QRCode as any).toDataURL(qrData, {
+        width: qrSize.value,
+        height: qrSize.value,
+        margin: 2,
+        color: {
+          dark: '#000000',
+          light: '#FFFFFF'
+        },
+        errorCorrectionLevel: 'M'
+      }, (err: any, url: string) => {
+        if (err) {
+          console.error('生成二维码失败:', err);
+          // 如果生成失败，显示错误信息
+          qrCanvas = uni.createCanvasContext('qrcode');
+          qrCanvas.clearRect(0, 0, qrSize.value, qrSize.value);
+          qrCanvas.setFillStyle('#ffffff');
+          qrCanvas.fillRect(0, 0, qrSize.value, qrSize.value);
+          qrCanvas.setFillStyle('#ff0000');
+          qrCanvas.setFontSize(12);
+          qrCanvas.fillText('二维码生成失败', qrSize.value / 2 - 40, qrSize.value / 2);
+          qrCanvas.draw();
+          return;
+        }
+        
+        // 使用uni-app的方式处理图片
+        // 将二维码数据直接绘制到canvas上
+        qrCanvas = uni.createCanvasContext('qrcode');
+        qrCanvas.clearRect(0, 0, qrSize.value, qrSize.value);
+        
+        // 使用uni-app的drawImage方法
+        qrCanvas.drawImage(url, 0, 0, qrSize.value, qrSize.value);
+        qrCanvas.draw();
+        
+        console.log('二维码生成成功');
+      });
+    }).catch((error) => {
+      console.error('加载qrcode库失败:', error);
+      // 如果无法加载qrcode库，显示提示信息
+      qrCanvas = uni.createCanvasContext('qrcode');
+      qrCanvas.clearRect(0, 0, qrSize.value, qrSize.value);
+      qrCanvas.setFillStyle('#ffffff');
+      qrCanvas.fillRect(0, 0, qrSize.value, qrSize.value);
+      qrCanvas.setFillStyle('#666666');
+      qrCanvas.setFontSize(12);
+      qrCanvas.fillText('请安装qrcode库', qrSize.value / 2 - 30, qrSize.value / 2);
+      qrCanvas.draw();
+    });
+    
+    console.log('二维码数据:', qrData);
+    
+  } catch (error) {
+    console.error('生成二维码异常:', error);
+    // 异常处理，显示错误信息
+    qrCanvas = uni.createCanvasContext('qrcode');
+    qrCanvas.clearRect(0, 0, qrSize.value, qrSize.value);
+    qrCanvas.setFillStyle('#ffffff');
+    qrCanvas.fillRect(0, 0, qrSize.value, qrSize.value);
+    qrCanvas.setFillStyle('#ff0000');
+    qrCanvas.setFontSize(12);
+    qrCanvas.fillText('二维码生成异常', qrSize.value / 2 - 40, qrSize.value / 2);
+    qrCanvas.draw();
+  }
+};
+
+// 启动倒计时
+const startTimer = () => {
+  qrTimer.value = 60;
+  if (qrTimerInterval) {
+    clearInterval(qrTimerInterval);
+  }
+  
+  qrTimerInterval = setInterval(() => {
+    qrTimer.value--;
+    if (qrTimer.value <= 0) {
+      clearInterval(qrTimerInterval);
+      uni.showToast({ title: '二维码已过期', icon: 'none' });
+      // 可以在这里自动刷新二维码
+      refreshQRCode();
+    }
+  }, 1000);
+};
+
+// 刷新二维码
+const refreshQRCode = async () => {
+  try {
+    await initQRCode();
+    uni.showToast({ title: '二维码已刷新', icon: 'success' });
+  } catch (error) {
+    uni.showToast({ title: '刷新失败', icon: 'none' });
+  }
+};
+
+// 返回上一页
+const goBack = () => {
+  uni.navigateBack();
+};
+
+// 格式化时间
+const formatTime = (time: string) => {
+  if (!time) return '未设置';
+  const date = new Date(time);
+  return date.toLocaleString('zh-CN', {
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit'
+  });
+};
+
+// 组件销毁时清理定时器
+onUnmounted(() => {
+  if (qrTimerInterval) {
+    clearInterval(qrTimerInterval);
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.qr-code-page {
+  min-height: 100vh;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+.qr-container {
+  max-width: 400px;
+  margin: 0 auto;
+}
+
+// 页面头部
+.page-header {
+  text-align: center;
+  margin-bottom: 30px;
+  
+  .page-title {
+    display: block;
+    font-size: 28px;
+    font-weight: 600;
+    color: white;
+    margin-bottom: 8px;
+  }
+  
+  .page-subtitle {
+    font-size: 16px;
+    color: rgba(255, 255, 255, 0.8);
+  }
+}
+
+// 二维码显示区域
+.qr-display {
+  margin-bottom: 30px;
+}
+
+.qr-card {
+  background: white;
+  border-radius: 16px;
+  padding: 24px;
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1);
+}
+
+.qr-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+  
+  .qr-title {
+    font-size: 18px;
+    font-weight: 600;
+    color: #333;
+    flex: 1;
+  }
+  
+  .qr-timer {
+    background: linear-gradient(135deg, #ff4757 0%, #ff3742 100%);
+    padding: 6px 12px;
+    border-radius: 20px;
+    
+    .timer-text {
+      color: white;
+      font-size: 14px;
+      font-weight: 600;
+    }
+  }
+}
+
+.qr-content {
+  display: flex;
+  justify-content: center;
+  margin-bottom: 20px;
+  
+  .qr-canvas {
+    border: 2px solid #f0f0f0;
+    border-radius: 8px;
+    background: white;
+  }
+}
+
+.qr-info {
+  .info-item {
+    display: flex;
+    margin-bottom: 8px;
+    
+    .info-label {
+      font-size: 14px;
+      color: #666;
+      min-width: 80px;
+    }
+    
+    .info-value {
+      font-size: 14px;
+      color: #333;
+      flex: 1;
+    }
+  }
+}
+
+// 操作按钮
+.action-buttons {
+  display: flex;
+  gap: 12px;
+  margin-bottom: 30px;
+  
+  .refresh-btn, .back-btn {
+    flex: 1;
+    height: 44px;
+    border: none;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    font-size: 16px;
+  }
+  
+  .refresh-btn {
+    background: #409EFF;
+    color: white;
+  }
+  
+  .back-btn {
+    background: #f5f5f5;
+    color: #666;
+  }
+  
+  .btn-text {
+    font-size: 14px;
+  }
+}
+
+// 使用说明
+.usage-tips {
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 12px;
+  padding: 20px;
+  backdrop-filter: blur(10px);
+  
+  .tips-header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 12px;
+    
+    .tips-title {
+      font-size: 16px;
+      font-weight: 600;
+      color: white;
+    }
+  }
+  
+  .tips-content {
+    .tip-item {
+      display: block;
+      font-size: 14px;
+      color: rgba(255, 255, 255, 0.9);
+      margin-bottom: 6px;
+      line-height: 1.4;
+    }
+  }
+}
+
+// 响应式优化
+@media (max-width: 375px) {
+  .qr-code-page {
+    padding: 15px;
+  }
+  
+  .qr-card {
+    padding: 20px;
+  }
+  
+  .qr-size {
+    width: 180px;
+    height: 180px;
+  }
+  
+  .page-header .page-title {
+    font-size: 24px;
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/view/routine/qd/selectTeachers.vue b/src/pages/view/routine/qd/selectTeachers.vue
new file mode 100644
index 0000000..04c1257
--- /dev/null
+++ b/src/pages/view/routine/qd/selectTeachers.vue
@@ -0,0 +1,844 @@
+<template>
+  <BasicLayout>
+    <scroll-view scroll-y class="teacher-scroll-view">
+      <view class="teacher-container">
+        <!-- 筛选条件区域 -->
+        <view class="filter-section">
+          <view class="filter-title">📋 选择条件</view>
+          
+          <!-- 选择类别 -->
+          <view class="filter-row">
+            <view class="filter-label">选择类别</view>
+            <picker 
+              mode="selector" 
+              :range="selectTypeOptions" 
+              range-key="label"
+              @change="onSelectTypeChange"
+              class="filter-picker"
+            >
+              <view class="picker-display">
+                <text :class="{ placeholder: !selectType }">
+                  {{ getSelectTypeText() || '请选择类别' }}
+                </text>
+                <uni-icons type="right" size="16" color="#999"></uni-icons>
+              </view>
+            </picker>
+          </view>
+
+          <!-- 职务类型选择器 -->
+          <view class="filter-row" v-if="selectType === 4">
+            <view class="filter-label">职务类型</view>
+            <picker 
+              mode="selector" 
+              :range="zwTypeOptions" 
+              range-key="label"
+              @change="onZwTypeChange"
+              class="filter-picker"
+            >
+              <view class="picker-display">
+                <text>{{ getZwTypeText() }}</text>
+                <uni-icons type="right" size="16" color="#999"></uni-icons>
+              </view>
+            </picker>
+          </view>
+
+          <!-- 具体选择 -->
+          <view class="filter-row" v-if="selectType && datas.length > 0">
+            <view class="filter-label">{{ getSecondSelectLabel() }}</view>
+            <view class="multi-select-container">
+              <view class="selected-items-display" @click="showMultiSelectModal">
+                <text :class="{ placeholder: !selectTwoType.length }">
+                  {{ getSecondSelectText() || '请选择' }}
+                </text>
+                <uni-icons type="right" size="16" color="#999"></uni-icons>
+              </view>
+            </view>
+          </view>
+
+          <!-- 多选弹窗 -->
+          <view v-if="showModal" class="modal-overlay" @click="hideMultiSelectModal">
+            <view class="modal-content" @click.stop>
+              <view class="modal-header">
+                <text class="modal-title">{{ getSecondSelectLabel() }}</text>
+                <view class="modal-actions">
+                  <text class="modal-btn cancel-btn" @click="hideMultiSelectModal">取消</text>
+                  <text class="modal-btn confirm-btn" @click="confirmMultiSelect">确定</text>
+                </view>
+              </view>
+              <view class="modal-body">
+                <view class="checkbox-list">
+                  <view 
+                    v-for="item in datas" 
+                    :key="item.value"
+                    class="checkbox-item"
+                    @click="toggleItemSelection(item.value)"
+                  >
+                    <view class="checkbox">
+                      <uni-icons 
+                        :type="selectTwoType.includes(item.value) ? 'checkbox-filled' : 'circle'" 
+                        size="20" 
+                        :color="selectTwoType.includes(item.value) ? '#007aff' : '#ccc'"
+                      ></uni-icons>
+                    </view>
+                    <text class="checkbox-label">{{ item.label }}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <!-- 选择结果区域 -->
+        <view class="result-section">
+          <view class="result-title">
+            👥 选择结果
+            <text v-if="selectedTeachers.length > 0" class="result-count">
+              ({{ selectedTeachers.length }})
+            </text>
+          </view>
+          
+          <!-- 已选教师标签 -->
+          <view class="name-tags" v-if="selectedTeachers.length > 0">
+            <view 
+              v-for="teacher in selectedTeachers" 
+              :key="teacher.id"
+              class="name-tag"
+            >
+              <text>{{ teacher.jsxm }}</text>
+              <view class="remove-icon" @click="removeTeacher(teacher.id)">
+                <uni-icons type="close" size="12" color="#ffffff"></uni-icons>
+              </view>
+            </view>
+          </view>
+
+          <!-- 空状态 -->
+          <view v-if="selectedTeachers.length === 0 && !isLoading" class="empty-state">
+            <uni-icons type="info" size="60" color="#ccc"></uni-icons>
+            <text class="empty-text">
+              {{ selectType ? '请先选择条件，加载教师列表' : '请选择筛选条件' }}
+            </text>
+          </view>
+
+          <!-- 加载状态 -->
+          <view v-if="isLoading" class="loading-state">
+            <uni-icons type="spinner-cycle" size="40" color="#007aff"></uni-icons>
+            <text class="loading-text">加载中...</text>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 底部操作 -->
+    <template #bottom>
+      <view class="bottom-actions">
+        <button class="action-btn cancel-btn" @click="handleCancel">
+          取消
+        </button>
+        <button class="action-btn confirm-btn" @click="handleConfirm">
+          确定 ({{ selectedTeachers.length }})
+        </button>
+      </view>
+    </template>
+  </BasicLayout>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, onMounted } from "vue";
+import { 
+  jsdfindJsByPhoneApi, 
+  jsFindByNjIdOrBjIdApi, 
+  jsFindByKmIdApi, 
+  jsFindByBzrNjIdApi, 
+  jsFindByZwIdApi,
+  findAllNj,
+  kmFindAllApi,
+  zwFindAllApi
+} from "@/api/base/server";
+
+interface TeacherInfo {
+  id: string;
+  jsxm: string;
+  jsId: string;
+  dzzw: string;
+  qtzw: string;
+}
+
+// 筛选相关状态
+const selectType = ref<number | null>(null);
+const selectTwoType = ref<string[]>([]);
+const zwType = ref<number>(1);
+const datas = ref<any[]>([]);
+const selectedTeachers = ref<TeacherInfo[]>([]);
+const isLoading = ref(false);
+const showModal = ref(false); // 控制多选弹窗的显示
+
+// 选择类别选项
+const selectTypeOptions = [
+  { value: 1, label: '所有老师' },
+  { value: 2, label: '科目' },
+  { value: 3, label: '班主任' },
+  { value: 4, label: '职务' }
+];
+
+// 职务类型选项
+const zwTypeOptions = [
+  { value: 1, label: '党政职务' },
+  { value: 2, label: '其他职务' }
+];
+
+// 获取选择类别文本
+const getSelectTypeText = () => {
+  const option = selectTypeOptions.find(item => item.value === selectType.value);
+  return option ? option.label : '';
+};
+
+// 获取职务类型文本
+const getZwTypeText = () => {
+  const option = zwTypeOptions.find(item => item.value === zwType.value);
+  return option ? option.label : '';
+};
+
+// 获取第二个选择框的标签
+const getSecondSelectLabel = () => {
+  switch (selectType.value) {
+    case 1:
+      return '年级/班级';
+    case 2:
+      return '科目';
+    case 3:
+      return '年级';
+    case 4:
+      return '具体职务';
+    default:
+      return '请选择';
+  }
+};
+
+// 获取第二个选择框的文本
+const getSecondSelectText = () => {
+  if (!selectTwoType.value.length) return '';
+  const selectedItems = datas.value.filter(item => 
+    selectTwoType.value.includes(item.value)
+  );
+  if (selectedItems.length === 1) {
+    return selectedItems[0].label;
+  } else if (selectedItems.length > 1) {
+    return `已选择${selectedItems.length}项`;
+  }
+  return '';
+};
+
+// 选择类别改变
+const onSelectTypeChange = async (e: any) => {
+  selectType.value = selectTypeOptions[e.detail.value].value;
+  selectTwoType.value = [];
+  selectedTeachers.value = [];
+  
+  if (selectType.value === 1 || selectType.value === 3) {
+    await loadNjData();
+  } else if (selectType.value === 2) {
+    await loadKmData();
+  } else if (selectType.value === 4) {
+    await loadZwData();
+  }
+};
+
+// 职务类型改变
+const onZwTypeChange = async (e: any) => {
+  zwType.value = zwTypeOptions[e.detail.value].value;
+  selectTwoType.value = [];
+  selectedTeachers.value = [];
+  await loadZwData();
+};
+
+// 多选弹窗相关
+const showMultiSelectModal = () => {
+  showModal.value = true;
+};
+
+const hideMultiSelectModal = () => {
+  showModal.value = false;
+};
+
+const toggleItemSelection = (value: string) => {
+  const index = selectTwoType.value.indexOf(value);
+  if (index > -1) {
+    selectTwoType.value.splice(index, 1);
+  } else {
+    selectTwoType.value.push(value);
+  }
+};
+
+const confirmMultiSelect = () => {
+  hideMultiSelectModal();
+  loadTeachers();
+};
+
+// 加载年级数据
+const loadNjData = async () => {
+  try {
+    const result = await findAllNj();
+    console.log('年级API返回结果:', result);
+    
+    // 处理不同的返回格式
+    let njData = [];
+    if (Array.isArray(result)) {
+      njData = result;
+    } else if (result && typeof result === 'object') {
+      // 检查各种可能的属性
+      if (Array.isArray(result.result)) {
+        njData = result.result;
+      } else if (result.resultCode === 1 && Array.isArray(result.result)) {
+        njData = result.result;
+      } else if (Array.isArray(result.data)) {
+        njData = result.data;
+      } else {
+        console.warn('年级数据格式异常:', result);
+        njData = [];
+      }
+    } else {
+      console.warn('年级数据格式异常:', result);
+      njData = [];
+    }
+    
+    // 直接使用后端已排序的数据，不进行二次排序
+    datas.value = njData.map((item: any) => ({
+      label: item.njmc || item.name || item.label,
+      value: item.id || item.value
+    }));
+    
+    console.log('处理后的年级数据:', datas.value);
+  } catch (error) {
+    console.error('加载年级数据失败:', error);
+    uni.showToast({ title: '加载年级数据失败', icon: 'none' });
+  }
+};
+
+// 加载科目数据
+const loadKmData = async () => {
+  try {
+    const result = await kmFindAllApi();
+    console.log('科目API返回结果:', result);
+    
+    // 处理不同的返回格式
+    let kmData = [];
+    if (Array.isArray(result)) {
+      kmData = result;
+    } else if (result && typeof result === 'object') {
+      // 检查各种可能的属性
+      if (Array.isArray(result.result)) {
+        kmData = result.result;
+      } else if (result.resultCode === 1 && Array.isArray(result.result)) {
+        kmData = result.result;
+      } else if (Array.isArray(result.data)) {
+        kmData = result.data;
+      } else {
+        console.warn('科目数据格式异常:', result);
+        kmData = [];
+      }
+    } else {
+      console.warn('科目数据格式异常:', result);
+      kmData = [];
+    }
+    
+    // 前端排序：按sort字段排序，如果没有sort字段则按名称排序
+    const sortedData = kmData.sort((a: any, b: any) => {
+      const sortA = a.sort || 0;
+      const sortB = b.sort || 0;
+      if (sortA !== sortB) {
+        return sortA - sortB;
+      } else {
+        return (a.kmmc || a.name || '').localeCompare(b.kmmc || b.name || '');
+      }
+    });
+    
+    datas.value = sortedData.map((item: any) => ({
+      label: item.kmmc || item.name || item.label,
+      value: item.id || item.value
+    }));
+    
+    console.log('处理后的科目数据:', datas.value);
+  } catch (error) {
+    console.error('加载科目数据失败:', error);
+    uni.showToast({ title: '加载科目数据失败', icon: 'none' });
+  }
+};
+
+// 加载职务数据
+const loadZwData = async () => {
+  try {
+    const result = await zwFindAllApi();
+    console.log('职务API返回结果:', result);
+    
+    // 处理不同的返回格式
+    let allZwData = [];
+    if (Array.isArray(result)) {
+      allZwData = result;
+    } else if (result && typeof result === 'object') {
+      // 检查各种可能的属性
+      if (Array.isArray(result.result)) {
+        allZwData = result.result;
+      } else if (result.resultCode === 1 && Array.isArray(result.result)) {
+        allZwData = result.result;
+      } else if (Array.isArray(result.data)) {
+        allZwData = result.data;
+      } else {
+        console.warn('职务数据格式异常:', result);
+        allZwData = [];
+      }
+    } else {
+      console.warn('职务数据格式异常:', result);
+      allZwData = [];
+    }
+    
+    // 根据职务类型过滤数据
+    const filteredData = allZwData.filter((item: any) => {
+      if (zwType.value === 1) {
+        return item.zwlx === '1' || item.zwlx === '党政职务' || item.zwlx === 'A' || item.zwlx === 'dzzw';
+      } else if (zwType.value === 2) {
+        return item.zwlx === '2' || item.zwlx === '其他职务' || item.zwlx === 'B' || item.zwlx === 'qtzw';
+      }
+      return true;
+    });
+    
+    // 前端排序：按sort字段排序，如果没有sort字段则按名称排序
+    const sortedData = filteredData.sort((a: any, b: any) => {
+      const sortA = a.sort || 0;
+      const sortB = b.sort || 0;
+      if (sortA !== sortB) {
+        return sortA - sortB;
+      } else {
+        return (a.zwmc || a.name || '').localeCompare(b.zwmc || b.name || '');
+      }
+    });
+    
+    datas.value = sortedData.map((item: any) => ({
+      label: item.zwmc || item.name || item.label,
+      value: item.id || item.value
+    }));
+    
+    console.log('处理后的职务数据:', datas.value);
+  } catch (error) {
+    console.error('加载职务数据失败:', error);
+    uni.showToast({ title: '加载职务数据失败', icon: 'none' });
+  }
+};
+
+// 加载教师数据
+const loadTeachers = async () => {
+  if (!selectType.value || !selectTwoType.value.length) return;
+  
+  isLoading.value = true;
+  try {
+    let allTeacherData: any[] = [];
+    
+    // 遍历所有选中的值，分别调用API
+    for (const selectedValue of selectTwoType.value) {
+      let result;
+      
+      if (selectType.value === 1) {
+        result = await jsFindByNjIdOrBjIdApi({
+          njOrBjId: selectedValue
+        });
+      } else if (selectType.value === 2) {
+        result = await jsFindByKmIdApi({
+          kmId: selectedValue
+        });
+      } else if (selectType.value === 3) {
+        result = await jsFindByBzrNjIdApi({
+          njId: selectedValue
+        });
+      } else if (selectType.value === 4) {
+        result = await jsFindByZwIdApi({
+          zwId: selectedValue,
+          zwType: zwType.value.toString()
+        });
+      }
+      
+      console.log('教师API返回结果:', result);
+      
+      // 处理不同的返回格式
+      let teacherData = [];
+      if (Array.isArray(result)) {
+        teacherData = result;
+      } else if (result && typeof result === 'object') {
+        // 检查各种可能的属性
+        if (Array.isArray(result.result)) {
+          teacherData = result.result;
+        } else if (result.resultCode === 1 && Array.isArray(result.result)) {
+          teacherData = result.result;
+        } else if (Array.isArray(result.data)) {
+          teacherData = result.data;
+        } else {
+          console.warn('教师数据格式异常:', result);
+          teacherData = [];
+        }
+      } else {
+        console.warn('教师数据格式异常:', result);
+        teacherData = [];
+      }
+      
+      // 将当前结果添加到总结果中
+      allTeacherData = allTeacherData.concat(teacherData);
+    }
+    
+    // 去重（根据教师ID）
+    const uniqueTeachers = allTeacherData.filter((teacher, index, self) => 
+      index === self.findIndex(t => (t.id || t.jsId) === (teacher.id || teacher.jsId))
+    );
+    
+    console.log('API返回的教师数据总数:', allTeacherData.length);
+    console.log('去重后的教师数据总数:', uniqueTeachers.length);
+    console.log('是否有重复数据:', allTeacherData.length !== uniqueTeachers.length);
+    
+    if (allTeacherData.length !== uniqueTeachers.length) {
+      console.warn('发现重复的教师数据，已进行去重处理');
+    }
+    
+    // 直接使用后端已排序的数据，不进行二次排序
+    selectedTeachers.value = uniqueTeachers.map((item: any) => ({
+      id: item.id || item.jsId,
+      jsxm: item.jsxm || item.name || item.label,
+      jsId: item.id || item.jsId,
+      dzzw: item.dzzw || '',
+      qtzw: item.qtzw || ''
+    }));
+    
+    console.log('最终处理后的教师数据:', selectedTeachers.value);
+  } catch (error) {
+    console.error('加载教师列表失败:', error);
+    uni.showToast({ title: '加载教师列表失败', icon: 'none' });
+  } finally {
+    isLoading.value = false;
+  }
+};
+
+// 移除教师
+const removeTeacher = (teacherId: string) => {
+  const index = selectedTeachers.value.findIndex(teacher => teacher.id === teacherId);
+  if (index > -1) {
+    selectedTeachers.value.splice(index, 1);
+  }
+};
+
+// 取消操作
+const handleCancel = () => {
+  uni.navigateBack();
+};
+
+// 确认选择
+const handleConfirm = () => {
+  console.log('=== handleConfirm 开始 ===');
+  console.log('当前选中的教师数量:', selectedTeachers.value.length);
+  console.log('选中的教师数据:', selectedTeachers.value);
+  
+  // 检查是否有重复的教师ID
+  const teacherIds = selectedTeachers.value.map(t => t.jsId);
+  const uniqueIds = [...new Set(teacherIds)];
+  console.log('教师ID列表:', teacherIds);
+  console.log('去重后的教师ID列表:', uniqueIds);
+  console.log('是否有重复ID:', teacherIds.length !== uniqueIds.length);
+  
+  if (teacherIds.length !== uniqueIds.length) {
+    console.warn('发现重复的教师ID，将进行去重处理');
+    // 去重处理
+    const uniqueTeachers = selectedTeachers.value.filter((teacher, index, self) => 
+      index === self.findIndex(t => t.jsId === teacher.jsId)
+    );
+    selectedTeachers.value = uniqueTeachers;
+    console.log('去重后的教师数据:', uniqueTeachers);
+  }
+  
+  // 使用全局事件传递教师数据
+  console.log('准备发送 teacherSelected 事件');
+  uni.$emit('teacherSelected', selectedTeachers.value);
+  console.log('teacherSelected 事件已发送');
+  
+  console.log('准备返回上一页');
+  uni.navigateBack();
+  console.log('=== handleConfirm 结束 ===');
+};
+
+// 页面加载时初始化
+onMounted(() => {
+  // 可以在这里加载默认数据或进行其他初始化
+});
+</script>
+
+<style lang="scss" scoped>
+.teacher-scroll-view {
+  height: calc(100vh - 120px);
+}
+
+.teacher-container {
+  padding: 15px;
+}
+
+.filter-section {
+  background: white;
+  border-radius: 12px;
+  padding: 15px;
+  margin-bottom: 15px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.filter-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 15px;
+}
+
+.filter-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.filter-label {
+  width: 80px;
+  font-size: 14px;
+  color: #666;
+  margin-right: 10px;
+}
+
+.filter-picker {
+  flex: 1;
+}
+
+.picker-display {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #f8f9fa;
+  border: 1px solid #e9ecef;
+  border-radius: 8px;
+  padding: 10px 12px;
+  font-size: 14px;
+  color: #333;
+}
+
+.placeholder {
+  color: #999;
+}
+
+.multi-select-container {
+  flex: 1;
+  position: relative;
+}
+
+.selected-items-display {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #f8f9fa;
+  border: 1px solid #e9ecef;
+  border-radius: 8px;
+  padding: 10px 12px;
+  font-size: 14px;
+  color: #333;
+  cursor: pointer;
+}
+
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: flex-end;
+  z-index: 1000;
+}
+
+.modal-content {
+  background-color: white;
+  border-radius: 12px 12px 0 0;
+  width: 100%;
+  max-height: 70%;
+  display: flex;
+  flex-direction: column;
+  box-shadow: 0 -4px 16px rgba(0, 0, 0, 0.2);
+  overflow: hidden;
+}
+
+.modal-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.modal-title {
+  font-size: 18px;
+  font-weight: bold;
+  color: #333;
+}
+
+.modal-actions {
+  display: flex;
+  gap: 15px;
+}
+
+.modal-btn {
+  padding: 8px 15px;
+  border-radius: 8px;
+  font-size: 16px;
+  font-weight: 500;
+  border: none;
+  cursor: pointer;
+}
+
+.modal-btn.cancel-btn {
+  background: #f5f5f5;
+  color: #666;
+}
+
+.modal-btn.confirm-btn {
+  background: linear-gradient(135deg, #007aff 0%, #0056cc 100%);
+  color: white;
+  box-shadow: 0 2px 8px rgba(0, 122, 255, 0.3);
+}
+
+.modal-body {
+  flex: 1;
+  overflow-y: auto;
+  padding: 15px;
+}
+
+.checkbox-list {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.checkbox-item {
+  display: flex;
+  align-items: center;
+  padding: 10px 0;
+  cursor: pointer;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.checkbox-item:last-child {
+  border-bottom: none;
+}
+
+.checkbox {
+  margin-right: 10px;
+  flex-shrink: 0;
+}
+
+.checkbox-label {
+  font-size: 15px;
+  color: #333;
+  flex: 1;
+}
+
+.result-section {
+  background: white;
+  border-radius: 12px;
+  padding: 15px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.result-title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 15px;
+}
+
+.result-count {
+  color: #007aff;
+  font-size: 14px;
+  margin-left: 8px;
+}
+
+.name-tags {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px 10px; // Row gap, Column gap
+  margin-bottom: 15px;
+
+  .name-tag {
+    position: relative;
+    font-size: 13px;
+    padding: 5px 8px;
+    border-radius: 4px;
+    text-align: center;
+    flex-grow: 0;
+    flex-shrink: 0;
+    box-sizing: border-box;
+    flex-basis: calc((100% - 30px) / 4);
+    height: 30px;
+    line-height: 20px;
+    border: 1px solid #f4f4f5;
+    white-space: normal;
+    word-break: break-all;
+    background-color: #f4f4f5;
+    color: #909399;
+
+    .remove-icon {
+      position: absolute;
+      top: -1px;
+      right: -1px;
+      width: 16px;
+      height: 16px;
+      background-color: #ff4d4f;
+      border-bottom-left-radius: 4px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 1px;
+      box-sizing: border-box;
+      cursor: pointer;
+    }
+  }
+}
+
+.empty-state, .loading-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 60px 20px;
+  color: #999;
+}
+
+.empty-text, .loading-text {
+  margin-top: 15px;
+  font-size: 16px;
+}
+
+.bottom-actions {
+  display: flex;
+  gap: 15px;
+  padding: 15px;
+  background: white;
+  border-top: 1px solid #f0f0f0;
+}
+
+.action-btn {
+  flex: 1;
+  padding: 12px;
+  border-radius: 8px;
+  font-size: 16px;
+  font-weight: 500;
+  border: none;
+}
+
+.cancel-btn {
+  background: #f5f5f5;
+  color: #666;
+}
+
+.confirm-btn {
+  background: linear-gradient(135deg, #007aff 0%, #0056cc 100%);
+  color: white;
+  box-shadow: 0 2px 8px rgba(0, 122, 255, 0.3);
+}
+</style> 
\ No newline at end of file
diff --git a/src/static/base/details.png b/src/static/base/details.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c1d2c977885bd50bfedfc420169c2ae6ccadb86
GIT binary patch
literal 9951
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
PVhtcGr3kN<Fb?^D>HEFt

literal 0
HcmV?d00001

diff --git a/src/static/base/push.png b/src/static/base/push.png
new file mode 100644
index 0000000000000000000000000000000000000000..693ffcdc48921fd09547e552ea86b2aceb056469
GIT binary patch
literal 7741
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
Xe>qi&RNG?v!2l&WRoTiHra}J)Fcg*K

literal 0
HcmV?d00001

diff --git a/src/static/base/qr-code.png b/src/static/base/qr-code.png
new file mode 100644
index 0000000000000000000000000000000000000000..d46440f3e3ffa4f1f27f94f1b0e47638f2a7f894
GIT binary patch
literal 5373
zcmbuDcQjmG+r|xp(TzHz4x@LYGsNhk6YU`)T8Ll>L6k6~M#v~pqPK|XA$pHq6Cu$V
zHKK=vh{QXd?_J;e{{Q|sd#`ovYoD{uTKio0?>_OS#=10=Y?MSqL^S$(TIPg#==uVY
z5ymQ;>O8^(cxbMxK~z1#u|q_})TFP4x)tQGpBr+@ryVeO<E*KTm{&|B9%-Mf5RWDT
zo9Ox7+UTIvLIrET<)gQX%+1?;L81ZUA&yzvnImPEB1hq(tmER58&GPc*n(PI0nD9<
zqA0Gn2Q+f9c=_tADLc$?@>W2AN#Nw7^7h%6!)3dGuBOh16&0;M6rZU9nlNU7^n>e}
z69A7Jr`0T=Bi5nM=8A~`_iaV+;AjA&usO6$l{Bgwgb;|7SE%Q41P;e!dn8g2>)@m*
z8d|bwB4L=X8p|<9zK($cvrlPd-qJWnHAK-KQTJ*ZqKk9-PP8AFNpq{uvERLymZkmE
zl6|4KqPrLrcoQ3<F_0S%n|Fdobpg~Er+#IA4X4>;^7y`v{4*2HF(fOYF(+Zt26x{j
z2bJB#J{eofRzUglEJ*cub$_;1=CH`k=N(HYTN!@;B+&z4#??45q+`Il_4{I18|R`g
z*TdkL?xQO(Ihi$JTxcNSb&?^p4atMjo2rS9yKJs6UV<1NildwB0~qZYBis0#4l8Tj
zvzJV{fbDDP@4CR#7LKg(LDMq|_X+}dRHX6VvjIfTf@OQcMhD|-O#_P*doQ%V_*?NF
z1;i`PGSdZO`f{jp_V3SbnA4liPn|vq&zy(+ipIYrA>OU)<e03n7yCuO!L~ZYRD6S^
zGs3t!sVaa~eaZFfPt`)3&L7RsB@O4-I`r~mL-B0N$W6~czRl=BBky<IsoxfWZ9_;d
z-{YlNSQ8O>3FJ?XR?f~8UUA4hK?!7Ca(>aQb(thdJMU(a)@E@U&JW)GJ<s79oVfGX
zy-T%!kc5Bjj{RkzpkBfP_~*XIEhWvDIfwsl&&Ha08z28rioXm51b}}};eRq^OX~Lx
ztVdK;JZBS}YdABDLTAc0PxPmQ`$+jspzt_BN76WU6eW?IWU3CX9XIAZ2uk5>>y=A{
zMQb8!N#H~3aU+aUn6%hGPxBICn}e_bpbqXk))^>#gG>h}GT8m7?hQNVC}Cv)q4!I=
zmfCz1VnbH$?JtH+<7U6syAgUXoE@Phtsm>C&BGsD>m;Kv%cMwG+&7&;!lt@womvcg
zONlHU_1~MhmB_?3&Ve_19lLncJAim5545#I*i0_0755`^Kv<}Zn0+JK;A!rc2o|3s
zC8ZZv;}tc@{BZ;JL^*k^rW23SL`#P`?)_531PH`6&XVePHZCCP#E=i#rEKdq;Zqwt
zbh)Rl2SO5c4gF>y>urFk0Q;!uQGkrKX@wlhDNnraVD35J%}zl&Z+I3;);L`C5si*u
zTclzB`|7#dw<(IelC*YMwuS1$%z3NnIJ<|yTC8<EoDLME0ya;e3!}rKH~NgdC>S0>
z(e`nNN?#pBzz;R|pK+mBq!K*zA4@hF)#i__XY*iRi=*c4pZmFAo0fUZZu-*GtrzR!
z66P?a$o)u^bkWEI4?oYi<9P<YEwWV{{mR1+G$NC&MOPo;Lj}}Rcv$+%Z~En^?1-kH
zvV0t{#FEEhTk<JDTZhbp(JYj$rEl=vj&+L%P}E~UF%~i8FQ3jBEc~3vV~na><?;Mm
z>M0d0XxjiQ<JZ$Q?jgj=hC+Uj#hj9RLZa6jRv1P>2$(vlwUsOef_g<?%bzY@_r~_|
zG-7C8rXEqMD~`1xtD~N}M+-qcgXz%2^;jbfYwBk;TL+Wqq#kd>8pjs`$*$M_m`v?+
zlpOs=?eQ#eO)&!Z3Tn@4>cD*<C*aN*hdX(+XQA^#yQhXz&CA&efr>E-cpTV;pSZE_
z?e!xc#LslRY75T@nnx9KGW~bB8_4?6A@EFPTEEd@zu*HcWd_{Q=j7*03LSbor#Xg-
z6$Z}_f=%cfBj#6&)0&#+j&C@BZ^-XwpWZY3t0H)L4`5e1`<6OI7`wp$C5Jzvb<$=R
z38rNbT!{<pVwP+Y4!M~cqDf}9UPQB0<f|KV&Q&QIs>v2AJ3TSfF`kWlJ=l)49SU+2
zQjEOF*6TCTcrcv_yGOEpZLA1&c!__PrJD-#lF(I>hip`mMX8kbsM*d~f1OE(CCo*-
zhDuIf!TwM@N)ARcxHvO)k!Ov-mU{bdqva_{g|L5jg+laF`Jw*S7UiO-S58NytDg!X
zE>qSLsc!c>#3WM*XEKE-U{W)^4zj5(snr{GsF@`?9vZH?Yl!0`6W@Xlo9~L>tyT8y
zdWue$byxAErsuH5RNB942vXpC(%(os8Ou`P@Gv4kP){S}fM2;cBof+B7ICK@OgAds
zo_FsC+ysa0VQZ{1gALV6kG9=_>n+D^xle*p;F(Y(C<;NWKrII!k}^G5i3OKjLQ0al
zLFVD;XV+glh!6nJ*7)<72Npct(^2iKB3iQuJ)YVv=V?$1T@sJgGZ@cT=1NbXFvOAk
zM2DUnH^Lx|NsGR`IwNQ|$bRA+HX*Z`j{}OGp(U5IHe>{i5DOfH%$P|`a>adjzSgfZ
z#_u{a6qM6ZBhSZ=Wc0?Wy8o))ww}NVY-i9J$mx8@fQ`sZonB37v%XbeTuffWPx7zr
z&m48K6@SR&E=gxGSK~4AMnlU(0?smP0J<fRFrrOKdu0wPC|(Oz6*}>rfuEZ<Sk9}S
zeWc0aMU;|%(7@=|uarJX=zt5h%#M=bC5eMJ#*+SMP+1E^E~^u?C<f*}>DQBVa(;DE
zRFgM+re5&=Ga{e6)p6YzCm&MeUHNb)=z(k6ddYA`{dtWv9iYwaqg?I_5K<Vt(6WX%
zrq^~qA*yYw@J+R&iroHMn>)7sPHfga0giJi_Y@Z;?&a`6msYgOpjye^jVB3R0V=oW
zBZsRn5v?_0pU|H&pAgd`>}7b+30k3jx}OqY6#D;!a^Q9HjSU~Ybtpu)%QlNKQFTN$
z9g&?89a6oMbGx8JVChCFE~f^4d@y``wta^m@sy6_`4a=T8h=YES{F@=|KnqGO8I${
z`7cY#62cQpPcM<IBVUOCyYvS&^mFrY&<;0lHev^qbgm8^7>~T7*h_i>w0~7m&5_~V
zqdFqbh}c<XtjG5{DUnan<c#+Gg05YSJaI5NlJOW%P!QY^cpNjvG(Z7>4=HLdg#OU!
z2CdO#2|r^b;E3<j#$VqO3FN|#uz&~xpTX9dyiR7=31Fk(@=D4W1VIf5&u>*I5D3R-
z$nb6sy%gq|MZ>tY55c;O%j#7munn}#J-cR^U~T7-iT2fiv0~g4jLL3SGKIOKe>lVa
zGbd#HiYy`J;k9JXrDRb4(%B#JE@|&0#>oTa9x+H3F6zaS2CuyD6iKmIDd$$U9J@Qp
zR&WVp47J)iHp;KNpFJnE?NS|IfW)H3Wt6^b8~-!}ev}t16#MRr9&?>cjjR9Or*6kV
z6binZfZV4YPyZe}wGp22x1m24w;{8B^vYh?Xsem+JE2S|(QO)jp*8fT1Z-AJZG1%@
zL6W&&xA8kkvLa=-Rw7mHU2<Js)xFrYj&T6iVQ7qx%BY0%lLhWj*QL17;?wEbnLmbU
z^UC`{69)7Pqkr5c*rSR|@K$QWS+K{#K3nffmUje<u~LN&p!N~}#xz1Dph8+O8|85%
zLy&ynww6^>^`3TT{<TB<i${Wb*>JOJU+MdZFnUwtG=U749zDC92(&ND(#Vbw_X~j)
zG&DnELtWs!HKDTD5CDu%eQ7+XMBCjr1#ULuZEZ7NHd=Sl82@QincmCTt>5X2d-bSp
zzFWTM0Q5v8vE;!__f{V2!t#{yuPvL^z7OgAyc=NTlIb)zgT?ck=h*vh3E@XRsMLRK
zXS_ZIX>akXxp=q6-L@SVizMUwg*v?b^bI|xp_%jUN*+o5Z<H0bG>*!@mDAnu>{s!b
z<ZHA|vRpHn@z7HW>T_vf$9PwuZyqrz1K%HW$a#sD{ULG)%qokyrP%$yFjEdEP!2Z-
zoB%OW7y^p?QIOq(mW<8Xk_j{Z*$lJ0&Y^b`u=x(@%Kp!W_eehDyEcNBUrUuNYsz4P
zH06=eZ|>3G?wjyW;jCfa1}=@F+F}E*q>yP(_lH5|Vx6eZ6^4X$W&a@HY&ebJ6Pi6S
z@KWl*yaHS=TGPe@(=f-q`I+flBF$a)piO~La6fBx?-ZD>M-gq8bqBU-?cKTSo*U~1
z^o_ZHj(ITw6Q9shlq7v&$N%QfD6TO<?o#;hOEI{Qu7<Zn9Lp4W-&j5oHmuZlheX%d
zvTc}RE@y0Zp<M}(^>M73QEPppeys(HXODTATS7;&*`PL%1xwus8st-Q5MsQFB)lyY
zWL8M*Y($8y!bMx5?!ti=&LzXv_G8UY%oO_$Q4NInVFmndQ3MOs{|}uN<i7akY>e~X
z`zs?UMpgF-PlCwzX_>9&K*??quli^7Y>TYhnpWOfSvSN<NRT|j`O(;sIh*M9(N;fx
z!5i18NQuAyrDt10Fh?Yj?;+{CI>8~{<zYm1US-UA4-9r<-O0WATu@Y0ZU27jKfw54
z_csHTyXPnAA>MBtrYcQ~2@%VDzC-LLjjghYIYCnOcb5H?O{2)0FgINcUj64tCQiah
zQ@Pz7q^_ouQ5WW3=K+tSTb)U-qD8fK$$tuJ^luiJooxDk{?fTx7BxSnZ84hfAYxWJ
zDH)@t`bP6#Bs=hY--|PMGm!b=WnJbiYK-$T>!dO~#E+Hni5x>eP%PmoEn{I=gkCI`
z-eH`S3oo!*rRqgNu7_RFxF|=UTEjgEgn#E{XhmSI<>fQ}BIw$g&^N2=Ed(^1_~$gZ
zir+LR=k$?D=ofEz9?D8hUDAbJ;Jm(EWA;u;9J!7!CicPwXq%u~+|fswD-|&Hg(~%M
zKRfk{c02cG8R*M77l@s}TLCXmCY*CyMT$a-t`26>qD&0nwhqd21gh%uD4I5UJ;@I3
zav{qep%^Yjl4KJ&41rFWHdA;0OLLCRbIxDYL_B{Ia6C%DGv6%1cc~vU2SaXo+aBoh
zSl2R#rFgg5kO&qI3^NDWm4cL+y&$v0afE;+CN6IrXOD1Dy_E<9_#!aC2x~@5xSo2!
zGZ<iXMr#JdKraN3V-FfeEwt`w#VWLT1l^>l`G_~mn)J+jNz$JPBjLHpDutmYGqLLf
zCHADW=;iQ&sr>3>UHd=`5wE}{H-hH3WYeffU_Y(L@tn<;Dsq_fSjSSGM2e}ygwe3D
zLoO4nsdFA+nVHC!WoAL(P9_qT;3UZj*CR@K$FG+?YL>LWb73BCV2r;9sI9ypDGHuF
zZaB`=+WT6bD&h^KP=DJ<K<Bi5mF}&I7Rj+xvIG*Ct&yek2yDob;aE`V!clO?wx?1Q
z)%sUJ#lUCHC29%m;0V3rTXnqg)S3bqoCn<#5Ztg%{)mY4YzP^e$$|mARVrwcVUmUR
zJwE56N~&cw+GXt=su=2v4VG59#B^odmVC#q$41P5H{@AY$RSy+Mf*Q))zPYqgmSSD
z*l1ip2;RrG(m-+UC5}e+gbRVC!Nkh9I=GqSiizC=%W}%<e>+&^o|Nq<dGg}L94C0j
znm^C_ZkZ>rTnLpC&wPTAs(-zzGQXt78@?vAU@-<_z&NP2!khYDUThkzY)_Im{k8g+
zPz!HEQ5s<CFWg3$zTq9OGup$%UY_rbN6I5yQ!epMTWpj%I8)&JAG#?peU=@yN=aww
zkx0Chl3g>MYqjjJym}pO6kLx>C}s{qz|9D4JN=gQ8H2{CyPxga-k%iqzxg8j04U6B
z8ZNJ!2Mb5vGMFb|Bk~#>|8HAa3f8J|yzOvTF#Q;lGxq#@RPO}JO1B<C9vw{9^1x2p
zjowR|8y}i^L2Y%;!pI>ZcpS<VetqnN$BH}UpYp~H3|Dn^RJ%3n@~Y*;I$t*?Tqm!^
zFpHFXEA=NF)k(Yaa)f;SW{4Av^m?pZz`;Ad;Z#uI29(ACjbN;s#2Gfx8C=&E`>i0{
zGcX^h(>~2BTY(jlAngPcCbQ<Q(4psUh!OJyLJ_N~tulnVft?0JP$P6n*E9?v&??rf
zO}(twCWLMrL4cJOQ5&*h&Z$dkHq`g`h>B7?<G<Zp8sMr!iz9g^%k0yq%!iTn7MB;*
zTJ3@flkb}`;}fX2dDuREk5R_oz@O5x`SZ250w%8hQ3@n&XV6JbhB}}0<NIS4-Jd=B
zG=qI3mNK$dxx#z+{frOUoC|^a2ZC2LDu7*=V`&9WyojTfNytd@)W$y<or^15iNAp8
z+yt}K9c+YOjBIL?Z^r@==6u#5tVKEs#`X}5emkjtGg&+eMrHdvej|Ox$iVl$ta4bc
z$AjD-Gp8IBQ`+_0Rn4}9E|^WoSG@ODpWKJrgYU)%KOC{H-3K^<vA14Mjj6@UZvF0V
zRHE7Ui$6b+^Kuo?%SnU(S;`r(s>~_^rQrAoW#QCG6{5duZO~Vyf&3I6IP;s$N=<Tn
z*>_s8MFzc;C!o@9v2}986I_ua${5<=!1Ls_*5cQqy-Vu1Z|cfx=KVS>CR}Uf(v?hj
zCn!0)1~_Q!q4&vcMu3MI!N|qY^npdX%kbw{e{6W=cgsIHQS?qIJ@bMHJjz@Q2<t5^
zHU#P;^qbgzYx$Y<<8k(TPF?}PR+XCyQa!|38OXNHDcM&_Et=C|LzArrr@YtjZ7?6v
z&@TZx1F%;Ld@8GLYE)#xU)bk}eI7DmDCM%QoO$SmsZ2LxsfQZOF=U!m`pDHv_(zoS
zugw+dR8R%movHYzt^E9^8T2%35jKbm@90VEDd+AE2B{PxCx97x*aLFAa-)SYom82E
zv*1Ke#oilQzuw3y4VJapgVsJ34zm#lXb@VgGWR)~*rW)s%U7IT?EhQoz5=YL#l7Ki
T!*vq=XA<da8*5c-IAZ<-m!Qp?

literal 0
HcmV?d00001