From 6a747ef5b9843b79e91ad2f620887e9851d4002e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Sat, 11 Jan 2025 18:13:10 +0800
Subject: [PATCH 01/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=8F=91=E8=B5=B7=E7=94=B3=E8=AF=B7=E5=92=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=B8=AD=E5=BF=83=E7=9A=84UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  22 ++-
 src/pages/approval/approval.vue               |  78 ++++++++-
 .../approval/components/ApplicationList.vue   |  58 +++++++
 .../approval/components/ApprovalRecords.vue   | 149 ++++++++++++++++++
 src/pages/attendance/attendance.vue           |   6 +-
 src/static/images/icon_default_avatar.png     | Bin 0 -> 3963 bytes
 src/types/uni-pages.d.ts                      |   6 +-
 7 files changed, 313 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/approval/components/ApplicationList.vue
 create mode 100644 src/pages/approval/components/ApprovalRecords.vue
 create mode 100644 src/static/images/icon_default_avatar.png

diff --git a/src/pages.json b/src/pages.json
index 64a6baa..7b81eb9 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -163,7 +163,19 @@
     },
     {
       "path": "pages/info-publish/basic-info",
-      "type": "page"
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/drafts-list",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
     },
     {
       "path": "pages/info-publish/info-publish",
@@ -223,6 +235,14 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/attendance/attendance-add-group/attendance-device",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/attendance/attendance-add-group/attendance-staff",
       "type": "page",
diff --git a/src/pages/approval/approval.vue b/src/pages/approval/approval.vue
index 5c80404..e0069bb 100644
--- a/src/pages/approval/approval.vue
+++ b/src/pages/approval/approval.vue
@@ -7,14 +7,18 @@
 }
 </route>
 <template>
-  <view>
+  <view class="h-100vh flex flex-col">
     <TopNavigation :title="index === 0 ? '发起申请' : '审批'"></TopNavigation>
+    <ApplicationList v-if="index === 0" :list="applicationListData"></ApplicationList>
+    <ApprovalRecords v-else></ApprovalRecords>
     <CustomTabBar :list="list" :default-index="index" @change="change"></CustomTabBar>
   </view>
 </template>
 
 <script setup lang="ts">
   import { TabBarItem } from '@/typings'
+  import ApplicationList from '@/pages/approval/components/ApplicationList.vue'
+  import ApprovalRecords from '@/pages/approval/components/ApprovalRecords.vue'
 
   const index = ref<number>(0)
 
@@ -29,6 +33,78 @@
     }
   ]
 
+  const applicationListData = ref<Array<object>>([
+    {
+      groupId: 138603,
+      groupName: '出勤休假',
+      sort: 1,
+      processDefs: [
+        {
+          processDefId: 249155,
+          processDefName: '请假',
+          icon: 'https://file.hikvisionmall.com/test1/image/f39c654cd30a48d28ddf37e4b64de57a.png',
+          version: '1735128632'
+        },
+        {
+          processDefId: 249156,
+          processDefName: '补卡',
+          icon: 'https://file.hikvisionmall.com/test1/image/26209b6732f2439fae3c6dd34a39145e.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 249158,
+          processDefName: '外出',
+          icon: 'https://file.hikvisionmall.com/test1/image/5c76288745dd47a38c9e1093d9737976.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 249157,
+          processDefName: '出差',
+          icon: 'https://file.hikvisionmall.com/test1/image/df75579e70c2435e9f78d04fc401b451.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 347336,
+          processDefName: '加班',
+          icon: 'https://file.hikvisionmall.com/test1/image/e4f21377ea2443b3856b07674ba41c2a.png',
+          version: '1711368134'
+        },
+        {
+          processDefId: 891737,
+          processDefName: '调休',
+          icon: 'https://file.hikvisionmall.com/prod/image/3d134cc9657e4816ad6aa8ef206fbc89.png',
+          version: '1735128832'
+        }
+      ]
+    },
+    {
+      groupId: 341473,
+      groupName: 'test',
+      sort: 2,
+      processDefs: [
+        {
+          processDefId: 924255,
+          processDefName: 'test1',
+          icon: 'https://file.hikvisionmall.com/prod/image/3d134cc9657e4816ad6aa8ef206fbc89.png',
+          version: '1736480449'
+        }
+      ]
+    },
+    {
+      groupId: 138604,
+      groupName: '其他',
+      sort: 999,
+      processDefs: [
+        {
+          processDefId: 466818,
+          processDefName: '访客预约',
+          icon: 'https://file.hikmall.com/prod/image/5300a838119d462b9e1c17489603b6d8.png',
+          version: '1715675086'
+        }
+      ]
+    }
+  ])
+
   onLoad(options => {
     if (options.index) {
       index.value = Number(options.index)
diff --git a/src/pages/approval/components/ApplicationList.vue b/src/pages/approval/components/ApplicationList.vue
new file mode 100644
index 0000000..26d60ba
--- /dev/null
+++ b/src/pages/approval/components/ApplicationList.vue
@@ -0,0 +1,58 @@
+<template>
+  <scroll-view class="flex-1 box-border" :scroll-y="true">
+    <view class="mx-4 pt-4 flex flex-items-center text-3.5 font-bold">
+      <view class="bg-#dfecff flex-1 px-3 py-6 rounded-2">
+        <view>使用指南</view>
+      </view>
+      <view class="w-4"></view>
+      <view class="bg-#feebda flex-1 px-3 py-6 rounded-2">
+        <view>常见问题</view>
+      </view>
+    </view>
+    <view class="py-4">
+      <wd-collapse v-model="collapseRoot" custom-class="!bg-transparent !border-0">
+        <wd-collapse-item
+          v-for="group in list"
+          :key="group.groupId"
+          :name="group.groupName"
+          :title="group.groupName"
+        >
+          <view
+            v-for="(item, index) in group.processDefs"
+            :key="item.processDefId"
+            :class="[index === group.processDefs.length - 1 ? '' : 'mb-2']"
+            class="flex flex-items-center bg-white px-3 py-3 mx-1 rounded-2"
+          >
+            <image :src="item.icon" class="w-7 h-7 rounded-2"></image>
+            <view class="text-3.5 ml-2">{{ item.processDefName }}</view>
+          </view>
+        </wd-collapse-item>
+      </wd-collapse>
+    </view>
+  </scroll-view>
+</template>
+
+<script setup lang="ts">
+  const collapseRoot = ref<string[]>([])
+
+  onMounted(() => {
+    collapseRoot.value = props.list.map(item => item.groupName)
+  })
+
+  const props = defineProps({
+    list: {
+      type: Array,
+      required: true
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+  .wd-collapse-item::after {
+    height: 0 !important;
+  }
+
+  :deep(.wd-collapse-item__header::after) {
+    height: 0 !important;
+  }
+</style>
diff --git a/src/pages/approval/components/ApprovalRecords.vue b/src/pages/approval/components/ApprovalRecords.vue
new file mode 100644
index 0000000..b470eac
--- /dev/null
+++ b/src/pages/approval/components/ApprovalRecords.vue
@@ -0,0 +1,149 @@
+<template>
+  <view class="mx-4 mt-2">
+    <wd-input
+      class="px-2 py-0.6 rounded-1"
+      placeholder="申请名称、发起人"
+      v-model="search"
+      clearable
+      custom-class="border-0"
+      :maxlength="50"
+      prefix-icon="search"
+      @change="handleChange"
+    />
+  </view>
+  <wd-tabs v-model="currentIndex" class="pt-3" auto-line-width @click="handleChange">
+    <wd-tab :title="item" v-for="(item, index) in tabs" :key="item" :name="index" />
+  </wd-tabs>
+  <swiper :current="currentIndex" @change="changeIndex">
+    <swiper-item v-for="(item, index) in tabs" :key="item" class="flex flex-col">
+      <view @click="closeOutside">
+        <wd-drop-menu>
+          <wd-drop-menu-item
+            v-model="typeList[index]"
+            :options="typeOptionList[index]"
+            @change="typeChange"
+          />
+          <wd-drop-menu-item
+            v-model="dateList[index]"
+            :options="dateOptions"
+            @change="dateChange"
+          />
+        </wd-drop-menu>
+      </view>
+      <scroll-view :scroll-y="true" class="flex-1 box-border">
+        <view class="pt-2">
+          <view
+            v-for="item in 10"
+            :key="item"
+            class="mx-4 my-2 p-4 bg-white shadow-sm rounded-2 text-3.5"
+          >
+            <view class="flex flex-items-center mb-2">
+              <view class="text-4.5 font-bold">请假</view>
+              <view class="ml-a px-3 py-1 border-solid border-[#2bbbc3] color-#2bbbc3 rounded">
+                通过
+              </view>
+            </view>
+            <view class="mb-2">请假类型：年假</view>
+            <view class="mb-2">开始时间：2025-12-31</view>
+            <view class="mb-2">结束时间：2025-12-31</view>
+            <view class="flex flex-items-center">
+              <image class="w-8 h-8" src="/static/images/icon_default_avatar.png"></image>
+              <view class="ml-4">xxx</view>
+              <view class="ml-a">2025-12-25</view>
+            </view>
+          </view>
+        </view>
+        <view class="py-6 mx-30%">
+          <wd-divider color="#515357">已经到底了</wd-divider>
+        </view>
+      </scroll-view>
+    </swiper-item>
+  </swiper>
+</template>
+
+<script setup lang="ts">
+  import { useQueue } from 'wot-design-uni'
+
+  const search = ref<string>('')
+
+  const currentIndex = ref<number>(0)
+
+  const tabs = ref<string[]>(['待办', '已办', '抄送我', '已发起'])
+
+  const { closeOutside } = useQueue()
+
+  const typeList = ref<Array<number>>([0, 0, 0, 0])
+  const dateList = ref<Array<number>>([0, 0, 0, 0])
+
+  const typeOptionList = ref<Array<Array<Record<string, number>>>>([
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '调休', value: 1 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ]
+  ])
+
+  const dateOptions = ref<Array<Record<string, number>>>([
+    { label: '全部日期', value: 0 },
+    { label: '近7日', value: 1 },
+    { label: '近14日', value: 2 },
+    { label: '近30日', value: 3 }
+  ])
+
+  function typeChange({ value }) {
+    console.log(value)
+  }
+
+  function dateChange({ value }) {
+    console.log(value)
+  }
+
+  const handleChange = value => {
+    currentIndex.value = value.index
+  }
+
+  const changeIndex = e => {
+    currentIndex.value = e.detail.current
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-input::after {
+    height: 0;
+  }
+
+  .wd-drop-item {
+    top: calc(var(--window-top) + 48px) !important;
+  }
+
+  :deep(.wd-drop-menu__item.is-active .wd-drop-menu__item-title::after) {
+    opacity: 0 !important;
+  }
+
+  :deep(.wd-drop-menu__list) {
+    background-color: transparent !important;
+  }
+
+  :deep(.wd-tabs__nav-item) {
+    margin-bottom: 5px;
+  }
+
+  :deep(.wd-tabs__nav-item.is-active) {
+    font-weight: bold;
+    color: #255cf7;
+  }
+</style>
diff --git a/src/pages/attendance/attendance.vue b/src/pages/attendance/attendance.vue
index 92cfe85..bb290ec 100644
--- a/src/pages/attendance/attendance.vue
+++ b/src/pages/attendance/attendance.vue
@@ -11,9 +11,9 @@
   <view class="h-[calc(100vh-50px)] flex flex-col">
     <TopNavigation :title="titleTab[curIndex]"></TopNavigation>
     <scroll-view class="flex-1 box-border" scroll-y>
-      <view v-for="(item, index) in pages" :key="index" v-show="curIndex == index">
-        <component :is="item"></component>
-      </view>
+      <AttendanceClockIn v-show="curIndex === 0"></AttendanceClockIn>
+      <AttendanceStatistics v-show="curIndex === 1"></AttendanceStatistics>
+      <AttendanceSet v-show="curIndex === 2"></AttendanceSet>
     </scroll-view>
   </view>
   <CustomTabBar :list="list" :default-index="0" @change="change"></CustomTabBar>
diff --git a/src/static/images/icon_default_avatar.png b/src/static/images/icon_default_avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..b93dfad6a207648a45b5f45684ac9d1b2d892d45
GIT binary patch
literal 3963
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
PHw`q@bX1FPn+N|dwed#Y

literal 0
HcmV?d00001

diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 11e6519..b85ce17 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -17,15 +17,19 @@ interface NavigateToOptions {
        "/pages/attendance/issue-record" |
        "/pages/code/code" |
        "/pages/get-code/get-code" |
+       "/pages/info-publish/announce-notice" |
+       "/pages/info-publish/basic-info" |
+       "/pages/info-publish/drafts-list" |
        "/pages/info-publish/info-publish" |
        "/pages/info-publish/notice-details" |
-       "/pages/info-publish/notice" |
+       "/pages/info-publish/notice-manage" |
        "/pages/login/login" |
        "/pages/mine/mine" |
        "/pages/notification/notification" |
        "/pages/reset-password/reset-password" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |
+       "/pages/attendance/attendance-add-group/attendance-device" |
        "/pages/attendance/attendance-add-group/attendance-staff" |
        "/pages/attendance/attendance-add-group/attendance-time" |
        "/pages/attendance/attendance-add-group/outside-rules" |

From 46f19f1808daac6e3076579361191c73541e3718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 17:52:14 +0800
Subject: [PATCH 02/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E8=AF=A6=E6=83=85=E9=A1=B5UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/approval-detail.vue        | 66 +++++++++++++++
 src/pages/approval/approval.vue               |  6 +-
 .../approval/components/ApplicationList.vue   |  7 ++
 .../approval/components/ApprovalContent.vue   | 61 ++++++++++++++
 .../approval/components/ApprovalProcess.vue   | 81 +++++++++++++++++++
 .../approval/components/ApprovalRecords.vue   | 15 +++-
 6 files changed, 231 insertions(+), 5 deletions(-)
 create mode 100644 src/pages/approval/approval-detail.vue
 create mode 100644 src/pages/approval/components/ApprovalContent.vue
 create mode 100644 src/pages/approval/components/ApprovalProcess.vue

diff --git a/src/pages/approval/approval-detail.vue b/src/pages/approval/approval-detail.vue
new file mode 100644
index 0000000..9b74160
--- /dev/null
+++ b/src/pages/approval/approval-detail.vue
@@ -0,0 +1,66 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation title="详情"></TopNavigation>
+    <scroll-view class="flex-1 box-border" :scroll-y="true">
+      <view class="pb-5">
+        <ApprovalContent class="mt-2" />
+        <ApprovalProcess class="mt-2" />
+      </view>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid">
+      <view class="flex flex-items-center flex-justify-around py-3">
+        <view class="py-2 px-13 bg-#ef2e2f color-white rounded-2">拒绝</view>
+        <view class="py-2 px-13 custom-bg-blue color-white rounded-2">同意</view>
+        <view class="custom-color-blue text-4" @click="showActions">更多</view>
+      </view>
+    </view>
+    <wd-action-sheet
+      v-model="show"
+      :actions="actions"
+      close-on-click-action
+      @close="close"
+      @select="select"
+    />
+  </view>
+</template>
+
+<script setup lang="ts">
+  import { useToast } from 'wot-design-uni'
+  import ApprovalContent from '@/pages/approval/components/ApprovalContent.vue'
+  import ApprovalProcess from '@/pages/approval/components/ApprovalProcess.vue'
+
+  const toast = useToast()
+
+  const show = ref<boolean>(false)
+  const actions = ref([
+    {
+      name: '专审'
+    },
+    {
+      name: '退回'
+    },
+    {
+      name: '取消'
+    }
+  ])
+
+  const showActions = () => {
+    show.value = true
+  }
+
+  const close = () => {
+    show.value = false
+  }
+
+  const select = ({ item, index }) => {
+    toast.show(`当前选中项: ${item.title}, 下标: ${index}`)
+  }
+</script>
diff --git a/src/pages/approval/approval.vue b/src/pages/approval/approval.vue
index e0069bb..09b0ea5 100644
--- a/src/pages/approval/approval.vue
+++ b/src/pages/approval/approval.vue
@@ -9,8 +9,10 @@
 <template>
   <view class="h-100vh flex flex-col">
     <TopNavigation :title="index === 0 ? '发起申请' : '审批'"></TopNavigation>
-    <ApplicationList v-if="index === 0" :list="applicationListData"></ApplicationList>
-    <ApprovalRecords v-else></ApprovalRecords>
+    <ApplicationList v-show="index === 0" :list="applicationListData"></ApplicationList>
+    <view v-show="index === 1" class="flex-1 box-border">
+      <ApprovalRecords></ApprovalRecords>
+    </view>
     <CustomTabBar :list="list" :default-index="index" @change="change"></CustomTabBar>
   </view>
 </template>
diff --git a/src/pages/approval/components/ApplicationList.vue b/src/pages/approval/components/ApplicationList.vue
index 26d60ba..a8c67fc 100644
--- a/src/pages/approval/components/ApplicationList.vue
+++ b/src/pages/approval/components/ApplicationList.vue
@@ -22,6 +22,7 @@
             :key="item.processDefId"
             :class="[index === group.processDefs.length - 1 ? '' : 'mb-2']"
             class="flex flex-items-center bg-white px-3 py-3 mx-1 rounded-2"
+            @click="toDetail(item)"
           >
             <image :src="item.icon" class="w-7 h-7 rounded-2"></image>
             <view class="text-3.5 ml-2">{{ item.processDefName }}</view>
@@ -45,6 +46,12 @@
       required: true
     }
   })
+
+  const toDetail = (item: Record<string, any>) => {
+    uni.navigateTo({
+      url: `/pages/approval/create-application?id=${item.processDefId}&title=${item.processDefName}`
+    })
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/ApprovalContent.vue b/src/pages/approval/components/ApprovalContent.vue
new file mode 100644
index 0000000..031fa1d
--- /dev/null
+++ b/src/pages/approval/components/ApprovalContent.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="bg-white rounded-2 py-2 px-4 mx-4">
+    <view class="flex flex-items-center">
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-10 h-10"
+        mode="aspectFill"
+      ></image>
+      <view class="ml-4">
+        <view class="font-bold text-4.5">请假</view>
+        <view class="text-3.5 mt-1">xxx</view>
+      </view>
+      <view
+        class="ml-a rounded py-0.5 px-1.5 text-3.5 border-solid border-1 border-#ef811c color-#ef811c"
+      >
+        审批中
+      </view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>所属组织：</view>
+      <view class="mt-2 break-all">123132123的互联</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>审批编号：</view>
+      <view class="mt-2 break-all">845465465465465465456</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假类型：</view>
+      <view class="mt-2 break-all">年假</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>开始时间：</view>
+      <view class="mt-2 break-all">2025-01-10</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>结束时间：</view>
+      <view class="mt-2 break-all">2025-01-10</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假时长(天)：</view>
+      <view class="mt-2 break-all">1.0</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假原因：</view>
+      <view class="mt-2 break-all">
+        请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假1111111111111111111111
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/ApprovalProcess.vue b/src/pages/approval/components/ApprovalProcess.vue
new file mode 100644
index 0000000..c999f2d
--- /dev/null
+++ b/src/pages/approval/components/ApprovalProcess.vue
@@ -0,0 +1,81 @@
+<template>
+  <view class="bg-white rounded-2 py-2 px-4 mx-4">
+    <view class="py-2 text-4">审批流程</view>
+    <wd-steps :active="1" vertical>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>发起申请</view>
+              <view class="ml-a color-#7e807f text-3">2504-12-25 20:11</view>
+            </view>
+            <view class="my-2">
+              <view class="py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa">
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>审批节点</view>
+              <view
+                class="ml-3 rounded-4 py-0.5 text-3 px-2 border-solid border-#ef811c border-1 color-#ef811c"
+              >
+                审批中
+              </view>
+            </view>
+            <view class="pt-2 color-#7e807f text-3">1人通过即可</view>
+            <view class="my-2">
+              <view
+                v-for="item in 4"
+                :key="item"
+                class="mb-2 py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa"
+              >
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>抄送节点</view>
+            </view>
+            <view class="my-2">
+              <view
+                v-for="item in 4"
+                :key="item"
+                class="mb-2 py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa"
+              >
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+    </wd-steps>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
diff --git a/src/pages/approval/components/ApprovalRecords.vue b/src/pages/approval/components/ApprovalRecords.vue
index b470eac..9d24188 100644
--- a/src/pages/approval/components/ApprovalRecords.vue
+++ b/src/pages/approval/components/ApprovalRecords.vue
@@ -36,10 +36,13 @@
             v-for="item in 10"
             :key="item"
             class="mx-4 my-2 p-4 bg-white shadow-sm rounded-2 text-3.5"
+            @click="toDetail(item)"
           >
             <view class="flex flex-items-center mb-2">
               <view class="text-4.5 font-bold">请假</view>
-              <view class="ml-a px-3 py-1 border-solid border-[#2bbbc3] color-#2bbbc3 rounded">
+              <view
+                class="ml-a px-3 py-1 border-solid border-[#2bbbc3] border-1 color-#2bbbc3 rounded"
+              >
                 通过
               </view>
             </view>
@@ -104,14 +107,20 @@
     { label: '近30日', value: 3 }
   ])
 
-  function typeChange({ value }) {
+  const typeChange = ({ value }) => {
     console.log(value)
   }
 
-  function dateChange({ value }) {
+  const dateChange = ({ value }) => {
     console.log(value)
   }
 
+  const toDetail = item => {
+    uni.navigateTo({
+      url: '/pages/approval/approval-detail'
+    })
+  }
+
   const handleChange = value => {
     currentIndex.value = value.index
   }

From 735ff0c7223a5b141f838c9c4104b8486f8cc6d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 17:52:54 +0800
Subject: [PATCH 03/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E8=BE=93=E5=85=A5=E6=A1=86=E4=B8=8E?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                               | 16 +++++
 src/pages/approval/components/Components.vue | 42 ++++++++++++
 src/pages/approval/components/Input.vue      | 64 ++++++++++++++++++
 src/pages/approval/components/Textarea.vue   | 71 ++++++++++++++++++++
 src/pages/approval/create-application.vue    | 40 +++++++++++
 src/types/uni-pages.d.ts                     |  2 +
 6 files changed, 235 insertions(+)
 create mode 100644 src/pages/approval/components/Components.vue
 create mode 100644 src/pages/approval/components/Input.vue
 create mode 100644 src/pages/approval/components/Textarea.vue
 create mode 100644 src/pages/approval/create-application.vue

diff --git a/src/pages.json b/src/pages.json
index 7b81eb9..5e5745b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -63,6 +63,14 @@
       "path": "pages/application-list/application-list",
       "type": "page"
     },
+    {
+      "path": "pages/approval/approval-detail",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/approval/approval",
       "type": "page",
@@ -71,6 +79,14 @@
         "disableScroll": true
       }
     },
+    {
+      "path": "pages/approval/create-application",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/attendance/allowed-time",
       "type": "page",
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
new file mode 100644
index 0000000..0162720
--- /dev/null
+++ b/src/pages/approval/components/Components.vue
@@ -0,0 +1,42 @@
+<template>
+  <view>
+    <view class="mx-4 p-2 rounded-2">
+      <Input
+        :id="0"
+        value="单行"
+        title="单行文本"
+        :required="true"
+        placeholder="单行文本"
+        @change="inputChange"
+      ></Input>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Textarea
+        :id="1"
+        title="多行文本"
+        :required="false"
+        placeholder="多行文本"
+        @change="textareaChange"
+      ></Textarea>
+      <wd-divider color="#bcbfbe"></wd-divider>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Input from '@/pages/approval/components/Input.vue'
+  import Textarea from '@/pages/approval/components/Textarea.vue'
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const textareaChange = e => {
+    console.log('textareaChange', e)
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
new file mode 100644
index 0000000..ff1e7d5
--- /dev/null
+++ b/src/pages/approval/components/Input.vue
@@ -0,0 +1,64 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-input
+        custom-class="!bg-transparent"
+        :placeholder="placeholder"
+        :maxlength="30"
+        v-model="text"
+        @input="change(id, $event)"
+      ></wd-input>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['change'])
+
+  const text = ref<string>('')
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: String,
+      default: ''
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  onMounted(() => {
+    text.value = props.value
+  })
+
+  const change = (id, data) => {
+    emits('change', { id, value: data.value })
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-input::after {
+    height: 0 !important;
+  }
+
+  :deep(.wd-input__inner) {
+    font-size: 0.875rem;
+  }
+</style>
diff --git a/src/pages/approval/components/Textarea.vue b/src/pages/approval/components/Textarea.vue
new file mode 100644
index 0000000..d870304
--- /dev/null
+++ b/src/pages/approval/components/Textarea.vue
@@ -0,0 +1,71 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-textarea
+        custom-class="!bg-transparent"
+        custom-textarea-class="h-16"
+        :placeholder="placeholder"
+        :maxlength="250"
+        v-model="text"
+        show-word-limit
+        @input="change(id, $event)"
+      ></wd-textarea>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['change'])
+
+  const text = ref<string>('')
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: String,
+      default: ''
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  onMounted(() => {
+    text.value = props.value
+  })
+
+  const change = (id, data) => {
+    emits('change', { id, value: data.value })
+  }
+</script>
+
+<style lang="scss" scoped>
+  :deep(.wd-textarea__value),
+  :deep(.wd-textarea__count) {
+    background: transparent !important;
+  }
+
+  :deep(.wd-textarea__inner) {
+    font-size: 0.875rem;
+  }
+
+  .wd-textarea {
+    padding: 0;
+  }
+</style>
diff --git a/src/pages/approval/create-application.vue b/src/pages/approval/create-application.vue
new file mode 100644
index 0000000..c7fd5a4
--- /dev/null
+++ b/src/pages/approval/create-application.vue
@@ -0,0 +1,40 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation :title="title"></TopNavigation>
+    <scroll-view class="flex-1 box-border" :scroll-y="true">
+      <Components></Components>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid">
+      <view class="flex flex-items-center flex-justify-around py-3 px-3">
+        <view class="py-2 w-45% text-center bg-#e2e5ea custom-color-blue rounded-2">保存草稿</view>
+        <view class="opacity-60% py-2 w-45% text-center custom-bg-blue color-white rounded-2">
+          提交
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Components from '@/pages/approval/components/Components.vue'
+
+  const title = ref<string>('')
+  const id = ref<number>(null)
+
+  onLoad(options => {
+    if (options.title) {
+      title.value = options.title
+    }
+    if (options.id) {
+      id.value = Number(options.id)
+    }
+  })
+</script>
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index b85ce17..64d411e 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -6,7 +6,9 @@
 interface NavigateToOptions {
   url: "/pages/home/home" |
        "/pages/application-list/application-list" |
+       "/pages/approval/approval-detail" |
        "/pages/approval/approval" |
+       "/pages/approval/create-application" |
        "/pages/attendance/allowed-time" |
        "/pages/attendance/attendance-rules" |
        "/pages/attendance/attendance" |

From 207a55e525e600c0b72cfe0ed127715502f25632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 18:42:04 +0800
Subject: [PATCH 04/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E9=80=89=E6=8B=A9=E5=99=A8=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  | 34 +++++++++-
 .../approval/components/SelectPicker.vue      | 66 +++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/approval/components/SelectPicker.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 0162720..2cfa5e9 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <view class="mx-4 p-2 rounded-2">
+    <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
         value="单行"
@@ -18,6 +18,22 @@
         @change="textareaChange"
       ></Textarea>
       <wd-divider color="#bcbfbe"></wd-divider>
+      <SelectPicker
+        :value="1"
+        :id="2"
+        title="单选框"
+        placeholder="单选"
+        :columns="columns"
+      ></SelectPicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <SelectPicker
+        :value="[0]"
+        :id="3"
+        title="多选框"
+        placeholder="多选"
+        type="checkbox"
+        :columns="columns"
+      ></SelectPicker>
     </view>
   </view>
 </template>
@@ -25,6 +41,22 @@
 <script setup lang="ts">
   import Input from '@/pages/approval/components/Input.vue'
   import Textarea from '@/pages/approval/components/Textarea.vue'
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+
+  const columns = ref<Record<number, any>>([
+    {
+      value: 0,
+      label: '男装'
+    },
+    {
+      value: 1,
+      label: '奢侈品'
+    },
+    {
+      value: 2,
+      label: '女装'
+    }
+  ])
 
   const inputChange = e => {
     console.log('inputChange', e)
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
new file mode 100644
index 0000000..4ce41f7
--- /dev/null
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -0,0 +1,66 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-select-picker
+        :type="type"
+        :title="placeholder"
+        :show-confirm="type === 'checkbox'"
+        v-model="picker"
+        :columns="columns"
+        size="large"
+      />
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const picker = ref(-1)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      default: 'radio'
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    },
+    value: {
+      type: [Number, Array, null],
+      default: null
+    },
+    columns: {
+      type: Array,
+      required: true
+    }
+  })
+
+  onMounted(() => {
+    if (props.value) {
+      picker.value = props.value
+    }
+  })
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-select-picker__cell) {
+    padding: var(--wot-cell-wrapper-padding, 10px) 0;
+    background-color: transparent;
+  }
+</style>

From a8a9f0863a75b2eac47390ba3b44392c0148b43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 18:56:05 +0800
Subject: [PATCH 05/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=95=B0=E5=AD=97=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue | 9 +++++++++
 src/pages/approval/components/Input.vue      | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 2cfa5e9..212d071 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -34,6 +34,15 @@
         type="checkbox"
         :columns="columns"
       ></SelectPicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Input
+        :id="4"
+        type="number"
+        title="数字"
+        :required="true"
+        placeholder="数字"
+        @change="inputChange"
+      ></Input>
     </view>
   </view>
 </template>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index ff1e7d5..96df501 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -6,9 +6,10 @@
     </view>
     <view class="pt-2">
       <wd-input
+        :type="type"
         custom-class="!bg-transparent"
         :placeholder="placeholder"
-        :maxlength="30"
+        :maxlength="type === 'text' ? 30 : 15"
         v-model="text"
         @input="change(id, $event)"
       ></wd-input>
@@ -26,6 +27,10 @@
       type: Number,
       required: true
     },
+    type: {
+      type: String,
+      default: 'text'
+    },
     required: {
       type: Boolean,
       default: false

From 813ec1dfd6f0449791d7500c62b68776d135053c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 18:17:24 +0800
Subject: [PATCH 06/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  22 ++
 .../approval/components/DatetimePicker.vue    | 196 ++++++++++++++++++
 2 files changed, 218 insertions(+)
 create mode 100644 src/pages/approval/components/DatetimePicker.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 212d071..0cfb397 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -43,6 +43,23 @@
         placeholder="数字"
         @change="inputChange"
       ></Input>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker :id="5" title="日期1" @change="changeDate"></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="6"
+        title="日期2"
+        type="dateHalfDay"
+        @change="changeDate"
+      ></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="7"
+        type="datetime"
+        :value="1737043380000"
+        title="日期3"
+        @change="changeDate"
+      ></DatetimePicker>
     </view>
   </view>
 </template>
@@ -51,6 +68,7 @@
   import Input from '@/pages/approval/components/Input.vue'
   import Textarea from '@/pages/approval/components/Textarea.vue'
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
 
   const columns = ref<Record<number, any>>([
     {
@@ -74,6 +92,10 @@
   const textareaChange = e => {
     console.log('textareaChange', e)
   }
+
+  const changeDate = e => {
+    console.log('changeDate', e)
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
new file mode 100644
index 0000000..95fc9c5
--- /dev/null
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -0,0 +1,196 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="py-2" @click="openDialog">
+      <view class="flex flex-items-center flex-justify-between">
+        <view>{{ text || placeholder }}</view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+  </view>
+  <wd-popup
+    v-model="show"
+    position="bottom"
+    custom-style="border-radius:12rpx;"
+    @after-leave="afterLeave"
+  >
+    <view>
+      <view class="p-4 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center">
+        <view class="font-bold">日期：</view>
+        <view class="font-bold ml-a" v-if="type !== 'dateHalfDay'">{{ date }}</view>
+      </view>
+      <view v-if="(type === 'date' || type === 'datetime') && showPicker">
+        <wd-datetime-picker-view
+          :formatter="formatter"
+          :type="type"
+          v-model="timestamp"
+          label="日期选择"
+          @change="change"
+        />
+      </view>
+      <view v-if="type === 'dateHalfDay' && showPicker">
+        <wd-tabs v-model="tab">
+          <wd-tab :title="index === 0 ? date : halfDay" v-for="(item, index) in 2" :key="index">
+            <view v-show="index === 0">
+              <wd-datetime-picker-view
+                :formatter="formatter"
+                type="date"
+                v-model="timestamp"
+                @change="change"
+              />
+            </view>
+            <view v-show="index === 1">
+              <wd-picker-view :columns="['上午', '下午']" v-model="halfDay" @change="change" />
+            </view>
+          </wd-tab>
+        </wd-tabs>
+      </view>
+      <view class="pb-safe">
+        <view class="flex py-3 flex-items-center flex-justify-around text-3.5 px-2 font-bold">
+          <view
+            class="w-45% bg-#eeeff4 custom-color-blue py-2.5 rounded-2 text-center"
+            @click="show = false"
+          >
+            取消
+          </view>
+          <view
+            class="w-45% custom-bg-blue color-white py-2.5 rounded-2 text-center"
+            @click="confirm"
+          >
+            确定
+          </view>
+        </view>
+      </view>
+    </view>
+  </wd-popup>
+</template>
+
+<script setup lang="ts">
+  import dayjs from 'dayjs'
+
+  const show = ref<boolean>(false)
+  const timestamp = ref<number>(0)
+  const text = ref<string>('')
+  const date = ref<string>('')
+  const halfDay = ref<string>('')
+  const showPicker = ref<boolean>(false)
+  const returnTimestamp = ref<number>(0)
+
+  const tab = ref<number>(0)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      default: 'date'
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  const formatter = (type, value) => {
+    switch (type) {
+      case 'year':
+        return value + '年'
+      case 'month':
+        return value + '月'
+      case 'date':
+        return value + '日'
+      case 'hour':
+        return value + '时'
+      case 'minute':
+        return value + '分'
+      default:
+        return value
+    }
+  }
+
+  const emits = defineEmits(['change'])
+
+  onMounted(() => {
+    if (props.value) {
+      timestamp.value = props.value
+      if (props.type === 'date') {
+        date.value = dayjs(props.value).format('YYYY-M-D')
+        text.value = date.value
+      } else if (props.type === 'datetime') {
+        date.value = dayjs(props.value).format('YYYY-M-D HH:mm')
+        text.value = date.value
+      } else if (props.type === 'dateHalfDay') {
+        date.value = dayjs(props.value).format('YYYY年M月D日')
+        halfDay.value = dayjs(props.value).hour() < 12 ? '上午' : '下午'
+        text.value = `${date.value} ${halfDay.value}`
+      }
+    }
+  })
+
+  const change = ({ value }) => {
+    if (props.type === 'date') {
+      date.value = dayjs(value).format('YYYY-M-D')
+    } else if (props.type === 'datetime') {
+      date.value = dayjs(value).format('YYYY-M-D HH:mm')
+    } else if (props.type === 'dateHalfDay') {
+      if (tab.value === 0) {
+        date.value = dayjs(value).format('YYYY年M月D日')
+      } else {
+        halfDay.value = value
+      }
+    }
+  }
+
+  const openDialog = () => {
+    if (!props.value) {
+      if (text.value === '') {
+        timestamp.value = new Date().getTime()
+      } else {
+        timestamp.value = returnTimestamp.value
+      }
+
+      if (props.type === 'date') {
+        date.value = dayjs(timestamp.value).format('YYYY-M-D')
+      } else if (props.type === 'datetime') {
+        date.value = dayjs(timestamp.value).format('YYYY-M-D HH:mm')
+      } else if (props.type === 'dateHalfDay') {
+        date.value = dayjs(timestamp.value).format('YYYY年M月D日')
+        halfDay.value = dayjs(timestamp.value).hour() < 12 ? '上午' : '下午'
+      }
+    }
+    showPicker.value = true
+    show.value = true
+  }
+
+  const confirm = () => {
+    show.value = false
+    returnTimestamp.value = timestamp.value
+    if (props.type === 'dateHalfDay') {
+      text.value = `${date.value} ${halfDay.value}`
+    } else {
+      text.value = date.value
+    }
+    emits('change', { id: props.id, value: returnTimestamp.value, text: text.value })
+  }
+
+  const afterLeave = () => {
+    showPicker.value = false
+  }
+</script>

From f2b1753601b633891ec5fe5324b85b6d4fc3bb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 19:39:14 +0800
Subject: [PATCH 07/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue |  3 +
 src/pages/approval/components/Images.vue     | 61 ++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 src/pages/approval/components/Images.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 0cfb397..2b9bc94 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -60,6 +60,8 @@
         title="日期3"
         @change="changeDate"
       ></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Images id="8" title="图片"></Images>
     </view>
   </view>
 </template>
@@ -69,6 +71,7 @@
   import Textarea from '@/pages/approval/components/Textarea.vue'
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import Images from '@/pages/approval/components/Images.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/Images.vue b/src/pages/approval/components/Images.vue
new file mode 100644
index 0000000..c1b3798
--- /dev/null
+++ b/src/pages/approval/components/Images.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-3">
+      <wd-upload
+        :file-list="fileList"
+        multiple
+        :limit="9"
+        image-mode="aspectFill"
+        :size-type="['original']"
+        action="https://mockapi.eolink.com/zhTuw2P8c29bc981a741931bdd86eb04dc1e8fd64865cb5/upload"
+        @change="handleChange"
+      ></wd-upload>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const fileList = ref<any[]>([])
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: Array,
+      default: () => []
+    }
+  })
+
+  onMounted(() => {
+    if (props.value.length > 0) {
+      fileList.value = props.value
+    }
+  })
+
+  const handleChange = ({ fileList: files }) => {
+    console.log('handleChange', files)
+    fileList.value = files
+  }
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-upload__evoke),
+  :deep(.wd-upload__status-content),
+  :deep(.wd-upload__picture) {
+    border-radius: 12rpx;
+  }
+</style>

From 1bdc3bdc875abe16f6295e6916ca0f43a901d083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 19:44:58 +0800
Subject: [PATCH 08/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E8=AF=B4=E6=98=8E=E9=A1=B9=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  6 ++++++
 src/pages/approval/components/Description.vue | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 src/pages/approval/components/Description.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 2b9bc94..4f2a1c8 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -62,6 +62,11 @@
       ></DatetimePicker>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Images id="8" title="图片"></Images>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Description
+        id="9"
+        title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
+      ></Description>
     </view>
   </view>
 </template>
@@ -72,6 +77,7 @@
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
+  import Description from '@/pages/approval/components/Description.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/Description.vue b/src/pages/approval/components/Description.vue
new file mode 100644
index 0000000..5bed04c
--- /dev/null
+++ b/src/pages/approval/components/Description.vue
@@ -0,0 +1,18 @@
+<template>
+  <view class="px-2 text-3.5 pb-2">
+    <view class="break-all">{{ title }}</view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    title: {
+      type: String,
+      required: true
+    }
+  })
+</script>

From 0c35f8742c1bfb061834570bc9d5d28454d2017d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Wed, 15 Jan 2025 20:03:50 +0800
Subject: [PATCH 09/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=88=90=E5=91=98=E5=8F=8A=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TopNavigation/TopNavigation.vue           |  17 +-
 src/pages.json                                |   8 +
 src/pages/approval/components/Components.vue  |  14 +-
 .../components/MemberOrDepartment.vue         |  65 +++++
 .../components/MemberOrDepartmentItem.vue     |  56 ++++
 .../components/SearchItem.vue                 |  35 +++
 .../select-member-or-department.vue           | 275 ++++++++++++++++++
 src/static/images/icon_delete.png             | Bin 0 -> 1493 bytes
 src/static/images/icon_file.png               | Bin 0 -> 1205 bytes
 src/types/uni-pages.d.ts                      |   1 +
 10 files changed, 468 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/approval/components/MemberOrDepartment.vue
 create mode 100644 src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
 create mode 100644 src/pages/select-member-or-department/components/SearchItem.vue
 create mode 100644 src/pages/select-member-or-department/select-member-or-department.vue
 create mode 100644 src/static/images/icon_delete.png
 create mode 100644 src/static/images/icon_file.png

diff --git a/src/components/TopNavigation/TopNavigation.vue b/src/components/TopNavigation/TopNavigation.vue
index af1bfdd..aa9af26 100644
--- a/src/components/TopNavigation/TopNavigation.vue
+++ b/src/components/TopNavigation/TopNavigation.vue
@@ -31,6 +31,13 @@
             {{ title }}
           </view>
         </view>
+        <view
+          v-if="rightButtonText"
+          class="text-3.5 font-normal pos-absolute right-5"
+          @click="rightButton"
+        >
+          {{ rightButtonText }}
+        </view>
       </view>
     </view>
   </view>
@@ -59,16 +66,24 @@
     backUrl: {
       type: String,
       default: '/static/images/icon_back.png'
+    },
+    rightButtonText: {
+      type: [String, null],
+      default: null
     }
   })
 
-  const emits = defineEmits(['back'])
+  const emits = defineEmits(['back', 'rightButton'])
 
   const back = () => {
     uni.navigateBack()
     emits('back')
   }
 
+  const rightButton = () => {
+    emits('rightButton')
+  }
+
   onMounted(async () => {
     systemInfo.value = await $basic.getSystemInfo()
   })
diff --git a/src/pages.json b/src/pages.json
index 5e5745b..9c1261e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -239,6 +239,14 @@
       },
       "needLogin": false
     },
+    {
+      "path": "pages/select-member-or-department/select-member-or-department",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/workbench/workbench",
       "type": "page"
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 4f2a1c8..d331ce8 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -61,12 +61,21 @@
         @change="changeDate"
       ></DatetimePicker>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <Images id="8" title="图片"></Images>
+      <Images :id="8" title="图片"></Images>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Description
-        id="9"
+        :id="9"
         title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
       ></Description>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <MemberOrDepartment :id="10" title="成员" type="member" :multiple="true"></MemberOrDepartment>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <MemberOrDepartment
+        :id="11"
+        title="部门"
+        type="department"
+        :multiple="true"
+      ></MemberOrDepartment>
     </view>
   </view>
 </template>
@@ -78,6 +87,7 @@
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
+  import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
new file mode 100644
index 0000000..5339c4c
--- /dev/null
+++ b/src/pages/approval/components/MemberOrDepartment.vue
@@ -0,0 +1,65 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="py-2" @click="toSelect">
+      <view class="flex flex-items-center flex-justify-between">
+        <view>{{ text || placeholder }}</view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string | null>(null)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  const toSelect = () => {
+    const params = {
+      type: props.type,
+      multiple: props.multiple,
+      title: props.type === 'member' ? '选择审批用户' : '选择部门'
+    }
+    uni.navigateTo({
+      url: `/pages/select-member-or-department/select-member-or-department?params=${JSON.stringify(params)}`,
+      events: {
+        change: res => {
+          console.log(1111, res)
+        }
+      }
+    })
+  }
+</script>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
new file mode 100644
index 0000000..2b3c360
--- /dev/null
+++ b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
@@ -0,0 +1,56 @@
+<template>
+  <view class="flex flex-items-center py-2 text-4" @click="toClick">
+    <view
+      v-if="item.type === 'member'"
+      class="w-10 h-10 flex flex-justify-center flex-items-center"
+    >
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-8 h-8 rounded-2"
+        mode="aspectFill"
+      ></image>
+    </view>
+    <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
+      <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+    </view>
+    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+      {{ item.name }}
+    </view>
+    <view class="ml-a" v-if="item.type === 'department'">
+      <wd-divider vertical></wd-divider>
+    </view>
+    <view
+      v-if="item.type === 'department'"
+      :class="[disabled ? 'color-#87a9fb' : 'custom-color-blue']"
+      class="ml-1"
+    >
+      下级
+    </view>
+    <wd-icon
+      name="arrow-right"
+      size="14px"
+      class="ml-2"
+      :color="disabled ? '#87a9fb' : '#255cf7'"
+      v-if="item.type === 'department'"
+    ></wd-icon>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['click'])
+
+  const props = defineProps({
+    item: {
+      type: Object,
+      required: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toClick = () => {
+    emits('click')
+  }
+</script>
diff --git a/src/pages/select-member-or-department/components/SearchItem.vue b/src/pages/select-member-or-department/components/SearchItem.vue
new file mode 100644
index 0000000..9a13733
--- /dev/null
+++ b/src/pages/select-member-or-department/components/SearchItem.vue
@@ -0,0 +1,35 @@
+<template>
+  <view class="flex flex-items-center py-2 text-4" @click="toClick">
+    <view
+      v-if="item.type === 'member'"
+      class="w-10 h-10 flex flex-justify-center flex-items-center"
+    >
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-8 h-8 rounded-2"
+        mode="aspectFill"
+      ></image>
+    </view>
+    <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
+      <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+    </view>
+    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+      {{ item.name }}
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['click'])
+
+  const props = defineProps({
+    item: {
+      type: Object,
+      required: true
+    }
+  })
+
+  const toClick = () => {
+    emits('click')
+  }
+</script>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select-member-or-department/select-member-or-department.vue
new file mode 100644
index 0000000..f3a80e6
--- /dev/null
+++ b/src/pages/select-member-or-department/select-member-or-department.vue
@@ -0,0 +1,275 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view>
+    <view v-if="showSearch" class="h-[calc(100vh-60px)] flex flex-col">
+      <view v-if="systemInfo" :style="{ marginTop: systemInfo.safeAreaInsets?.top + 'px' }">
+        <view class="h-12 pt-1 pb-2">
+          <wd-search
+            :placeholder-left="true"
+            :focus="false"
+            @change="changeSearch"
+            @cancel="showSearch = false"
+          />
+        </view>
+      </view>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in list"
+            :key="item.id"
+            class="border-[#ebebeb] border-b-1 border-b-solid px-4 flex flex-items-center"
+          >
+            <view
+              v-if="!(type === 'member' && item.type === 'department')"
+              class="mr-3"
+              @click="toClick(item)"
+            >
+              <wd-icon
+                v-if="value.includes(item)"
+                name="check-circle-filled"
+                color="#255cf9"
+                size="26px"
+              ></wd-icon>
+              <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
+            </view>
+            <SearchItem class="flex-1" :item="item" @click="toClick(item)"></SearchItem>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+    <view v-if="!showSearch" class="h-[calc(100vh-60px-env(safe-area-inset-bottom))] flex flex-col">
+      <TopNavigation :title="title"></TopNavigation>
+      <view
+        @click="showSearch = true"
+        class="bg-white flex flex-justify-center flex-items-center rounded color-#a6a6a6 mx-4 mt-3 py-1.5"
+      >
+        <wd-icon name="search" size="16px" class="mr-2"></wd-icon>
+        <view>搜索</view>
+      </view>
+      <view class="flex flex-items-center m-4 text-3.5 break-all overflow-hidden whitespace-nowrap">
+        <view
+          v-for="(department, index) in organizationList"
+          :key="department.id"
+          class="flex flex-items-center"
+          @click="toOrganization(index)"
+        >
+          <span
+            :class="[index === organizationList.length - 1 ? 'color-#838589' : 'custom-color-blue']"
+          >
+            {{ department.name }}
+          </span>
+          <span v-if="index !== organizationList.length - 1" class="mx-0.5">/</span>
+        </view>
+      </view>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in list"
+            :key="item.id"
+            class="border-[#ebebeb] border-b-1 border-b-solid px-4 flex flex-items-center"
+          >
+            <view
+              v-if="!(type === 'member' && item.type === 'department')"
+              class="mr-3"
+              @click="toClick(item)"
+            >
+              <wd-icon
+                v-if="value.includes(item)"
+                name="check-circle-filled"
+                color="#255cf9"
+                size="26px"
+              ></wd-icon>
+              <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
+            </view>
+            <MemberOrDepartmentItem
+              class="flex-1"
+              :item="item"
+              :disabled="item.type === 'department' && value.includes(item)"
+              @click="toClick(item)"
+            ></MemberOrDepartmentItem>
+          </view>
+        </view>
+        <view class="py-5 px-15">
+          <wd-divider color="#838589">仅显示已开通账号的人员</wd-divider>
+        </view>
+      </scroll-view>
+    </view>
+    <view
+      class="pb-safe h-60px px-4 border-[#ebebeb] border-t-1 border-t-solid text-3.5 flex flex-items-center"
+    >
+      <view class="flex flex-items-center flex-justify-between w-full">
+        <view class="flex flex-items-center" v-if="value.length" @click="showSelected = true">
+          <view class="custom-color-blue">已选中：{{ value.length }}个人</view>
+          <wd-icon name="arrow-right" size="16px" class="ml-2" color="#255cf7"></wd-icon>
+        </view>
+        <view v-else></view>
+        <view class="custom-bg-blue color-white py-1 px-5 rounded" @click="confirm">确定</view>
+      </view>
+    </view>
+  </view>
+  <wd-popup v-model="showSelected" position="bottom">
+    <view class="h-100vh flex flex-col bg-#f3f5fa">
+      <TopNavigation
+        title="已选中"
+        :have-back="false"
+        right-button-text="确定"
+        @right-button="showSelected = false"
+      ></TopNavigation>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in value"
+            :key="item.id"
+            class="flex flex-items-center px-4 py-3 border-[#ebebeb] border-b-1 border-b-solid"
+          >
+            <image :src="item.avatar" class="w-10 h-10 rounded-2"></image>
+            <view class="ml-4 text-3.5">
+              <view>{{ item.name }}</view>
+              <view class="mt-1 color-#a6a6a6 text-3">{{ item.name }}</view>
+            </view>
+            <view class="p-1 ml-a bg-#f3f5f8 rounded-50%" @click="deleteItem(item)">
+              <image src="/static/images/icon_delete.png" class="w-5 h-5"></image>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </wd-popup>
+</template>
+
+<script setup lang="ts">
+  import { useBasicStore } from '@/store'
+  import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
+  import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+
+  const instance = getCurrentInstance().proxy
+  const eventChannel = instance.getOpenerEventChannel()
+
+  const type = ref<string>('')
+  const multiple = ref<boolean>(false)
+  const title = ref<string>('')
+  const showSearch = ref<boolean>(false)
+
+  const organizationList = ref<Array<object>>([
+    {
+      id: 1,
+      type: 'department',
+      name: '技术部'
+    }
+  ])
+
+  const $basic = useBasicStore()
+
+  const systemInfo = ref(null)
+
+  const value = ref<Array>([])
+  const showSelected = ref<boolean>(false)
+
+  const list = ref<Array<object>>([
+    {
+      id: 0,
+      type: 'department',
+      name: 'xxx的互联',
+      avatar: '/static/images/icon_file.png'
+    },
+    {
+      id: 1,
+      type: 'member',
+      name: '张三',
+      avatar: '/static/images/icon_default_avatar.png'
+    },
+    {
+      id: 2,
+      type: 'member',
+      name: '李四',
+      avatar: '/static/images/icon_default_avatar.png'
+    },
+    {
+      id: 3,
+      type: 'member',
+      name: '王五',
+      avatar: '/static/images/icon_default_avatar.png'
+    }
+  ])
+
+  const toClick = item => {
+    if (value.value.includes(item)) {
+      value.value = value.value.filter(v => v !== item)
+    } else {
+      if (multiple.value || value.value.length === 0) {
+        value.value.push(item)
+      } else {
+        uni.showToast({
+          title: '最多选择一个',
+          icon: 'none'
+        })
+      }
+    }
+  }
+
+  const deleteItem = item => {
+    value.value = value.value.filter(v => v !== item)
+  }
+
+  onMounted(async () => {
+    systemInfo.value = await $basic.getSystemInfo()
+  })
+
+  function changeSearch({ value }) {
+    console.log('输入', value)
+  }
+
+  onLoad(options => {
+    const params = JSON.parse(options.params)
+    type.value = params.type
+    multiple.value = params.multiple
+    title.value = params.title
+  })
+
+  const toOrganization = index => {
+    if (index === organizationList.value.length - 1) {
+      return
+    }
+    uni.navigateBack({
+      delta: organizationList.value.length - index - 1
+    })
+  }
+
+  const change = e => {
+    console.log('change', e)
+  }
+
+  const confirm = () => {
+    eventChannel.emit('change', { value: value.value })
+    uni.navigateBack({
+      delta: organizationList.value.length
+    })
+  }
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-checkbox) {
+    margin-bottom: 0;
+  }
+
+  .wd-search {
+    background: transparent;
+  }
+
+  :deep(.wd-search__block) {
+    padding: 3px 0;
+    background-color: #e2e5ea;
+    border-radius: 0.5rem;
+  }
+
+  :deep(.wd-search__cancel) {
+    color: #a6a6a6;
+  }
+</style>
diff --git a/src/static/images/icon_delete.png b/src/static/images/icon_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..10c193fd39f760e9eda2fbbad302136b9b4c82ba
GIT binary patch
literal 1493
zcmZ`(do<Ju6u!TCYRrrg%E+^_G>FY=JSK*;C?u6MdA43ro}C(x_>EL-IcO(qJ%>`F
zu&rn7F^;k%&y`oosJs$pY0D$*w14mZaqm6%-tT<(p6{M>lbjrFC?q8k08s2~t(_$i
z{c2JKiElRdZkGfk!r8_ON;{RO0q`ky)|SV(9<w>#!7mNSSH@>KdM;&ywVAm=Q@sWC
z{S%hrM>USyIehEhzV=b;n|86=pZaUjF&^&GUQ@$SifX`~q)9ltYl)^zH9ElgIbLUn
zjbvI*v>;+J4UzO!r$%CY{tME;5-%>Ti;c*Kdy01@T;udpH0m6^qoS4PWhy5s3{pzS
z;_w)Ygt(@V$&u+HIb0_!WenrjS&MlF$rdfECz2{TWn%<1W2G@+Y;f2+Y~7XGkaF?%
z6VAhdP%LV{lGls?=ZCfoH89BD+x+1z9=KsRAUEdYd`!;`W%*M(R=6Dvc^qRa_NA+<
zv3=X#xF%ir?F_*f@3F_g?cPh30hfybBw^XxKV+NqZAuE~y2;SiP&e|l-#_4Id?unE
z$*5Ls=$#3QoWen2kF25$;Ihv~ZUQe8Q_KM2f0L?1P~cghxKot3J3ZiUoU@^d;Chj<
z!DcX)I-RuXG}I~kst)RgU48iL?8lA591yznZFoAgo1qL4^@pmSNqL*oIw5~@XC@U)
ziBNs58r%J7-qZ7n>sQ&as8&K1mKJYMq?Os~Vgc<$5-0Xc50ZGzWPmDy1#TCGU4auQ
zj8IWNp*$KKM?1%2KMPv8bHlroM=(w$3O9JGDt9Nx^?K`S^@Gl~Ee(&N7_hFY8yB3*
zX_>|L@2y<;w4`*+%}&;~4tG|Xc3kIAEgweW{Z|Lv)fAKiS-wMG8r+EGhoDF<oCFN?
z{Joo0Dh#6BGnse5_C+{^($&A!6jyu)w)2}wVoJ2`%#JtUWR&?h>X~J97w|9f<HARY
zpp#N)cx=@W^^w+&m3oj*a5nRqrwjK%WPH1?)goD#zCSSd$9v}b9+-otG`qky2pF0G
zcRt;DAccd{Csv<ng9ua%yYy?#FVk#qF^h8}UT?L)@-JZcKLJ~n0K!zN`YTLvHj;`2
z&vyrdb`Pd59VisG9+qDb59(ztNAp}vBpL>Jr-dMCi2XFEAWj8%t{$Sar<@~^dzo2V
z#Ob``IZk%!B}H|BlAa)tATp=ppeA~4#ki6ze1TzM1cgYEA3*5qG<VF`f*(AjvW+CX
zz7G98a10Su#kYbZl?NhaThjZ-8XK%E&Q=Lf+kf^i9!-zJuE&K|05~z#Bs7jXQUJn?
zmBobmTj20-k7F4}XP4n|@J%jpN>PGHB#Wjb*Y=5%Ur;hFb_W}2aXO+M{eJFq`w$49
zY4wg$`s8_iGQ3vMI4{F4RkSXAzHb_amCz(|Y6+f;VK17XN5_v^NOoM^KXch5Fct(+
zQhf?Mdp_!>hcb{pm6r5I1-Dh!jx>6oAv;(r)ztW$j@Et8)mV!J16HAO9ws$DWS>6X
z5Nf7*?dlV2eij=Wn9{WqP1#Qaxcw6W)u`V=_FSilS$I@#vSP#ddV~%6o&4Qu<Gr0}
zX6Ct~!$FHJGeO`7q7SM`9|yxJ(n=^Ds$R^ckEP~q1KpU{J79~ox(_TTH@Y72#2R4P
zrCS6_)q&Ts=;2b`HLbM3Fxkx3c!C!LD?VkJpLpD(C0=qe2GPjh6v`J|Jaf?Gl@JE@
zIk73m#K?c(<kEv%>l^Q+<(QY#dB136jJr!CC6Sbw4YN`c=EdC+5K3t>&LskLg#>?(
z05ks`9Ru9h2tyLoY|`wafp9S^>j(%Pv?H$q<c^Nqz(BB7n;{OwUnczIAyn>Qt_Gl!
yOy+Gsvz!*l2(TJ!>3A4PxaltiqUDZ`qQ>7@h0p6x`KC*LD%c%xv@W&sivI^x=VxXB

literal 0
HcmV?d00001

diff --git a/src/static/images/icon_file.png b/src/static/images/icon_file.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a8886b842e0730c225abb5596c8a0e2df2ca159
GIT binary patch
literal 1205
zcmeAS@N?(olHy`uVBq!ia0vp^y+GW+!3HGF4!o)cQjEnx?oJHr&dI!FU|`Ajba4!+
zh<iKdV9;#?i5Asg0R`EgyizQj&-?uHdNRW%<Z)lR6kC+k>;CIfk-rOFqcY3wQ`mco
zA9b@daXxua(KgwENlJl3ox$Yci5Uzg1_FK$(lX?}9X_49RdM<IOpn<gUYV*tDLJwK
zQvc&%yDKr<j&D75p=Se+rtNw&o(D5yV>xDBW&W(VZVpghZ~y#hn<twHX|yd<Ptg0z
zbS`&^xZ~#!Ryl3Ezm(k;$~|xOwkVJ-clV0jyB8gJ_x*4{dGyz?$6GqnZ8?3<FXx%Q
z(!$_zk7vfadcOR#^>g-}{k=RgX4xs{Ic>`xdtW|2V~0=Yg2EjpwM@_FZ2R*mUuxcJ
z^<HTc&E<z*8s;xg{w&96QvdaQYSu4yri^_jI%Yq5{ea=D_|Jk{3}?Soa$79yvB+F^
z^y_o|M+;rT4JzKLyDW%wJlUO7cuZNzVY7$wYr(xw|M6yAyZk=My0?khq&sw@-a`%x
zht2Eq#Bb|f&=JeMe`x9cD^HfZoZUQOcgzp==mnfdZ+(Ao$y?;Ym$Qy1WG}QlO8PK^
z;lcq&3&sVU?#EabG&UA6ISBXla5^wEKV)f8laUl|U}HPP$>3{Yq{hI@(<00;t02WE
zgKt)$^UFCE_wO?0@ZG<(`H?E`TZhB@cj+~p+&`(ye5xt4?@ME;&`ED=ChlC{n#nBX
zH*?jDbGEs&8kUs^hfaQ5v2kbqPmQ<P7uz>@nO`jI4_#Zzcy>m_%fqKaFTX9>X!kCY
z$-lYuR<dbyvH#4%#Y@B6T=o6mcb@&R|6$h3^%V<unja8<o$I*yk<*-Qd?tRm-FujN
zH9XWM7ZheiKM~DvakM(g&>MVPX}yCo*CkK3j5)W&Dp{ohC-@mTJifB+g!YAwrjkjF
zQp>lw#x=T$ESb!6!D6fKCoYpk3UgB$j;+j{7`{M|^`#2)NHKaf%dA5E@4piT-g3@7
z28`lk+*yUy4wsX(d*6GqojqJvAsJMacSrxWu*!t<nbkF?+BH|&m@;H66MFUh_wv|z
zPZCR_O*&>jtUK^y{p2}(%a8BTEsSE}UGD2S<+WUJRi>6*=CQ_x&3PK@-tPOt_G3|C
z$)y-JX219cJsW!Z`gZ>jDimvaCOhwX;^cRi)HVquOM5?<!>2lb%D!7)eJ_}#&3_x>
z$B?1Le(!LR!)530skRKhPY+Z_@MTnGY}~}YV5Lk2|7k{Fe%-Kd3?@^V-zQowc)9TC
jDY=GaMGtIszDsZ3b$`C!kBA?@a)`mx)z4*}Q$iB}w`U?2

literal 0
HcmV?d00001

diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 64d411e..63e6d56 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -29,6 +29,7 @@ interface NavigateToOptions {
        "/pages/mine/mine" |
        "/pages/notification/notification" |
        "/pages/reset-password/reset-password" |
+       "/pages/select-member-or-department/select-member-or-department" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |
        "/pages/attendance/attendance-add-group/attendance-device" |

From 51123d48c8893e4fc223cf31ff35d4d403864155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 09:38:56 +0800
Subject: [PATCH 10/37] =?UTF-8?q?fix:=20=E6=95=B4=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TeamPopup/TeamPopup.vue        |  3 +-
 .../TopNavigation/TopNavigation.vue           |  3 +-
 src/pages.json                                | 58 +++++++++----------
 .../application-list.vue                      |  0
 .../home/{ => compoents}/HomeAddDevice.vue    |  0
 .../{ => compoents}/HomeAddTeamManager.vue    |  0
 .../home/{ => compoents}/HomeAttendance.vue   |  0
 .../home/{ => compoents}/HomeBulletin.vue     |  0
 .../home/{ => compoents}/HomeOpenDoor.vue     |  0
 .../home/{ => compoents}/HomeSetting.vue      |  0
 src/pages/home/{ => compoents}/HomeSwiper.vue |  0
 src/pages/home/{ => compoents}/HomeTab.vue    |  2 +-
 .../home/{ => compoents}/HomeTeamManager.vue  |  0
 src/pages/home/{ => compoents}/HomeTodo.vue   |  0
 src/pages/home/home.vue                       | 32 +++++-----
 src/pages/{code => login}/code.vue            |  6 +-
 src/pages/{get-code => login}/get-code.vue    |  8 ++-
 src/pages/login/login.vue                     | 12 +++-
 .../reset-password.vue                        |  6 +-
 .../components/MemberOrDepartmentItem.vue     |  6 +-
 .../select-member-or-department.vue           |  3 +-
 src/service/user.ts                           |  4 +-
 src/types/uni-pages.d.ts                      |  8 +--
 23 files changed, 84 insertions(+), 67 deletions(-)
 rename src/pages/{application-list => home}/application-list.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAddDevice.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAddTeamManager.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAttendance.vue (100%)
 rename src/pages/home/{ => compoents}/HomeBulletin.vue (100%)
 rename src/pages/home/{ => compoents}/HomeOpenDoor.vue (100%)
 rename src/pages/home/{ => compoents}/HomeSetting.vue (100%)
 rename src/pages/home/{ => compoents}/HomeSwiper.vue (100%)
 rename src/pages/home/{ => compoents}/HomeTab.vue (96%)
 rename src/pages/home/{ => compoents}/HomeTeamManager.vue (100%)
 rename src/pages/home/{ => compoents}/HomeTodo.vue (100%)
 rename src/pages/{code => login}/code.vue (97%)
 rename src/pages/{get-code => login}/get-code.vue (93%)
 rename src/pages/{reset-password => login}/reset-password.vue (98%)

diff --git a/src/components/TeamPopup/TeamPopup.vue b/src/components/TeamPopup/TeamPopup.vue
index b9e73f1..d120885 100644
--- a/src/components/TeamPopup/TeamPopup.vue
+++ b/src/components/TeamPopup/TeamPopup.vue
@@ -56,10 +56,11 @@
 
 <script setup lang="ts">
   import { useBasicStore } from '@/store'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
   const show = ref<boolean>(false)
 
   onMounted(async () => {
diff --git a/src/components/TopNavigation/TopNavigation.vue b/src/components/TopNavigation/TopNavigation.vue
index aa9af26..56440b9 100644
--- a/src/components/TopNavigation/TopNavigation.vue
+++ b/src/components/TopNavigation/TopNavigation.vue
@@ -45,10 +45,11 @@
 
 <script lang="ts" setup>
   import { useBasicStore } from '@/store'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   defineProps({
     mini: {
diff --git a/src/pages.json b/src/pages.json
index 9c1261e..35d9713 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -59,10 +59,6 @@
         "disableScroll": true
       }
     },
-    {
-      "path": "pages/application-list/application-list",
-      "type": "page"
-    },
     {
       "path": "pages/approval/approval-detail",
       "type": "page",
@@ -152,22 +148,8 @@
       }
     },
     {
-      "path": "pages/code/code",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
-    },
-    {
-      "path": "pages/get-code/get-code",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
+      "path": "pages/home/application-list",
+      "type": "page"
     },
     {
       "path": "pages/info-publish/announce-notice",
@@ -213,6 +195,24 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/login/code",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      },
+      "needLogin": false
+    },
+    {
+      "path": "pages/login/get-code",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      },
+      "needLogin": false
+    },
     {
       "path": "pages/login/login",
       "type": "page",
@@ -222,6 +222,15 @@
       },
       "needLogin": false
     },
+    {
+      "path": "pages/login/reset-password",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      },
+      "needLogin": false
+    },
     {
       "path": "pages/mine/mine",
       "type": "page"
@@ -230,15 +239,6 @@
       "path": "pages/notification/notification",
       "type": "page"
     },
-    {
-      "path": "pages/reset-password/reset-password",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
-    },
     {
       "path": "pages/select-member-or-department/select-member-or-department",
       "type": "page",
diff --git a/src/pages/application-list/application-list.vue b/src/pages/home/application-list.vue
similarity index 100%
rename from src/pages/application-list/application-list.vue
rename to src/pages/home/application-list.vue
diff --git a/src/pages/home/HomeAddDevice.vue b/src/pages/home/compoents/HomeAddDevice.vue
similarity index 100%
rename from src/pages/home/HomeAddDevice.vue
rename to src/pages/home/compoents/HomeAddDevice.vue
diff --git a/src/pages/home/HomeAddTeamManager.vue b/src/pages/home/compoents/HomeAddTeamManager.vue
similarity index 100%
rename from src/pages/home/HomeAddTeamManager.vue
rename to src/pages/home/compoents/HomeAddTeamManager.vue
diff --git a/src/pages/home/HomeAttendance.vue b/src/pages/home/compoents/HomeAttendance.vue
similarity index 100%
rename from src/pages/home/HomeAttendance.vue
rename to src/pages/home/compoents/HomeAttendance.vue
diff --git a/src/pages/home/HomeBulletin.vue b/src/pages/home/compoents/HomeBulletin.vue
similarity index 100%
rename from src/pages/home/HomeBulletin.vue
rename to src/pages/home/compoents/HomeBulletin.vue
diff --git a/src/pages/home/HomeOpenDoor.vue b/src/pages/home/compoents/HomeOpenDoor.vue
similarity index 100%
rename from src/pages/home/HomeOpenDoor.vue
rename to src/pages/home/compoents/HomeOpenDoor.vue
diff --git a/src/pages/home/HomeSetting.vue b/src/pages/home/compoents/HomeSetting.vue
similarity index 100%
rename from src/pages/home/HomeSetting.vue
rename to src/pages/home/compoents/HomeSetting.vue
diff --git a/src/pages/home/HomeSwiper.vue b/src/pages/home/compoents/HomeSwiper.vue
similarity index 100%
rename from src/pages/home/HomeSwiper.vue
rename to src/pages/home/compoents/HomeSwiper.vue
diff --git a/src/pages/home/HomeTab.vue b/src/pages/home/compoents/HomeTab.vue
similarity index 96%
rename from src/pages/home/HomeTab.vue
rename to src/pages/home/compoents/HomeTab.vue
index f124fe2..00caea8 100644
--- a/src/pages/home/HomeTab.vue
+++ b/src/pages/home/compoents/HomeTab.vue
@@ -50,7 +50,7 @@
 
   const clickMenu = () => {
     uni.navigateTo({
-      url: '/pages/application-list/application-list'
+      url: '/pages/home/application-list'
     })
   }
 
diff --git a/src/pages/home/HomeTeamManager.vue b/src/pages/home/compoents/HomeTeamManager.vue
similarity index 100%
rename from src/pages/home/HomeTeamManager.vue
rename to src/pages/home/compoents/HomeTeamManager.vue
diff --git a/src/pages/home/HomeTodo.vue b/src/pages/home/compoents/HomeTodo.vue
similarity index 100%
rename from src/pages/home/HomeTodo.vue
rename to src/pages/home/compoents/HomeTodo.vue
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index 201d182..bf6f66e 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -40,7 +40,7 @@
           <HomeSwiper @colorChange="colorChange"></HomeSwiper>
           <HomeBulletin class="my-2"></HomeBulletin>
           <HomeTodo class="my-2"></HomeTodo>
-          <CustomTab :list="featuresList" @clickItem="clickItem"></CustomTab>
+          <CustomTab :list="featuresList"></CustomTab>
           <HomeOpenDoor class="my-2"></HomeOpenDoor>
           <HomeAttendance class="my-2"></HomeAttendance>
           <HomeTeamManager class="my-2"></HomeTeamManager>
@@ -56,25 +56,26 @@
 </template>
 
 <script lang="ts" setup>
-  import CustomTab from '@/pages/home/HomeTab.vue'
+  import CustomTab from '@/pages/home/compoents/HomeTab.vue'
   import { useBasicStore, useUserStore } from '@/store'
   import { Result } from '@/constants/result'
   import { HomeTab } from '@/typings'
-  import HomeSwiper from '@/pages/home/HomeSwiper.vue'
-  import HomeBulletin from '@/pages/home/HomeBulletin.vue'
-  import HomeTodo from '@/pages/home/HomeTodo.vue'
-  import HomeOpenDoor from '@/pages/home/HomeOpenDoor.vue'
-  import HomeAttendance from '@/pages/home/HomeAttendance.vue'
-  import HomeTeamManager from '@/pages/home/HomeTeamManager.vue'
-  import HomeSetting from '@/pages/home/HomeSetting.vue'
-  import HomeAddDevice from '@/pages/home/HomeAddDevice.vue'
-  import HomeAddTeamManager from '@/pages/home/HomeAddTeamManager.vue'
+  import HomeSwiper from '@/pages/home/compoents/HomeSwiper.vue'
+  import HomeBulletin from '@/pages/home/compoents/HomeBulletin.vue'
+  import HomeTodo from '@/pages/home/compoents/HomeTodo.vue'
+  import HomeOpenDoor from '@/pages/home/compoents/HomeOpenDoor.vue'
+  import HomeAttendance from '@/pages/home/compoents/HomeAttendance.vue'
+  import HomeTeamManager from '@/pages/home/compoents/HomeTeamManager.vue'
+  import HomeSetting from '@/pages/home/compoents/HomeSetting.vue'
+  import HomeAddDevice from '@/pages/home/compoents/HomeAddDevice.vue'
+  import HomeAddTeamManager from '@/pages/home/compoents/HomeAddTeamManager.vue'
   import TeamPopup from '@/components/TeamPopup/TeamPopup.vue'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $user = useUserStore()
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   const color = ref<string>('#bfcbef')
 
@@ -314,11 +315,4 @@
   const colorChange = data => {
     color.value = data
   }
-
-  const clickItem = item => {
-    console.log(item)
-    uni.navigateTo({
-      url: item.url
-    })
-  }
 </script>
diff --git a/src/pages/code/code.vue b/src/pages/login/code.vue
similarity index 97%
rename from src/pages/code/code.vue
rename to src/pages/login/code.vue
index 04ac263..3f72908 100644
--- a/src/pages/code/code.vue
+++ b/src/pages/login/code.vue
@@ -124,7 +124,7 @@
         }
       } else if (type.value === 'reset-password') {
         await uni.redirectTo({
-          url: `/pages/reset-password/reset-password?phone=${phone.value}&code=${code.value}`
+          url: `/pages/login/reset-password?phone=${phone.value}&code=${code.value}`
         })
       }
     }
@@ -159,4 +159,8 @@
     border: #b8b8b8 solid 2rpx;
     border-radius: 12rpx;
   }
+
+  page {
+    background-color: #ffffff;
+  }
 </style>
diff --git a/src/pages/get-code/get-code.vue b/src/pages/login/get-code.vue
similarity index 93%
rename from src/pages/get-code/get-code.vue
rename to src/pages/login/get-code.vue
index 22720bd..574fe38 100644
--- a/src/pages/get-code/get-code.vue
+++ b/src/pages/login/get-code.vue
@@ -63,7 +63,7 @@
       uni.hideLoading()
       if (result.errorCode === Result.Success.code) {
         await uni.navigateTo({
-          url: `/pages/reset-password/reset-password?phone=${phone.value}`
+          url: `/pages/login/reset-password?phone=${phone.value}`
         })
       } else {
         await uni.showToast({
@@ -85,3 +85,9 @@
     phone.value = value
   }
 </script>
+
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index c9cc32b..48f0e18 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -61,7 +61,7 @@
               :disabled="!phonePass"
               :round="false"
               size="large"
-              @click="codeLogin"
+              @click="codeLogin(false, $event)"
             >
               获取验证码
             </wd-button>
@@ -264,7 +264,7 @@
       })
       uni.hideLoading()
       if (result.errorCode === Result.Success.code) {
-        let url = `/pages/code/code?phone=${phone.value}&type=login`
+        let url = `/pages/login/code?phone=${phone.value}&type=login`
         if (tip) {
           url = url + `&tip=true`
         }
@@ -298,7 +298,7 @@
       params = `?phone=${phone.value}`
     }
     uni.navigateTo({
-      url: `/pages/get-code/get-code${params}`
+      url: `/pages/login/get-code${params}`
     })
   }
 
@@ -325,3 +325,9 @@
     consentAgreement.value = !consentAgreement.value
   }
 </script>
+
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/reset-password/reset-password.vue b/src/pages/login/reset-password.vue
similarity index 98%
rename from src/pages/reset-password/reset-password.vue
rename to src/pages/login/reset-password.vue
index c70afde..d89595f 100644
--- a/src/pages/reset-password/reset-password.vue
+++ b/src/pages/login/reset-password.vue
@@ -226,4 +226,8 @@
   }
 </script>
 
-<style scoped lang="scss"></style>
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
index 2b3c360..a845b28 100644
--- a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
+++ b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
@@ -16,11 +16,11 @@
     <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
       {{ item.name }}
     </view>
-    <view class="ml-a" v-if="item.type === 'department'">
+    <view class="ml-a" v-if="item.type !== 'member'">
       <wd-divider vertical></wd-divider>
     </view>
     <view
-      v-if="item.type === 'department'"
+      v-if="item.type !== 'member'"
       :class="[disabled ? 'color-#87a9fb' : 'custom-color-blue']"
       class="ml-1"
     >
@@ -31,7 +31,7 @@
       size="14px"
       class="ml-2"
       :color="disabled ? '#87a9fb' : '#255cf7'"
-      v-if="item.type === 'department'"
+      v-if="item.type !== 'member'"
     ></wd-icon>
   </view>
 </template>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select-member-or-department/select-member-or-department.vue
index f3a80e6..c27d26b 100644
--- a/src/pages/select-member-or-department/select-member-or-department.vue
+++ b/src/pages/select-member-or-department/select-member-or-department.vue
@@ -148,6 +148,7 @@
   import { useBasicStore } from '@/store'
   import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
   import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const instance = getCurrentInstance().proxy
   const eventChannel = instance.getOpenerEventChannel()
@@ -167,7 +168,7 @@
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   const value = ref<Array>([])
   const showSelected = ref<boolean>(false)
diff --git a/src/service/user.ts b/src/service/user.ts
index eee4867..4bbbe59 100644
--- a/src/service/user.ts
+++ b/src/service/user.ts
@@ -62,8 +62,8 @@ interface TeamInfo {
 }
 
 // 获取用户信息
-export const getUserInfoApi = (params: UserInfo) => {
-  return http.post('/v1/user/detail', params)
+export const getUserInfoApi = () => {
+  return http.post('/v1/user/detail')
 }
 
 export interface resetPasswordRequest {
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 63e6d56..058f3eb 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -5,7 +5,6 @@
 
 interface NavigateToOptions {
   url: "/pages/home/home" |
-       "/pages/application-list/application-list" |
        "/pages/approval/approval-detail" |
        "/pages/approval/approval" |
        "/pages/approval/create-application" |
@@ -17,18 +16,19 @@ interface NavigateToOptions {
        "/pages/attendance/flexible-punching" |
        "/pages/attendance/issue-record-detail" |
        "/pages/attendance/issue-record" |
-       "/pages/code/code" |
-       "/pages/get-code/get-code" |
+       "/pages/home/application-list" |
        "/pages/info-publish/announce-notice" |
        "/pages/info-publish/basic-info" |
        "/pages/info-publish/drafts-list" |
        "/pages/info-publish/info-publish" |
        "/pages/info-publish/notice-details" |
        "/pages/info-publish/notice-manage" |
+       "/pages/login/code" |
+       "/pages/login/get-code" |
        "/pages/login/login" |
+       "/pages/login/reset-password" |
        "/pages/mine/mine" |
        "/pages/notification/notification" |
-       "/pages/reset-password/reset-password" |
        "/pages/select-member-or-department/select-member-or-department" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |

From 46bb7cebedf2eaf0936186dd00522277a294d5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”>
Date: Thu, 16 Jan 2025 10:24:56 +0800
Subject: [PATCH 11/37] =?UTF-8?q?feat:=201=EF=BC=8C=E6=98=9F=E5=8B=A4?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=A1=E6=81=AF=E5=8F=91=E5=B8=83=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?-=E6=96=B0=E5=A2=9E=E4=BF=A1=E6=81=AF=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E7=9B=B8=E5=85=B3UI=E5=8F=8A=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=202=EF=BC=8C=E6=98=9F=E5=8B=A4=EF=BC=9A=E5=B7=B2?=
 =?UTF-8?q?=E6=9C=89=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BB=A3=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=8A=E9=A3=8E=E6=A0=BC=E4=BF=AE=E6=94=B9=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=203=EF=BC=8C=E6=98=9F=E5=8B=A4=EF=BC=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8F=91=E5=B8=83=E6=A8=A1=E5=9D=97-=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=92=AD=E6=94=BE=E5=86=85=E5=AE=B9=E5=BA=93=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home/home.vue                       |   3 +-
 src/pages/info-publish/announce-notice.vue    | 175 +++++-----
 src/pages/info-publish/basic-info.vue         | 180 +++++-----
 src/pages/info-publish/info-publish.vue       | 205 +++++++++++-
 src/pages/info-publish/material-library.vue   | 309 ++++++++++++++++++
 .../info-publish/play-content-library.vue     | 229 +++++++++++++
 src/static/images/content_icon.png            | Bin 0 -> 3980 bytes
 src/static/images/material_icon.png           | Bin 0 -> 7146 bytes
 src/static/images/notice_icon.png             | Bin 0 -> 5556 bytes
 src/static/images/plan_icon.png               | Bin 0 -> 7104 bytes
 src/static/images/publish_icon.png            | Bin 0 -> 52476 bytes
 11 files changed, 917 insertions(+), 184 deletions(-)
 create mode 100644 src/pages/info-publish/material-library.vue
 create mode 100644 src/pages/info-publish/play-content-library.vue
 create mode 100644 src/static/images/content_icon.png
 create mode 100644 src/static/images/material_icon.png
 create mode 100644 src/static/images/notice_icon.png
 create mode 100644 src/static/images/plan_icon.png
 create mode 100644 src/static/images/publish_icon.png

diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index 201d182..2cc60d1 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -261,7 +261,8 @@
         {
           id: 6093,
           icon: 'https://file.hikmall.com/prod/image/8ed90fc35e3840e782d73676efcc9a30.png',
-          name: '信息发布'
+          name: '信息发布',
+          url: '/pages/info-publish/info-publish'
         }
       ]
     },
diff --git a/src/pages/info-publish/announce-notice.vue b/src/pages/info-publish/announce-notice.vue
index 0826981..5e3e664 100644
--- a/src/pages/info-publish/announce-notice.vue
+++ b/src/pages/info-publish/announce-notice.vue
@@ -8,100 +8,85 @@
 </route>
 
 <template>
-  <TopNavigation title="新增公告"></TopNavigation>
-  <div class="announce-notice">
-    <!-- 表单内容 -->
-    <div class="form-content">
-      <div class="form-item">
-        <div class="label">
-          <span class="required">*</span>
-          公告标题
-        </div>
-        <input
-          type="text"
-          v-model="formData.title"
-          placeholder="请输入公告标题"
-          class="input-field"
-        />
-      </div>
+  <view class="h-[calc(100vh-0px)] flex flex-col">
+    <TopNavigation title="新增公告"></TopNavigation>
+    <scroll-view class="flex-1 box-border" scroll-y>
+      <view class="announce-notice">
+        <!-- 表单内容 -->
+        <div class="form-content">
+          <div class="form-item">
+            <div class="label">
+              <span class="required">*</span>
+              公告标题
+            </div>
+            <input
+              type="text"
+              v-model="formData.title"
+              placeholder="请输入公告标题"
+              class="input-field"
+            />
+          </div>
 
-      <div class="form-item">
-        <div class="label">
-          <span class="required">*</span>
-          公告正文
+          <div class="form-item">
+            <div class="label">
+              <span class="required">*</span>
+              公告正文
+            </div>
+            <textarea
+              v-model="formData.content"
+              placeholder="请输入要发布的内容"
+              class="textarea-field"
+              @input="handleContentInput"
+            ></textarea>
+            <div class="word-count">{{ contentLength }}/2000</div>
+          </div>
         </div>
-        <textarea
-          v-model="formData.content"
-          placeholder="请输入要发布的内容"
-          class="textarea-field"
-          @input="handleContentInput"
-        ></textarea>
-        <div class="word-count">{{ contentLength }}/2000</div>
-      </div>
-    </div>
 
-    <!-- 底部按钮 -->
-    <view class="bottom-btns">
-      <button class="nextstep-btn" @click="handleNextStep">下一步</button>
-    </view>
-  </div>
+        <!-- 底部按钮 -->
+        <view class="bottom-btns">
+          <button class="nextstep-btn" @click="handleNextStep">下一步</button>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
 </template>
 
-<script>
-  export default {
-    data() {
-      return {
-        formData: {
-          title: '',
-          content: ''
-        }
-      }
-    },
-    computed: {
-      contentLength() {
-        return this.formData.content.length
-      }
-    },
-    methods: {
-      goBack() {
-        this.$router.back()
-      },
-      handleContentInput() {
-        if (this.formData.content.length > 2000) {
-          this.formData.content = this.formData.content.slice(0, 2000)
-        }
-      },
-      handleNextStep() {
-        uni.navigateTo({
-          url: '/pages/info-publish/basic-info'
-        })
-      }
+<script setup lang="ts">
+  import { ref, computed } from 'vue'
+
+  // 表单数据
+  const formData = ref({
+    title: '',
+    content: ''
+  })
+
+  // 计算字数
+  const contentLength = computed(() => formData.value.content.length)
+
+  // 处理内容输入
+  const handleContentInput = () => {
+    if (formData.value.content.length > 2000) {
+      formData.value.content = formData.value.content.slice(0, 2000)
     }
   }
+
+  // 下一步按钮点击处理
+  const handleNextStep = () => {
+    uni.navigateTo({
+      url: '/pages/info-publish/basic-info'
+    })
+  }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+  page {
+    background-color: #f5f5f5;
+  }
+
   .announce-notice {
     display: flex;
     flex-direction: column;
-    height: 100vh;
-    background: #f5f5f5;
-  }
-
-  .header {
-    position: relative;
-    display: flex;
-    align-items: center;
-    height: 44px;
-    padding: 0 15px;
-    background: #fff;
-  }
-
-  .title {
-    flex: 1;
-    font-size: 17px;
-    font-weight: 500;
-    text-align: center;
+    min-height: 100%;
   }
 
   .form-content {
@@ -117,6 +102,8 @@
   }
 
   .label {
+    display: flex;
+    align-items: center;
     margin-bottom: 10px;
     font-size: 15px;
   }
@@ -156,19 +143,17 @@
     padding: 10px 15px;
     background-color: #fff;
     box-shadow: 0 -2px 6px rgba(0, 0, 0, 0.05);
+  }
 
-    .nextstep-btn {
-      flex: 1;
-      height: 40px;
-      font-size: 14px;
-      line-height: 40px;
-      text-align: center;
-      border-radius: 4px;
-    }
-
-    .nextstep-btn {
-      color: #fff;
-      background-color: #007aff;
-    }
+  .nextstep-btn {
+    flex: 1;
+    height: 40px;
+    font-size: 14px;
+    line-height: 40px;
+    color: #fff;
+    text-align: center;
+    background-color: #007aff;
+    border: none;
+    border-radius: 4px;
   }
 </style>
diff --git a/src/pages/info-publish/basic-info.vue b/src/pages/info-publish/basic-info.vue
index 43807b7..fe616c5 100644
--- a/src/pages/info-publish/basic-info.vue
+++ b/src/pages/info-publish/basic-info.vue
@@ -8,98 +8,100 @@
 </route>
 
 <template>
-  <TopNavigation title="公告管理"></TopNavigation>
-  <div class="basic-info">
-    <!-- 基本信息区域 -->
-    <div class="content">
-      <div class="section-title">基本信息</div>
+  <view class="h-[calc(100vh-0px)] flex flex-col">
+    <TopNavigation title="公告管理"></TopNavigation>
+    <scroll-view class="flex-1 box-border" scroll-y>
+      <view class="basic-info">
+        <!-- 基本信息区域 -->
+        <view class="content">
+          <view class="section-title">基本信息</view>
 
-      <!-- 发布对象 -->
-      <div class="form-item" @click="selectTarget">
-        <div class="label">
-          <span class="required">*</span>
-          <span>发布对象</span>
-        </div>
-        <div class="value">
-          <span class="placeholder">请选择</span>
-          <i class="arrow">></i>
-        </div>
-      </div>
+          <!-- 发布对象 -->
+          <view class="form-item" @click="selectTarget">
+            <view class="label">
+              <text class="required">*</text>
+              <text>发布对象</text>
+            </view>
+            <view class="value">
+              <text class="placeholder">请选择</text>
+              <text class="arrow">></text>
+            </view>
+          </view>
 
-      <!-- 发布类型 -->
-      <div class="form-item" @click="showTimePicker = true">
-        <div class="label">
-          <span class="required">*</span>
-          <span>发布时间</span>
-        </div>
-        <div class="value">
-          <span>{{ publishType }}</span>
-          <i class="arrow">></i>
-        </div>
-      </div>
+          <!-- 发布类型 -->
+          <view class="form-item" @click="handleShowTimePicker">
+            <view class="label">
+              <text class="required">*</text>
+              <text>发布时间</text>
+            </view>
+            <view class="value">
+              <text>{{ publishType }}</text>
+              <text class="arrow">></text>
+            </view>
+          </view>
 
-      <!-- 发布日期 - 仅在定时发布时显示 -->
-      <div class="form-item" v-if="isScheduled" @click="showDatePicker = true">
-        <div class="label">
-          <span class="required">*</span>
-          <span>发布日期</span>
-        </div>
-        <div class="value">
-          <span>{{ publishDate }}</span>
-          <i class="arrow">></i>
-        </div>
-      </div>
+          <!-- 发布日期 - 仅在定时发布时显示 -->
+          <view class="form-item" v-if="isScheduled" @click="showDatePicker = true">
+            <view class="label">
+              <text class="required">*</text>
+              <text>发布日期</text>
+            </view>
+            <view class="value">
+              <text>{{ publishDate }}</text>
+              <text class="arrow">></text>
+            </view>
+          </view>
 
-      <!-- 发布时间 - 仅在定时发布时显示 -->
-      <div class="form-item" v-if="isScheduled" @click="showTimePickerDetail = true">
-        <div class="label">
-          <span class="required">*</span>
-          <span>发布时间</span>
-        </div>
-        <div class="value">
-          <span>{{ publishTimeDetail }}</span>
-          <i class="arrow">></i>
-        </div>
-      </div>
-    </div>
+          <!-- 发布时间 - 仅在定时发布时显示 -->
+          <view class="form-item" v-if="isScheduled" @click="showTimePickerDetail = true">
+            <view class="label">
+              <text class="required">*</text>
+              <text>发布时间</text>
+            </view>
+            <view class="value">
+              <text>{{ publishTimeDetail }}</text>
+              <text class="arrow">></text>
+            </view>
+          </view>
+        </view>
 
-    <!-- 底部按钮 -->
-    <div class="footer">
-      <button class="draft-btn" @click="saveDraft">保存为草稿</button>
-      <button class="publish-btn" @click="publish">发布公告</button>
-    </div>
+        <!-- 底部按钮 -->
+        <view class="footer">
+          <button class="draft-btn" @click="saveDraft">保存为草稿</button>
+          <button class="publish-btn" @click="publish">发布公告</button>
+        </view>
+      </view>
+    </scroll-view>
 
     <!-- 发布类型选择弹窗 -->
-    <transition name="slide-up">
-      <div class="popup" v-if="showTimePicker">
-        <div class="mask" @click="hideTimePicker"></div>
-        <div class="popup-content">
-          <div class="popup-header">
-            <div class="popup-title">请选择发布时间</div>
-            <div class="popup-close" @click="showTimePicker = false">×</div>
-          </div>
-          <div class="popup-body">
-            <div
-              class="time-option"
-              :class="{ active: !isScheduled }"
-              @click="selectPublishType('now')"
-            >
-              立即发布
-              <i class="check-icon" v-if="!isScheduled">✓</i>
-            </div>
-            <div
-              class="time-option"
-              :class="{ active: isScheduled }"
-              @click="selectPublishType('schedule')"
-            >
-              定时发布
-              <i class="check-icon" v-if="isScheduled">✓</i>
-            </div>
-          </div>
-        </div>
-      </div>
-    </transition>
-  </div>
+    <view class="popup" v-if="showTimePicker">
+      <view class="mask" @click="handleCloseTimePicker"></view>
+      <view class="popup-content">
+        <view class="popup-header">
+          <view class="popup-title">请选择发布时间</view>
+          <view class="popup-close" @click="handleCloseTimePicker">×</view>
+        </view>
+        <view class="popup-body">
+          <view
+            class="time-option"
+            :class="{ active: !isScheduled }"
+            @click="selectPublishType('now')"
+          >
+            <text>立即发布</text>
+            <text class="check-icon" v-if="!isScheduled">✓</text>
+          </view>
+          <view
+            class="time-option"
+            :class="{ active: isScheduled }"
+            @click="selectPublishType('schedule')"
+          >
+            <text>定时发布</text>
+            <text class="check-icon" v-if="isScheduled">✓</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup lang="ts">
@@ -155,6 +157,14 @@
   const publish = () => {
     // 发布公告逻辑
   }
+
+  const handleShowTimePicker = () => {
+    showTimePicker.value = true
+  }
+
+  const handleCloseTimePicker = () => {
+    showTimePicker.value = false
+  }
 </script>
 <style scoped>
   .basic-info {
diff --git a/src/pages/info-publish/info-publish.vue b/src/pages/info-publish/info-publish.vue
index 126a836..8ffd9ec 100644
--- a/src/pages/info-publish/info-publish.vue
+++ b/src/pages/info-publish/info-publish.vue
@@ -1,7 +1,206 @@
+<route lang="json5" type="page">
+{
+  layout: 'default',
+  style: {
+    navigationStyle: 'custom'
+  }
+}
+</route>
+
 <template>
-  <view></view>
+  <view class="h-[calc(100vh-50px)] flex flex-col">
+    <TopNavigation title="信息发布"></TopNavigation>
+    <scroll-view class="flex-1 box-border" scroll-y>
+      <!-- 使用说明卡片 -->
+      <view class="instruction-card">
+        <view class="card-content">
+          <view class="title">信息发布使用说明</view>
+          <view class="subtitle">快速上手信息发布</view>
+          <view class="detail-btn">
+            看详情
+            <text class="arrow">></text>
+          </view>
+        </view>
+        <image class="card-icon" src="@/static/images/publish_icon.png" mode="aspectFit" />
+      </view>
+
+      <!-- 功能列表 -->
+      <view class="function-list">
+        <view
+          class="function-item"
+          v-for="(item, index) in functionList"
+          :key="index"
+          @click="navigateTo(item.path)"
+        >
+          <view class="item-left">
+            <image class="item-icon" :src="item.icon" mode="aspectFit" />
+            <view class="item-info">
+              <view class="item-title">{{ item.title }}</view>
+              <view class="item-desc">{{ item.description }}</view>
+            </view>
+          </view>
+          <text class="arrow">></text>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+  <CustomTabBar :list="tabList" :default-index="0" @change="handleTabChange"></CustomTabBar>
 </template>
 
-<script setup lang="ts"></script>
+<script lang="ts" setup>
+  import { ref } from 'vue'
+  import { TabBarItem } from '@/typings'
 
-<style scoped lang="scss"></style>
+  // 功能列表数据
+  const functionList = ref([
+    {
+      title: '素材库',
+      description: '管理图片、音频、视频等素材',
+      icon: '/static/images/material_icon.png',
+      path: '/pages/info-publish/material-library'
+    },
+    {
+      title: '播放内容库',
+      description: '将文字、图片、视频素材组合成节目',
+      icon: '/static/images/content_icon.png',
+      path: '/pages/info-publish/play-content-library'
+    },
+    {
+      title: '发布计划',
+      description: '设置播放内容与时间规则同步到设备',
+      icon: '/static/images/plan_icon.png',
+      path: '/pages/info-publish/plan'
+    },
+    {
+      title: '公告管理',
+      description: '发布手机公告给团队成员',
+      icon: '/static/images/notice_icon.png',
+      path: '/pages/info-publish/notice-manage'
+    }
+  ])
+
+  // 底部标签栏配置
+  const tabList = ref<Array<TabBarItem>>([
+    {
+      title: '首页',
+      icon: 'home'
+    },
+    {
+      title: '屏幕控制',
+      icon: 'screen'
+    }
+  ])
+
+  // 页面跳转
+  const navigateTo = (path: string) => {
+    uni.navigateTo({
+      url: path
+    })
+  }
+
+  // 标签切换处理
+  const handleTabChange = (data: { value: number }) => {
+    // 处理标签切换逻辑
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    background-color: #f6f8fc;
+  }
+  /* 通用箭头样式 - 放在最前面 */
+  .arrow {
+    font-size: 16px;
+    color: #ccc;
+  }
+  /* 说明卡片样式 */
+  .instruction-card {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 20px;
+    margin: 16px;
+    color: #fff;
+    background: #4080ff;
+    border-radius: 12px;
+
+    .card-content {
+      flex: 1;
+    }
+
+    .title {
+      margin-bottom: 8px;
+      font-size: 18px;
+      font-weight: 500;
+    }
+
+    .subtitle {
+      font-size: 14px;
+      opacity: 0.8;
+    }
+
+    .detail-btn {
+      display: inline-flex;
+      align-items: center;
+      padding: 4px 12px;
+      margin-top: 12px;
+      font-size: 14px;
+      background: rgba(255, 255, 255, 0.2);
+      border-radius: 16px;
+
+      .arrow {
+        color: #fff; /* 覆盖通用箭头样式 */
+      }
+    }
+
+    .card-icon {
+      width: 60px;
+      height: 60px;
+      margin-left: 20px;
+    }
+  }
+  /*   功能列表样式 */
+  .function-list {
+    margin: 16px;
+    overflow: hidden;
+    background: #fff;
+    border-radius: 12px;
+
+    .function-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 16px;
+      border-bottom: 1px solid #f5f5f5;
+
+      &:last-child {
+        border-bottom: none;
+      }
+    }
+
+    .item-left {
+      display: flex;
+      align-items: center;
+    }
+
+    .item-icon {
+      width: 30px;
+      height: 30px;
+      margin-right: 12px;
+    }
+
+    .item-info {
+      .item-title {
+        margin-bottom: 4px;
+        font-size: 16px;
+        font-weight: 500;
+        color: #333;
+      }
+
+      .item-desc {
+        font-size: 12px;
+        color: #999;
+      }
+    }
+  }
+</style>
diff --git a/src/pages/info-publish/material-library.vue b/src/pages/info-publish/material-library.vue
new file mode 100644
index 0000000..23d1d16
--- /dev/null
+++ b/src/pages/info-publish/material-library.vue
@@ -0,0 +1,309 @@
+<route lang="json5" type="page">
+{
+  layout: 'default',
+  style: {
+    navigationStyle: 'custom'
+  }
+}
+</route>
+
+<template>
+  <view class="h-[calc(100vh-0px)] flex flex-col">
+    <TopNavigation title="素材库"></TopNavigation>
+    <scroll-view class="flex-1 box-border" scroll-y>
+      <!-- 存储容量卡片 -->
+      <view class="storage-card">
+        <view class="storage-title">素材存储容量</view>
+        <view class="storage-info">
+          <text class="used-text">已用 0.00%</text>
+          <text class="remain-text">剩余19.99 G/ 20.00 G</text>
+        </view>
+        <view class="progress-bar">
+          <view class="progress" :style="{ width: usedPercentage + '%' }"></view>
+        </view>
+        <view class="storage-details">
+          <view class="detail-item">
+            <text class="size image">833.67 K</text>
+            <text class="type">图片</text>
+          </view>
+          <view class="detail-item">
+            <text class="size audio">0 B</text>
+            <text class="type">音频</text>
+          </view>
+          <view class="detail-item">
+            <text class="size video">0 B</text>
+            <text class="type">视频</text>
+          </view>
+        </view>
+      </view>
+
+      <!-- 素材类型标签 -->
+      <view class="material-tabs">
+        <view
+          v-for="(tab, index) in tabs"
+          :key="index"
+          class="tab-item"
+          :class="{ active: currentTab === index }"
+          @click="handleTabChange(index)"
+        >
+          <text>{{ tab.name }}({{ tab.count }})</text>
+        </view>
+      </view>
+
+      <!-- 素材列表 -->
+      <view class="material-list">
+        <view v-for="(item, index) in materialList" :key="index" class="material-item">
+          <image class="material-icon" :src="item.icon" mode="aspectFill" />
+          <view class="material-info">
+            <text class="material-name">{{ item.name }}</text>
+            <text class="material-id">{{ item.id }}</text>
+            <text class="material-time">{{ item.time }}</text>
+          </view>
+          <view class="right-wrapper">
+            <text class="status-tag">已通过</text>
+            <text class="arrow">></text>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 底部按钮 -->
+    <view class="footer">
+      <button class="upload-btn">上传列表</button>
+      <button class="add-btn">添加图片素材</button>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import { ref } from 'vue'
+
+  // 使用率
+  const usedPercentage = ref(0.0)
+
+  // 标签页配置
+  const tabs = ref([
+    { name: '图片', count: 4 },
+    { name: '音频', count: 0 },
+    { name: '视频', count: 0 }
+  ])
+
+  // 当前选中的标签
+  const currentTab = ref(0)
+
+  // 素材列表数据
+  const materialList = ref([
+    {
+      icon: '/static/images/house_resource.png',
+      name: 'house_resource.png',
+      id: 'HikMall_30013234',
+      time: '2024-12-26 15:11:18'
+    },
+    {
+      icon: '/static/images/app_icon.png',
+      name: 'app_icon.png',
+      id: 'HikMall_30013234',
+      time: '2024-12-26 15:10:37'
+    },
+    {
+      icon: '/static/images/home.png',
+      name: 'home.png',
+      id: 'HikMall_30013234',
+      time: '2024-12-26 15:05:10'
+    },
+    {
+      icon: '/static/images/lock.jpg',
+      name: '锁通通 2.jpg',
+      id: 'HikMall_30013234',
+      time: '2024-12-26 15:05:10'
+    }
+  ])
+
+  // 切换标签
+  const handleTabChange = (index: number) => {
+    currentTab.value = index
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    background-color: #f5f5f5;
+  }
+
+  .storage-card {
+    padding: 20px;
+    margin: 16px;
+    background: #fff;
+    border-radius: 12px;
+
+    .storage-title {
+      margin-bottom: 12px;
+      font-size: 16px;
+      font-weight: 500;
+    }
+
+    .storage-info {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 8px;
+      font-size: 14px;
+    }
+
+    .progress-bar {
+      height: 4px;
+      margin-bottom: 16px;
+      background: #f0f0f0;
+      border-radius: 2px;
+
+      .progress {
+        height: 100%;
+        background: #4080ff;
+        border-radius: 2px;
+      }
+    }
+
+    .storage-details {
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .detail-item {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .size {
+        margin-bottom: 4px;
+        font-size: 14px;
+
+        &.image {
+          color: #4080ff;
+        }
+        &.audio {
+          color: #00c1d4;
+        }
+        &.video {
+          color: #ffb100;
+        }
+      }
+
+      .type {
+        font-size: 12px;
+        color: #999;
+      }
+    }
+  }
+
+  .material-tabs {
+    display: flex;
+    padding: 0 16px;
+    margin-bottom: 12px;
+
+    .tab-item {
+      position: relative;
+      padding: 8px 0;
+      margin-right: 24px;
+      font-size: 14px;
+      color: #999;
+
+      &.active {
+        font-weight: 500;
+        color: #333;
+
+        &::after {
+          position: absolute;
+          bottom: 0;
+          left: 0;
+          width: 100%;
+          height: 2px;
+          content: '';
+          background: #4080ff;
+        }
+      }
+    }
+  }
+
+  .material-list {
+    padding: 0 16px;
+
+    .material-item {
+      position: relative; // 添加相对定位
+      display: flex;
+      align-items: center;
+      padding: 16px;
+      margin-bottom: 12px;
+      background: #fff;
+      border-radius: 8px;
+    }
+
+    .material-icon {
+      width: 48px;
+      height: 48px;
+      margin-right: 12px;
+      border-radius: 4px;
+    }
+
+    .material-info {
+      flex: 1;
+
+      .material-name {
+        margin-bottom: 4px;
+        font-size: 14px;
+        color: #333;
+      }
+
+      .material-id,
+      .material-time {
+        display: block;
+        font-size: 12px;
+        color: #999;
+      }
+    }
+
+    .status-tag {
+      position: absolute; // 添加绝对定位
+      top: 0; // 距离顶部 8px
+      right: 0; // 距离右侧 16px
+      padding: 2px 6px; // 添加内边距
+      font-size: 12px;
+      color: #52c41a;
+      background-color: rgba(82, 196, 26, 0.1); // 添加浅绿色背景
+      border-radius: 2px; // 添加圆角
+    }
+
+    .arrow {
+      margin-top: 24px; // 向下偏移以对齐底部
+      color: #ccc;
+    }
+  }
+
+  .footer {
+    position: fixed;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    padding: 10px 16px;
+    background: #fff;
+    box-shadow: 0 -2px 6px rgba(0, 0, 0, 0.05);
+
+    button {
+      flex: 1;
+      height: 40px;
+      font-size: 14px;
+      border: none;
+      border-radius: 4px;
+
+      &.upload-btn {
+        margin-right: 12px;
+        color: #333;
+        background: #f5f5f5;
+      }
+
+      &.add-btn {
+        color: #fff;
+        background: #4080ff;
+      }
+    }
+  }
+</style>
diff --git a/src/pages/info-publish/play-content-library.vue b/src/pages/info-publish/play-content-library.vue
new file mode 100644
index 0000000..45a4045
--- /dev/null
+++ b/src/pages/info-publish/play-content-library.vue
@@ -0,0 +1,229 @@
+<route lang="json5" type="page">
+{
+  layout: 'default',
+  style: {
+    navigationStyle: 'custom'
+  }
+}
+</route>
+
+<template>
+  <view class="h-[calc(100vh-0px)] flex flex-col">
+    <TopNavigation title="播放内容库"></TopNavigation>
+    <scroll-view class="flex-1 box-border" scroll-y>
+      <!-- 设备类型切换 -->
+      <view class="device-tabs">
+        <view
+          v-for="(tab, index) in deviceTabs"
+          :key="index"
+          class="tab-item"
+          :class="{ active: currentDeviceTab === index }"
+          @click="handleDeviceTabChange(index)"
+        >
+          <text>{{ tab.name }}</text>
+        </view>
+      </view>
+
+      <!-- 右上角按钮 -->
+      <!-- <view class="action-btn">
+        <text>图片/视频轮播</text>
+      </view> -->
+
+      <!-- 内容卡片 -->
+      <view class="content-card">
+        <view class="card-header">
+          <view class="content-title">智慧屏节目202412260150523</view>
+          <view class="content-type">图片/视频轮播</view>
+        </view>
+
+        <view class="content-info">
+          <view class="info-item">
+            <text class="label">分辨率</text>
+            <text class="value">1920*1080</text>
+          </view>
+          <view class="info-item">
+            <text class="label">更新人员</text>
+            <text class="value">HikMall_30013234</text>
+          </view>
+          <view class="info-item">
+            <text class="label">更新时间</text>
+            <text class="value">2024-12-26 15:05:31</text>
+          </view>
+        </view>
+
+        <!-- 操作按钮组 -->
+        <view class="action-group">
+          <button class="action-button" @click="handlePreview">预览</button>
+          <button class="action-button" @click="handleEdit">编辑</button>
+          <button class="action-button" @click="handleDelete">删除</button>
+          <button class="action-button" @click="handlePublish">发布</button>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 底部按钮 -->
+    <view class="footer">
+      <button class="add-btn">添加智慧屏节目</button>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import { ref } from 'vue'
+
+  // 设备类型标签
+  const deviceTabs = ref([{ name: '智慧屏' }, { name: '门禁' }])
+
+  // 当前选中的设备类型
+  const currentDeviceTab = ref(0)
+
+  // 切换设备类型
+  const handleDeviceTabChange = (index: number) => {
+    currentDeviceTab.value = index
+  }
+
+  // 操作按钮事件处理
+  const handlePreview = () => {
+    // 实现预览逻辑
+  }
+
+  const handleEdit = () => {
+    // 实现编辑逻辑
+  }
+
+  const handleDelete = () => {
+    // 实现删除逻辑
+  }
+
+  const handlePublish = () => {
+    // 实现发布逻辑
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    background-color: #f5f5f5;
+  }
+
+  .device-tabs {
+    display: flex;
+    padding: 8px 16px;
+    margin: 16px;
+    background: #fff;
+    border-radius: 8px;
+
+    .tab-item {
+      flex: 1;
+      padding: 8px 0;
+      font-size: 14px;
+      color: #666;
+      text-align: center;
+
+      &.active {
+        font-weight: 500;
+        color: #333;
+        background: #f5f5f5;
+        border-radius: 4px;
+      }
+    }
+  }
+
+  .action-btn {
+    position: absolute;
+    top: 16px;
+    right: 16px;
+    padding: 6px 12px;
+    font-size: 12px;
+    color: #fff;
+    background: #4080ff;
+    border-radius: 16px;
+  }
+
+  .content-card {
+    padding: 16px;
+    margin: 16px;
+    background: #fff;
+    border-radius: 8px;
+
+    .card-header {
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      margin-bottom: 16px;
+    }
+
+    .content-title {
+      flex: 1;
+      margin-right: 12px; // 为右侧标识留出空间
+      font-size: 16px;
+      font-weight: 500;
+      color: #333;
+    }
+
+    .content-type {
+      padding: 2px 8px;
+      margin-top: 0px;
+      font-size: 12px;
+      color: #4080ff;
+      white-space: nowrap;
+      background: rgba(64, 128, 255, 0.1);
+      border-radius: 4px;
+    }
+    .info-item {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 12px;
+      font-size: 14px;
+
+      &:last-child {
+        margin-bottom: 14px;
+      }
+
+      .label {
+        color: #666;
+      }
+
+      .value {
+        color: #333;
+      }
+    }
+  }
+
+  .action-group {
+    display: flex;
+    gap: 8px;
+    justify-content: space-between;
+
+    .action-button {
+      flex: 1;
+      height: 32px;
+      font-size: 14px;
+      line-height: 32px;
+      color: #4080ff;
+      background: #fff;
+      border: 1px solid #4080ff;
+      border-radius: 4px;
+    }
+  }
+
+  .footer {
+    position: fixed;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    padding: 16px;
+    background: #fff;
+    box-shadow: 0 -2px 6px rgba(0, 0, 0, 0.05);
+
+    .add-btn {
+      width: 100%;
+      height: 40px;
+      font-size: 14px;
+      line-height: 40px;
+      color: #fff;
+      background: #4080ff;
+      border: none;
+      border-radius: 4px;
+    }
+  }
+</style>
diff --git a/src/static/images/content_icon.png b/src/static/images/content_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..971ae31db29cfeb607cd3f812500df2249934f89
GIT binary patch
literal 3980
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

literal 0
HcmV?d00001

diff --git a/src/static/images/material_icon.png b/src/static/images/material_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..bacb37ab3d92847723121e96f94ff4a25388ed42
GIT binary patch
literal 7146
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

literal 0
HcmV?d00001

diff --git a/src/static/images/notice_icon.png b/src/static/images/notice_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..86454afd01f30dc5963cf2bf15734463fcfe888a
GIT binary patch
literal 5556
zcmV;l6-(-gP)<h;3K|Lk000e1NJLTq00310003SH1^@s6QZiVX00009a7bBm000XU
z000XU0RWnu7ytkjW=TXrRCt`#UCXZ}$65b<RejF6=g!<alX>}(j6FDpWMnd6GQ2`S
zMlu>i77<|q3nL*GUb94jW&Q!gh6M{YEZAhhCNWVY5JUuQ0&${o9yWf(&e(H3o;&Bx
zd39HPEUK&P(N*1j?!z{pbkyC|)m7cU{$BNcRegw=aa{D%JNm|VU!$+Tb^F+wJW*O#
zdQiR7Q^FIM@vm1N6n}hf2e0?lr{e;3Z^l>u?C<!dKA@mnF+&nTW%|*~5JbVg_UdX)
z$?JkXboVnTuMH_UI8N0G%9Tc?3DXJV+z#RQe;s)GNpWgt8}nR$#{%l!jIaLn*ZJn{
zcLjvV*V8&a&iAc3d`M=7tu6@A3~*E@*Phk{A-MH|G&Ab=31-tr&}Uu0)Edh*VZH(?
z1^m%dj6e7daeX?bmjECJ_{gB{&G_oyd;>S{yiZV7zO5W50K>sn8lW15+<oWziQBXQ
zTd)}&FIY2J6H2Xde<^T($re}uxPIv@{g+?A$hI_){^k2=K=TimzwuTX$89i_W(cz9
z>(W-eZmxB$F_aEp5HmvvYOXijYOWaxf$5l`6ys~pGk*4A;M&gsvpKeXZtW1(e%hPy
z)#qR308phV31|*XbIx4vgQ%In%)!r{bK>s<sx>!1b4<<89t*+HY<{*$rveN|TF&Ie
za}*MoPJsRU0{{G?Myc?^V$D})b8Oo>M*{V`|BIW8nd!I-Obe*nny0Ch`DvyGP|XAt
zs{?KWX~B$vbp6(90tP_S57#Qh)FE=$TR;J{z*Nl5PcuUb!l^C78@CDX++maoFO&)w
zEwD!d^={4ZKA09nAI$J!IoSGK=<h4dNg(~}hln^3a-zMKnFEeYais+kK*QaZq+r}V
z(71CzP?}LGe$AdcvQBjm(sw>@2#6?acw+JHYs)t}zIdBotSi$LyMH=57J^~*>}>9s
zz?K~wsKHHWqwMW|c!QpyVE=~Tl@o|K5b<^&X;5N7nYjVeH##Zm12fk*YXA}`6)pmJ
z{m7syO{fyCRHf`*>;hSF@@}fdjbYt(pGN##A9YU@`kNL+qodn;vgy+sbc8-_YLH;=
zPicWd+O{0C%;wlWc1}%kqB|GXO^J50P0#4qCR2d+abs#!r+uC2c?qp+dq!<Fy$0aa
zkwMkk0m+dvw_<Gf-8GIAea?tSJ$A$s7&1*D5pEsTo=69H>1XIr2?;Q}1~Nd0PQ5ed
zM>_@?0Dzqx;POMpLM_&*8jNy9&3>9<QO|d}ssttlV+{gV1S$ZoQV*Da==B;nm~&%b
zQq;wjeSiW9Q18t7(c3eAR+}69a?qfv4U00K*v=N?SAWiVW%C+X8~v#U+`v$(lx>Sp
zNTW}UPGj#}KNXTOod9?53EX^*@$yeJ$_kKzvS2Drtw4-Yy3whvKKz5XXZpr$j^A2T
z`0}X6s;oOYSQ=e5Uzi8kpW8<?=ij~S+Sxy_dyFbEgv^mvU7``6<JNvWXaIn<2FCTX
zNC9k*2&c9Q7tSy~cMZ7wpu~TE-}sz9#T+?=LoGF+zCF`7-anu(mEdO~fO*MKil6}~
z1yqW$u7I^7REnX&Sgr+DB~Vrxi;{4EX*yq*rp;2B2QDkZNC0JrFRL<+u4aND4vu5;
zb!}7D7&k*!UlSNbp|SHG;gRzKmoG7Pt`olbg1~$Ch6R@l!1=lYs73w&&nWP-0&bW^
zQe`jPge=#OI>v9Zjv2}*cIX3YkK-~Tf{-qP1pp-2{D77LT$RAyJ;p1y7;nByIJ?XE
z#ZUD=hd&hWQf&eNezMPBQ5w(K!eQ}nK#FwD@hIw0FiPFcsir-V<ygSQ2vXb%0D2$~
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
C+K@B=

literal 0
HcmV?d00001

diff --git a/src/static/images/plan_icon.png b/src/static/images/plan_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..16568e55f5945f6a1afea25e7648ce8cad0164de
GIT binary patch
literal 7104
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

literal 0
HcmV?d00001

diff --git a/src/static/images/publish_icon.png b/src/static/images/publish_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..21ad94363caa6d37dd8934c139f9a890ff0f6a03
GIT binary patch
literal 52476
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

literal 0
HcmV?d00001


From d6ff287a65d1437bf77ab366cba2042d1c99e2b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 15:19:30 +0800
Subject: [PATCH 12/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=A8=A1=E5=9D=97=E8=AF=B7=E5=81=87=E3=80=81=E5=87=BA?=
 =?UTF-8?q?=E5=B7=AE=E3=80=81=E5=A4=96=E5=87=BA=E3=80=81=E8=A1=A5=E5=8D=A1?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E7=8F=AD=E5=A5=97=E4=BB=B6=E7=9A=84=E5=B0=81?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  23 +++-
 .../approval/components/DatetimePicker.vue    |  63 +++++++++-
 .../components/DatetimePickerGroup.vue        | 110 ++++++++++++++++++
 src/pages/approval/components/Input.vue       |  13 +++
 src/pages/approval/components/Leave.vue       |  97 +++++++++++++++
 .../components/MemberOrDepartment.vue         |   4 +-
 src/pages/approval/components/Overtime.vue    |  43 +++++++
 .../approval/components/SelectPicker.vue      |  40 ++++++-
 8 files changed, 387 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/approval/components/DatetimePickerGroup.vue
 create mode 100644 src/pages/approval/components/Leave.vue
 create mode 100644 src/pages/approval/components/Overtime.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index d331ce8..001aede 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,5 +1,5 @@
 <template>
-  <view>
+  <view class="pb-3">
     <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
@@ -76,6 +76,22 @@
         type="department"
         :multiple="true"
       ></MemberOrDepartment>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Leave :id="12"></Leave>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePickerGroup :id="13" type="businessTrip" unit="date"></DatetimePickerGroup>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePickerGroup :id="14" type="goOut" unit="dateHalfDay"></DatetimePickerGroup>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Overtime :id="15"></Overtime>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="16"
+        type="datetime"
+        required
+        title="补卡时间"
+        @change="changeDate"
+      ></DatetimePicker>
     </view>
   </view>
 </template>
@@ -88,8 +104,11 @@
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
   import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
+  import Leave from '@/pages/approval/components/Leave.vue'
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+  import Overtime from '@/pages/approval/components/Overtime.vue'
 
-  const columns = ref<Record<number, any>>([
+  const columns = ref<Record<number, string>>([
     {
       value: 0,
       label: '男装'
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
index 95fc9c5..e27f5d8 100644
--- a/src/pages/approval/components/DatetimePicker.vue
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -6,7 +6,9 @@
     </view>
     <view class="py-2" @click="openDialog">
       <view class="flex flex-items-center flex-justify-between">
-        <view>{{ text || placeholder }}</view>
+        <view :class="text ? 'custom-color-black' : 'color-#838589'">
+          {{ text || placeholder }}
+        </view>
         <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
@@ -104,7 +106,31 @@
     },
     placeholder: {
       type: String,
-      default: '请输入'
+      default: '请选择'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    disabledText: {
+      type: String,
+      default: ''
+    },
+    minDate: {
+      type: [Number, null],
+      default: null
+    },
+    maxDate: {
+      type: [Number, null],
+      default: null
+    },
+    minDateText: {
+      type: String,
+      default: ''
+    },
+    maxDateText: {
+      type: String,
+      default: ''
     }
   })
 
@@ -159,6 +185,13 @@
   }
 
   const openDialog = () => {
+    if (props.disabled) {
+      uni.showToast({
+        title: props.disabledText,
+        icon: 'none'
+      })
+      return
+    }
     if (!props.value) {
       if (text.value === '') {
         timestamp.value = new Date().getTime()
@@ -180,6 +213,20 @@
   }
 
   const confirm = () => {
+    if (props.minDate && timestamp.value < props.minDate) {
+      uni.showToast({
+        title: props.minDateText,
+        icon: 'none'
+      })
+      return
+    }
+    if (props.maxDate && timestamp.value > props.maxDate) {
+      uni.showToast({
+        title: props.maxDateText,
+        icon: 'none'
+      })
+      return
+    }
     show.value = false
     returnTimestamp.value = timestamp.value
     if (props.type === 'dateHalfDay') {
@@ -193,4 +240,16 @@
   const afterLeave = () => {
     showPicker.value = false
   }
+
+  const clear = () => {
+    text.value = ''
+    date.value = ''
+    halfDay.value = ''
+    returnTimestamp.value = 0
+    emits('change', { id: props.id, value: returnTimestamp.value, text: text.value })
+  }
+
+  defineExpose({
+    clear
+  })
 </script>
diff --git a/src/pages/approval/components/DatetimePickerGroup.vue b/src/pages/approval/components/DatetimePickerGroup.vue
new file mode 100644
index 0000000..3d3142d
--- /dev/null
+++ b/src/pages/approval/components/DatetimePickerGroup.vue
@@ -0,0 +1,110 @@
+<template>
+  <view>
+    <DatetimePicker
+      :id="1"
+      ref="startDatetimePicker"
+      title="开始时间"
+      @change="changeDate"
+      :max-date="endTimestamp"
+      max-date-text="开始时间不能晚于结束时间"
+      required
+      :disabled="disabled"
+      :disabled-text="disabledText"
+      :type="unit"
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <DatetimePicker
+      :id="2"
+      title="结束时间"
+      ref="endDatetimePicker"
+      :min-date="startTimestamp"
+      min-date-text="结束时间不能早于开始时间"
+      @change="changeDate"
+      required
+      :type="unit"
+      :disabled="disabled"
+      :disabled-text="disabledText"
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input
+      :id="3"
+      ref="inputComponent"
+      type="number"
+      :title="`${textMap[type]}时长${unit === 'datetime' ? '（小时）' : '（天）'}`"
+      required
+      :readonly="updateTime"
+      placeholder="自动计算"
+      @change="inputChange"
+    ></Input>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import Input from '@/pages/approval/components/Input.vue'
+
+  const textMap = {
+    leave: '请假',
+    businessTrip: '出差',
+    goOut: '外出',
+    overtime: '加班'
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    unit: {
+      type: String,
+      default: 'date'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    disabledText: {
+      type: String,
+      default: ''
+    },
+    updateTime: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const startTimestamp = ref(0)
+  const endTimestamp = ref(0)
+
+  const startDatetimePicker = ref(null)
+  const endDatetimePicker = ref(null)
+  const inputComponent = ref(null)
+
+  const changeDate = e => {
+    if (e.id === 1) {
+      startTimestamp.value = e.value
+    } else {
+      endTimestamp.value = e.value
+    }
+  }
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const clear = () => {
+    startDatetimePicker.value.clear()
+    endDatetimePicker.value.clear()
+    inputComponent.value.clear()
+  }
+
+  defineExpose({
+    clear
+  })
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index 96df501..9334107 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -11,6 +11,7 @@
         :placeholder="placeholder"
         :maxlength="type === 'text' ? 30 : 15"
         v-model="text"
+        :readonly="readonly"
         @input="change(id, $event)"
       ></wd-input>
     </view>
@@ -46,6 +47,10 @@
     placeholder: {
       type: String,
       default: '请输入'
+    },
+    readonly: {
+      type: Boolean,
+      default: false
     }
   })
 
@@ -56,6 +61,14 @@
   const change = (id, data) => {
     emits('change', { id, value: data.value })
   }
+
+  const clear = () => {
+    text.value = ''
+  }
+
+  defineExpose({
+    clear
+  })
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/Leave.vue b/src/pages/approval/components/Leave.vue
new file mode 100644
index 0000000..b7bade7
--- /dev/null
+++ b/src/pages/approval/components/Leave.vue
@@ -0,0 +1,97 @@
+<template>
+  <view>
+    <SelectPicker
+      :id="0"
+      title="请假类型"
+      placeholder="请选择"
+      :columns="columns"
+      required
+      @change="changeSelect"
+    ></SelectPicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <DatetimePickerGroup
+      ref="timeGroup"
+      type="leave"
+      :disabled="!leaveType"
+      :updateTime="updateTime"
+      :unit="leaveType?.unit ?? 'date'"
+      disabled-text="请选择请假类型"
+      :id="1"
+    ></DatetimePickerGroup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+
+  const leaveType = ref(null)
+  const timeGroup = ref(null)
+
+  const columns = ref<Record<number, string>>([
+    {
+      value: 0,
+      label: '年假',
+      unit: 'date'
+    },
+    {
+      value: 1,
+      label: '事假',
+      unit: 'dateHalfDay'
+    },
+    {
+      value: 2,
+      label: '病假',
+      unit: 'datetime'
+    },
+    {
+      value: 3,
+      label: '婚假',
+      unit: 'date',
+      limit: 5
+    },
+    {
+      value: 4,
+      label: '产假',
+      unit: 'datetime',
+      limit: 24.5
+    },
+    {
+      value: 5,
+      label: '陪产假',
+      unit: 'datetime'
+    },
+    {
+      value: 6,
+      label: '丧假',
+      unit: 'date'
+    },
+    {
+      value: 7,
+      label: '哺乳假',
+      unit: 'date'
+    }
+  ])
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    updateTime: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const changeSelect = e => {
+    leaveType.value = e.value
+    timeGroup.value.clear()
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
index 5339c4c..e582118 100644
--- a/src/pages/approval/components/MemberOrDepartment.vue
+++ b/src/pages/approval/components/MemberOrDepartment.vue
@@ -6,7 +6,9 @@
     </view>
     <view class="py-2" @click="toSelect">
       <view class="flex flex-items-center flex-justify-between">
-        <view>{{ text || placeholder }}</view>
+        <view :class="text ? 'custom-color-black' : 'color-#838589'">
+          {{ text || placeholder }}
+        </view>
         <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
diff --git a/src/pages/approval/components/Overtime.vue b/src/pages/approval/components/Overtime.vue
new file mode 100644
index 0000000..683a52c
--- /dev/null
+++ b/src/pages/approval/components/Overtime.vue
@@ -0,0 +1,43 @@
+<template>
+  <view>
+    <DatetimePicker
+      :id="0"
+      ref="startDatetimePicker"
+      title="加班日期"
+      @change="changeDate"
+      required
+    ></DatetimePicker>
+    <wd-divider v-if="timestamp" color="#bcbfbe"></wd-divider>
+    <DatetimePickerGroup
+      v-if="timestamp"
+      type="overtime"
+      unit="datetime"
+      :id="1"
+    ></DatetimePickerGroup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+
+  const timestamp = ref<number>(0)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    }
+  })
+
+  const changeDate = e => {
+    timestamp.value = e.value
+    console.log('changeDate', e)
+  }
+</script>
+
+<style scoped lang="scss">
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
index 4ce41f7..99708b3 100644
--- a/src/pages/approval/components/SelectPicker.vue
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -12,7 +12,9 @@
         v-model="picker"
         :columns="columns"
         size="large"
-      />
+        @change="change"
+        select-size="large"
+      ></wd-select-picker>
     </view>
   </view>
 </template>
@@ -51,11 +53,17 @@
     }
   })
 
+  const emits = defineEmits(['change'])
+
   onMounted(() => {
     if (props.value) {
       picker.value = props.value
     }
   })
+
+  const change = ({ value }) => {
+    emits('change', { id: props.id, value: props.columns.find(item => item.value === value) })
+  }
 </script>
 
 <style scoped lang="scss">
@@ -63,4 +71,34 @@
     padding: var(--wot-cell-wrapper-padding, 10px) 0;
     background-color: transparent;
   }
+
+  :deep(.wd-radio-group),
+  :deep(.wd-checkbox-group) {
+    background-color: #ffffff;
+    border-radius: 0.5rem;
+  }
+
+  :deep(.wd-action-sheet) {
+    background-color: #f3f5fa;
+  }
+
+  :deep(.uni-scroll-view-content) {
+    padding-bottom: 0.5rem;
+  }
+
+  :deep(.wd-radio),
+  :deep(.wd-checkbox) {
+    position: relative;
+    padding: 1rem !important;
+  }
+
+  :deep(.wd-radio)::after,
+  :deep(.wd-checkbox)::after {
+    position: absolute;
+    bottom: 0;
+    left: 4%;
+    width: 92%;
+    content: '';
+    border-bottom: 1px solid #efefef;
+  }
 </style>

From e58a2a1b21a6f9078e640009e47e617cca721f9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”>
Date: Thu, 16 Jan 2025 17:11:38 +0800
Subject: [PATCH 13/37] =?UTF-8?q?feat:=201,=E6=98=9F=E5=8B=A4:=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8F=91=E5=B8=83=E6=A8=A1=E5=9D=97=E2=80=94=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=BC=96=E8=BE=91=E5=9B=BE=E7=89=87/=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E8=BD=AE=E6=92=AD=E9=A1=B5=E9=9D=A2UI=E5=B8=83?=
 =?UTF-8?q?=E5=B1=802,=E6=98=9F=E5=8B=A4:=E4=BF=A1=E6=81=AF=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=A8=A1=E5=9D=97=E2=80=94=E6=96=B0=E5=A2=9E=E7=B4=A0?=
 =?UTF-8?q?=E6=9D=90=E5=BA=93UI=E5=B8=83=E5=B1=803,=E6=98=9F=E5=8B=A4:?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=91=E5=B8=83=E6=A8=A1=E5=9D=97=E2=80=94?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=91=E5=B8=83=E8=AE=A1=E5=88=92=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2UI=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/info-publish/edit-pic-video.vue     | 161 ++++++++++++++++++
 src/pages/info-publish/info-publish.vue       |   4 +-
 src/pages/info-publish/material-library.vue   |   8 +-
 .../info-publish/play-content-library.vue     |   3 +
 src/pages/info-publish/release-plan.vue       | 138 +++++++++++++++
 .../images/icon_publish_control_grey.png      | Bin 0 -> 2787 bytes
 src/static/images/icon_publish_home_blue.png  | Bin 0 -> 2348 bytes
 7 files changed, 308 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/info-publish/edit-pic-video.vue
 create mode 100644 src/pages/info-publish/release-plan.vue
 create mode 100644 src/static/images/icon_publish_control_grey.png
 create mode 100644 src/static/images/icon_publish_home_blue.png

diff --git a/src/pages/info-publish/edit-pic-video.vue b/src/pages/info-publish/edit-pic-video.vue
new file mode 100644
index 0000000..c5f10fb
--- /dev/null
+++ b/src/pages/info-publish/edit-pic-video.vue
@@ -0,0 +1,161 @@
+<route lang="json5" type="page">
+{
+  layout: 'default',
+  style: {
+    navigationStyle: 'custom'
+  }
+}
+</route>
+
+<template>
+  <view class="h-[calc(100vh-0px)] flex flex-col">
+    <TopNavigation title="编辑图片/视频轮播"></TopNavigation>
+    <scroll-view class="flex-1 box-border" scroll-y>
+      <view class="content-form">
+        <!-- 名称 -->
+        <view class="form-item">
+          <view class="form-label">名称</view>
+          <view class="form-value">
+            <input
+              type="text"
+              v-model="formData.name"
+              placeholder="请输入名称"
+              class="form-input"
+            />
+            <text v-if="formData.name" class="clear-icon" @click="clearName">×</text>
+          </view>
+        </view>
+
+        <!-- 屏幕方向 -->
+        <view class="form-item">
+          <view class="form-label">屏幕方向</view>
+          <view class="form-value">
+            <text>横屏</text>
+          </view>
+        </view>
+
+        <!-- 屏幕分辨率 -->
+        <view class="form-item">
+          <view class="form-label">屏幕分辨率</view>
+          <view class="form-value">
+            <text>1920*1080</text>
+          </view>
+        </view>
+
+        <!-- 内容类型 -->
+        <view class="form-item">
+          <view class="form-label">内容类型</view>
+          <view class="form-value">
+            <text>图片/视频轮播</text>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 底部按钮 -->
+    <view class="footer">
+      <button class="next-btn" @click="handleNext">下一步</button>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import { ref } from 'vue'
+
+  // 表单数据
+  const formData = ref({
+    name: '智慧屏节目202412260150523'
+  })
+
+  // 清除名称
+  const clearName = () => {
+    formData.value.name = ''
+  }
+
+  // 下一步按钮点击事件
+  const handleNext = () => {
+    // 实现下一步逻辑
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    background-color: #f5f5f5;
+  }
+
+  .content-form {
+    margin: 16px;
+    background: #fff;
+    border-radius: 8px;
+  }
+
+  .form-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px;
+    border-bottom: 1px solid #f5f5f5;
+
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+
+  .form-label {
+    font-size: 15px;
+    color: #333;
+  }
+
+  .form-value {
+    display: flex;
+    flex: 1; // 添加这行，让表单值区域占据剩余空间
+    align-items: center;
+    justify-content: flex-end; // 添加这行，让内容靠右对齐
+
+    .form-input {
+      flex: 1; // 让输入框占据剩余空间
+      height: 20px; // 设置合适的高度
+      padding: 0; // 移除默认内边距
+      margin-left: 16px; // 与左侧标签保持间距
+      font-size: 14px;
+      line-height: 20px;
+      color: #333;
+      text-align: right; // 文本右对齐
+      background: transparent; // 透明背景
+      border: none; // 移除边框
+    }
+
+    .clear-icon {
+      flex-shrink: 0; // 防止图标被压缩
+      width: 16px;
+      height: 16px;
+      margin-left: 8px;
+      line-height: 16px;
+      color: #999;
+      text-align: center;
+      background: #eee;
+      border-radius: 50%;
+    }
+  }
+
+  .footer {
+    position: fixed;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    padding: 16px;
+    background: #fff;
+    box-shadow: 0 -2px 6px rgba(0, 0, 0, 0.05);
+
+    .next-btn {
+      width: 100%;
+      height: 40px;
+      font-size: 14px;
+      line-height: 40px;
+      color: #fff;
+      background: #4080ff;
+      border: none;
+      border-radius: 4px;
+    }
+  }
+</style>
diff --git a/src/pages/info-publish/info-publish.vue b/src/pages/info-publish/info-publish.vue
index 8ffd9ec..bfa945d 100644
--- a/src/pages/info-publish/info-publish.vue
+++ b/src/pages/info-publish/info-publish.vue
@@ -69,7 +69,7 @@
       title: '发布计划',
       description: '设置播放内容与时间规则同步到设备',
       icon: '/static/images/plan_icon.png',
-      path: '/pages/info-publish/plan'
+      path: '/pages/info-publish/release-plan'
     },
     {
       title: '公告管理',
@@ -87,7 +87,7 @@
     },
     {
       title: '屏幕控制',
-      icon: 'screen'
+      icon: 'home'
     }
   ])
 
diff --git a/src/pages/info-publish/material-library.vue b/src/pages/info-publish/material-library.vue
index 23d1d16..3cb02b3 100644
--- a/src/pages/info-publish/material-library.vue
+++ b/src/pages/info-publish/material-library.vue
@@ -94,25 +94,25 @@
   // 素材列表数据
   const materialList = ref([
     {
-      icon: '/static/images/house_resource.png',
+      icon: 'https://file.hikmall.com/prod/image/885eb6ac104e4a76941e67eb738142ec.png',
       name: 'house_resource.png',
       id: 'HikMall_30013234',
       time: '2024-12-26 15:11:18'
     },
     {
-      icon: '/static/images/app_icon.png',
+      icon: 'https://file.hikmall.com/prod/image/885eb6ac104e4a76941e67eb738142ec.png',
       name: 'app_icon.png',
       id: 'HikMall_30013234',
       time: '2024-12-26 15:10:37'
     },
     {
-      icon: '/static/images/home.png',
+      icon: 'https://file.hikmall.com/prod/image/885eb6ac104e4a76941e67eb738142ec.png',
       name: 'home.png',
       id: 'HikMall_30013234',
       time: '2024-12-26 15:05:10'
     },
     {
-      icon: '/static/images/lock.jpg',
+      icon: 'https://file.hikmall.com/prod/image/885eb6ac104e4a76941e67eb738142ec.png',
       name: '锁通通 2.jpg',
       id: 'HikMall_30013234',
       time: '2024-12-26 15:05:10'
diff --git a/src/pages/info-publish/play-content-library.vue b/src/pages/info-publish/play-content-library.vue
index 45a4045..ae1602f 100644
--- a/src/pages/info-publish/play-content-library.vue
+++ b/src/pages/info-publish/play-content-library.vue
@@ -89,6 +89,9 @@
 
   const handleEdit = () => {
     // 实现编辑逻辑
+    uni.navigateTo({
+      url: '/pages/info-publish/edit-pic-video'
+    })
   }
 
   const handleDelete = () => {
diff --git a/src/pages/info-publish/release-plan.vue b/src/pages/info-publish/release-plan.vue
new file mode 100644
index 0000000..1d74a88
--- /dev/null
+++ b/src/pages/info-publish/release-plan.vue
@@ -0,0 +1,138 @@
+<route lang="json5" type="page">
+{
+  layout: 'default',
+  style: {
+    navigationStyle: 'custom'
+  }
+}
+</route>
+
+<template>
+  <view class="h-[calc(100vh-0px)] flex flex-col">
+    <TopNavigation title="发布计划"></TopNavigation>
+    <scroll-view class="flex-1 box-border" scroll-y>
+      <!-- 设备类型切换 -->
+      <view class="device-tabs">
+        <view
+          v-for="(tab, index) in deviceTabs"
+          :key="index"
+          class="tab-item"
+          :class="{ active: currentDeviceTab === index }"
+          @click="handleDeviceTabChange(index)"
+        >
+          <text>{{ tab.name }}</text>
+        </view>
+      </view>
+
+      <!-- 空状态展示 -->
+      <view class="empty-state" v-if="!hasData">
+        <image class="empty-icon" src="/static/images/empty-box.png" mode="aspectFit" />
+        <text class="empty-text">暂无数据</text>
+      </view>
+    </scroll-view>
+
+    <!-- 底部按钮组 -->
+    <view class="footer">
+      <button class="history-btn">下发记录</button>
+      <button class="add-btn">添加计划</button>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import { ref } from 'vue'
+
+  // 设备类型标签
+  const deviceTabs = ref([{ name: '智慧屏' }, { name: '门禁' }])
+
+  // 当前选中的设备类型
+  const currentDeviceTab = ref(0)
+
+  // 是否有数据
+  const hasData = ref(false)
+
+  // 切换设备类型
+  const handleDeviceTabChange = (index: number) => {
+    currentDeviceTab.value = index
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    background-color: #f5f5f5;
+  }
+
+  .device-tabs {
+    display: flex;
+    padding: 4px;
+    margin: 16px;
+    background: #fff;
+    border-radius: 8px;
+
+    .tab-item {
+      flex: 1;
+      padding: 8px 0;
+      font-size: 14px;
+      color: #666;
+      text-align: center;
+      border-radius: 4px;
+
+      &.active {
+        font-weight: 500;
+        color: #333;
+        background: #f5f5f5;
+      }
+    }
+  }
+
+  .empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    margin-top: 200px;
+
+    .empty-icon {
+      width: 120px;
+      height: 120px;
+      margin-bottom: 16px;
+    }
+
+    .empty-text {
+      font-size: 14px;
+      color: #999;
+    }
+  }
+
+  .footer {
+    position: fixed;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    gap: 12px; // 按钮之间的间距
+    padding: 16px;
+    background: #fff;
+    box-shadow: 0 -2px 6px rgba(0, 0, 0, 0.05);
+
+    button {
+      height: 40px;
+      font-size: 14px;
+      line-height: 40px;
+      border: none;
+      border-radius: 4px;
+    }
+
+    .history-btn {
+      flex: 1;
+      color: #333;
+      background: #f5f5f5;
+    }
+
+    .add-btn {
+      flex: 1;
+      color: #fff;
+      background: #4080ff;
+    }
+  }
+</style>
diff --git a/src/static/images/icon_publish_control_grey.png b/src/static/images/icon_publish_control_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..251043099c83741b50803109b51cc15e7dab61c6
GIT binary patch
literal 2787
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

literal 0
HcmV?d00001

diff --git a/src/static/images/icon_publish_home_blue.png b/src/static/images/icon_publish_home_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4fbb9904442a31d2031e9ea546086203d1f66b6
GIT binary patch
literal 2348
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
Sdm~l=0000<MNUMnLSTY$|81fG

literal 0
HcmV?d00001


From f8be94b7a96bc47292841c87d6d2797cf634ee62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 18:38:45 +0800
Subject: [PATCH 14/37] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E8=A1=8C=E5=86=85?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F+=E6=B7=BB=E5=8A=A0=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E9=94=AE=E7=9B=98=E7=BB=84=E4=BB=B6+=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=82=80=E7=BA=A6=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  6 +-
 src/pages/approval/components/Components.vue  | 10 +-
 .../approval/components/DatetimePicker.vue    | 36 +++++--
 src/pages/approval/components/Input.vue       | 53 ++++++++---
 src/pages/approval/components/Keyboard.vue    | 94 +++++++++++++++++++
 .../components/MemberOrDepartment.vue         | 67 -------------
 .../approval/components/NavigatorSelector.vue | 89 ++++++++++++++++++
 .../approval/components/SelectPicker.vue      | 52 +++++++---
 src/pages/approval/components/Visitor.vue     | 86 +++++++++++++++++
 .../components/OrganizationItem.vue}          |  0
 .../components/SearchItem.vue                 |  0
 src/pages/select/select-access-control.vue    |  7 ++
 .../select-organization.vue}                  | 10 +-
 src/types/uni-pages.d.ts                      |  3 +-
 14 files changed, 399 insertions(+), 114 deletions(-)
 create mode 100644 src/pages/approval/components/Keyboard.vue
 delete mode 100644 src/pages/approval/components/MemberOrDepartment.vue
 create mode 100644 src/pages/approval/components/NavigatorSelector.vue
 create mode 100644 src/pages/approval/components/Visitor.vue
 rename src/pages/{select-member-or-department/components/MemberOrDepartmentItem.vue => select/components/OrganizationItem.vue} (100%)
 rename src/pages/{select-member-or-department => select}/components/SearchItem.vue (100%)
 create mode 100644 src/pages/select/select-access-control.vue
 rename src/pages/{select-member-or-department/select-member-or-department.vue => select/select-organization.vue} (96%)

diff --git a/src/pages.json b/src/pages.json
index 35d9713..0c06a21 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -240,7 +240,11 @@
       "type": "page"
     },
     {
-      "path": "pages/select-member-or-department/select-member-or-department",
+      "path": "pages/select/select-access-control",
+      "type": "page"
+    },
+    {
+      "path": "pages/select/select-organization",
       "type": "page",
       "style": {
         "navigationStyle": "custom",
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 001aede..167026c 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,5 +1,6 @@
 <template>
   <view class="pb-3">
+    <Visitor></Visitor>
     <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
@@ -68,14 +69,14 @@
         title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
       ></Description>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <MemberOrDepartment :id="10" title="成员" type="member" :multiple="true"></MemberOrDepartment>
+      <NavigatorSelector :id="10" title="成员" type="member" :multiple="true"></NavigatorSelector>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <MemberOrDepartment
+      <NavigatorSelector
         :id="11"
         title="部门"
         type="department"
         :multiple="true"
-      ></MemberOrDepartment>
+      ></NavigatorSelector>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Leave :id="12"></Leave>
       <wd-divider color="#bcbfbe"></wd-divider>
@@ -103,10 +104,11 @@
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
-  import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
+  import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
   import Leave from '@/pages/approval/components/Leave.vue'
   import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
   import Overtime from '@/pages/approval/components/Overtime.vue'
+  import Visitor from '@/pages/approval/components/Visitor.vue'
 
   const columns = ref<Record<number, string>>([
     {
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
index e27f5d8..338eed4 100644
--- a/src/pages/approval/components/DatetimePicker.vue
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -1,15 +1,29 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
-    </view>
-    <view class="py-2" @click="openDialog">
-      <view class="flex flex-items-center flex-justify-between">
-        <view :class="text ? 'custom-color-black' : 'color-#838589'">
-          {{ text || placeholder }}
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pt-2 pb-1">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view @click="openDialog" class="flex-1 flex flex-items-center">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']" class="ml-a mr-2">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="openDialog">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
         </view>
-        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
   </view>
@@ -131,6 +145,10 @@
     maxDateText: {
       type: String,
       default: ''
+    },
+    inline: {
+      type: Boolean,
+      default: false
     }
   })
 
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index 9334107..d24115a 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -1,19 +1,38 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <wd-input
+          class="flex-1 ml-2"
+          :type="type"
+          custom-class="!bg-transparent"
+          :custom-input-class="inline ? 'text-right' : 'text-left'"
+          :placeholder="placeholder"
+          :maxlength="maxlength ?? (type === 'text' ? 30 : 15)"
+          v-model="text"
+          :readonly="readonly"
+          @input="change(id, $event)"
+        ></wd-input>
+      </view>
     </view>
-    <view class="pt-2">
-      <wd-input
-        :type="type"
-        custom-class="!bg-transparent"
-        :placeholder="placeholder"
-        :maxlength="type === 'text' ? 30 : 15"
-        v-model="text"
-        :readonly="readonly"
-        @input="change(id, $event)"
-      ></wd-input>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="pt-2">
+        <wd-input
+          :type="type"
+          custom-class="!bg-transparent"
+          :placeholder="placeholder"
+          :maxlength="maxlength ?? (type === 'text' ? 30 : 15)"
+          v-model="text"
+          :readonly="readonly"
+          @input="change(id, $event)"
+        ></wd-input>
+      </view>
     </view>
   </view>
 </template>
@@ -51,6 +70,14 @@
     readonly: {
       type: Boolean,
       default: false
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    },
+    maxlength: {
+      type: [Number, null],
+      default: null
     }
   })
 
diff --git a/src/pages/approval/components/Keyboard.vue b/src/pages/approval/components/Keyboard.vue
new file mode 100644
index 0000000..7713ec5
--- /dev/null
+++ b/src/pages/approval/components/Keyboard.vue
@@ -0,0 +1,94 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative py-1.5">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view
+          class="flex-1 ml-a text-right"
+          @click="toSelect"
+          :class="[text ? 'custom-color-black' : 'color-#bfbfbf']"
+        >
+          {{ text || placeholder }}
+        </view>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <wd-keyboard
+      :mode="type"
+      title="键盘"
+      :hide-on-click-outside="true"
+      v-model:visible="visible"
+      @input="onInput"
+      closeText="确认"
+      @delete="onDelete"
+    />
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string>('')
+  const visible = ref<boolean>(false)
+
+  const onInput = value => {
+    if (props.maxlength && text.value.length >= props.maxlength) return
+    text.value += value
+  }
+  const onDelete = () => {
+    text.value = text.value.slice(0, -1)
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    },
+    maxlength: {
+      type: [Number, null],
+      default: null
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toSelect = () => {
+    visible.value = true
+  }
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
deleted file mode 100644
index e582118..0000000
--- a/src/pages/approval/components/MemberOrDepartment.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
-    </view>
-    <view class="py-2" @click="toSelect">
-      <view class="flex flex-items-center flex-justify-between">
-        <view :class="text ? 'custom-color-black' : 'color-#838589'">
-          {{ text || placeholder }}
-        </view>
-        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup lang="ts">
-  const text = ref<string | null>(null)
-
-  const props = defineProps({
-    id: {
-      type: Number,
-      required: true
-    },
-    type: {
-      type: String,
-      required: true
-    },
-    multiple: {
-      type: Boolean,
-      default: false
-    },
-    required: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      required: true
-    },
-    value: {
-      type: [Number, null],
-      default: null
-    },
-    placeholder: {
-      type: String,
-      default: '请输入'
-    }
-  })
-
-  const toSelect = () => {
-    const params = {
-      type: props.type,
-      multiple: props.multiple,
-      title: props.type === 'member' ? '选择审批用户' : '选择部门'
-    }
-    uni.navigateTo({
-      url: `/pages/select-member-or-department/select-member-or-department?params=${JSON.stringify(params)}`,
-      events: {
-        change: res => {
-          console.log(1111, res)
-        }
-      }
-    })
-  }
-</script>
diff --git a/src/pages/approval/components/NavigatorSelector.vue b/src/pages/approval/components/NavigatorSelector.vue
new file mode 100644
index 0000000..018918c
--- /dev/null
+++ b/src/pages/approval/components/NavigatorSelector.vue
@@ -0,0 +1,89 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pb-1.5">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+          {{ text || placeholder }}
+        </view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string | null>(null)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toSelect = () => {
+    if (props.type === 'accessControl') {
+      uni.navigateTo({
+        url: `/pages/select/select-access-control`
+      })
+    } else {
+      const params = {
+        type: props.type,
+        multiple: props.multiple,
+        title: props.type === 'member' ? '选择审批用户' : '选择部门'
+      }
+      uni.navigateTo({
+        url: `/pages/select/select-organization?params=${JSON.stringify(params)}`,
+        events: {
+          change: res => {
+            console.log(1111, res)
+          }
+        }
+      })
+    }
+  }
+</script>
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
index 99708b3..65aad0e 100644
--- a/src/pages/approval/components/SelectPicker.vue
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -1,20 +1,40 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <wd-select-picker
+          class="flex-1"
+          align-right
+          :type="type"
+          :title="placeholder"
+          :show-confirm="type === 'checkbox'"
+          v-model="picker"
+          :columns="columns"
+          size="large"
+          @change="change"
+          select-size="large"
+        ></wd-select-picker>
+      </view>
     </view>
-    <view class="pt-2">
-      <wd-select-picker
-        :type="type"
-        :title="placeholder"
-        :show-confirm="type === 'checkbox'"
-        v-model="picker"
-        :columns="columns"
-        size="large"
-        @change="change"
-        select-size="large"
-      ></wd-select-picker>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="pt-2">
+        <wd-select-picker
+          :type="type"
+          :title="placeholder"
+          :show-confirm="type === 'checkbox'"
+          v-model="picker"
+          :columns="columns"
+          size="large"
+          @change="change"
+          select-size="large"
+        ></wd-select-picker>
+      </view>
     </view>
   </view>
 </template>
@@ -50,6 +70,10 @@
     columns: {
       type: Array,
       required: true
+    },
+    inline: {
+      type: Boolean,
+      default: false
     }
   })
 
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
new file mode 100644
index 0000000..e3d6dd3
--- /dev/null
+++ b/src/pages/approval/components/Visitor.vue
@@ -0,0 +1,86 @@
+<template>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <Input :id="0" title="访客姓名" :required="true" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input
+      :id="1"
+      title="访客手机"
+      :required="true"
+      :maxlength="11"
+      @change="inputChange"
+      inline
+      type="number"
+    ></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <SelectPicker required :id="2" title="访客类型" :columns="columns" inline></SelectPicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <NavigatorSelector :id="3" title="通行门禁点" type="accessControl" inline></NavigatorSelector>
+  </view>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <Keyboard :id="4" title="车牌号码" type="car" :maxlength="8" inline></Keyboard>
+  </view>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <DatetimePicker
+      :id="5"
+      ref="startDatetimePicker"
+      title="预约到访时间"
+      @change="changeDate"
+      type="datetime"
+      inline
+      required
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="7" title="同行人数" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="8" title="访问单位" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="9" title="到访事由说明" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="10" title="访问地址" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Description :id="11" title="表单通过后，访客将收到断音邀请通知"></Description>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Input from '@/pages/approval/components/Input.vue'
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import Description from '@/pages/approval/components/Description.vue'
+  import Keyboard from '@/pages/approval/components/Keyboard.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
+
+  const columns = ref<Record<number, string>>([
+    {
+      value: 0,
+      label: '外卖快递'
+    },
+    {
+      value: 1,
+      label: '会议洽谈'
+    },
+    {
+      value: 2,
+      label: '探亲访友'
+    },
+    {
+      value: 3,
+      label: '业务沟通'
+    }
+  ])
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const changeDate = e => {
+    // timestamp.value = e.value
+    console.log('changeDate', e)
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select/components/OrganizationItem.vue
similarity index 100%
rename from src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
rename to src/pages/select/components/OrganizationItem.vue
diff --git a/src/pages/select-member-or-department/components/SearchItem.vue b/src/pages/select/components/SearchItem.vue
similarity index 100%
rename from src/pages/select-member-or-department/components/SearchItem.vue
rename to src/pages/select/components/SearchItem.vue
diff --git a/src/pages/select/select-access-control.vue b/src/pages/select/select-access-control.vue
new file mode 100644
index 0000000..126a836
--- /dev/null
+++ b/src/pages/select/select-access-control.vue
@@ -0,0 +1,7 @@
+<template>
+  <view></view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select/select-organization.vue
similarity index 96%
rename from src/pages/select-member-or-department/select-member-or-department.vue
rename to src/pages/select/select-organization.vue
index c27d26b..779490c 100644
--- a/src/pages/select-member-or-department/select-member-or-department.vue
+++ b/src/pages/select/select-organization.vue
@@ -61,7 +61,7 @@
           @click="toOrganization(index)"
         >
           <span
-            :class="[index === organizationList.length - 1 ? 'color-#838589' : 'custom-color-blue']"
+            :class="[index === organizationList.length - 1 ? 'color-#bfbfbf' : 'custom-color-blue']"
           >
             {{ department.name }}
           </span>
@@ -88,12 +88,12 @@
               ></wd-icon>
               <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
             </view>
-            <MemberOrDepartmentItem
+            <OrganizationItem
               class="flex-1"
               :item="item"
               :disabled="item.type === 'department' && value.includes(item)"
               @click="toClick(item)"
-            ></MemberOrDepartmentItem>
+            ></OrganizationItem>
           </view>
         </view>
         <view class="py-5 px-15">
@@ -146,8 +146,8 @@
 
 <script setup lang="ts">
   import { useBasicStore } from '@/store'
-  import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
-  import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+  import OrganizationItem from '@/pages/select/components/OrganizationItem.vue'
+  import SearchItem from '@/pages/select/components/SearchItem.vue'
   import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const instance = getCurrentInstance().proxy
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 058f3eb..cc65bba 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -29,7 +29,8 @@ interface NavigateToOptions {
        "/pages/login/reset-password" |
        "/pages/mine/mine" |
        "/pages/notification/notification" |
-       "/pages/select-member-or-department/select-member-or-department" |
+       "/pages/select/select-access-control" |
+       "/pages/select/select-organization" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |
        "/pages/attendance/attendance-add-group/attendance-device" |

From 4a6c7475bf97eac33e02632f3fe33bc47b9324d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”>
Date: Fri, 17 Jan 2025 10:52:47 +0800
Subject: [PATCH 15/37] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E8=AE=A1=E5=88=92=E9=A1=B5=E9=9D=A2UI=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/info-publish/add-release-plan.vue   | 281 ++++++++++++++++++
 .../info-publish/play-content-library.vue     |   3 +
 src/pages/info-publish/release-plan.vue       |   1 -
 3 files changed, 284 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/info-publish/add-release-plan.vue

diff --git a/src/pages/info-publish/add-release-plan.vue b/src/pages/info-publish/add-release-plan.vue
new file mode 100644
index 0000000..1651f5c
--- /dev/null
+++ b/src/pages/info-publish/add-release-plan.vue
@@ -0,0 +1,281 @@
+<route lang="json5" type="page">
+{
+  layout: 'default',
+  style: {
+    navigationStyle: 'custom'
+  }
+}
+</route>
+
+<template>
+  <view class="h-[calc(100vh-0px)] flex flex-col">
+    <TopNavigation title="添加发布计划"></TopNavigation>
+    <scroll-view class="flex-1 box-border" scroll-y>
+      <view class="plan-form">
+        <!-- 计划名称 -->
+        <view class="form-item">
+          <view class="form-label">
+            <text class="required">*</text>
+            <text>计划名称</text>
+          </view>
+          <input
+            type="text"
+            v-model="formData.name"
+            placeholder="智慧屏202501171038843"
+            class="form-input"
+          />
+        </view>
+
+        <!-- 计划描述 -->
+        <view class="form-item">
+          <view class="form-label">计划描述</view>
+          <input
+            type="text"
+            v-model="formData.description"
+            placeholder="请输入"
+            class="form-input"
+          />
+        </view>
+
+        <!-- 播放规则 -->
+        <view class="form-item">
+          <view class="form-label">
+            <text class="required">*</text>
+            <text>播放规则</text>
+          </view>
+          <view class="form-value" @click="handleSelectRule">
+            <text>每天循环播放</text>
+            <text class="arrow">></text>
+          </view>
+        </view>
+
+        <!-- 播放时间与内容 -->
+        <view class="form-section">
+          <view class="section-header">
+            <text class="required">*</text>
+            <text>播放时间与内容</text>
+          </view>
+
+          <view class="time-content-card">
+            <view class="time-row">
+              <text class="label">时段</text>
+              <text class="value">00:00– 23:59</text>
+              <text class="action-icon">▶</text>
+              <text class="delete-icon">🗑</text>
+            </view>
+            <view class="content-row">
+              <text class="label">内容</text>
+              <text class="value ellipsis">智慧屏节目2024...</text>
+            </view>
+          </view>
+
+          <view class="add-time-btn" @click="handleAddTime">
+            <text class="plus-icon">+</text>
+            <text>添加时段</text>
+          </view>
+        </view>
+
+        <!-- 关联设备 -->
+        <view class="form-item">
+          <view class="form-label">
+            <text class="required">*</text>
+            <text>关联设备</text>
+          </view>
+          <view class="form-value" @click="handleSelectDevice">
+            <text class="placeholder">请选择</text>
+            <text class="arrow">></text>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 底部按钮 -->
+    <view class="footer">
+      <button class="submit-btn" @click="handleSubmit">保存并发布</button>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import { ref } from 'vue'
+
+  // 表单数据
+  const formData = ref({
+    name: '',
+    description: '',
+    rule: '每天循环播放',
+    timeSlots: [],
+    devices: []
+  })
+
+  // 选择播放规则
+  const handleSelectRule = () => {
+    // 实现规则选择逻辑
+  }
+
+  // 添加时段
+  const handleAddTime = () => {
+    // 实现添加时段逻辑
+  }
+
+  // 选择设备
+  const handleSelectDevice = () => {
+    // 实现设备选择逻辑
+  }
+
+  // 提交表单
+  const handleSubmit = () => {
+    // 实现表单提交逻辑
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    background-color: #f5f5f5;
+  }
+
+  .plan-form {
+    margin: 16px;
+  }
+
+  .form-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px;
+    margin-bottom: 12px;
+    background: #fff;
+    border-radius: 8px;
+  }
+
+  .form-label {
+    display: flex;
+    align-items: center;
+    font-size: 15px;
+    color: #333;
+
+    .required {
+      margin-right: 4px;
+      color: #ff4d4f;
+    }
+  }
+
+  .form-input {
+    flex: 1;
+    font-size: 14px;
+    color: #333;
+    text-align: right;
+  }
+
+  .form-value {
+    display: flex;
+    align-items: center;
+    font-size: 14px;
+    color: #333;
+
+    .placeholder {
+      color: #999;
+    }
+
+    .arrow {
+      margin-left: 8px;
+      color: #ccc;
+    }
+  }
+
+  .form-section {
+    padding: 16px;
+    margin-bottom: 12px;
+    background: #fff;
+    border-radius: 8px;
+
+    .section-header {
+      display: flex;
+      align-items: center;
+      margin-bottom: 16px;
+      font-size: 15px;
+      color: #333;
+
+      .required {
+        margin-right: 4px;
+        color: #ff4d4f;
+      }
+    }
+  }
+
+  .time-content-card {
+    padding: 12px;
+    margin-bottom: 12px;
+    background: #f5f7fa;
+    border-radius: 4px;
+
+    .time-row,
+    .content-row {
+      display: flex;
+      align-items: center;
+      margin-bottom: 8px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      .label {
+        width: 40px;
+        font-size: 14px;
+        color: #666;
+      }
+
+      .value {
+        flex: 1;
+        margin: 0 8px;
+        font-size: 14px;
+        color: #333;
+      }
+
+      .action-icon,
+      .delete-icon {
+        padding: 4px;
+        color: #999;
+      }
+    }
+  }
+
+  .add-time-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 14px;
+    color: #4080ff;
+
+    .plus-icon {
+      margin-right: 4px;
+    }
+  }
+
+  .footer {
+    position: fixed;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    padding: 16px;
+    background: #fff;
+    box-shadow: 0 -2px 6px rgba(0, 0, 0, 0.05);
+
+    .submit-btn {
+      width: 100%;
+      height: 40px;
+      font-size: 14px;
+      line-height: 40px;
+      color: #fff;
+      background: #4080ff;
+      border: none;
+      border-radius: 4px;
+    }
+  }
+
+  .ellipsis {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+</style>
diff --git a/src/pages/info-publish/play-content-library.vue b/src/pages/info-publish/play-content-library.vue
index ae1602f..a318743 100644
--- a/src/pages/info-publish/play-content-library.vue
+++ b/src/pages/info-publish/play-content-library.vue
@@ -100,6 +100,9 @@
 
   const handlePublish = () => {
     // 实现发布逻辑
+    uni.navigateTo({
+      url: '/pages/info-publish/add-release-plan'
+    })
   }
 </script>
 
diff --git a/src/pages/info-publish/release-plan.vue b/src/pages/info-publish/release-plan.vue
index 1d74a88..bcf3b4c 100644
--- a/src/pages/info-publish/release-plan.vue
+++ b/src/pages/info-publish/release-plan.vue
@@ -64,7 +64,6 @@
 
   .device-tabs {
     display: flex;
-    padding: 4px;
     margin: 16px;
     background: #fff;
     border-radius: 8px;

From 10ce85a53d29f7c37f9cb5a08c1b8083510488c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 11:59:26 +0800
Subject: [PATCH 16/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=AE=BF=E5=AE=A2=E9=A2=84=E7=BA=A6=E5=A5=97=E4=BB=B6?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85+=E9=80=89=E6=8B=A9=E9=97=A8=E7=A6=81?=
 =?UTF-8?q?=E7=82=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |   6 +-
 .../approval/components/NavigatorSelector.vue |   9 +-
 .../approval/components/VisitDuration.vue     | 194 ++++++++++++++++++
 src/pages/approval/components/Visitor.vue     |   3 +
 src/pages/select/select-access-control.vue    |  99 ++++++++-
 5 files changed, 305 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/approval/components/VisitDuration.vue

diff --git a/src/pages.json b/src/pages.json
index 0c06a21..74ed35d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -241,7 +241,11 @@
     },
     {
       "path": "pages/select/select-access-control",
-      "type": "page"
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
     },
     {
       "path": "pages/select/select-organization",
diff --git a/src/pages/approval/components/NavigatorSelector.vue b/src/pages/approval/components/NavigatorSelector.vue
index 018918c..fe88998 100644
--- a/src/pages/approval/components/NavigatorSelector.vue
+++ b/src/pages/approval/components/NavigatorSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="px-2 text-3.5">
     <view v-if="inline">
-      <view class="flex flex-items-center pos-relative pb-1.5">
+      <view class="flex flex-items-center pos-relative pb-1.5" @click="toSelect">
         <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
         <view>{{ title }}</view>
         <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
@@ -68,7 +68,12 @@
   const toSelect = () => {
     if (props.type === 'accessControl') {
       uni.navigateTo({
-        url: `/pages/select/select-access-control`
+        url: `/pages/select/select-access-control`,
+        events: {
+          change: res => {
+            console.log(1111, res)
+          }
+        }
       })
     } else {
       const params = {
diff --git a/src/pages/approval/components/VisitDuration.vue b/src/pages/approval/components/VisitDuration.vue
new file mode 100644
index 0000000..87d89b8
--- /dev/null
+++ b/src/pages/approval/components/VisitDuration.vue
@@ -0,0 +1,194 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pb-1.5" @click="toSelect">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+          {{ text || placeholder }}
+        </view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <wd-popup v-model="show" position="bottom" custom-style="border-radius:12rpx;">
+      <view v-if="showDuration">
+        <view
+          class="px-4 py-2 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center"
+        >
+          <view @click="show = false">取消</view>
+          <view class="font-bold text-4 flex-1 text-center">访问时长</view>
+          <view class="flex flex-items-center" @click="changeSelect">
+            <view class="custom-color-blue">自定义时间</view>
+            <wd-icon name="arrow-right" size="14px" class="ml-1" color="#255cf7"></wd-icon>
+          </view>
+        </view>
+        <scroll-view class="h-60 text-3.5" :scroll-y="true">
+          <view
+            v-for="item in durationList"
+            :key="item.value"
+            @click="changeDuration(item)"
+            class="py-4 px-4 flex flex-items-center"
+          >
+            <view>{{ item.label }}</view>
+            <view
+              class="bg-#f3f5fa ml-a w-12 h-6 rounded-5 flex flex-items-center flex-justify-center"
+            >
+              <wd-icon
+                v-if="duration === item.label"
+                name="check"
+                size="15px"
+                class="ml-1"
+                color="#255cf7"
+              ></wd-icon>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <view v-else>
+        <view
+          class="px-4 py-2 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center"
+        >
+          <view class="flex flex-items-center" @click="showDuration = true">
+            <wd-icon name="arrow-left" size="14px" class="ml-1" color="#0d0f10"></wd-icon>
+            <view class="custom-color-black">返回</view>
+          </view>
+          <view class="font-bold text-4 flex-1 text-center">时间选择器</view>
+          <wd-icon
+            name="close"
+            size="14px"
+            class="ml-1"
+            color="#0d0f10"
+            @click="show = false"
+          ></wd-icon>
+        </view>
+        <wd-datetime-picker-view
+          :formatter="formatter"
+          type="datetime"
+          v-model="timestamp"
+          @change="change"
+        />
+      </view>
+      <view
+        @click="confirm"
+        class="py-2.5 rounded custom-bg-blue w-90% mx-5% font-bold text-center color-white text-3.5 my-2"
+      >
+        完成
+      </view>
+    </wd-popup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import dayjs from 'dayjs'
+
+  const text = ref<string | null>(null)
+  const show = ref<boolean>(false)
+  const timestamp = ref<number>(0)
+  const duration = ref<string>('')
+
+  const showDuration = ref<boolean>(true)
+
+  const formatter = (type, value) => {
+    switch (type) {
+      case 'year':
+        return value + '年'
+      case 'month':
+        return value + '月'
+      case 'date':
+        return value + '日'
+      case 'hour':
+        return value + '时'
+      case 'minute':
+        return value + '分'
+      default:
+        return value
+    }
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [String, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const durationList = [
+    { label: '30分钟', value: 1800000 },
+    { label: '1小时', value: 3600000 },
+    { label: '2小时', value: 7200000 },
+    { label: '3小时', value: 10800000 },
+    { label: '5小时', value: 18000000 },
+    { label: '8小时', value: 28800000 },
+    { label: '12小时', value: 43200000 },
+    { label: '24小时', value: 86400000 }
+  ]
+
+  onMounted(() => {
+    if (props.value) {
+      text.value = props.value
+      duration.value = props.value
+    }
+  })
+
+  const changeSelect = () => {
+    timestamp.value = new Date().getTime()
+    showDuration.value = false
+  }
+
+  const toSelect = () => {
+    show.value = true
+  }
+
+  const change = value => {
+    timestamp.value = value.value
+    duration.value = ''
+  }
+
+  const changeDuration = item => {
+    duration.value = item.label
+    timestamp.value = 0
+  }
+
+  const confirm = () => {
+    if (timestamp.value === 0) {
+      text.value = duration.value
+    } else {
+      text.value = dayjs(timestamp.value).format('YYYY-M-D HH:mm')
+    }
+    show.value = false
+  }
+</script>
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
index e3d6dd3..e9fa668 100644
--- a/src/pages/approval/components/Visitor.vue
+++ b/src/pages/approval/components/Visitor.vue
@@ -30,6 +30,8 @@
       required
     ></DatetimePicker>
     <wd-divider color="#bcbfbe"></wd-divider>
+    <VisitDuration :id="6" title="访问时长" required value="2小时" inline></VisitDuration>
+    <wd-divider color="#bcbfbe"></wd-divider>
     <Input :id="7" title="同行人数" @change="inputChange" inline></Input>
     <wd-divider color="#bcbfbe"></wd-divider>
     <Input :id="8" title="访问单位" @change="inputChange" inline></Input>
@@ -49,6 +51,7 @@
   import Keyboard from '@/pages/approval/components/Keyboard.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
+  import VisitDuration from '@/pages/approval/components/VisitDuration.vue'
 
   const columns = ref<Record<number, string>>([
     {
diff --git a/src/pages/select/select-access-control.vue b/src/pages/select/select-access-control.vue
index 126a836..57dfd24 100644
--- a/src/pages/select/select-access-control.vue
+++ b/src/pages/select/select-access-control.vue
@@ -1,7 +1,100 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
 <template>
-  <view></view>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation class="bg-white" title="选择门禁点"></TopNavigation>
+    <scroll-view class="flex-1 box-border text-3.5 custom-color-black border-1" :scroll-y="true">
+      <wd-checkbox-group v-model="value" size="large" @change="change">
+        <view class="px-4 py-1.5 bg-white mb-2">
+          <wd-checkbox :modelValue="item.id" v-for="item in permissionList" :key="item.id">
+            <view class="flex flex-items-center">
+              <view
+                class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2"
+              >
+                <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+              </view>
+              <view class="ml-2">{{ item.name }}</view>
+            </view>
+          </wd-checkbox>
+        </view>
+        <view
+          v-for="(item, index) in list"
+          :key="item.id"
+          class="bg-white border-#eef0f5 border-b-solid"
+          :class="[index === list.length - 1 ? 'border-b-0' : 'border-b-1']"
+        >
+          <wd-checkbox :modelValue="item.id" class="py-1.5 px-4">
+            <view class="flex flex-items-center">
+              <image
+                src="https://file.hikmall.com/prod/image/69c3851d052e493ebb6e7c2e7a189b61.png"
+                class="w-10 h-10"
+              ></image>
+              <view class="ml-2">{{ item.name }}</view>
+            </view>
+          </wd-checkbox>
+        </view>
+      </wd-checkbox-group>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid border-1 flex flex-items-center">
+      <view
+        @click="confirm"
+        class="opacity-60% w-90% py-2 mx-5% text-center custom-bg-blue color-white rounded-2 my-3"
+      >
+        确定
+      </view>
+    </view>
+  </view>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+  const instance = getCurrentInstance().proxy
+  const eventChannel = instance.getOpenerEventChannel()
 
-<style scoped lang="scss"></style>
+  const value = ref<number[]>([])
+  const selected = ref<Array>([])
+
+  const permissionList = [
+    {
+      name: '[访客类型]权限组',
+      id: 0
+    }
+  ]
+
+  const list = [
+    {
+      name: 'DS-K(FU6004429)',
+      id: 1
+    },
+    {
+      name: 'DS-K(L40959329)',
+      id: 2
+    }
+  ]
+
+  const change = value => {
+    selected.value = []
+    selected.value.push(...permissionList.filter(item => value.value.includes(item.id)))
+    selected.value.push(...list.filter(item => value.value.includes(item.id)))
+  }
+
+  const confirm = () => {
+    eventChannel.emit('change', { value: selected.value })
+    uni.navigateBack()
+  }
+</script>
+
+<style scoped lang="scss">
+  .wd-checkbox-group {
+    background-color: transparent;
+  }
+
+  .wd-checkbox {
+    margin-bottom: 0;
+  }
+</style>

From 0e64d092a422a6800f688b4a037ea86f0160b697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 13:46:39 +0800
Subject: [PATCH 17/37] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=92=8C=E6=88=90=E5=91=98=E9=80=89=E6=8B=A9=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/select/components/SearchItem.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pages/select/components/SearchItem.vue b/src/pages/select/components/SearchItem.vue
index 9a13733..eb3ce14 100644
--- a/src/pages/select/components/SearchItem.vue
+++ b/src/pages/select/components/SearchItem.vue
@@ -13,8 +13,15 @@
     <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
       <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
     </view>
-    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
-      {{ item.name }}
+    <view class="ml-2">
+      <view class="break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+        {{ item.name }}
+      </view>
+      <view
+        class="color-#838589 text-3 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1"
+      >
+        xxx的互联/test
+      </view>
     </view>
   </view>
 </template>

From 7a2cb9f2da13a7e79a83f12e0e24f1f5089a4ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”>
Date: Fri, 17 Jan 2025 14:41:26 +0800
Subject: [PATCH 18/37] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E8=AE=A1=E5=88=92=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/info-publish/release-plan.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/info-publish/release-plan.vue b/src/pages/info-publish/release-plan.vue
index bcf3b4c..1d74a88 100644
--- a/src/pages/info-publish/release-plan.vue
+++ b/src/pages/info-publish/release-plan.vue
@@ -64,6 +64,7 @@
 
   .device-tabs {
     display: flex;
+    padding: 4px;
     margin: 16px;
     background: #fff;
     border-radius: 8px;

From a0b4e1f0b5505bbfba823d9a6e02459708542588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 14:52:30 +0800
Subject: [PATCH 19/37] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=B5=81=E7=A8=8B=E5=88=9B=E5=BB=BAUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approval/components/ApprovalCreate.vue    | 101 ++++++++++++++++++
 .../components/{Components.vue => Form.vue}   |   4 +-
 src/pages/approval/components/Visitor.vue     |   6 +-
 src/pages/approval/create-application.vue     |   6 +-
 src/static/images/icon_airplane.png           | Bin 0 -> 1949 bytes
 src/static/images/icon_approval.png           | Bin 0 -> 1627 bytes
 6 files changed, 110 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/approval/components/ApprovalCreate.vue
 rename src/pages/approval/components/{Components.vue => Form.vue} (98%)
 create mode 100644 src/static/images/icon_airplane.png
 create mode 100644 src/static/images/icon_approval.png

diff --git a/src/pages/approval/components/ApprovalCreate.vue b/src/pages/approval/components/ApprovalCreate.vue
new file mode 100644
index 0000000..ab6071f
--- /dev/null
+++ b/src/pages/approval/components/ApprovalCreate.vue
@@ -0,0 +1,101 @@
+<template>
+  <view class="bg-white rounded-2 py-3 px-4 mx-4 my-2 shadow-sm">
+    <view class="text-4">审批流程</view>
+    <view v-if="false" class="text-3 color-#838589 mt-2">必填信息填写完整后，将显示审批流程</view>
+    <view v-else class="mt-4 color-#838589">
+      <wd-steps :active="3" vertical>
+        <wd-step>
+          <template v-slot:icon>
+            <view
+              class="custom-bg-blue w-5 h-5 rounded-50% flex flex-items-center flex-justify-center"
+            >
+              <view class="w-2.5 h-2.5 bg-white rounded-50%"></view>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>发起人</view>
+              </view>
+              <view class="my-2">
+                <view>
+                  <image
+                    src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                    class="h-10 w-10 rounded-2"
+                    mode="aspectFill"
+                  ></image>
+                  <view class="mx-2">xxx</view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+        <wd-step>
+          <template v-slot:icon>
+            <view class="bg-#f0801e w-5 h-5 rounded-50% flex flex-items-center flex-justify-center">
+              <image src="/static/images/icon_approval.png" class="w-3 h-3"></image>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>审批节点</view>
+              </view>
+              <view class="pt-2 color-#7e807f text-3">1人通过即可</view>
+              <view class="my-2 flex flex-wrap">
+                <view v-for="item in 8" :key="item" class="mb-2 w-fit mr-2">
+                  <view>
+                    <image
+                      src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                      class="h-10 w-10 rounded-2"
+                      mode="aspectFill"
+                    ></image>
+                    <view class="mx-2">xxx</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+        <wd-step>
+          <template v-slot:icon>
+            <view class="bg-#2ab6c7 w-5 h-5 rounded-50% flex flex-items-center flex-justify-center">
+              <image src="/static/images/icon_airplane.png" class="w-3 h-3"></image>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>抄送节点</view>
+              </view>
+              <view class="my-2 flex flex-wrap">
+                <view v-for="item in 3" :key="item" class="mb-2 w-fit mr-2">
+                  <view>
+                    <image
+                      src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                      class="h-10 w-10 rounded-2"
+                      mode="aspectFill"
+                    ></image>
+                    <view class="mx-2">xxx</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+      </wd-steps>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+  :deep(.wd-step__header) {
+    width: 1.25rem;
+  }
+
+  :deep(.wd-step__line) {
+    background: #255cf7;
+  }
+</style>
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Form.vue
similarity index 98%
rename from src/pages/approval/components/Components.vue
rename to src/pages/approval/components/Form.vue
index 167026c..3538184 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Form.vue
@@ -1,7 +1,7 @@
 <template>
-  <view class="pb-3">
+  <view class="pb-3 mb-2">
     <Visitor></Visitor>
-    <view class="bg-white mx-4 p-2 rounded-2">
+    <view class="bg-white mx-4 p-2 rounded-2 shadow-sm">
       <Input
         :id="0"
         value="单行"
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
index e9fa668..1f8ac23 100644
--- a/src/pages/approval/components/Visitor.vue
+++ b/src/pages/approval/components/Visitor.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <Input :id="0" title="访客姓名" :required="true" @change="inputChange" inline></Input>
     <wd-divider color="#bcbfbe"></wd-divider>
     <Input
@@ -16,10 +16,10 @@
     <wd-divider color="#bcbfbe"></wd-divider>
     <NavigatorSelector :id="3" title="通行门禁点" type="accessControl" inline></NavigatorSelector>
   </view>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <Keyboard :id="4" title="车牌号码" type="car" :maxlength="8" inline></Keyboard>
   </view>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <DatetimePicker
       :id="5"
       ref="startDatetimePicker"
diff --git a/src/pages/approval/create-application.vue b/src/pages/approval/create-application.vue
index c7fd5a4..fcb0d49 100644
--- a/src/pages/approval/create-application.vue
+++ b/src/pages/approval/create-application.vue
@@ -10,7 +10,8 @@
   <view class="h-100vh flex flex-col">
     <TopNavigation :title="title"></TopNavigation>
     <scroll-view class="flex-1 box-border" :scroll-y="true">
-      <Components></Components>
+      <ApprovalCreate></ApprovalCreate>
+      <Form></Form>
     </scroll-view>
     <view class="pb-safe border-#eef0f5 border-t-solid">
       <view class="flex flex-items-center flex-justify-around py-3 px-3">
@@ -24,7 +25,8 @@
 </template>
 
 <script setup lang="ts">
-  import Components from '@/pages/approval/components/Components.vue'
+  import Form from '@/pages/approval/components/Form.vue'
+  import ApprovalCreate from '@/pages/approval/components/ApprovalCreate.vue'
 
   const title = ref<string>('')
   const id = ref<number>(null)
diff --git a/src/static/images/icon_airplane.png b/src/static/images/icon_airplane.png
new file mode 100644
index 0000000000000000000000000000000000000000..090beac47d176e327d249d6fb5fdde268554264b
GIT binary patch
literal 1949
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

literal 0
HcmV?d00001

diff --git a/src/static/images/icon_approval.png b/src/static/images/icon_approval.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c4943fea2f24125079a7d6037e9aeef4ace25ac
GIT binary patch
literal 1627
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
Z{SQxU)}JuPX{rDK002ovPDHLkV1g!t&07Ef

literal 0
HcmV?d00001


From 215eee5f017570ec59df76da2ecf664e4e435d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Sat, 11 Jan 2025 18:13:10 +0800
Subject: [PATCH 20/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=8F=91=E8=B5=B7=E7=94=B3=E8=AF=B7=E5=92=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=B8=AD=E5=BF=83=E7=9A=84UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/approval.vue               |  78 ++++++++-
 .../approval/components/ApplicationList.vue   |  58 +++++++
 .../approval/components/ApprovalRecords.vue   | 149 ++++++++++++++++++
 src/pages/attendance/attendance.vue           |   6 +-
 src/static/images/icon_default_avatar.png     | Bin 0 -> 3963 bytes
 5 files changed, 287 insertions(+), 4 deletions(-)
 create mode 100644 src/pages/approval/components/ApplicationList.vue
 create mode 100644 src/pages/approval/components/ApprovalRecords.vue
 create mode 100644 src/static/images/icon_default_avatar.png

diff --git a/src/pages/approval/approval.vue b/src/pages/approval/approval.vue
index 5c80404..e0069bb 100644
--- a/src/pages/approval/approval.vue
+++ b/src/pages/approval/approval.vue
@@ -7,14 +7,18 @@
 }
 </route>
 <template>
-  <view>
+  <view class="h-100vh flex flex-col">
     <TopNavigation :title="index === 0 ? '发起申请' : '审批'"></TopNavigation>
+    <ApplicationList v-if="index === 0" :list="applicationListData"></ApplicationList>
+    <ApprovalRecords v-else></ApprovalRecords>
     <CustomTabBar :list="list" :default-index="index" @change="change"></CustomTabBar>
   </view>
 </template>
 
 <script setup lang="ts">
   import { TabBarItem } from '@/typings'
+  import ApplicationList from '@/pages/approval/components/ApplicationList.vue'
+  import ApprovalRecords from '@/pages/approval/components/ApprovalRecords.vue'
 
   const index = ref<number>(0)
 
@@ -29,6 +33,78 @@
     }
   ]
 
+  const applicationListData = ref<Array<object>>([
+    {
+      groupId: 138603,
+      groupName: '出勤休假',
+      sort: 1,
+      processDefs: [
+        {
+          processDefId: 249155,
+          processDefName: '请假',
+          icon: 'https://file.hikvisionmall.com/test1/image/f39c654cd30a48d28ddf37e4b64de57a.png',
+          version: '1735128632'
+        },
+        {
+          processDefId: 249156,
+          processDefName: '补卡',
+          icon: 'https://file.hikvisionmall.com/test1/image/26209b6732f2439fae3c6dd34a39145e.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 249158,
+          processDefName: '外出',
+          icon: 'https://file.hikvisionmall.com/test1/image/5c76288745dd47a38c9e1093d9737976.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 249157,
+          processDefName: '出差',
+          icon: 'https://file.hikvisionmall.com/test1/image/df75579e70c2435e9f78d04fc401b451.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 347336,
+          processDefName: '加班',
+          icon: 'https://file.hikvisionmall.com/test1/image/e4f21377ea2443b3856b07674ba41c2a.png',
+          version: '1711368134'
+        },
+        {
+          processDefId: 891737,
+          processDefName: '调休',
+          icon: 'https://file.hikvisionmall.com/prod/image/3d134cc9657e4816ad6aa8ef206fbc89.png',
+          version: '1735128832'
+        }
+      ]
+    },
+    {
+      groupId: 341473,
+      groupName: 'test',
+      sort: 2,
+      processDefs: [
+        {
+          processDefId: 924255,
+          processDefName: 'test1',
+          icon: 'https://file.hikvisionmall.com/prod/image/3d134cc9657e4816ad6aa8ef206fbc89.png',
+          version: '1736480449'
+        }
+      ]
+    },
+    {
+      groupId: 138604,
+      groupName: '其他',
+      sort: 999,
+      processDefs: [
+        {
+          processDefId: 466818,
+          processDefName: '访客预约',
+          icon: 'https://file.hikmall.com/prod/image/5300a838119d462b9e1c17489603b6d8.png',
+          version: '1715675086'
+        }
+      ]
+    }
+  ])
+
   onLoad(options => {
     if (options.index) {
       index.value = Number(options.index)
diff --git a/src/pages/approval/components/ApplicationList.vue b/src/pages/approval/components/ApplicationList.vue
new file mode 100644
index 0000000..26d60ba
--- /dev/null
+++ b/src/pages/approval/components/ApplicationList.vue
@@ -0,0 +1,58 @@
+<template>
+  <scroll-view class="flex-1 box-border" :scroll-y="true">
+    <view class="mx-4 pt-4 flex flex-items-center text-3.5 font-bold">
+      <view class="bg-#dfecff flex-1 px-3 py-6 rounded-2">
+        <view>使用指南</view>
+      </view>
+      <view class="w-4"></view>
+      <view class="bg-#feebda flex-1 px-3 py-6 rounded-2">
+        <view>常见问题</view>
+      </view>
+    </view>
+    <view class="py-4">
+      <wd-collapse v-model="collapseRoot" custom-class="!bg-transparent !border-0">
+        <wd-collapse-item
+          v-for="group in list"
+          :key="group.groupId"
+          :name="group.groupName"
+          :title="group.groupName"
+        >
+          <view
+            v-for="(item, index) in group.processDefs"
+            :key="item.processDefId"
+            :class="[index === group.processDefs.length - 1 ? '' : 'mb-2']"
+            class="flex flex-items-center bg-white px-3 py-3 mx-1 rounded-2"
+          >
+            <image :src="item.icon" class="w-7 h-7 rounded-2"></image>
+            <view class="text-3.5 ml-2">{{ item.processDefName }}</view>
+          </view>
+        </wd-collapse-item>
+      </wd-collapse>
+    </view>
+  </scroll-view>
+</template>
+
+<script setup lang="ts">
+  const collapseRoot = ref<string[]>([])
+
+  onMounted(() => {
+    collapseRoot.value = props.list.map(item => item.groupName)
+  })
+
+  const props = defineProps({
+    list: {
+      type: Array,
+      required: true
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+  .wd-collapse-item::after {
+    height: 0 !important;
+  }
+
+  :deep(.wd-collapse-item__header::after) {
+    height: 0 !important;
+  }
+</style>
diff --git a/src/pages/approval/components/ApprovalRecords.vue b/src/pages/approval/components/ApprovalRecords.vue
new file mode 100644
index 0000000..b470eac
--- /dev/null
+++ b/src/pages/approval/components/ApprovalRecords.vue
@@ -0,0 +1,149 @@
+<template>
+  <view class="mx-4 mt-2">
+    <wd-input
+      class="px-2 py-0.6 rounded-1"
+      placeholder="申请名称、发起人"
+      v-model="search"
+      clearable
+      custom-class="border-0"
+      :maxlength="50"
+      prefix-icon="search"
+      @change="handleChange"
+    />
+  </view>
+  <wd-tabs v-model="currentIndex" class="pt-3" auto-line-width @click="handleChange">
+    <wd-tab :title="item" v-for="(item, index) in tabs" :key="item" :name="index" />
+  </wd-tabs>
+  <swiper :current="currentIndex" @change="changeIndex">
+    <swiper-item v-for="(item, index) in tabs" :key="item" class="flex flex-col">
+      <view @click="closeOutside">
+        <wd-drop-menu>
+          <wd-drop-menu-item
+            v-model="typeList[index]"
+            :options="typeOptionList[index]"
+            @change="typeChange"
+          />
+          <wd-drop-menu-item
+            v-model="dateList[index]"
+            :options="dateOptions"
+            @change="dateChange"
+          />
+        </wd-drop-menu>
+      </view>
+      <scroll-view :scroll-y="true" class="flex-1 box-border">
+        <view class="pt-2">
+          <view
+            v-for="item in 10"
+            :key="item"
+            class="mx-4 my-2 p-4 bg-white shadow-sm rounded-2 text-3.5"
+          >
+            <view class="flex flex-items-center mb-2">
+              <view class="text-4.5 font-bold">请假</view>
+              <view class="ml-a px-3 py-1 border-solid border-[#2bbbc3] color-#2bbbc3 rounded">
+                通过
+              </view>
+            </view>
+            <view class="mb-2">请假类型：年假</view>
+            <view class="mb-2">开始时间：2025-12-31</view>
+            <view class="mb-2">结束时间：2025-12-31</view>
+            <view class="flex flex-items-center">
+              <image class="w-8 h-8" src="/static/images/icon_default_avatar.png"></image>
+              <view class="ml-4">xxx</view>
+              <view class="ml-a">2025-12-25</view>
+            </view>
+          </view>
+        </view>
+        <view class="py-6 mx-30%">
+          <wd-divider color="#515357">已经到底了</wd-divider>
+        </view>
+      </scroll-view>
+    </swiper-item>
+  </swiper>
+</template>
+
+<script setup lang="ts">
+  import { useQueue } from 'wot-design-uni'
+
+  const search = ref<string>('')
+
+  const currentIndex = ref<number>(0)
+
+  const tabs = ref<string[]>(['待办', '已办', '抄送我', '已发起'])
+
+  const { closeOutside } = useQueue()
+
+  const typeList = ref<Array<number>>([0, 0, 0, 0])
+  const dateList = ref<Array<number>>([0, 0, 0, 0])
+
+  const typeOptionList = ref<Array<Array<Record<string, number>>>>([
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '调休', value: 1 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ]
+  ])
+
+  const dateOptions = ref<Array<Record<string, number>>>([
+    { label: '全部日期', value: 0 },
+    { label: '近7日', value: 1 },
+    { label: '近14日', value: 2 },
+    { label: '近30日', value: 3 }
+  ])
+
+  function typeChange({ value }) {
+    console.log(value)
+  }
+
+  function dateChange({ value }) {
+    console.log(value)
+  }
+
+  const handleChange = value => {
+    currentIndex.value = value.index
+  }
+
+  const changeIndex = e => {
+    currentIndex.value = e.detail.current
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-input::after {
+    height: 0;
+  }
+
+  .wd-drop-item {
+    top: calc(var(--window-top) + 48px) !important;
+  }
+
+  :deep(.wd-drop-menu__item.is-active .wd-drop-menu__item-title::after) {
+    opacity: 0 !important;
+  }
+
+  :deep(.wd-drop-menu__list) {
+    background-color: transparent !important;
+  }
+
+  :deep(.wd-tabs__nav-item) {
+    margin-bottom: 5px;
+  }
+
+  :deep(.wd-tabs__nav-item.is-active) {
+    font-weight: bold;
+    color: #255cf7;
+  }
+</style>
diff --git a/src/pages/attendance/attendance.vue b/src/pages/attendance/attendance.vue
index 92cfe85..bb290ec 100644
--- a/src/pages/attendance/attendance.vue
+++ b/src/pages/attendance/attendance.vue
@@ -11,9 +11,9 @@
   <view class="h-[calc(100vh-50px)] flex flex-col">
     <TopNavigation :title="titleTab[curIndex]"></TopNavigation>
     <scroll-view class="flex-1 box-border" scroll-y>
-      <view v-for="(item, index) in pages" :key="index" v-show="curIndex == index">
-        <component :is="item"></component>
-      </view>
+      <AttendanceClockIn v-show="curIndex === 0"></AttendanceClockIn>
+      <AttendanceStatistics v-show="curIndex === 1"></AttendanceStatistics>
+      <AttendanceSet v-show="curIndex === 2"></AttendanceSet>
     </scroll-view>
   </view>
   <CustomTabBar :list="list" :default-index="0" @change="change"></CustomTabBar>
diff --git a/src/static/images/icon_default_avatar.png b/src/static/images/icon_default_avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..b93dfad6a207648a45b5f45684ac9d1b2d892d45
GIT binary patch
literal 3963
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
PHw`q@bX1FPn+N|dwed#Y

literal 0
HcmV?d00001


From b5be5bc0ae5318c45c01ebfd08e0c937d1f1c843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 17:52:14 +0800
Subject: [PATCH 21/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E8=AF=A6=E6=83=85=E9=A1=B5UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/approval-detail.vue        | 66 +++++++++++++++
 src/pages/approval/approval.vue               |  6 +-
 .../approval/components/ApplicationList.vue   |  7 ++
 .../approval/components/ApprovalContent.vue   | 61 ++++++++++++++
 .../approval/components/ApprovalProcess.vue   | 81 +++++++++++++++++++
 .../approval/components/ApprovalRecords.vue   | 15 +++-
 6 files changed, 231 insertions(+), 5 deletions(-)
 create mode 100644 src/pages/approval/approval-detail.vue
 create mode 100644 src/pages/approval/components/ApprovalContent.vue
 create mode 100644 src/pages/approval/components/ApprovalProcess.vue

diff --git a/src/pages/approval/approval-detail.vue b/src/pages/approval/approval-detail.vue
new file mode 100644
index 0000000..9b74160
--- /dev/null
+++ b/src/pages/approval/approval-detail.vue
@@ -0,0 +1,66 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation title="详情"></TopNavigation>
+    <scroll-view class="flex-1 box-border" :scroll-y="true">
+      <view class="pb-5">
+        <ApprovalContent class="mt-2" />
+        <ApprovalProcess class="mt-2" />
+      </view>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid">
+      <view class="flex flex-items-center flex-justify-around py-3">
+        <view class="py-2 px-13 bg-#ef2e2f color-white rounded-2">拒绝</view>
+        <view class="py-2 px-13 custom-bg-blue color-white rounded-2">同意</view>
+        <view class="custom-color-blue text-4" @click="showActions">更多</view>
+      </view>
+    </view>
+    <wd-action-sheet
+      v-model="show"
+      :actions="actions"
+      close-on-click-action
+      @close="close"
+      @select="select"
+    />
+  </view>
+</template>
+
+<script setup lang="ts">
+  import { useToast } from 'wot-design-uni'
+  import ApprovalContent from '@/pages/approval/components/ApprovalContent.vue'
+  import ApprovalProcess from '@/pages/approval/components/ApprovalProcess.vue'
+
+  const toast = useToast()
+
+  const show = ref<boolean>(false)
+  const actions = ref([
+    {
+      name: '专审'
+    },
+    {
+      name: '退回'
+    },
+    {
+      name: '取消'
+    }
+  ])
+
+  const showActions = () => {
+    show.value = true
+  }
+
+  const close = () => {
+    show.value = false
+  }
+
+  const select = ({ item, index }) => {
+    toast.show(`当前选中项: ${item.title}, 下标: ${index}`)
+  }
+</script>
diff --git a/src/pages/approval/approval.vue b/src/pages/approval/approval.vue
index e0069bb..09b0ea5 100644
--- a/src/pages/approval/approval.vue
+++ b/src/pages/approval/approval.vue
@@ -9,8 +9,10 @@
 <template>
   <view class="h-100vh flex flex-col">
     <TopNavigation :title="index === 0 ? '发起申请' : '审批'"></TopNavigation>
-    <ApplicationList v-if="index === 0" :list="applicationListData"></ApplicationList>
-    <ApprovalRecords v-else></ApprovalRecords>
+    <ApplicationList v-show="index === 0" :list="applicationListData"></ApplicationList>
+    <view v-show="index === 1" class="flex-1 box-border">
+      <ApprovalRecords></ApprovalRecords>
+    </view>
     <CustomTabBar :list="list" :default-index="index" @change="change"></CustomTabBar>
   </view>
 </template>
diff --git a/src/pages/approval/components/ApplicationList.vue b/src/pages/approval/components/ApplicationList.vue
index 26d60ba..a8c67fc 100644
--- a/src/pages/approval/components/ApplicationList.vue
+++ b/src/pages/approval/components/ApplicationList.vue
@@ -22,6 +22,7 @@
             :key="item.processDefId"
             :class="[index === group.processDefs.length - 1 ? '' : 'mb-2']"
             class="flex flex-items-center bg-white px-3 py-3 mx-1 rounded-2"
+            @click="toDetail(item)"
           >
             <image :src="item.icon" class="w-7 h-7 rounded-2"></image>
             <view class="text-3.5 ml-2">{{ item.processDefName }}</view>
@@ -45,6 +46,12 @@
       required: true
     }
   })
+
+  const toDetail = (item: Record<string, any>) => {
+    uni.navigateTo({
+      url: `/pages/approval/create-application?id=${item.processDefId}&title=${item.processDefName}`
+    })
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/ApprovalContent.vue b/src/pages/approval/components/ApprovalContent.vue
new file mode 100644
index 0000000..031fa1d
--- /dev/null
+++ b/src/pages/approval/components/ApprovalContent.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="bg-white rounded-2 py-2 px-4 mx-4">
+    <view class="flex flex-items-center">
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-10 h-10"
+        mode="aspectFill"
+      ></image>
+      <view class="ml-4">
+        <view class="font-bold text-4.5">请假</view>
+        <view class="text-3.5 mt-1">xxx</view>
+      </view>
+      <view
+        class="ml-a rounded py-0.5 px-1.5 text-3.5 border-solid border-1 border-#ef811c color-#ef811c"
+      >
+        审批中
+      </view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>所属组织：</view>
+      <view class="mt-2 break-all">123132123的互联</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>审批编号：</view>
+      <view class="mt-2 break-all">845465465465465465456</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假类型：</view>
+      <view class="mt-2 break-all">年假</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>开始时间：</view>
+      <view class="mt-2 break-all">2025-01-10</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>结束时间：</view>
+      <view class="mt-2 break-all">2025-01-10</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假时长(天)：</view>
+      <view class="mt-2 break-all">1.0</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假原因：</view>
+      <view class="mt-2 break-all">
+        请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假1111111111111111111111
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/ApprovalProcess.vue b/src/pages/approval/components/ApprovalProcess.vue
new file mode 100644
index 0000000..c999f2d
--- /dev/null
+++ b/src/pages/approval/components/ApprovalProcess.vue
@@ -0,0 +1,81 @@
+<template>
+  <view class="bg-white rounded-2 py-2 px-4 mx-4">
+    <view class="py-2 text-4">审批流程</view>
+    <wd-steps :active="1" vertical>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>发起申请</view>
+              <view class="ml-a color-#7e807f text-3">2504-12-25 20:11</view>
+            </view>
+            <view class="my-2">
+              <view class="py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa">
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>审批节点</view>
+              <view
+                class="ml-3 rounded-4 py-0.5 text-3 px-2 border-solid border-#ef811c border-1 color-#ef811c"
+              >
+                审批中
+              </view>
+            </view>
+            <view class="pt-2 color-#7e807f text-3">1人通过即可</view>
+            <view class="my-2">
+              <view
+                v-for="item in 4"
+                :key="item"
+                class="mb-2 py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa"
+              >
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>抄送节点</view>
+            </view>
+            <view class="my-2">
+              <view
+                v-for="item in 4"
+                :key="item"
+                class="mb-2 py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa"
+              >
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+    </wd-steps>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
diff --git a/src/pages/approval/components/ApprovalRecords.vue b/src/pages/approval/components/ApprovalRecords.vue
index b470eac..9d24188 100644
--- a/src/pages/approval/components/ApprovalRecords.vue
+++ b/src/pages/approval/components/ApprovalRecords.vue
@@ -36,10 +36,13 @@
             v-for="item in 10"
             :key="item"
             class="mx-4 my-2 p-4 bg-white shadow-sm rounded-2 text-3.5"
+            @click="toDetail(item)"
           >
             <view class="flex flex-items-center mb-2">
               <view class="text-4.5 font-bold">请假</view>
-              <view class="ml-a px-3 py-1 border-solid border-[#2bbbc3] color-#2bbbc3 rounded">
+              <view
+                class="ml-a px-3 py-1 border-solid border-[#2bbbc3] border-1 color-#2bbbc3 rounded"
+              >
                 通过
               </view>
             </view>
@@ -104,14 +107,20 @@
     { label: '近30日', value: 3 }
   ])
 
-  function typeChange({ value }) {
+  const typeChange = ({ value }) => {
     console.log(value)
   }
 
-  function dateChange({ value }) {
+  const dateChange = ({ value }) => {
     console.log(value)
   }
 
+  const toDetail = item => {
+    uni.navigateTo({
+      url: '/pages/approval/approval-detail'
+    })
+  }
+
   const handleChange = value => {
     currentIndex.value = value.index
   }

From 871a935ecb0b7bbc4dbe4d0b1518dbf102b5e73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 17:52:54 +0800
Subject: [PATCH 22/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E8=BE=93=E5=85=A5=E6=A1=86=E4=B8=8E?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                               | 16 +++++
 src/pages/approval/components/Components.vue | 42 ++++++++++++
 src/pages/approval/components/Input.vue      | 64 ++++++++++++++++++
 src/pages/approval/components/Textarea.vue   | 71 ++++++++++++++++++++
 src/pages/approval/create-application.vue    | 40 +++++++++++
 src/types/uni-pages.d.ts                     |  2 +
 6 files changed, 235 insertions(+)
 create mode 100644 src/pages/approval/components/Components.vue
 create mode 100644 src/pages/approval/components/Input.vue
 create mode 100644 src/pages/approval/components/Textarea.vue
 create mode 100644 src/pages/approval/create-application.vue

diff --git a/src/pages.json b/src/pages.json
index 81ad8c4..1fb3c68 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -63,6 +63,14 @@
       "path": "pages/application-list/application-list",
       "type": "page"
     },
+    {
+      "path": "pages/approval/approval-detail",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/approval/approval",
       "type": "page",
@@ -71,6 +79,14 @@
         "disableScroll": true
       }
     },
+    {
+      "path": "pages/approval/create-application",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/attendance/allowed-time",
       "type": "page",
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
new file mode 100644
index 0000000..0162720
--- /dev/null
+++ b/src/pages/approval/components/Components.vue
@@ -0,0 +1,42 @@
+<template>
+  <view>
+    <view class="mx-4 p-2 rounded-2">
+      <Input
+        :id="0"
+        value="单行"
+        title="单行文本"
+        :required="true"
+        placeholder="单行文本"
+        @change="inputChange"
+      ></Input>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Textarea
+        :id="1"
+        title="多行文本"
+        :required="false"
+        placeholder="多行文本"
+        @change="textareaChange"
+      ></Textarea>
+      <wd-divider color="#bcbfbe"></wd-divider>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Input from '@/pages/approval/components/Input.vue'
+  import Textarea from '@/pages/approval/components/Textarea.vue'
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const textareaChange = e => {
+    console.log('textareaChange', e)
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
new file mode 100644
index 0000000..ff1e7d5
--- /dev/null
+++ b/src/pages/approval/components/Input.vue
@@ -0,0 +1,64 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-input
+        custom-class="!bg-transparent"
+        :placeholder="placeholder"
+        :maxlength="30"
+        v-model="text"
+        @input="change(id, $event)"
+      ></wd-input>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['change'])
+
+  const text = ref<string>('')
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: String,
+      default: ''
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  onMounted(() => {
+    text.value = props.value
+  })
+
+  const change = (id, data) => {
+    emits('change', { id, value: data.value })
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-input::after {
+    height: 0 !important;
+  }
+
+  :deep(.wd-input__inner) {
+    font-size: 0.875rem;
+  }
+</style>
diff --git a/src/pages/approval/components/Textarea.vue b/src/pages/approval/components/Textarea.vue
new file mode 100644
index 0000000..d870304
--- /dev/null
+++ b/src/pages/approval/components/Textarea.vue
@@ -0,0 +1,71 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-textarea
+        custom-class="!bg-transparent"
+        custom-textarea-class="h-16"
+        :placeholder="placeholder"
+        :maxlength="250"
+        v-model="text"
+        show-word-limit
+        @input="change(id, $event)"
+      ></wd-textarea>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['change'])
+
+  const text = ref<string>('')
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: String,
+      default: ''
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  onMounted(() => {
+    text.value = props.value
+  })
+
+  const change = (id, data) => {
+    emits('change', { id, value: data.value })
+  }
+</script>
+
+<style lang="scss" scoped>
+  :deep(.wd-textarea__value),
+  :deep(.wd-textarea__count) {
+    background: transparent !important;
+  }
+
+  :deep(.wd-textarea__inner) {
+    font-size: 0.875rem;
+  }
+
+  .wd-textarea {
+    padding: 0;
+  }
+</style>
diff --git a/src/pages/approval/create-application.vue b/src/pages/approval/create-application.vue
new file mode 100644
index 0000000..c7fd5a4
--- /dev/null
+++ b/src/pages/approval/create-application.vue
@@ -0,0 +1,40 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation :title="title"></TopNavigation>
+    <scroll-view class="flex-1 box-border" :scroll-y="true">
+      <Components></Components>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid">
+      <view class="flex flex-items-center flex-justify-around py-3 px-3">
+        <view class="py-2 w-45% text-center bg-#e2e5ea custom-color-blue rounded-2">保存草稿</view>
+        <view class="opacity-60% py-2 w-45% text-center custom-bg-blue color-white rounded-2">
+          提交
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Components from '@/pages/approval/components/Components.vue'
+
+  const title = ref<string>('')
+  const id = ref<number>(null)
+
+  onLoad(options => {
+    if (options.title) {
+      title.value = options.title
+    }
+    if (options.id) {
+      id.value = Number(options.id)
+    }
+  })
+</script>
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 51ebdf9..b4660c3 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -7,7 +7,9 @@ interface NavigateToOptions {
   url: "/pages/mine/mine" |
        "/pages/home/home" |
        "/pages/application-list/application-list" |
+       "/pages/approval/approval-detail" |
        "/pages/approval/approval" |
+       "/pages/approval/create-application" |
        "/pages/attendance/allowed-time" |
        "/pages/attendance/attendance-rules" |
        "/pages/attendance/attendance" |

From b9230bc39423ecc2f30c677b06aa273b1a4da55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 18:42:04 +0800
Subject: [PATCH 23/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E9=80=89=E6=8B=A9=E5=99=A8=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  | 34 +++++++++-
 .../approval/components/SelectPicker.vue      | 66 +++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/approval/components/SelectPicker.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 0162720..2cfa5e9 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <view class="mx-4 p-2 rounded-2">
+    <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
         value="单行"
@@ -18,6 +18,22 @@
         @change="textareaChange"
       ></Textarea>
       <wd-divider color="#bcbfbe"></wd-divider>
+      <SelectPicker
+        :value="1"
+        :id="2"
+        title="单选框"
+        placeholder="单选"
+        :columns="columns"
+      ></SelectPicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <SelectPicker
+        :value="[0]"
+        :id="3"
+        title="多选框"
+        placeholder="多选"
+        type="checkbox"
+        :columns="columns"
+      ></SelectPicker>
     </view>
   </view>
 </template>
@@ -25,6 +41,22 @@
 <script setup lang="ts">
   import Input from '@/pages/approval/components/Input.vue'
   import Textarea from '@/pages/approval/components/Textarea.vue'
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+
+  const columns = ref<Record<number, any>>([
+    {
+      value: 0,
+      label: '男装'
+    },
+    {
+      value: 1,
+      label: '奢侈品'
+    },
+    {
+      value: 2,
+      label: '女装'
+    }
+  ])
 
   const inputChange = e => {
     console.log('inputChange', e)
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
new file mode 100644
index 0000000..4ce41f7
--- /dev/null
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -0,0 +1,66 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-select-picker
+        :type="type"
+        :title="placeholder"
+        :show-confirm="type === 'checkbox'"
+        v-model="picker"
+        :columns="columns"
+        size="large"
+      />
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const picker = ref(-1)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      default: 'radio'
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    },
+    value: {
+      type: [Number, Array, null],
+      default: null
+    },
+    columns: {
+      type: Array,
+      required: true
+    }
+  })
+
+  onMounted(() => {
+    if (props.value) {
+      picker.value = props.value
+    }
+  })
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-select-picker__cell) {
+    padding: var(--wot-cell-wrapper-padding, 10px) 0;
+    background-color: transparent;
+  }
+</style>

From 84084b0758186fe01ef6a838e1990dca0ef36a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 18:56:05 +0800
Subject: [PATCH 24/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=95=B0=E5=AD=97=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue | 9 +++++++++
 src/pages/approval/components/Input.vue      | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 2cfa5e9..212d071 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -34,6 +34,15 @@
         type="checkbox"
         :columns="columns"
       ></SelectPicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Input
+        :id="4"
+        type="number"
+        title="数字"
+        :required="true"
+        placeholder="数字"
+        @change="inputChange"
+      ></Input>
     </view>
   </view>
 </template>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index ff1e7d5..96df501 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -6,9 +6,10 @@
     </view>
     <view class="pt-2">
       <wd-input
+        :type="type"
         custom-class="!bg-transparent"
         :placeholder="placeholder"
-        :maxlength="30"
+        :maxlength="type === 'text' ? 30 : 15"
         v-model="text"
         @input="change(id, $event)"
       ></wd-input>
@@ -26,6 +27,10 @@
       type: Number,
       required: true
     },
+    type: {
+      type: String,
+      default: 'text'
+    },
     required: {
       type: Boolean,
       default: false

From 53d212ba33a7676a781ad049aa1b50a75f5ba2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 18:17:24 +0800
Subject: [PATCH 25/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  22 ++
 .../approval/components/DatetimePicker.vue    | 196 ++++++++++++++++++
 2 files changed, 218 insertions(+)
 create mode 100644 src/pages/approval/components/DatetimePicker.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 212d071..0cfb397 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -43,6 +43,23 @@
         placeholder="数字"
         @change="inputChange"
       ></Input>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker :id="5" title="日期1" @change="changeDate"></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="6"
+        title="日期2"
+        type="dateHalfDay"
+        @change="changeDate"
+      ></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="7"
+        type="datetime"
+        :value="1737043380000"
+        title="日期3"
+        @change="changeDate"
+      ></DatetimePicker>
     </view>
   </view>
 </template>
@@ -51,6 +68,7 @@
   import Input from '@/pages/approval/components/Input.vue'
   import Textarea from '@/pages/approval/components/Textarea.vue'
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
 
   const columns = ref<Record<number, any>>([
     {
@@ -74,6 +92,10 @@
   const textareaChange = e => {
     console.log('textareaChange', e)
   }
+
+  const changeDate = e => {
+    console.log('changeDate', e)
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
new file mode 100644
index 0000000..95fc9c5
--- /dev/null
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -0,0 +1,196 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="py-2" @click="openDialog">
+      <view class="flex flex-items-center flex-justify-between">
+        <view>{{ text || placeholder }}</view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+  </view>
+  <wd-popup
+    v-model="show"
+    position="bottom"
+    custom-style="border-radius:12rpx;"
+    @after-leave="afterLeave"
+  >
+    <view>
+      <view class="p-4 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center">
+        <view class="font-bold">日期：</view>
+        <view class="font-bold ml-a" v-if="type !== 'dateHalfDay'">{{ date }}</view>
+      </view>
+      <view v-if="(type === 'date' || type === 'datetime') && showPicker">
+        <wd-datetime-picker-view
+          :formatter="formatter"
+          :type="type"
+          v-model="timestamp"
+          label="日期选择"
+          @change="change"
+        />
+      </view>
+      <view v-if="type === 'dateHalfDay' && showPicker">
+        <wd-tabs v-model="tab">
+          <wd-tab :title="index === 0 ? date : halfDay" v-for="(item, index) in 2" :key="index">
+            <view v-show="index === 0">
+              <wd-datetime-picker-view
+                :formatter="formatter"
+                type="date"
+                v-model="timestamp"
+                @change="change"
+              />
+            </view>
+            <view v-show="index === 1">
+              <wd-picker-view :columns="['上午', '下午']" v-model="halfDay" @change="change" />
+            </view>
+          </wd-tab>
+        </wd-tabs>
+      </view>
+      <view class="pb-safe">
+        <view class="flex py-3 flex-items-center flex-justify-around text-3.5 px-2 font-bold">
+          <view
+            class="w-45% bg-#eeeff4 custom-color-blue py-2.5 rounded-2 text-center"
+            @click="show = false"
+          >
+            取消
+          </view>
+          <view
+            class="w-45% custom-bg-blue color-white py-2.5 rounded-2 text-center"
+            @click="confirm"
+          >
+            确定
+          </view>
+        </view>
+      </view>
+    </view>
+  </wd-popup>
+</template>
+
+<script setup lang="ts">
+  import dayjs from 'dayjs'
+
+  const show = ref<boolean>(false)
+  const timestamp = ref<number>(0)
+  const text = ref<string>('')
+  const date = ref<string>('')
+  const halfDay = ref<string>('')
+  const showPicker = ref<boolean>(false)
+  const returnTimestamp = ref<number>(0)
+
+  const tab = ref<number>(0)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      default: 'date'
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  const formatter = (type, value) => {
+    switch (type) {
+      case 'year':
+        return value + '年'
+      case 'month':
+        return value + '月'
+      case 'date':
+        return value + '日'
+      case 'hour':
+        return value + '时'
+      case 'minute':
+        return value + '分'
+      default:
+        return value
+    }
+  }
+
+  const emits = defineEmits(['change'])
+
+  onMounted(() => {
+    if (props.value) {
+      timestamp.value = props.value
+      if (props.type === 'date') {
+        date.value = dayjs(props.value).format('YYYY-M-D')
+        text.value = date.value
+      } else if (props.type === 'datetime') {
+        date.value = dayjs(props.value).format('YYYY-M-D HH:mm')
+        text.value = date.value
+      } else if (props.type === 'dateHalfDay') {
+        date.value = dayjs(props.value).format('YYYY年M月D日')
+        halfDay.value = dayjs(props.value).hour() < 12 ? '上午' : '下午'
+        text.value = `${date.value} ${halfDay.value}`
+      }
+    }
+  })
+
+  const change = ({ value }) => {
+    if (props.type === 'date') {
+      date.value = dayjs(value).format('YYYY-M-D')
+    } else if (props.type === 'datetime') {
+      date.value = dayjs(value).format('YYYY-M-D HH:mm')
+    } else if (props.type === 'dateHalfDay') {
+      if (tab.value === 0) {
+        date.value = dayjs(value).format('YYYY年M月D日')
+      } else {
+        halfDay.value = value
+      }
+    }
+  }
+
+  const openDialog = () => {
+    if (!props.value) {
+      if (text.value === '') {
+        timestamp.value = new Date().getTime()
+      } else {
+        timestamp.value = returnTimestamp.value
+      }
+
+      if (props.type === 'date') {
+        date.value = dayjs(timestamp.value).format('YYYY-M-D')
+      } else if (props.type === 'datetime') {
+        date.value = dayjs(timestamp.value).format('YYYY-M-D HH:mm')
+      } else if (props.type === 'dateHalfDay') {
+        date.value = dayjs(timestamp.value).format('YYYY年M月D日')
+        halfDay.value = dayjs(timestamp.value).hour() < 12 ? '上午' : '下午'
+      }
+    }
+    showPicker.value = true
+    show.value = true
+  }
+
+  const confirm = () => {
+    show.value = false
+    returnTimestamp.value = timestamp.value
+    if (props.type === 'dateHalfDay') {
+      text.value = `${date.value} ${halfDay.value}`
+    } else {
+      text.value = date.value
+    }
+    emits('change', { id: props.id, value: returnTimestamp.value, text: text.value })
+  }
+
+  const afterLeave = () => {
+    showPicker.value = false
+  }
+</script>

From 561c84f1a909ce5d27370c740c48af7a3f8c5ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 19:39:14 +0800
Subject: [PATCH 26/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue |  3 +
 src/pages/approval/components/Images.vue     | 61 ++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 src/pages/approval/components/Images.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 0cfb397..2b9bc94 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -60,6 +60,8 @@
         title="日期3"
         @change="changeDate"
       ></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Images id="8" title="图片"></Images>
     </view>
   </view>
 </template>
@@ -69,6 +71,7 @@
   import Textarea from '@/pages/approval/components/Textarea.vue'
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import Images from '@/pages/approval/components/Images.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/Images.vue b/src/pages/approval/components/Images.vue
new file mode 100644
index 0000000..c1b3798
--- /dev/null
+++ b/src/pages/approval/components/Images.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-3">
+      <wd-upload
+        :file-list="fileList"
+        multiple
+        :limit="9"
+        image-mode="aspectFill"
+        :size-type="['original']"
+        action="https://mockapi.eolink.com/zhTuw2P8c29bc981a741931bdd86eb04dc1e8fd64865cb5/upload"
+        @change="handleChange"
+      ></wd-upload>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const fileList = ref<any[]>([])
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: Array,
+      default: () => []
+    }
+  })
+
+  onMounted(() => {
+    if (props.value.length > 0) {
+      fileList.value = props.value
+    }
+  })
+
+  const handleChange = ({ fileList: files }) => {
+    console.log('handleChange', files)
+    fileList.value = files
+  }
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-upload__evoke),
+  :deep(.wd-upload__status-content),
+  :deep(.wd-upload__picture) {
+    border-radius: 12rpx;
+  }
+</style>

From 3cb49a5132bfbe444175d820ed430a59f6abbe39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 19:44:58 +0800
Subject: [PATCH 27/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E8=AF=B4=E6=98=8E=E9=A1=B9=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  6 ++++++
 src/pages/approval/components/Description.vue | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 src/pages/approval/components/Description.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 2b9bc94..4f2a1c8 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -62,6 +62,11 @@
       ></DatetimePicker>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Images id="8" title="图片"></Images>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Description
+        id="9"
+        title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
+      ></Description>
     </view>
   </view>
 </template>
@@ -72,6 +77,7 @@
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
+  import Description from '@/pages/approval/components/Description.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/Description.vue b/src/pages/approval/components/Description.vue
new file mode 100644
index 0000000..5bed04c
--- /dev/null
+++ b/src/pages/approval/components/Description.vue
@@ -0,0 +1,18 @@
+<template>
+  <view class="px-2 text-3.5 pb-2">
+    <view class="break-all">{{ title }}</view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    title: {
+      type: String,
+      required: true
+    }
+  })
+</script>

From 03d338974ef60e3a49a7d48a3747be1e174fc1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 14:54:10 +0800
Subject: [PATCH 28/37] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TopNavigation/TopNavigation.vue           |  21 +-
 src/pages.json                                |  64 +++-
 src/pages/approval/components/Components.vue  |  14 +-
 .../components/MemberOrDepartment.vue         |  65 +++++
 .../components/MemberOrDepartmentItem.vue     |  56 ++++
 .../components/SearchItem.vue                 |  35 +++
 .../select-member-or-department.vue           | 275 ++++++++++++++++++
 src/static/images/icon_delete.png             | Bin 0 -> 1493 bytes
 src/static/images/icon_file.png               | Bin 0 -> 1205 bytes
 src/types/uni-pages.d.ts                      |   6 +
 10 files changed, 529 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/approval/components/MemberOrDepartment.vue
 create mode 100644 src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
 create mode 100644 src/pages/select-member-or-department/components/SearchItem.vue
 create mode 100644 src/pages/select-member-or-department/select-member-or-department.vue
 create mode 100644 src/static/images/icon_delete.png
 create mode 100644 src/static/images/icon_file.png

diff --git a/src/components/TopNavigation/TopNavigation.vue b/src/components/TopNavigation/TopNavigation.vue
index e1755e0..7e6a7f9 100644
--- a/src/components/TopNavigation/TopNavigation.vue
+++ b/src/components/TopNavigation/TopNavigation.vue
@@ -26,14 +26,21 @@
           class="pos-absolute left-3 h-5 w-5"
           @click="back"
         ></image>
-        <view class="flex-1 text-center">
-          <view class="line-clamp-1 max-w-60 break-all mx-auto">
+        <view class="flex flex-items-center">
+          <view class="line-clamp-1 max-w-60 break-all">
             {{ title }}
           </view>
         </view>
         <view class="pos-absolute right--3">
           <slot></slot>
         </view>
+        <view
+          v-if="rightButtonText"
+          class="text-3.5 font-normal pos-absolute right-5"
+          @click="rightButton"
+        >
+          {{ rightButtonText }}
+        </view>
       </view>
     </view>
   </view>
@@ -62,16 +69,24 @@
     backUrl: {
       type: String,
       default: '/static/images/icon_back.png'
+    },
+    rightButtonText: {
+      type: [String, null],
+      default: null
     }
   })
 
-  const emits = defineEmits(['back'])
+  const emits = defineEmits(['back', 'rightButton'])
 
   const back = () => {
     uni.navigateBack()
     emits('back')
   }
 
+  const rightButton = () => {
+    emits('rightButton')
+  }
+
   onMounted(async () => {
     systemInfo.value = await $basic.getSystemInfo()
   })
diff --git a/src/pages.json b/src/pages.json
index 1fb3c68..39642f0 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -50,6 +50,14 @@
     ]
   },
   "pages": [
+    {
+      "path": "pages/mine/mine",
+      "type": "home",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "首页"
+      }
+    },
     {
       "path": "pages/home/home",
       "type": "home",
@@ -169,6 +177,14 @@
       },
       "needLogin": false
     },
+    {
+      "path": "pages/info-publish/add-release-plan",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/info-publish/announce-notice",
       "type": "page",
@@ -193,9 +209,29 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/info-publish/edit-pic-video",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/info-publish/info-publish",
-      "type": "page"
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/material-library",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
     },
     {
       "path": "pages/info-publish/notice-details",
@@ -213,6 +249,22 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/info-publish/play-content-library",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/release-plan",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/login/login",
       "type": "page",
@@ -243,6 +295,14 @@
       },
       "needLogin": false
     },
+    {
+      "path": "pages/select-member-or-department/select-member-or-department",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/workbench/workbench",
       "type": "page"
@@ -297,4 +357,4 @@
     }
   ],
   "subPackages": []
-}
+}
\ No newline at end of file
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 4f2a1c8..d331ce8 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -61,12 +61,21 @@
         @change="changeDate"
       ></DatetimePicker>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <Images id="8" title="图片"></Images>
+      <Images :id="8" title="图片"></Images>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Description
-        id="9"
+        :id="9"
         title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
       ></Description>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <MemberOrDepartment :id="10" title="成员" type="member" :multiple="true"></MemberOrDepartment>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <MemberOrDepartment
+        :id="11"
+        title="部门"
+        type="department"
+        :multiple="true"
+      ></MemberOrDepartment>
     </view>
   </view>
 </template>
@@ -78,6 +87,7 @@
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
+  import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
new file mode 100644
index 0000000..5339c4c
--- /dev/null
+++ b/src/pages/approval/components/MemberOrDepartment.vue
@@ -0,0 +1,65 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="py-2" @click="toSelect">
+      <view class="flex flex-items-center flex-justify-between">
+        <view>{{ text || placeholder }}</view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string | null>(null)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  const toSelect = () => {
+    const params = {
+      type: props.type,
+      multiple: props.multiple,
+      title: props.type === 'member' ? '选择审批用户' : '选择部门'
+    }
+    uni.navigateTo({
+      url: `/pages/select-member-or-department/select-member-or-department?params=${JSON.stringify(params)}`,
+      events: {
+        change: res => {
+          console.log(1111, res)
+        }
+      }
+    })
+  }
+</script>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
new file mode 100644
index 0000000..2b3c360
--- /dev/null
+++ b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
@@ -0,0 +1,56 @@
+<template>
+  <view class="flex flex-items-center py-2 text-4" @click="toClick">
+    <view
+      v-if="item.type === 'member'"
+      class="w-10 h-10 flex flex-justify-center flex-items-center"
+    >
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-8 h-8 rounded-2"
+        mode="aspectFill"
+      ></image>
+    </view>
+    <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
+      <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+    </view>
+    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+      {{ item.name }}
+    </view>
+    <view class="ml-a" v-if="item.type === 'department'">
+      <wd-divider vertical></wd-divider>
+    </view>
+    <view
+      v-if="item.type === 'department'"
+      :class="[disabled ? 'color-#87a9fb' : 'custom-color-blue']"
+      class="ml-1"
+    >
+      下级
+    </view>
+    <wd-icon
+      name="arrow-right"
+      size="14px"
+      class="ml-2"
+      :color="disabled ? '#87a9fb' : '#255cf7'"
+      v-if="item.type === 'department'"
+    ></wd-icon>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['click'])
+
+  const props = defineProps({
+    item: {
+      type: Object,
+      required: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toClick = () => {
+    emits('click')
+  }
+</script>
diff --git a/src/pages/select-member-or-department/components/SearchItem.vue b/src/pages/select-member-or-department/components/SearchItem.vue
new file mode 100644
index 0000000..9a13733
--- /dev/null
+++ b/src/pages/select-member-or-department/components/SearchItem.vue
@@ -0,0 +1,35 @@
+<template>
+  <view class="flex flex-items-center py-2 text-4" @click="toClick">
+    <view
+      v-if="item.type === 'member'"
+      class="w-10 h-10 flex flex-justify-center flex-items-center"
+    >
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-8 h-8 rounded-2"
+        mode="aspectFill"
+      ></image>
+    </view>
+    <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
+      <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+    </view>
+    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+      {{ item.name }}
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['click'])
+
+  const props = defineProps({
+    item: {
+      type: Object,
+      required: true
+    }
+  })
+
+  const toClick = () => {
+    emits('click')
+  }
+</script>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select-member-or-department/select-member-or-department.vue
new file mode 100644
index 0000000..f3a80e6
--- /dev/null
+++ b/src/pages/select-member-or-department/select-member-or-department.vue
@@ -0,0 +1,275 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view>
+    <view v-if="showSearch" class="h-[calc(100vh-60px)] flex flex-col">
+      <view v-if="systemInfo" :style="{ marginTop: systemInfo.safeAreaInsets?.top + 'px' }">
+        <view class="h-12 pt-1 pb-2">
+          <wd-search
+            :placeholder-left="true"
+            :focus="false"
+            @change="changeSearch"
+            @cancel="showSearch = false"
+          />
+        </view>
+      </view>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in list"
+            :key="item.id"
+            class="border-[#ebebeb] border-b-1 border-b-solid px-4 flex flex-items-center"
+          >
+            <view
+              v-if="!(type === 'member' && item.type === 'department')"
+              class="mr-3"
+              @click="toClick(item)"
+            >
+              <wd-icon
+                v-if="value.includes(item)"
+                name="check-circle-filled"
+                color="#255cf9"
+                size="26px"
+              ></wd-icon>
+              <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
+            </view>
+            <SearchItem class="flex-1" :item="item" @click="toClick(item)"></SearchItem>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+    <view v-if="!showSearch" class="h-[calc(100vh-60px-env(safe-area-inset-bottom))] flex flex-col">
+      <TopNavigation :title="title"></TopNavigation>
+      <view
+        @click="showSearch = true"
+        class="bg-white flex flex-justify-center flex-items-center rounded color-#a6a6a6 mx-4 mt-3 py-1.5"
+      >
+        <wd-icon name="search" size="16px" class="mr-2"></wd-icon>
+        <view>搜索</view>
+      </view>
+      <view class="flex flex-items-center m-4 text-3.5 break-all overflow-hidden whitespace-nowrap">
+        <view
+          v-for="(department, index) in organizationList"
+          :key="department.id"
+          class="flex flex-items-center"
+          @click="toOrganization(index)"
+        >
+          <span
+            :class="[index === organizationList.length - 1 ? 'color-#838589' : 'custom-color-blue']"
+          >
+            {{ department.name }}
+          </span>
+          <span v-if="index !== organizationList.length - 1" class="mx-0.5">/</span>
+        </view>
+      </view>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in list"
+            :key="item.id"
+            class="border-[#ebebeb] border-b-1 border-b-solid px-4 flex flex-items-center"
+          >
+            <view
+              v-if="!(type === 'member' && item.type === 'department')"
+              class="mr-3"
+              @click="toClick(item)"
+            >
+              <wd-icon
+                v-if="value.includes(item)"
+                name="check-circle-filled"
+                color="#255cf9"
+                size="26px"
+              ></wd-icon>
+              <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
+            </view>
+            <MemberOrDepartmentItem
+              class="flex-1"
+              :item="item"
+              :disabled="item.type === 'department' && value.includes(item)"
+              @click="toClick(item)"
+            ></MemberOrDepartmentItem>
+          </view>
+        </view>
+        <view class="py-5 px-15">
+          <wd-divider color="#838589">仅显示已开通账号的人员</wd-divider>
+        </view>
+      </scroll-view>
+    </view>
+    <view
+      class="pb-safe h-60px px-4 border-[#ebebeb] border-t-1 border-t-solid text-3.5 flex flex-items-center"
+    >
+      <view class="flex flex-items-center flex-justify-between w-full">
+        <view class="flex flex-items-center" v-if="value.length" @click="showSelected = true">
+          <view class="custom-color-blue">已选中：{{ value.length }}个人</view>
+          <wd-icon name="arrow-right" size="16px" class="ml-2" color="#255cf7"></wd-icon>
+        </view>
+        <view v-else></view>
+        <view class="custom-bg-blue color-white py-1 px-5 rounded" @click="confirm">确定</view>
+      </view>
+    </view>
+  </view>
+  <wd-popup v-model="showSelected" position="bottom">
+    <view class="h-100vh flex flex-col bg-#f3f5fa">
+      <TopNavigation
+        title="已选中"
+        :have-back="false"
+        right-button-text="确定"
+        @right-button="showSelected = false"
+      ></TopNavigation>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in value"
+            :key="item.id"
+            class="flex flex-items-center px-4 py-3 border-[#ebebeb] border-b-1 border-b-solid"
+          >
+            <image :src="item.avatar" class="w-10 h-10 rounded-2"></image>
+            <view class="ml-4 text-3.5">
+              <view>{{ item.name }}</view>
+              <view class="mt-1 color-#a6a6a6 text-3">{{ item.name }}</view>
+            </view>
+            <view class="p-1 ml-a bg-#f3f5f8 rounded-50%" @click="deleteItem(item)">
+              <image src="/static/images/icon_delete.png" class="w-5 h-5"></image>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </wd-popup>
+</template>
+
+<script setup lang="ts">
+  import { useBasicStore } from '@/store'
+  import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
+  import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+
+  const instance = getCurrentInstance().proxy
+  const eventChannel = instance.getOpenerEventChannel()
+
+  const type = ref<string>('')
+  const multiple = ref<boolean>(false)
+  const title = ref<string>('')
+  const showSearch = ref<boolean>(false)
+
+  const organizationList = ref<Array<object>>([
+    {
+      id: 1,
+      type: 'department',
+      name: '技术部'
+    }
+  ])
+
+  const $basic = useBasicStore()
+
+  const systemInfo = ref(null)
+
+  const value = ref<Array>([])
+  const showSelected = ref<boolean>(false)
+
+  const list = ref<Array<object>>([
+    {
+      id: 0,
+      type: 'department',
+      name: 'xxx的互联',
+      avatar: '/static/images/icon_file.png'
+    },
+    {
+      id: 1,
+      type: 'member',
+      name: '张三',
+      avatar: '/static/images/icon_default_avatar.png'
+    },
+    {
+      id: 2,
+      type: 'member',
+      name: '李四',
+      avatar: '/static/images/icon_default_avatar.png'
+    },
+    {
+      id: 3,
+      type: 'member',
+      name: '王五',
+      avatar: '/static/images/icon_default_avatar.png'
+    }
+  ])
+
+  const toClick = item => {
+    if (value.value.includes(item)) {
+      value.value = value.value.filter(v => v !== item)
+    } else {
+      if (multiple.value || value.value.length === 0) {
+        value.value.push(item)
+      } else {
+        uni.showToast({
+          title: '最多选择一个',
+          icon: 'none'
+        })
+      }
+    }
+  }
+
+  const deleteItem = item => {
+    value.value = value.value.filter(v => v !== item)
+  }
+
+  onMounted(async () => {
+    systemInfo.value = await $basic.getSystemInfo()
+  })
+
+  function changeSearch({ value }) {
+    console.log('输入', value)
+  }
+
+  onLoad(options => {
+    const params = JSON.parse(options.params)
+    type.value = params.type
+    multiple.value = params.multiple
+    title.value = params.title
+  })
+
+  const toOrganization = index => {
+    if (index === organizationList.value.length - 1) {
+      return
+    }
+    uni.navigateBack({
+      delta: organizationList.value.length - index - 1
+    })
+  }
+
+  const change = e => {
+    console.log('change', e)
+  }
+
+  const confirm = () => {
+    eventChannel.emit('change', { value: value.value })
+    uni.navigateBack({
+      delta: organizationList.value.length
+    })
+  }
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-checkbox) {
+    margin-bottom: 0;
+  }
+
+  .wd-search {
+    background: transparent;
+  }
+
+  :deep(.wd-search__block) {
+    padding: 3px 0;
+    background-color: #e2e5ea;
+    border-radius: 0.5rem;
+  }
+
+  :deep(.wd-search__cancel) {
+    color: #a6a6a6;
+  }
+</style>
diff --git a/src/static/images/icon_delete.png b/src/static/images/icon_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..10c193fd39f760e9eda2fbbad302136b9b4c82ba
GIT binary patch
literal 1493
zcmZ`(do<Ju6u!TCYRrrg%E+^_G>FY=JSK*;C?u6MdA43ro}C(x_>EL-IcO(qJ%>`F
zu&rn7F^;k%&y`oosJs$pY0D$*w14mZaqm6%-tT<(p6{M>lbjrFC?q8k08s2~t(_$i
z{c2JKiElRdZkGfk!r8_ON;{RO0q`ky)|SV(9<w>#!7mNSSH@>KdM;&ywVAm=Q@sWC
z{S%hrM>USyIehEhzV=b;n|86=pZaUjF&^&GUQ@$SifX`~q)9ltYl)^zH9ElgIbLUn
zjbvI*v>;+J4UzO!r$%CY{tME;5-%>Ti;c*Kdy01@T;udpH0m6^qoS4PWhy5s3{pzS
z;_w)Ygt(@V$&u+HIb0_!WenrjS&MlF$rdfECz2{TWn%<1W2G@+Y;f2+Y~7XGkaF?%
z6VAhdP%LV{lGls?=ZCfoH89BD+x+1z9=KsRAUEdYd`!;`W%*M(R=6Dvc^qRa_NA+<
zv3=X#xF%ir?F_*f@3F_g?cPh30hfybBw^XxKV+NqZAuE~y2;SiP&e|l-#_4Id?unE
z$*5Ls=$#3QoWen2kF25$;Ihv~ZUQe8Q_KM2f0L?1P~cghxKot3J3ZiUoU@^d;Chj<
z!DcX)I-RuXG}I~kst)RgU48iL?8lA591yznZFoAgo1qL4^@pmSNqL*oIw5~@XC@U)
ziBNs58r%J7-qZ7n>sQ&as8&K1mKJYMq?Os~Vgc<$5-0Xc50ZGzWPmDy1#TCGU4auQ
zj8IWNp*$KKM?1%2KMPv8bHlroM=(w$3O9JGDt9Nx^?K`S^@Gl~Ee(&N7_hFY8yB3*
zX_>|L@2y<;w4`*+%}&;~4tG|Xc3kIAEgweW{Z|Lv)fAKiS-wMG8r+EGhoDF<oCFN?
z{Joo0Dh#6BGnse5_C+{^($&A!6jyu)w)2}wVoJ2`%#JtUWR&?h>X~J97w|9f<HARY
zpp#N)cx=@W^^w+&m3oj*a5nRqrwjK%WPH1?)goD#zCSSd$9v}b9+-otG`qky2pF0G
zcRt;DAccd{Csv<ng9ua%yYy?#FVk#qF^h8}UT?L)@-JZcKLJ~n0K!zN`YTLvHj;`2
z&vyrdb`Pd59VisG9+qDb59(ztNAp}vBpL>Jr-dMCi2XFEAWj8%t{$Sar<@~^dzo2V
z#Ob``IZk%!B}H|BlAa)tATp=ppeA~4#ki6ze1TzM1cgYEA3*5qG<VF`f*(AjvW+CX
zz7G98a10Su#kYbZl?NhaThjZ-8XK%E&Q=Lf+kf^i9!-zJuE&K|05~z#Bs7jXQUJn?
zmBobmTj20-k7F4}XP4n|@J%jpN>PGHB#Wjb*Y=5%Ur;hFb_W}2aXO+M{eJFq`w$49
zY4wg$`s8_iGQ3vMI4{F4RkSXAzHb_amCz(|Y6+f;VK17XN5_v^NOoM^KXch5Fct(+
zQhf?Mdp_!>hcb{pm6r5I1-Dh!jx>6oAv;(r)ztW$j@Et8)mV!J16HAO9ws$DWS>6X
z5Nf7*?dlV2eij=Wn9{WqP1#Qaxcw6W)u`V=_FSilS$I@#vSP#ddV~%6o&4Qu<Gr0}
zX6Ct~!$FHJGeO`7q7SM`9|yxJ(n=^Ds$R^ckEP~q1KpU{J79~ox(_TTH@Y72#2R4P
zrCS6_)q&Ts=;2b`HLbM3Fxkx3c!C!LD?VkJpLpD(C0=qe2GPjh6v`J|Jaf?Gl@JE@
zIk73m#K?c(<kEv%>l^Q+<(QY#dB136jJr!CC6Sbw4YN`c=EdC+5K3t>&LskLg#>?(
z05ks`9Ru9h2tyLoY|`wafp9S^>j(%Pv?H$q<c^Nqz(BB7n;{OwUnczIAyn>Qt_Gl!
yOy+Gsvz!*l2(TJ!>3A4PxaltiqUDZ`qQ>7@h0p6x`KC*LD%c%xv@W&sivI^x=VxXB

literal 0
HcmV?d00001

diff --git a/src/static/images/icon_file.png b/src/static/images/icon_file.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a8886b842e0730c225abb5596c8a0e2df2ca159
GIT binary patch
literal 1205
zcmeAS@N?(olHy`uVBq!ia0vp^y+GW+!3HGF4!o)cQjEnx?oJHr&dI!FU|`Ajba4!+
zh<iKdV9;#?i5Asg0R`EgyizQj&-?uHdNRW%<Z)lR6kC+k>;CIfk-rOFqcY3wQ`mco
zA9b@daXxua(KgwENlJl3ox$Yci5Uzg1_FK$(lX?}9X_49RdM<IOpn<gUYV*tDLJwK
zQvc&%yDKr<j&D75p=Se+rtNw&o(D5yV>xDBW&W(VZVpghZ~y#hn<twHX|yd<Ptg0z
zbS`&^xZ~#!Ryl3Ezm(k;$~|xOwkVJ-clV0jyB8gJ_x*4{dGyz?$6GqnZ8?3<FXx%Q
z(!$_zk7vfadcOR#^>g-}{k=RgX4xs{Ic>`xdtW|2V~0=Yg2EjpwM@_FZ2R*mUuxcJ
z^<HTc&E<z*8s;xg{w&96QvdaQYSu4yri^_jI%Yq5{ea=D_|Jk{3}?Soa$79yvB+F^
z^y_o|M+;rT4JzKLyDW%wJlUO7cuZNzVY7$wYr(xw|M6yAyZk=My0?khq&sw@-a`%x
zht2Eq#Bb|f&=JeMe`x9cD^HfZoZUQOcgzp==mnfdZ+(Ao$y?;Ym$Qy1WG}QlO8PK^
z;lcq&3&sVU?#EabG&UA6ISBXla5^wEKV)f8laUl|U}HPP$>3{Yq{hI@(<00;t02WE
zgKt)$^UFCE_wO?0@ZG<(`H?E`TZhB@cj+~p+&`(ye5xt4?@ME;&`ED=ChlC{n#nBX
zH*?jDbGEs&8kUs^hfaQ5v2kbqPmQ<P7uz>@nO`jI4_#Zzcy>m_%fqKaFTX9>X!kCY
z$-lYuR<dbyvH#4%#Y@B6T=o6mcb@&R|6$h3^%V<unja8<o$I*yk<*-Qd?tRm-FujN
zH9XWM7ZheiKM~DvakM(g&>MVPX}yCo*CkK3j5)W&Dp{ohC-@mTJifB+g!YAwrjkjF
zQp>lw#x=T$ESb!6!D6fKCoYpk3UgB$j;+j{7`{M|^`#2)NHKaf%dA5E@4piT-g3@7
z28`lk+*yUy4wsX(d*6GqojqJvAsJMacSrxWu*!t<nbkF?+BH|&m@;H66MFUh_wv|z
zPZCR_O*&>jtUK^y{p2}(%a8BTEsSE}UGD2S<+WUJRi>6*=CQ_x&3PK@-tPOt_G3|C
z$)y-JX219cJsW!Z`gZ>jDimvaCOhwX;^cRi)HVquOM5?<!>2lb%D!7)eJ_}#&3_x>
z$B?1Le(!LR!)530skRKhPY+Z_@MTnGY}~}YV5Lk2|7k{Fe%-Kd3?@^V-zQowc)9TC
jDY=GaMGtIszDsZ3b$`C!kBA?@a)`mx)z4*}Q$iB}w`U?2

literal 0
HcmV?d00001

diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index b4660c3..8e6bfdb 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -20,16 +20,22 @@ interface NavigateToOptions {
        "/pages/attendance/issue-record" |
        "/pages/code/code" |
        "/pages/get-code/get-code" |
+       "/pages/info-publish/add-release-plan" |
        "/pages/info-publish/announce-notice" |
        "/pages/info-publish/basic-info" |
        "/pages/info-publish/drafts-list" |
+       "/pages/info-publish/edit-pic-video" |
        "/pages/info-publish/info-publish" |
+       "/pages/info-publish/material-library" |
        "/pages/info-publish/notice-details" |
        "/pages/info-publish/notice-manage" |
+       "/pages/info-publish/play-content-library" |
+       "/pages/info-publish/release-plan" |
        "/pages/login/login" |
        "/pages/notification/notification" |
        "/pages/personnel-passage/traffic-correlation" |
        "/pages/reset-password/reset-password" |
+       "/pages/select-member-or-department/select-member-or-department" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |
        "/pages/attendance/attendance-add-group/attendance-device" |

From 67996568f4e40a7646dbcc4f75e161a4bfde8aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 09:38:56 +0800
Subject: [PATCH 29/37] =?UTF-8?q?fix:=20=E6=95=B4=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TeamPopup/TeamPopup.vue        |   3 +-
 .../TopNavigation/TopNavigation.vue           |   3 +-
 src/pages.json                                | 102 ++++--------------
 .../application-list.vue                      |   0
 .../home/{ => compoents}/HomeAddDevice.vue    |   0
 .../{ => compoents}/HomeAddTeamManager.vue    |   0
 .../home/{ => compoents}/HomeAttendance.vue   |   0
 .../home/{ => compoents}/HomeBulletin.vue     |   0
 .../home/{ => compoents}/HomeOpenDoor.vue     |   0
 .../home/{ => compoents}/HomeSetting.vue      |   0
 src/pages/home/{ => compoents}/HomeSwiper.vue |   0
 src/pages/home/{ => compoents}/HomeTab.vue    |   2 +-
 .../home/{ => compoents}/HomeTeamManager.vue  |   0
 src/pages/home/{ => compoents}/HomeTodo.vue   |   0
 src/pages/home/home.vue                       |  32 +++---
 src/pages/{code => login}/code.vue            |   6 +-
 src/pages/{get-code => login}/get-code.vue    |   8 +-
 src/pages/login/login.vue                     |  12 ++-
 .../reset-password.vue                        |   6 +-
 .../components/MemberOrDepartmentItem.vue     |   6 +-
 .../select-member-or-department.vue           |   3 +-
 src/types/uni-pages.d.ts                      |  18 ++--
 22 files changed, 78 insertions(+), 123 deletions(-)
 rename src/pages/{application-list => home}/application-list.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAddDevice.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAddTeamManager.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAttendance.vue (100%)
 rename src/pages/home/{ => compoents}/HomeBulletin.vue (100%)
 rename src/pages/home/{ => compoents}/HomeOpenDoor.vue (100%)
 rename src/pages/home/{ => compoents}/HomeSetting.vue (100%)
 rename src/pages/home/{ => compoents}/HomeSwiper.vue (100%)
 rename src/pages/home/{ => compoents}/HomeTab.vue (96%)
 rename src/pages/home/{ => compoents}/HomeTeamManager.vue (100%)
 rename src/pages/home/{ => compoents}/HomeTodo.vue (100%)
 rename src/pages/{code => login}/code.vue (97%)
 rename src/pages/{get-code => login}/get-code.vue (93%)
 rename src/pages/{reset-password => login}/reset-password.vue (98%)

diff --git a/src/components/TeamPopup/TeamPopup.vue b/src/components/TeamPopup/TeamPopup.vue
index b9e73f1..d120885 100644
--- a/src/components/TeamPopup/TeamPopup.vue
+++ b/src/components/TeamPopup/TeamPopup.vue
@@ -56,10 +56,11 @@
 
 <script setup lang="ts">
   import { useBasicStore } from '@/store'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
   const show = ref<boolean>(false)
 
   onMounted(async () => {
diff --git a/src/components/TopNavigation/TopNavigation.vue b/src/components/TopNavigation/TopNavigation.vue
index 7e6a7f9..190fe75 100644
--- a/src/components/TopNavigation/TopNavigation.vue
+++ b/src/components/TopNavigation/TopNavigation.vue
@@ -48,10 +48,11 @@
 
 <script lang="ts" setup>
   import { useBasicStore } from '@/store'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   defineProps({
     mini: {
diff --git a/src/pages.json b/src/pages.json
index 39642f0..de9a36a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -50,14 +50,6 @@
     ]
   },
   "pages": [
-    {
-      "path": "pages/mine/mine",
-      "type": "home",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "首页"
-      }
-    },
     {
       "path": "pages/home/home",
       "type": "home",
@@ -67,10 +59,6 @@
         "disableScroll": true
       }
     },
-    {
-      "path": "pages/application-list/application-list",
-      "type": "page"
-    },
     {
       "path": "pages/approval/approval-detail",
       "type": "page",
@@ -160,30 +148,8 @@
       }
     },
     {
-      "path": "pages/code/code",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
-    },
-    {
-      "path": "pages/get-code/get-code",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
-    },
-    {
-      "path": "pages/info-publish/add-release-plan",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
+      "path": "pages/home/application-list",
+      "type": "page"
     },
     {
       "path": "pages/info-publish/announce-notice",
@@ -209,29 +175,9 @@
         "navigationStyle": "custom"
       }
     },
-    {
-      "path": "pages/info-publish/edit-pic-video",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
-    },
     {
       "path": "pages/info-publish/info-publish",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/info-publish/material-library",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
+      "type": "page"
     },
     {
       "path": "pages/info-publish/notice-details",
@@ -250,20 +196,22 @@
       }
     },
     {
-      "path": "pages/info-publish/play-content-library",
+      "path": "pages/login/code",
       "type": "page",
-      "layout": "default",
       "style": {
-        "navigationStyle": "custom"
-      }
+        "navigationStyle": "custom",
+        "disableScroll": true
+      },
+      "needLogin": false
     },
     {
-      "path": "pages/info-publish/release-plan",
+      "path": "pages/login/get-code",
       "type": "page",
-      "layout": "default",
       "style": {
-        "navigationStyle": "custom"
-      }
+        "navigationStyle": "custom",
+        "disableScroll": true
+      },
+      "needLogin": false
     },
     {
       "path": "pages/login/login",
@@ -275,19 +223,7 @@
       "needLogin": false
     },
     {
-      "path": "pages/notification/notification",
-      "type": "page"
-    },
-    {
-      "path": "pages/personnel-passage/traffic-correlation",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/reset-password/reset-password",
+      "path": "pages/login/reset-password",
       "type": "page",
       "style": {
         "navigationStyle": "custom",
@@ -295,6 +231,14 @@
       },
       "needLogin": false
     },
+    {
+      "path": "pages/mine/mine",
+      "type": "page"
+    },
+    {
+      "path": "pages/notification/notification",
+      "type": "page"
+    },
     {
       "path": "pages/select-member-or-department/select-member-or-department",
       "type": "page",
@@ -357,4 +301,4 @@
     }
   ],
   "subPackages": []
-}
\ No newline at end of file
+}
diff --git a/src/pages/application-list/application-list.vue b/src/pages/home/application-list.vue
similarity index 100%
rename from src/pages/application-list/application-list.vue
rename to src/pages/home/application-list.vue
diff --git a/src/pages/home/HomeAddDevice.vue b/src/pages/home/compoents/HomeAddDevice.vue
similarity index 100%
rename from src/pages/home/HomeAddDevice.vue
rename to src/pages/home/compoents/HomeAddDevice.vue
diff --git a/src/pages/home/HomeAddTeamManager.vue b/src/pages/home/compoents/HomeAddTeamManager.vue
similarity index 100%
rename from src/pages/home/HomeAddTeamManager.vue
rename to src/pages/home/compoents/HomeAddTeamManager.vue
diff --git a/src/pages/home/HomeAttendance.vue b/src/pages/home/compoents/HomeAttendance.vue
similarity index 100%
rename from src/pages/home/HomeAttendance.vue
rename to src/pages/home/compoents/HomeAttendance.vue
diff --git a/src/pages/home/HomeBulletin.vue b/src/pages/home/compoents/HomeBulletin.vue
similarity index 100%
rename from src/pages/home/HomeBulletin.vue
rename to src/pages/home/compoents/HomeBulletin.vue
diff --git a/src/pages/home/HomeOpenDoor.vue b/src/pages/home/compoents/HomeOpenDoor.vue
similarity index 100%
rename from src/pages/home/HomeOpenDoor.vue
rename to src/pages/home/compoents/HomeOpenDoor.vue
diff --git a/src/pages/home/HomeSetting.vue b/src/pages/home/compoents/HomeSetting.vue
similarity index 100%
rename from src/pages/home/HomeSetting.vue
rename to src/pages/home/compoents/HomeSetting.vue
diff --git a/src/pages/home/HomeSwiper.vue b/src/pages/home/compoents/HomeSwiper.vue
similarity index 100%
rename from src/pages/home/HomeSwiper.vue
rename to src/pages/home/compoents/HomeSwiper.vue
diff --git a/src/pages/home/HomeTab.vue b/src/pages/home/compoents/HomeTab.vue
similarity index 96%
rename from src/pages/home/HomeTab.vue
rename to src/pages/home/compoents/HomeTab.vue
index f124fe2..00caea8 100644
--- a/src/pages/home/HomeTab.vue
+++ b/src/pages/home/compoents/HomeTab.vue
@@ -50,7 +50,7 @@
 
   const clickMenu = () => {
     uni.navigateTo({
-      url: '/pages/application-list/application-list'
+      url: '/pages/home/application-list'
     })
   }
 
diff --git a/src/pages/home/HomeTeamManager.vue b/src/pages/home/compoents/HomeTeamManager.vue
similarity index 100%
rename from src/pages/home/HomeTeamManager.vue
rename to src/pages/home/compoents/HomeTeamManager.vue
diff --git a/src/pages/home/HomeTodo.vue b/src/pages/home/compoents/HomeTodo.vue
similarity index 100%
rename from src/pages/home/HomeTodo.vue
rename to src/pages/home/compoents/HomeTodo.vue
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index 1ed0009..233a012 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -40,7 +40,7 @@
           <HomeSwiper @colorChange="colorChange"></HomeSwiper>
           <HomeBulletin class="my-2"></HomeBulletin>
           <HomeTodo class="my-2"></HomeTodo>
-          <CustomTab :list="featuresList" @clickItem="clickItem"></CustomTab>
+          <CustomTab :list="featuresList"></CustomTab>
           <HomeOpenDoor class="my-2"></HomeOpenDoor>
           <HomeAttendance class="my-2"></HomeAttendance>
           <HomeTeamManager class="my-2"></HomeTeamManager>
@@ -56,25 +56,26 @@
 </template>
 
 <script lang="ts" setup>
-  import CustomTab from '@/pages/home/HomeTab.vue'
+  import CustomTab from '@/pages/home/compoents/HomeTab.vue'
   import { useBasicStore, useUserStore } from '@/store'
   import { Result } from '@/constants/result'
   import { HomeTab } from '@/typings'
-  import HomeSwiper from '@/pages/home/HomeSwiper.vue'
-  import HomeBulletin from '@/pages/home/HomeBulletin.vue'
-  import HomeTodo from '@/pages/home/HomeTodo.vue'
-  import HomeOpenDoor from '@/pages/home/HomeOpenDoor.vue'
-  import HomeAttendance from '@/pages/home/HomeAttendance.vue'
-  import HomeTeamManager from '@/pages/home/HomeTeamManager.vue'
-  import HomeSetting from '@/pages/home/HomeSetting.vue'
-  import HomeAddDevice from '@/pages/home/HomeAddDevice.vue'
-  import HomeAddTeamManager from '@/pages/home/HomeAddTeamManager.vue'
+  import HomeSwiper from '@/pages/home/compoents/HomeSwiper.vue'
+  import HomeBulletin from '@/pages/home/compoents/HomeBulletin.vue'
+  import HomeTodo from '@/pages/home/compoents/HomeTodo.vue'
+  import HomeOpenDoor from '@/pages/home/compoents/HomeOpenDoor.vue'
+  import HomeAttendance from '@/pages/home/compoents/HomeAttendance.vue'
+  import HomeTeamManager from '@/pages/home/compoents/HomeTeamManager.vue'
+  import HomeSetting from '@/pages/home/compoents/HomeSetting.vue'
+  import HomeAddDevice from '@/pages/home/compoents/HomeAddDevice.vue'
+  import HomeAddTeamManager from '@/pages/home/compoents/HomeAddTeamManager.vue'
   import TeamPopup from '@/components/TeamPopup/TeamPopup.vue'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $user = useUserStore()
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   const color = ref<string>('#bfcbef')
 
@@ -318,11 +319,4 @@
   const colorChange = data => {
     color.value = data
   }
-
-  const clickItem = item => {
-    console.log(item)
-    uni.navigateTo({
-      url: item.url
-    })
-  }
 </script>
diff --git a/src/pages/code/code.vue b/src/pages/login/code.vue
similarity index 97%
rename from src/pages/code/code.vue
rename to src/pages/login/code.vue
index 04ac263..3f72908 100644
--- a/src/pages/code/code.vue
+++ b/src/pages/login/code.vue
@@ -124,7 +124,7 @@
         }
       } else if (type.value === 'reset-password') {
         await uni.redirectTo({
-          url: `/pages/reset-password/reset-password?phone=${phone.value}&code=${code.value}`
+          url: `/pages/login/reset-password?phone=${phone.value}&code=${code.value}`
         })
       }
     }
@@ -159,4 +159,8 @@
     border: #b8b8b8 solid 2rpx;
     border-radius: 12rpx;
   }
+
+  page {
+    background-color: #ffffff;
+  }
 </style>
diff --git a/src/pages/get-code/get-code.vue b/src/pages/login/get-code.vue
similarity index 93%
rename from src/pages/get-code/get-code.vue
rename to src/pages/login/get-code.vue
index 22720bd..574fe38 100644
--- a/src/pages/get-code/get-code.vue
+++ b/src/pages/login/get-code.vue
@@ -63,7 +63,7 @@
       uni.hideLoading()
       if (result.errorCode === Result.Success.code) {
         await uni.navigateTo({
-          url: `/pages/reset-password/reset-password?phone=${phone.value}`
+          url: `/pages/login/reset-password?phone=${phone.value}`
         })
       } else {
         await uni.showToast({
@@ -85,3 +85,9 @@
     phone.value = value
   }
 </script>
+
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index c9cc32b..48f0e18 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -61,7 +61,7 @@
               :disabled="!phonePass"
               :round="false"
               size="large"
-              @click="codeLogin"
+              @click="codeLogin(false, $event)"
             >
               获取验证码
             </wd-button>
@@ -264,7 +264,7 @@
       })
       uni.hideLoading()
       if (result.errorCode === Result.Success.code) {
-        let url = `/pages/code/code?phone=${phone.value}&type=login`
+        let url = `/pages/login/code?phone=${phone.value}&type=login`
         if (tip) {
           url = url + `&tip=true`
         }
@@ -298,7 +298,7 @@
       params = `?phone=${phone.value}`
     }
     uni.navigateTo({
-      url: `/pages/get-code/get-code${params}`
+      url: `/pages/login/get-code${params}`
     })
   }
 
@@ -325,3 +325,9 @@
     consentAgreement.value = !consentAgreement.value
   }
 </script>
+
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/reset-password/reset-password.vue b/src/pages/login/reset-password.vue
similarity index 98%
rename from src/pages/reset-password/reset-password.vue
rename to src/pages/login/reset-password.vue
index c70afde..d89595f 100644
--- a/src/pages/reset-password/reset-password.vue
+++ b/src/pages/login/reset-password.vue
@@ -226,4 +226,8 @@
   }
 </script>
 
-<style scoped lang="scss"></style>
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
index 2b3c360..a845b28 100644
--- a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
+++ b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
@@ -16,11 +16,11 @@
     <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
       {{ item.name }}
     </view>
-    <view class="ml-a" v-if="item.type === 'department'">
+    <view class="ml-a" v-if="item.type !== 'member'">
       <wd-divider vertical></wd-divider>
     </view>
     <view
-      v-if="item.type === 'department'"
+      v-if="item.type !== 'member'"
       :class="[disabled ? 'color-#87a9fb' : 'custom-color-blue']"
       class="ml-1"
     >
@@ -31,7 +31,7 @@
       size="14px"
       class="ml-2"
       :color="disabled ? '#87a9fb' : '#255cf7'"
-      v-if="item.type === 'department'"
+      v-if="item.type !== 'member'"
     ></wd-icon>
   </view>
 </template>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select-member-or-department/select-member-or-department.vue
index f3a80e6..c27d26b 100644
--- a/src/pages/select-member-or-department/select-member-or-department.vue
+++ b/src/pages/select-member-or-department/select-member-or-department.vue
@@ -148,6 +148,7 @@
   import { useBasicStore } from '@/store'
   import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
   import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const instance = getCurrentInstance().proxy
   const eventChannel = instance.getOpenerEventChannel()
@@ -167,7 +168,7 @@
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   const value = ref<Array>([])
   const showSelected = ref<boolean>(false)
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 8e6bfdb..058f3eb 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -4,9 +4,7 @@
 // Generated by vite-plugin-uni-pages
 
 interface NavigateToOptions {
-  url: "/pages/mine/mine" |
-       "/pages/home/home" |
-       "/pages/application-list/application-list" |
+  url: "/pages/home/home" |
        "/pages/approval/approval-detail" |
        "/pages/approval/approval" |
        "/pages/approval/create-application" |
@@ -18,23 +16,19 @@ interface NavigateToOptions {
        "/pages/attendance/flexible-punching" |
        "/pages/attendance/issue-record-detail" |
        "/pages/attendance/issue-record" |
-       "/pages/code/code" |
-       "/pages/get-code/get-code" |
-       "/pages/info-publish/add-release-plan" |
+       "/pages/home/application-list" |
        "/pages/info-publish/announce-notice" |
        "/pages/info-publish/basic-info" |
        "/pages/info-publish/drafts-list" |
-       "/pages/info-publish/edit-pic-video" |
        "/pages/info-publish/info-publish" |
-       "/pages/info-publish/material-library" |
        "/pages/info-publish/notice-details" |
        "/pages/info-publish/notice-manage" |
-       "/pages/info-publish/play-content-library" |
-       "/pages/info-publish/release-plan" |
+       "/pages/login/code" |
+       "/pages/login/get-code" |
        "/pages/login/login" |
+       "/pages/login/reset-password" |
+       "/pages/mine/mine" |
        "/pages/notification/notification" |
-       "/pages/personnel-passage/traffic-correlation" |
-       "/pages/reset-password/reset-password" |
        "/pages/select-member-or-department/select-member-or-department" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |

From 3bfcf05ad964e7e24bcd98e278f56caeae681c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 15:19:30 +0800
Subject: [PATCH 30/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=A8=A1=E5=9D=97=E8=AF=B7=E5=81=87=E3=80=81=E5=87=BA?=
 =?UTF-8?q?=E5=B7=AE=E3=80=81=E5=A4=96=E5=87=BA=E3=80=81=E8=A1=A5=E5=8D=A1?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E7=8F=AD=E5=A5=97=E4=BB=B6=E7=9A=84=E5=B0=81?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  23 +++-
 .../approval/components/DatetimePicker.vue    |  63 +++++++++-
 .../components/DatetimePickerGroup.vue        | 110 ++++++++++++++++++
 src/pages/approval/components/Input.vue       |  13 +++
 src/pages/approval/components/Leave.vue       |  97 +++++++++++++++
 .../components/MemberOrDepartment.vue         |   4 +-
 src/pages/approval/components/Overtime.vue    |  43 +++++++
 .../approval/components/SelectPicker.vue      |  40 ++++++-
 8 files changed, 387 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/approval/components/DatetimePickerGroup.vue
 create mode 100644 src/pages/approval/components/Leave.vue
 create mode 100644 src/pages/approval/components/Overtime.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index d331ce8..001aede 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,5 +1,5 @@
 <template>
-  <view>
+  <view class="pb-3">
     <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
@@ -76,6 +76,22 @@
         type="department"
         :multiple="true"
       ></MemberOrDepartment>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Leave :id="12"></Leave>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePickerGroup :id="13" type="businessTrip" unit="date"></DatetimePickerGroup>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePickerGroup :id="14" type="goOut" unit="dateHalfDay"></DatetimePickerGroup>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Overtime :id="15"></Overtime>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="16"
+        type="datetime"
+        required
+        title="补卡时间"
+        @change="changeDate"
+      ></DatetimePicker>
     </view>
   </view>
 </template>
@@ -88,8 +104,11 @@
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
   import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
+  import Leave from '@/pages/approval/components/Leave.vue'
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+  import Overtime from '@/pages/approval/components/Overtime.vue'
 
-  const columns = ref<Record<number, any>>([
+  const columns = ref<Record<number, string>>([
     {
       value: 0,
       label: '男装'
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
index 95fc9c5..e27f5d8 100644
--- a/src/pages/approval/components/DatetimePicker.vue
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -6,7 +6,9 @@
     </view>
     <view class="py-2" @click="openDialog">
       <view class="flex flex-items-center flex-justify-between">
-        <view>{{ text || placeholder }}</view>
+        <view :class="text ? 'custom-color-black' : 'color-#838589'">
+          {{ text || placeholder }}
+        </view>
         <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
@@ -104,7 +106,31 @@
     },
     placeholder: {
       type: String,
-      default: '请输入'
+      default: '请选择'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    disabledText: {
+      type: String,
+      default: ''
+    },
+    minDate: {
+      type: [Number, null],
+      default: null
+    },
+    maxDate: {
+      type: [Number, null],
+      default: null
+    },
+    minDateText: {
+      type: String,
+      default: ''
+    },
+    maxDateText: {
+      type: String,
+      default: ''
     }
   })
 
@@ -159,6 +185,13 @@
   }
 
   const openDialog = () => {
+    if (props.disabled) {
+      uni.showToast({
+        title: props.disabledText,
+        icon: 'none'
+      })
+      return
+    }
     if (!props.value) {
       if (text.value === '') {
         timestamp.value = new Date().getTime()
@@ -180,6 +213,20 @@
   }
 
   const confirm = () => {
+    if (props.minDate && timestamp.value < props.minDate) {
+      uni.showToast({
+        title: props.minDateText,
+        icon: 'none'
+      })
+      return
+    }
+    if (props.maxDate && timestamp.value > props.maxDate) {
+      uni.showToast({
+        title: props.maxDateText,
+        icon: 'none'
+      })
+      return
+    }
     show.value = false
     returnTimestamp.value = timestamp.value
     if (props.type === 'dateHalfDay') {
@@ -193,4 +240,16 @@
   const afterLeave = () => {
     showPicker.value = false
   }
+
+  const clear = () => {
+    text.value = ''
+    date.value = ''
+    halfDay.value = ''
+    returnTimestamp.value = 0
+    emits('change', { id: props.id, value: returnTimestamp.value, text: text.value })
+  }
+
+  defineExpose({
+    clear
+  })
 </script>
diff --git a/src/pages/approval/components/DatetimePickerGroup.vue b/src/pages/approval/components/DatetimePickerGroup.vue
new file mode 100644
index 0000000..3d3142d
--- /dev/null
+++ b/src/pages/approval/components/DatetimePickerGroup.vue
@@ -0,0 +1,110 @@
+<template>
+  <view>
+    <DatetimePicker
+      :id="1"
+      ref="startDatetimePicker"
+      title="开始时间"
+      @change="changeDate"
+      :max-date="endTimestamp"
+      max-date-text="开始时间不能晚于结束时间"
+      required
+      :disabled="disabled"
+      :disabled-text="disabledText"
+      :type="unit"
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <DatetimePicker
+      :id="2"
+      title="结束时间"
+      ref="endDatetimePicker"
+      :min-date="startTimestamp"
+      min-date-text="结束时间不能早于开始时间"
+      @change="changeDate"
+      required
+      :type="unit"
+      :disabled="disabled"
+      :disabled-text="disabledText"
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input
+      :id="3"
+      ref="inputComponent"
+      type="number"
+      :title="`${textMap[type]}时长${unit === 'datetime' ? '（小时）' : '（天）'}`"
+      required
+      :readonly="updateTime"
+      placeholder="自动计算"
+      @change="inputChange"
+    ></Input>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import Input from '@/pages/approval/components/Input.vue'
+
+  const textMap = {
+    leave: '请假',
+    businessTrip: '出差',
+    goOut: '外出',
+    overtime: '加班'
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    unit: {
+      type: String,
+      default: 'date'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    disabledText: {
+      type: String,
+      default: ''
+    },
+    updateTime: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const startTimestamp = ref(0)
+  const endTimestamp = ref(0)
+
+  const startDatetimePicker = ref(null)
+  const endDatetimePicker = ref(null)
+  const inputComponent = ref(null)
+
+  const changeDate = e => {
+    if (e.id === 1) {
+      startTimestamp.value = e.value
+    } else {
+      endTimestamp.value = e.value
+    }
+  }
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const clear = () => {
+    startDatetimePicker.value.clear()
+    endDatetimePicker.value.clear()
+    inputComponent.value.clear()
+  }
+
+  defineExpose({
+    clear
+  })
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index 96df501..9334107 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -11,6 +11,7 @@
         :placeholder="placeholder"
         :maxlength="type === 'text' ? 30 : 15"
         v-model="text"
+        :readonly="readonly"
         @input="change(id, $event)"
       ></wd-input>
     </view>
@@ -46,6 +47,10 @@
     placeholder: {
       type: String,
       default: '请输入'
+    },
+    readonly: {
+      type: Boolean,
+      default: false
     }
   })
 
@@ -56,6 +61,14 @@
   const change = (id, data) => {
     emits('change', { id, value: data.value })
   }
+
+  const clear = () => {
+    text.value = ''
+  }
+
+  defineExpose({
+    clear
+  })
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/Leave.vue b/src/pages/approval/components/Leave.vue
new file mode 100644
index 0000000..b7bade7
--- /dev/null
+++ b/src/pages/approval/components/Leave.vue
@@ -0,0 +1,97 @@
+<template>
+  <view>
+    <SelectPicker
+      :id="0"
+      title="请假类型"
+      placeholder="请选择"
+      :columns="columns"
+      required
+      @change="changeSelect"
+    ></SelectPicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <DatetimePickerGroup
+      ref="timeGroup"
+      type="leave"
+      :disabled="!leaveType"
+      :updateTime="updateTime"
+      :unit="leaveType?.unit ?? 'date'"
+      disabled-text="请选择请假类型"
+      :id="1"
+    ></DatetimePickerGroup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+
+  const leaveType = ref(null)
+  const timeGroup = ref(null)
+
+  const columns = ref<Record<number, string>>([
+    {
+      value: 0,
+      label: '年假',
+      unit: 'date'
+    },
+    {
+      value: 1,
+      label: '事假',
+      unit: 'dateHalfDay'
+    },
+    {
+      value: 2,
+      label: '病假',
+      unit: 'datetime'
+    },
+    {
+      value: 3,
+      label: '婚假',
+      unit: 'date',
+      limit: 5
+    },
+    {
+      value: 4,
+      label: '产假',
+      unit: 'datetime',
+      limit: 24.5
+    },
+    {
+      value: 5,
+      label: '陪产假',
+      unit: 'datetime'
+    },
+    {
+      value: 6,
+      label: '丧假',
+      unit: 'date'
+    },
+    {
+      value: 7,
+      label: '哺乳假',
+      unit: 'date'
+    }
+  ])
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    updateTime: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const changeSelect = e => {
+    leaveType.value = e.value
+    timeGroup.value.clear()
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
index 5339c4c..e582118 100644
--- a/src/pages/approval/components/MemberOrDepartment.vue
+++ b/src/pages/approval/components/MemberOrDepartment.vue
@@ -6,7 +6,9 @@
     </view>
     <view class="py-2" @click="toSelect">
       <view class="flex flex-items-center flex-justify-between">
-        <view>{{ text || placeholder }}</view>
+        <view :class="text ? 'custom-color-black' : 'color-#838589'">
+          {{ text || placeholder }}
+        </view>
         <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
diff --git a/src/pages/approval/components/Overtime.vue b/src/pages/approval/components/Overtime.vue
new file mode 100644
index 0000000..683a52c
--- /dev/null
+++ b/src/pages/approval/components/Overtime.vue
@@ -0,0 +1,43 @@
+<template>
+  <view>
+    <DatetimePicker
+      :id="0"
+      ref="startDatetimePicker"
+      title="加班日期"
+      @change="changeDate"
+      required
+    ></DatetimePicker>
+    <wd-divider v-if="timestamp" color="#bcbfbe"></wd-divider>
+    <DatetimePickerGroup
+      v-if="timestamp"
+      type="overtime"
+      unit="datetime"
+      :id="1"
+    ></DatetimePickerGroup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+
+  const timestamp = ref<number>(0)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    }
+  })
+
+  const changeDate = e => {
+    timestamp.value = e.value
+    console.log('changeDate', e)
+  }
+</script>
+
+<style scoped lang="scss">
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
index 4ce41f7..99708b3 100644
--- a/src/pages/approval/components/SelectPicker.vue
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -12,7 +12,9 @@
         v-model="picker"
         :columns="columns"
         size="large"
-      />
+        @change="change"
+        select-size="large"
+      ></wd-select-picker>
     </view>
   </view>
 </template>
@@ -51,11 +53,17 @@
     }
   })
 
+  const emits = defineEmits(['change'])
+
   onMounted(() => {
     if (props.value) {
       picker.value = props.value
     }
   })
+
+  const change = ({ value }) => {
+    emits('change', { id: props.id, value: props.columns.find(item => item.value === value) })
+  }
 </script>
 
 <style scoped lang="scss">
@@ -63,4 +71,34 @@
     padding: var(--wot-cell-wrapper-padding, 10px) 0;
     background-color: transparent;
   }
+
+  :deep(.wd-radio-group),
+  :deep(.wd-checkbox-group) {
+    background-color: #ffffff;
+    border-radius: 0.5rem;
+  }
+
+  :deep(.wd-action-sheet) {
+    background-color: #f3f5fa;
+  }
+
+  :deep(.uni-scroll-view-content) {
+    padding-bottom: 0.5rem;
+  }
+
+  :deep(.wd-radio),
+  :deep(.wd-checkbox) {
+    position: relative;
+    padding: 1rem !important;
+  }
+
+  :deep(.wd-radio)::after,
+  :deep(.wd-checkbox)::after {
+    position: absolute;
+    bottom: 0;
+    left: 4%;
+    width: 92%;
+    content: '';
+    border-bottom: 1px solid #efefef;
+  }
 </style>

From dc3d862e62f8c7862fd412f80199f65a11db5671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 18:38:45 +0800
Subject: [PATCH 31/37] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E8=A1=8C=E5=86=85?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F+=E6=B7=BB=E5=8A=A0=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E9=94=AE=E7=9B=98=E7=BB=84=E4=BB=B6+=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=82=80=E7=BA=A6=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  6 +-
 src/pages/approval/components/Components.vue  | 10 +-
 .../approval/components/DatetimePicker.vue    | 36 +++++--
 src/pages/approval/components/Input.vue       | 53 ++++++++---
 src/pages/approval/components/Keyboard.vue    | 94 +++++++++++++++++++
 .../components/MemberOrDepartment.vue         | 67 -------------
 .../approval/components/NavigatorSelector.vue | 89 ++++++++++++++++++
 .../approval/components/SelectPicker.vue      | 52 +++++++---
 src/pages/approval/components/Visitor.vue     | 86 +++++++++++++++++
 .../components/OrganizationItem.vue}          |  0
 .../components/SearchItem.vue                 |  0
 src/pages/select/select-access-control.vue    |  7 ++
 .../select-organization.vue}                  | 10 +-
 src/types/uni-pages.d.ts                      |  3 +-
 14 files changed, 399 insertions(+), 114 deletions(-)
 create mode 100644 src/pages/approval/components/Keyboard.vue
 delete mode 100644 src/pages/approval/components/MemberOrDepartment.vue
 create mode 100644 src/pages/approval/components/NavigatorSelector.vue
 create mode 100644 src/pages/approval/components/Visitor.vue
 rename src/pages/{select-member-or-department/components/MemberOrDepartmentItem.vue => select/components/OrganizationItem.vue} (100%)
 rename src/pages/{select-member-or-department => select}/components/SearchItem.vue (100%)
 create mode 100644 src/pages/select/select-access-control.vue
 rename src/pages/{select-member-or-department/select-member-or-department.vue => select/select-organization.vue} (96%)

diff --git a/src/pages.json b/src/pages.json
index de9a36a..b675786 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -240,7 +240,11 @@
       "type": "page"
     },
     {
-      "path": "pages/select-member-or-department/select-member-or-department",
+      "path": "pages/select/select-access-control",
+      "type": "page"
+    },
+    {
+      "path": "pages/select/select-organization",
       "type": "page",
       "style": {
         "navigationStyle": "custom",
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 001aede..167026c 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,5 +1,6 @@
 <template>
   <view class="pb-3">
+    <Visitor></Visitor>
     <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
@@ -68,14 +69,14 @@
         title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
       ></Description>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <MemberOrDepartment :id="10" title="成员" type="member" :multiple="true"></MemberOrDepartment>
+      <NavigatorSelector :id="10" title="成员" type="member" :multiple="true"></NavigatorSelector>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <MemberOrDepartment
+      <NavigatorSelector
         :id="11"
         title="部门"
         type="department"
         :multiple="true"
-      ></MemberOrDepartment>
+      ></NavigatorSelector>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Leave :id="12"></Leave>
       <wd-divider color="#bcbfbe"></wd-divider>
@@ -103,10 +104,11 @@
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
-  import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
+  import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
   import Leave from '@/pages/approval/components/Leave.vue'
   import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
   import Overtime from '@/pages/approval/components/Overtime.vue'
+  import Visitor from '@/pages/approval/components/Visitor.vue'
 
   const columns = ref<Record<number, string>>([
     {
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
index e27f5d8..338eed4 100644
--- a/src/pages/approval/components/DatetimePicker.vue
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -1,15 +1,29 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
-    </view>
-    <view class="py-2" @click="openDialog">
-      <view class="flex flex-items-center flex-justify-between">
-        <view :class="text ? 'custom-color-black' : 'color-#838589'">
-          {{ text || placeholder }}
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pt-2 pb-1">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view @click="openDialog" class="flex-1 flex flex-items-center">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']" class="ml-a mr-2">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="openDialog">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
         </view>
-        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
   </view>
@@ -131,6 +145,10 @@
     maxDateText: {
       type: String,
       default: ''
+    },
+    inline: {
+      type: Boolean,
+      default: false
     }
   })
 
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index 9334107..d24115a 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -1,19 +1,38 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <wd-input
+          class="flex-1 ml-2"
+          :type="type"
+          custom-class="!bg-transparent"
+          :custom-input-class="inline ? 'text-right' : 'text-left'"
+          :placeholder="placeholder"
+          :maxlength="maxlength ?? (type === 'text' ? 30 : 15)"
+          v-model="text"
+          :readonly="readonly"
+          @input="change(id, $event)"
+        ></wd-input>
+      </view>
     </view>
-    <view class="pt-2">
-      <wd-input
-        :type="type"
-        custom-class="!bg-transparent"
-        :placeholder="placeholder"
-        :maxlength="type === 'text' ? 30 : 15"
-        v-model="text"
-        :readonly="readonly"
-        @input="change(id, $event)"
-      ></wd-input>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="pt-2">
+        <wd-input
+          :type="type"
+          custom-class="!bg-transparent"
+          :placeholder="placeholder"
+          :maxlength="maxlength ?? (type === 'text' ? 30 : 15)"
+          v-model="text"
+          :readonly="readonly"
+          @input="change(id, $event)"
+        ></wd-input>
+      </view>
     </view>
   </view>
 </template>
@@ -51,6 +70,14 @@
     readonly: {
       type: Boolean,
       default: false
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    },
+    maxlength: {
+      type: [Number, null],
+      default: null
     }
   })
 
diff --git a/src/pages/approval/components/Keyboard.vue b/src/pages/approval/components/Keyboard.vue
new file mode 100644
index 0000000..7713ec5
--- /dev/null
+++ b/src/pages/approval/components/Keyboard.vue
@@ -0,0 +1,94 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative py-1.5">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view
+          class="flex-1 ml-a text-right"
+          @click="toSelect"
+          :class="[text ? 'custom-color-black' : 'color-#bfbfbf']"
+        >
+          {{ text || placeholder }}
+        </view>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <wd-keyboard
+      :mode="type"
+      title="键盘"
+      :hide-on-click-outside="true"
+      v-model:visible="visible"
+      @input="onInput"
+      closeText="确认"
+      @delete="onDelete"
+    />
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string>('')
+  const visible = ref<boolean>(false)
+
+  const onInput = value => {
+    if (props.maxlength && text.value.length >= props.maxlength) return
+    text.value += value
+  }
+  const onDelete = () => {
+    text.value = text.value.slice(0, -1)
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    },
+    maxlength: {
+      type: [Number, null],
+      default: null
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toSelect = () => {
+    visible.value = true
+  }
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
deleted file mode 100644
index e582118..0000000
--- a/src/pages/approval/components/MemberOrDepartment.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
-    </view>
-    <view class="py-2" @click="toSelect">
-      <view class="flex flex-items-center flex-justify-between">
-        <view :class="text ? 'custom-color-black' : 'color-#838589'">
-          {{ text || placeholder }}
-        </view>
-        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup lang="ts">
-  const text = ref<string | null>(null)
-
-  const props = defineProps({
-    id: {
-      type: Number,
-      required: true
-    },
-    type: {
-      type: String,
-      required: true
-    },
-    multiple: {
-      type: Boolean,
-      default: false
-    },
-    required: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      required: true
-    },
-    value: {
-      type: [Number, null],
-      default: null
-    },
-    placeholder: {
-      type: String,
-      default: '请输入'
-    }
-  })
-
-  const toSelect = () => {
-    const params = {
-      type: props.type,
-      multiple: props.multiple,
-      title: props.type === 'member' ? '选择审批用户' : '选择部门'
-    }
-    uni.navigateTo({
-      url: `/pages/select-member-or-department/select-member-or-department?params=${JSON.stringify(params)}`,
-      events: {
-        change: res => {
-          console.log(1111, res)
-        }
-      }
-    })
-  }
-</script>
diff --git a/src/pages/approval/components/NavigatorSelector.vue b/src/pages/approval/components/NavigatorSelector.vue
new file mode 100644
index 0000000..018918c
--- /dev/null
+++ b/src/pages/approval/components/NavigatorSelector.vue
@@ -0,0 +1,89 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pb-1.5">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+          {{ text || placeholder }}
+        </view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string | null>(null)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toSelect = () => {
+    if (props.type === 'accessControl') {
+      uni.navigateTo({
+        url: `/pages/select/select-access-control`
+      })
+    } else {
+      const params = {
+        type: props.type,
+        multiple: props.multiple,
+        title: props.type === 'member' ? '选择审批用户' : '选择部门'
+      }
+      uni.navigateTo({
+        url: `/pages/select/select-organization?params=${JSON.stringify(params)}`,
+        events: {
+          change: res => {
+            console.log(1111, res)
+          }
+        }
+      })
+    }
+  }
+</script>
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
index 99708b3..65aad0e 100644
--- a/src/pages/approval/components/SelectPicker.vue
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -1,20 +1,40 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <wd-select-picker
+          class="flex-1"
+          align-right
+          :type="type"
+          :title="placeholder"
+          :show-confirm="type === 'checkbox'"
+          v-model="picker"
+          :columns="columns"
+          size="large"
+          @change="change"
+          select-size="large"
+        ></wd-select-picker>
+      </view>
     </view>
-    <view class="pt-2">
-      <wd-select-picker
-        :type="type"
-        :title="placeholder"
-        :show-confirm="type === 'checkbox'"
-        v-model="picker"
-        :columns="columns"
-        size="large"
-        @change="change"
-        select-size="large"
-      ></wd-select-picker>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="pt-2">
+        <wd-select-picker
+          :type="type"
+          :title="placeholder"
+          :show-confirm="type === 'checkbox'"
+          v-model="picker"
+          :columns="columns"
+          size="large"
+          @change="change"
+          select-size="large"
+        ></wd-select-picker>
+      </view>
     </view>
   </view>
 </template>
@@ -50,6 +70,10 @@
     columns: {
       type: Array,
       required: true
+    },
+    inline: {
+      type: Boolean,
+      default: false
     }
   })
 
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
new file mode 100644
index 0000000..e3d6dd3
--- /dev/null
+++ b/src/pages/approval/components/Visitor.vue
@@ -0,0 +1,86 @@
+<template>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <Input :id="0" title="访客姓名" :required="true" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input
+      :id="1"
+      title="访客手机"
+      :required="true"
+      :maxlength="11"
+      @change="inputChange"
+      inline
+      type="number"
+    ></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <SelectPicker required :id="2" title="访客类型" :columns="columns" inline></SelectPicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <NavigatorSelector :id="3" title="通行门禁点" type="accessControl" inline></NavigatorSelector>
+  </view>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <Keyboard :id="4" title="车牌号码" type="car" :maxlength="8" inline></Keyboard>
+  </view>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <DatetimePicker
+      :id="5"
+      ref="startDatetimePicker"
+      title="预约到访时间"
+      @change="changeDate"
+      type="datetime"
+      inline
+      required
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="7" title="同行人数" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="8" title="访问单位" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="9" title="到访事由说明" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="10" title="访问地址" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Description :id="11" title="表单通过后，访客将收到断音邀请通知"></Description>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Input from '@/pages/approval/components/Input.vue'
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import Description from '@/pages/approval/components/Description.vue'
+  import Keyboard from '@/pages/approval/components/Keyboard.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
+
+  const columns = ref<Record<number, string>>([
+    {
+      value: 0,
+      label: '外卖快递'
+    },
+    {
+      value: 1,
+      label: '会议洽谈'
+    },
+    {
+      value: 2,
+      label: '探亲访友'
+    },
+    {
+      value: 3,
+      label: '业务沟通'
+    }
+  ])
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const changeDate = e => {
+    // timestamp.value = e.value
+    console.log('changeDate', e)
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select/components/OrganizationItem.vue
similarity index 100%
rename from src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
rename to src/pages/select/components/OrganizationItem.vue
diff --git a/src/pages/select-member-or-department/components/SearchItem.vue b/src/pages/select/components/SearchItem.vue
similarity index 100%
rename from src/pages/select-member-or-department/components/SearchItem.vue
rename to src/pages/select/components/SearchItem.vue
diff --git a/src/pages/select/select-access-control.vue b/src/pages/select/select-access-control.vue
new file mode 100644
index 0000000..126a836
--- /dev/null
+++ b/src/pages/select/select-access-control.vue
@@ -0,0 +1,7 @@
+<template>
+  <view></view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select/select-organization.vue
similarity index 96%
rename from src/pages/select-member-or-department/select-member-or-department.vue
rename to src/pages/select/select-organization.vue
index c27d26b..779490c 100644
--- a/src/pages/select-member-or-department/select-member-or-department.vue
+++ b/src/pages/select/select-organization.vue
@@ -61,7 +61,7 @@
           @click="toOrganization(index)"
         >
           <span
-            :class="[index === organizationList.length - 1 ? 'color-#838589' : 'custom-color-blue']"
+            :class="[index === organizationList.length - 1 ? 'color-#bfbfbf' : 'custom-color-blue']"
           >
             {{ department.name }}
           </span>
@@ -88,12 +88,12 @@
               ></wd-icon>
               <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
             </view>
-            <MemberOrDepartmentItem
+            <OrganizationItem
               class="flex-1"
               :item="item"
               :disabled="item.type === 'department' && value.includes(item)"
               @click="toClick(item)"
-            ></MemberOrDepartmentItem>
+            ></OrganizationItem>
           </view>
         </view>
         <view class="py-5 px-15">
@@ -146,8 +146,8 @@
 
 <script setup lang="ts">
   import { useBasicStore } from '@/store'
-  import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
-  import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+  import OrganizationItem from '@/pages/select/components/OrganizationItem.vue'
+  import SearchItem from '@/pages/select/components/SearchItem.vue'
   import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const instance = getCurrentInstance().proxy
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 058f3eb..cc65bba 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -29,7 +29,8 @@ interface NavigateToOptions {
        "/pages/login/reset-password" |
        "/pages/mine/mine" |
        "/pages/notification/notification" |
-       "/pages/select-member-or-department/select-member-or-department" |
+       "/pages/select/select-access-control" |
+       "/pages/select/select-organization" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |
        "/pages/attendance/attendance-add-group/attendance-device" |

From 14474c3d6785a4650cd7a4f4270a0dc52981dc34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 11:59:26 +0800
Subject: [PATCH 32/37] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=AE=BF=E5=AE=A2=E9=A2=84=E7=BA=A6=E5=A5=97=E4=BB=B6?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85+=E9=80=89=E6=8B=A9=E9=97=A8=E7=A6=81?=
 =?UTF-8?q?=E7=82=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |   6 +-
 .../approval/components/NavigatorSelector.vue |   9 +-
 .../approval/components/VisitDuration.vue     | 194 ++++++++++++++++++
 src/pages/approval/components/Visitor.vue     |   3 +
 src/pages/select/select-access-control.vue    |  99 ++++++++-
 5 files changed, 305 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/approval/components/VisitDuration.vue

diff --git a/src/pages.json b/src/pages.json
index b675786..e648387 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -241,7 +241,11 @@
     },
     {
       "path": "pages/select/select-access-control",
-      "type": "page"
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
     },
     {
       "path": "pages/select/select-organization",
diff --git a/src/pages/approval/components/NavigatorSelector.vue b/src/pages/approval/components/NavigatorSelector.vue
index 018918c..fe88998 100644
--- a/src/pages/approval/components/NavigatorSelector.vue
+++ b/src/pages/approval/components/NavigatorSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="px-2 text-3.5">
     <view v-if="inline">
-      <view class="flex flex-items-center pos-relative pb-1.5">
+      <view class="flex flex-items-center pos-relative pb-1.5" @click="toSelect">
         <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
         <view>{{ title }}</view>
         <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
@@ -68,7 +68,12 @@
   const toSelect = () => {
     if (props.type === 'accessControl') {
       uni.navigateTo({
-        url: `/pages/select/select-access-control`
+        url: `/pages/select/select-access-control`,
+        events: {
+          change: res => {
+            console.log(1111, res)
+          }
+        }
       })
     } else {
       const params = {
diff --git a/src/pages/approval/components/VisitDuration.vue b/src/pages/approval/components/VisitDuration.vue
new file mode 100644
index 0000000..87d89b8
--- /dev/null
+++ b/src/pages/approval/components/VisitDuration.vue
@@ -0,0 +1,194 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pb-1.5" @click="toSelect">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+          {{ text || placeholder }}
+        </view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <wd-popup v-model="show" position="bottom" custom-style="border-radius:12rpx;">
+      <view v-if="showDuration">
+        <view
+          class="px-4 py-2 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center"
+        >
+          <view @click="show = false">取消</view>
+          <view class="font-bold text-4 flex-1 text-center">访问时长</view>
+          <view class="flex flex-items-center" @click="changeSelect">
+            <view class="custom-color-blue">自定义时间</view>
+            <wd-icon name="arrow-right" size="14px" class="ml-1" color="#255cf7"></wd-icon>
+          </view>
+        </view>
+        <scroll-view class="h-60 text-3.5" :scroll-y="true">
+          <view
+            v-for="item in durationList"
+            :key="item.value"
+            @click="changeDuration(item)"
+            class="py-4 px-4 flex flex-items-center"
+          >
+            <view>{{ item.label }}</view>
+            <view
+              class="bg-#f3f5fa ml-a w-12 h-6 rounded-5 flex flex-items-center flex-justify-center"
+            >
+              <wd-icon
+                v-if="duration === item.label"
+                name="check"
+                size="15px"
+                class="ml-1"
+                color="#255cf7"
+              ></wd-icon>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <view v-else>
+        <view
+          class="px-4 py-2 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center"
+        >
+          <view class="flex flex-items-center" @click="showDuration = true">
+            <wd-icon name="arrow-left" size="14px" class="ml-1" color="#0d0f10"></wd-icon>
+            <view class="custom-color-black">返回</view>
+          </view>
+          <view class="font-bold text-4 flex-1 text-center">时间选择器</view>
+          <wd-icon
+            name="close"
+            size="14px"
+            class="ml-1"
+            color="#0d0f10"
+            @click="show = false"
+          ></wd-icon>
+        </view>
+        <wd-datetime-picker-view
+          :formatter="formatter"
+          type="datetime"
+          v-model="timestamp"
+          @change="change"
+        />
+      </view>
+      <view
+        @click="confirm"
+        class="py-2.5 rounded custom-bg-blue w-90% mx-5% font-bold text-center color-white text-3.5 my-2"
+      >
+        完成
+      </view>
+    </wd-popup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import dayjs from 'dayjs'
+
+  const text = ref<string | null>(null)
+  const show = ref<boolean>(false)
+  const timestamp = ref<number>(0)
+  const duration = ref<string>('')
+
+  const showDuration = ref<boolean>(true)
+
+  const formatter = (type, value) => {
+    switch (type) {
+      case 'year':
+        return value + '年'
+      case 'month':
+        return value + '月'
+      case 'date':
+        return value + '日'
+      case 'hour':
+        return value + '时'
+      case 'minute':
+        return value + '分'
+      default:
+        return value
+    }
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [String, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const durationList = [
+    { label: '30分钟', value: 1800000 },
+    { label: '1小时', value: 3600000 },
+    { label: '2小时', value: 7200000 },
+    { label: '3小时', value: 10800000 },
+    { label: '5小时', value: 18000000 },
+    { label: '8小时', value: 28800000 },
+    { label: '12小时', value: 43200000 },
+    { label: '24小时', value: 86400000 }
+  ]
+
+  onMounted(() => {
+    if (props.value) {
+      text.value = props.value
+      duration.value = props.value
+    }
+  })
+
+  const changeSelect = () => {
+    timestamp.value = new Date().getTime()
+    showDuration.value = false
+  }
+
+  const toSelect = () => {
+    show.value = true
+  }
+
+  const change = value => {
+    timestamp.value = value.value
+    duration.value = ''
+  }
+
+  const changeDuration = item => {
+    duration.value = item.label
+    timestamp.value = 0
+  }
+
+  const confirm = () => {
+    if (timestamp.value === 0) {
+      text.value = duration.value
+    } else {
+      text.value = dayjs(timestamp.value).format('YYYY-M-D HH:mm')
+    }
+    show.value = false
+  }
+</script>
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
index e3d6dd3..e9fa668 100644
--- a/src/pages/approval/components/Visitor.vue
+++ b/src/pages/approval/components/Visitor.vue
@@ -30,6 +30,8 @@
       required
     ></DatetimePicker>
     <wd-divider color="#bcbfbe"></wd-divider>
+    <VisitDuration :id="6" title="访问时长" required value="2小时" inline></VisitDuration>
+    <wd-divider color="#bcbfbe"></wd-divider>
     <Input :id="7" title="同行人数" @change="inputChange" inline></Input>
     <wd-divider color="#bcbfbe"></wd-divider>
     <Input :id="8" title="访问单位" @change="inputChange" inline></Input>
@@ -49,6 +51,7 @@
   import Keyboard from '@/pages/approval/components/Keyboard.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
+  import VisitDuration from '@/pages/approval/components/VisitDuration.vue'
 
   const columns = ref<Record<number, string>>([
     {
diff --git a/src/pages/select/select-access-control.vue b/src/pages/select/select-access-control.vue
index 126a836..57dfd24 100644
--- a/src/pages/select/select-access-control.vue
+++ b/src/pages/select/select-access-control.vue
@@ -1,7 +1,100 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
 <template>
-  <view></view>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation class="bg-white" title="选择门禁点"></TopNavigation>
+    <scroll-view class="flex-1 box-border text-3.5 custom-color-black border-1" :scroll-y="true">
+      <wd-checkbox-group v-model="value" size="large" @change="change">
+        <view class="px-4 py-1.5 bg-white mb-2">
+          <wd-checkbox :modelValue="item.id" v-for="item in permissionList" :key="item.id">
+            <view class="flex flex-items-center">
+              <view
+                class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2"
+              >
+                <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+              </view>
+              <view class="ml-2">{{ item.name }}</view>
+            </view>
+          </wd-checkbox>
+        </view>
+        <view
+          v-for="(item, index) in list"
+          :key="item.id"
+          class="bg-white border-#eef0f5 border-b-solid"
+          :class="[index === list.length - 1 ? 'border-b-0' : 'border-b-1']"
+        >
+          <wd-checkbox :modelValue="item.id" class="py-1.5 px-4">
+            <view class="flex flex-items-center">
+              <image
+                src="https://file.hikmall.com/prod/image/69c3851d052e493ebb6e7c2e7a189b61.png"
+                class="w-10 h-10"
+              ></image>
+              <view class="ml-2">{{ item.name }}</view>
+            </view>
+          </wd-checkbox>
+        </view>
+      </wd-checkbox-group>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid border-1 flex flex-items-center">
+      <view
+        @click="confirm"
+        class="opacity-60% w-90% py-2 mx-5% text-center custom-bg-blue color-white rounded-2 my-3"
+      >
+        确定
+      </view>
+    </view>
+  </view>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+  const instance = getCurrentInstance().proxy
+  const eventChannel = instance.getOpenerEventChannel()
 
-<style scoped lang="scss"></style>
+  const value = ref<number[]>([])
+  const selected = ref<Array>([])
+
+  const permissionList = [
+    {
+      name: '[访客类型]权限组',
+      id: 0
+    }
+  ]
+
+  const list = [
+    {
+      name: 'DS-K(FU6004429)',
+      id: 1
+    },
+    {
+      name: 'DS-K(L40959329)',
+      id: 2
+    }
+  ]
+
+  const change = value => {
+    selected.value = []
+    selected.value.push(...permissionList.filter(item => value.value.includes(item.id)))
+    selected.value.push(...list.filter(item => value.value.includes(item.id)))
+  }
+
+  const confirm = () => {
+    eventChannel.emit('change', { value: selected.value })
+    uni.navigateBack()
+  }
+</script>
+
+<style scoped lang="scss">
+  .wd-checkbox-group {
+    background-color: transparent;
+  }
+
+  .wd-checkbox {
+    margin-bottom: 0;
+  }
+</style>

From 5a602a6f4d5e4b7bf24de22fc05f306bfa109768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 13:46:39 +0800
Subject: [PATCH 33/37] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=92=8C=E6=88=90=E5=91=98=E9=80=89=E6=8B=A9=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/select/components/SearchItem.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pages/select/components/SearchItem.vue b/src/pages/select/components/SearchItem.vue
index 9a13733..eb3ce14 100644
--- a/src/pages/select/components/SearchItem.vue
+++ b/src/pages/select/components/SearchItem.vue
@@ -13,8 +13,15 @@
     <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
       <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
     </view>
-    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
-      {{ item.name }}
+    <view class="ml-2">
+      <view class="break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+        {{ item.name }}
+      </view>
+      <view
+        class="color-#838589 text-3 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1"
+      >
+        xxx的互联/test
+      </view>
     </view>
   </view>
 </template>

From fa7c4de6956db4b6e1b9ec80f7b1c3832d26de92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 14:52:30 +0800
Subject: [PATCH 34/37] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=B5=81=E7=A8=8B=E5=88=9B=E5=BB=BAUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approval/components/ApprovalCreate.vue    | 101 ++++++++++++++++++
 .../components/{Components.vue => Form.vue}   |   4 +-
 src/pages/approval/components/Visitor.vue     |   6 +-
 src/pages/approval/create-application.vue     |   6 +-
 src/static/images/icon_airplane.png           | Bin 0 -> 1949 bytes
 src/static/images/icon_approval.png           | Bin 0 -> 1627 bytes
 6 files changed, 110 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/approval/components/ApprovalCreate.vue
 rename src/pages/approval/components/{Components.vue => Form.vue} (98%)
 create mode 100644 src/static/images/icon_airplane.png
 create mode 100644 src/static/images/icon_approval.png

diff --git a/src/pages/approval/components/ApprovalCreate.vue b/src/pages/approval/components/ApprovalCreate.vue
new file mode 100644
index 0000000..ab6071f
--- /dev/null
+++ b/src/pages/approval/components/ApprovalCreate.vue
@@ -0,0 +1,101 @@
+<template>
+  <view class="bg-white rounded-2 py-3 px-4 mx-4 my-2 shadow-sm">
+    <view class="text-4">审批流程</view>
+    <view v-if="false" class="text-3 color-#838589 mt-2">必填信息填写完整后，将显示审批流程</view>
+    <view v-else class="mt-4 color-#838589">
+      <wd-steps :active="3" vertical>
+        <wd-step>
+          <template v-slot:icon>
+            <view
+              class="custom-bg-blue w-5 h-5 rounded-50% flex flex-items-center flex-justify-center"
+            >
+              <view class="w-2.5 h-2.5 bg-white rounded-50%"></view>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>发起人</view>
+              </view>
+              <view class="my-2">
+                <view>
+                  <image
+                    src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                    class="h-10 w-10 rounded-2"
+                    mode="aspectFill"
+                  ></image>
+                  <view class="mx-2">xxx</view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+        <wd-step>
+          <template v-slot:icon>
+            <view class="bg-#f0801e w-5 h-5 rounded-50% flex flex-items-center flex-justify-center">
+              <image src="/static/images/icon_approval.png" class="w-3 h-3"></image>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>审批节点</view>
+              </view>
+              <view class="pt-2 color-#7e807f text-3">1人通过即可</view>
+              <view class="my-2 flex flex-wrap">
+                <view v-for="item in 8" :key="item" class="mb-2 w-fit mr-2">
+                  <view>
+                    <image
+                      src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                      class="h-10 w-10 rounded-2"
+                      mode="aspectFill"
+                    ></image>
+                    <view class="mx-2">xxx</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+        <wd-step>
+          <template v-slot:icon>
+            <view class="bg-#2ab6c7 w-5 h-5 rounded-50% flex flex-items-center flex-justify-center">
+              <image src="/static/images/icon_airplane.png" class="w-3 h-3"></image>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>抄送节点</view>
+              </view>
+              <view class="my-2 flex flex-wrap">
+                <view v-for="item in 3" :key="item" class="mb-2 w-fit mr-2">
+                  <view>
+                    <image
+                      src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                      class="h-10 w-10 rounded-2"
+                      mode="aspectFill"
+                    ></image>
+                    <view class="mx-2">xxx</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+      </wd-steps>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+  :deep(.wd-step__header) {
+    width: 1.25rem;
+  }
+
+  :deep(.wd-step__line) {
+    background: #255cf7;
+  }
+</style>
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Form.vue
similarity index 98%
rename from src/pages/approval/components/Components.vue
rename to src/pages/approval/components/Form.vue
index 167026c..3538184 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Form.vue
@@ -1,7 +1,7 @@
 <template>
-  <view class="pb-3">
+  <view class="pb-3 mb-2">
     <Visitor></Visitor>
-    <view class="bg-white mx-4 p-2 rounded-2">
+    <view class="bg-white mx-4 p-2 rounded-2 shadow-sm">
       <Input
         :id="0"
         value="单行"
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
index e9fa668..1f8ac23 100644
--- a/src/pages/approval/components/Visitor.vue
+++ b/src/pages/approval/components/Visitor.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <Input :id="0" title="访客姓名" :required="true" @change="inputChange" inline></Input>
     <wd-divider color="#bcbfbe"></wd-divider>
     <Input
@@ -16,10 +16,10 @@
     <wd-divider color="#bcbfbe"></wd-divider>
     <NavigatorSelector :id="3" title="通行门禁点" type="accessControl" inline></NavigatorSelector>
   </view>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <Keyboard :id="4" title="车牌号码" type="car" :maxlength="8" inline></Keyboard>
   </view>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <DatetimePicker
       :id="5"
       ref="startDatetimePicker"
diff --git a/src/pages/approval/create-application.vue b/src/pages/approval/create-application.vue
index c7fd5a4..fcb0d49 100644
--- a/src/pages/approval/create-application.vue
+++ b/src/pages/approval/create-application.vue
@@ -10,7 +10,8 @@
   <view class="h-100vh flex flex-col">
     <TopNavigation :title="title"></TopNavigation>
     <scroll-view class="flex-1 box-border" :scroll-y="true">
-      <Components></Components>
+      <ApprovalCreate></ApprovalCreate>
+      <Form></Form>
     </scroll-view>
     <view class="pb-safe border-#eef0f5 border-t-solid">
       <view class="flex flex-items-center flex-justify-around py-3 px-3">
@@ -24,7 +25,8 @@
 </template>
 
 <script setup lang="ts">
-  import Components from '@/pages/approval/components/Components.vue'
+  import Form from '@/pages/approval/components/Form.vue'
+  import ApprovalCreate from '@/pages/approval/components/ApprovalCreate.vue'
 
   const title = ref<string>('')
   const id = ref<number>(null)
diff --git a/src/static/images/icon_airplane.png b/src/static/images/icon_airplane.png
new file mode 100644
index 0000000000000000000000000000000000000000..090beac47d176e327d249d6fb5fdde268554264b
GIT binary patch
literal 1949
zcmV;O2V(e%P)<h;3K|Lk000e1NJLTq005Ez004jp1^@s6;AJo#00001b5ch_0Itp)
z=>Px+S4l)cRCr$Po$Z>OAPj}|%G$lM?OxfoS7rwvo%IVyfItFgezhI7a(GEj0G)Zl
z2MS~;uq?~(X_`LgjBDW3ffd*Rnx@HtGy$Z6VMuBE6`<`JUjQjZ%>mEx0JJLskOpLe
z)#M03>$PV0VO<pm52FADpj`}rGz=E>hH?OU`=fdOgNQ`exa%Vm0Q&Jq0I6#>NR7(?
z=<SbC{*$Ec^PpUSHdX%4^ZWsj`eY>7s%2UJOw;shpGeG<;OkYdx$9v<GE+!1r*8m#
z7QSJCR9H~8mlFc$<c|=M)OLUVjY$G@^+y0HzrR#np^$;5w&|VL01{O)<;PV9XjkK7
zp69>&Uoau59FoxOH3I17j}VcJLevtVCw~NxjDe&8pk1+(KLSWbKvD$Iqdx*j%0W^H
z(4#*BNJ>G{3eYCkEv*40WgsaB$m@>)k`j=N0Oa*Y0I4xZ#sKpABY@NhB#Qur{1HH^
z3{r)KROuEy8f}0iE&F!;4gd<KHGm`xQZE4QGKC&r!=i0rm<;=$m=fN!hKLlCj`4lR
z00rld-qDJo6%Kt+U;u!k{s<8%V`z*5&?eFQu_K>k@JLLU1_Owc))0{x5Df|tKw>Zw
zJXA42U+$HArP>*~4&|*iNNpYk6$9ip+&hTAYe4jRA~))fklO53VQZ%@%i<tf-`!Z@
z6P!On`G4sF#S!S_QyR>cpB_6x)n+e+9q)LJ3JoAyU+YJSdZdFW7qWJYfe5rqx<-T+
z5K;ZnkRGW~hop|PmJqpnCi$bGKr#l<yHeUBXRQkD3Oval4FQrdfNoKsa)ovRiRzEK
z1!)__>u+SF=9EU~ol;3lh&XAjJCF<+=qFCE5V=?CwHyd!f7A^~#sPBuaPlHb(lOZ|
znFpx@fY#-X<9mjbKt!HDGCi~10YFaw+ZtBm3hg!l%JGS&CL}un$U8r?yuuNu^8}A&
z`6Dx_ts{U!5Y=3W4Km0n`%R>_&HxHQ)Ve}To<C9zQilNDDzm)<w3zDyN$j+yF12+E
z(5*6443Rf##{8HHv)w5`kCmBnh}dPniqzIIK*5o%sLa0wniQkmEVUK>g`QZ{ZSj53
zXDBN3ui7N}qv{|jG?o&O1(y~YFT}>$s~e<20P>n@?Y`*kbBNn&pJ)^{+k*fUG}Trh
z;%uv}0#fG&`booRIxsSzqU{Lf#bOa@K!8YdE}AQ}3m9!d8WbQBMD8HP721iT)UrQ&
z9%*2JoOYy5U&<@ABS@sjvWup+!2ya^W`@l5k&CRf#+pYO93WC<W)vcFgw2Xb0BDtu
zJYtPhXhr=|Fd_k<x7J-llskXqHQNB_G+0TddaKUdb9Akqhz(_(*mvZCLP~7_=q3{x
zB1>id0}QNo`e2#?&`lb4DQu|Bzcn^@{^*q2HiPK?t>u%Qu@GG2`xJ;&?YCx%R3xoE
zn(f1L^S>&-UXIy*k;B=dTCC76%CXz*O>MC*86;Y<1?>Q$BJ)Sysx1Uor%<uYrlEz{
zV4NuBkAm|^gh=JeU5l@d*_%dQ?zn1UWg#}whwLa!D*t2P#J)GS51VbO_x4+^(4_oP
zRzxzK0+UB#C%$Oyx{_&445TAu%6t_d+B(M^NEfJfU)5r20TBIkMzR*k<$uf@<$PZ;
zTCpp$gD0{);ppq0zCfyw0+TB<cW=Fv`B$1sr?n~`DJ5bRnq5z>%ns2=%Zsm4Wb~br
zt;^Gei#<hBvZW96HZHxm4|OdtJ9Kwc=3nK^*2XMI%oLa{R8M98L#Jo!(*;P8Dlpkp
zcW$oVvPt+OwH`?_O@^-Bc_ea87x6~`=|EMl720Lsh@>@uw5dD@M6R{jsoxjTO;l~t
zsjlM+?IfL)KSD(MiAZjGp~bR|^cXo_U(6o?q=#-awjG88qL@DdNRe)+xE9C(BK24?
ze*};iU1A+7Nq+>87$A8jLa9qOiT_iv(?ru6Kq}Nv27DDjD%982E~7LBiuxl&Bw@U?
zKqc*uh6l;bXdizDRFbR19;@2EN<6I%4bo*<<ZBgUp7(uEl1%M8FWvt28k3*^NwPNs
z>uYX%?!RrN-2GYnBbfqgq%}k&+KaJjM=S1b&>-jlNjMH9uJ~7tRs|wem9&P4M2kov
zq+PUfi=pBvF!6y1fFvA{ialynD|KA;phT;h_crW)q{P&A?ayi>J~XgAP>F6Ex!w;z
zN)LT1APPjPYSS6;Na-F)B}D0CBL7T8qy!CXdXI$LYjO%e;>(U`^q?6);(-K+JbD2n
zI!INkAo^|TI1(Vy`$2q95B*m39SM+VeS(x0(Fq{MK>|c^jV6E;8)>giN(3E;KV(>u
zh)X2!MZ_Tjko-a+r4b>*5{Z9_1Q0PG0!SW^umr-S$nAIMpVG$}0gr@el+eWh=`0!`
zN`MHd?VQ@M1d<35KstZ~Uz9-+Jks>N$%mAd#}Ul-YcK(#Oo))$rs;E@=Z^w94u6T!
jt2VbmUi_J~5h(i)#$|(G<)2t800000NkvXXu0mjfJE(X0

literal 0
HcmV?d00001

diff --git a/src/static/images/icon_approval.png b/src/static/images/icon_approval.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c4943fea2f24125079a7d6037e9aeef4ace25ac
GIT binary patch
literal 1627
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
Z{SQxU)}JuPX{rDK002ovPDHLkV1g!t&07Ef

literal 0
HcmV?d00001


From 76d427f84cd0da429423f60f47402d342348b9ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 14:59:34 +0800
Subject: [PATCH 35/37] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                            | 62 +++++++++++++++++++++--
 src/pages/approval/create-application.vue |  2 +-
 src/pages/mine/mine.vue                   |  2 +-
 src/types/uni-pages.d.ts                  |  6 +++
 4 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index e648387..0b8e599 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -151,6 +151,14 @@
       "path": "pages/home/application-list",
       "type": "page"
     },
+    {
+      "path": "pages/info-publish/add-release-plan",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/info-publish/announce-notice",
       "type": "page",
@@ -175,9 +183,29 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/info-publish/edit-pic-video",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/info-publish/info-publish",
-      "type": "page"
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/material-library",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
     },
     {
       "path": "pages/info-publish/notice-details",
@@ -195,6 +223,22 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/info-publish/play-content-library",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/release-plan",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/login/code",
       "type": "page",
@@ -233,12 +277,24 @@
     },
     {
       "path": "pages/mine/mine",
-      "type": "page"
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "首页"
+      }
     },
     {
       "path": "pages/notification/notification",
       "type": "page"
     },
+    {
+      "path": "pages/personnel-passage/traffic-correlation",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/select/select-access-control",
       "type": "page",
@@ -309,4 +365,4 @@
     }
   ],
   "subPackages": []
-}
+}
\ No newline at end of file
diff --git a/src/pages/approval/create-application.vue b/src/pages/approval/create-application.vue
index fcb0d49..1b2cf46 100644
--- a/src/pages/approval/create-application.vue
+++ b/src/pages/approval/create-application.vue
@@ -10,8 +10,8 @@
   <view class="h-100vh flex flex-col">
     <TopNavigation :title="title"></TopNavigation>
     <scroll-view class="flex-1 box-border" :scroll-y="true">
-      <ApprovalCreate></ApprovalCreate>
       <Form></Form>
+      <ApprovalCreate></ApprovalCreate>
     </scroll-view>
     <view class="pb-safe border-#eef0f5 border-t-solid">
       <view class="flex flex-items-center flex-justify-around py-3 px-3">
diff --git a/src/pages/mine/mine.vue b/src/pages/mine/mine.vue
index 2e79a40..4d7711c 100644
--- a/src/pages/mine/mine.vue
+++ b/src/pages/mine/mine.vue
@@ -1,4 +1,4 @@
-<route lang="json5" type="home">
+<route lang="json5">
 {
   style: {
     navigationStyle: 'custom',
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index cc65bba..eb8731c 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -17,18 +17,24 @@ interface NavigateToOptions {
        "/pages/attendance/issue-record-detail" |
        "/pages/attendance/issue-record" |
        "/pages/home/application-list" |
+       "/pages/info-publish/add-release-plan" |
        "/pages/info-publish/announce-notice" |
        "/pages/info-publish/basic-info" |
        "/pages/info-publish/drafts-list" |
+       "/pages/info-publish/edit-pic-video" |
        "/pages/info-publish/info-publish" |
+       "/pages/info-publish/material-library" |
        "/pages/info-publish/notice-details" |
        "/pages/info-publish/notice-manage" |
+       "/pages/info-publish/play-content-library" |
+       "/pages/info-publish/release-plan" |
        "/pages/login/code" |
        "/pages/login/get-code" |
        "/pages/login/login" |
        "/pages/login/reset-password" |
        "/pages/mine/mine" |
        "/pages/notification/notification" |
+       "/pages/personnel-passage/traffic-correlation" |
        "/pages/select/select-access-control" |
        "/pages/select/select-organization" |
        "/pages/workbench/workbench" |

From 8bee2be96dc52a8ff6ffcd9284b8e65e3670398e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 15:48:07 +0800
Subject: [PATCH 36/37] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=B5=81=E7=A8=8BUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approval/components/ApprovalCreate.vue    | 56 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/pages/approval/components/ApprovalCreate.vue b/src/pages/approval/components/ApprovalCreate.vue
index ab6071f..6f939c9 100644
--- a/src/pages/approval/components/ApprovalCreate.vue
+++ b/src/pages/approval/components/ApprovalCreate.vue
@@ -24,7 +24,49 @@
                     class="h-10 w-10 rounded-2"
                     mode="aspectFill"
                   ></image>
-                  <view class="mx-2">xxx</view>
+                  <view
+                    class="w-10 text-center break-all overflow-hidden text-ellipsis line-clamp-1"
+                  >
+                    213321123321312213321123
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+        <wd-step>
+          <template v-slot:icon>
+            <view class="bg-#f0801e w-5 h-5 rounded-50% flex flex-items-center flex-justify-center">
+              <image src="/static/images/icon_approval.png" class="w-3 h-3"></image>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>审批节点</view>
+              </view>
+              <view class="pt-2 color-#7e807f text-3">1人通过即可</view>
+              <view class="my-2 flex flex-wrap">
+                <view class="mb-2 w-fit mr-2">
+                  <view
+                    class="h-10 w-10 rounded-2 border-#255cf7 border-1 border-solid flex flex-items-center flex-justify-center box-border"
+                  >
+                    <wd-icon name="add" size="22px" color="#255cf7"></wd-icon>
+                  </view>
+                </view>
+                <view v-for="item in 8" :key="item" class="mb-2 w-fit mr-2">
+                  <view class="border-0">
+                    <image
+                      src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                      class="h-10 w-10 rounded-2"
+                      mode="aspectFill"
+                    ></image>
+                    <view
+                      class="w-10 text-center break-all overflow-hidden text-ellipsis line-clamp-1"
+                    >
+                      xxx
+                    </view>
+                  </view>
                 </view>
               </view>
             </view>
@@ -50,7 +92,11 @@
                       class="h-10 w-10 rounded-2"
                       mode="aspectFill"
                     ></image>
-                    <view class="mx-2">xxx</view>
+                    <view
+                      class="w-10 text-center break-all overflow-hidden text-ellipsis line-clamp-1"
+                    >
+                      xxx
+                    </view>
                   </view>
                 </view>
               </view>
@@ -76,7 +122,11 @@
                       class="h-10 w-10 rounded-2"
                       mode="aspectFill"
                     ></image>
-                    <view class="mx-2">xxx</view>
+                    <view
+                      class="w-10 text-center break-all overflow-hidden text-ellipsis line-clamp-1"
+                    >
+                      xxx
+                    </view>
                   </view>
                 </view>
               </view>

From d73dd25bb767708321349e2e39bfcc793babc627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 15:48:07 +0800
Subject: [PATCH 37/37] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=B5=81=E7=A8=8BUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approval/components/ApprovalCreate.vue    | 56 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/pages/approval/components/ApprovalCreate.vue b/src/pages/approval/components/ApprovalCreate.vue
index ab6071f..6f939c9 100644
--- a/src/pages/approval/components/ApprovalCreate.vue
+++ b/src/pages/approval/components/ApprovalCreate.vue
@@ -24,7 +24,49 @@
                     class="h-10 w-10 rounded-2"
                     mode="aspectFill"
                   ></image>
-                  <view class="mx-2">xxx</view>
+                  <view
+                    class="w-10 text-center break-all overflow-hidden text-ellipsis line-clamp-1"
+                  >
+                    213321123321312213321123
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+        <wd-step>
+          <template v-slot:icon>
+            <view class="bg-#f0801e w-5 h-5 rounded-50% flex flex-items-center flex-justify-center">
+              <image src="/static/images/icon_approval.png" class="w-3 h-3"></image>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>审批节点</view>
+              </view>
+              <view class="pt-2 color-#7e807f text-3">1人通过即可</view>
+              <view class="my-2 flex flex-wrap">
+                <view class="mb-2 w-fit mr-2">
+                  <view
+                    class="h-10 w-10 rounded-2 border-#255cf7 border-1 border-solid flex flex-items-center flex-justify-center box-border"
+                  >
+                    <wd-icon name="add" size="22px" color="#255cf7"></wd-icon>
+                  </view>
+                </view>
+                <view v-for="item in 8" :key="item" class="mb-2 w-fit mr-2">
+                  <view class="border-0">
+                    <image
+                      src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                      class="h-10 w-10 rounded-2"
+                      mode="aspectFill"
+                    ></image>
+                    <view
+                      class="w-10 text-center break-all overflow-hidden text-ellipsis line-clamp-1"
+                    >
+                      xxx
+                    </view>
+                  </view>
                 </view>
               </view>
             </view>
@@ -50,7 +92,11 @@
                       class="h-10 w-10 rounded-2"
                       mode="aspectFill"
                     ></image>
-                    <view class="mx-2">xxx</view>
+                    <view
+                      class="w-10 text-center break-all overflow-hidden text-ellipsis line-clamp-1"
+                    >
+                      xxx
+                    </view>
                   </view>
                 </view>
               </view>
@@ -76,7 +122,11 @@
                       class="h-10 w-10 rounded-2"
                       mode="aspectFill"
                     ></image>
-                    <view class="mx-2">xxx</view>
+                    <view
+                      class="w-10 text-center break-all overflow-hidden text-ellipsis line-clamp-1"
+                    >
+                      xxx
+                    </view>
                   </view>
                 </view>
               </view>