From 471cfe61885cd67e294e97dd6775b474e1c0bbdd Mon Sep 17 00:00:00 2001
From: zhaichao <zhaichao@fengyingkj.top>
Date: Thu, 24 Sep 2026 14:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=A1=A8=E5=8D=95=E3=80=81?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=AF=A6=E6=83=85=E3=80=81=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=8D=8F=E5=90=8C=E3=80=81=E5=8D=8F=E5=90=8C=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=9C=E6=B1=87=E6=8A=A5=E5=92=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/form.vue        | 19 ++++++++++--------
 pages/coop/create.vue       | 17 +++++++++-------
 pages/coop/detail.vue       | 29 ++++++++++++++++++++-------
 pages/password/password.vue | 31 ++++++++++++++++-------------
 pages/reports/list.vue      | 39 +++++++++++++++++++++++--------------
 pages/todo/detail.vue       | 10 ++++++++--
 6 files changed, 92 insertions(+), 53 deletions(-)

diff --git a/pages/apply/form.vue b/pages/apply/form.vue
index 228fca9..ba23a2b 100644
--- a/pages/apply/form.vue
+++ b/pages/apply/form.vue
@@ -51,7 +51,9 @@
         <text class="lab">审批链</text>
         <text class="hint">{{ suggestedLabel || '将按固定审批链流转' }}</text>
       </view>
-      <wd-button type="primary" block size="large" @click="submit">提交申请</wd-button>
+      <view class="submit">
+        <wd-button type="primary" block size="large" @click="submit">提交申请</wd-button>
+      </view>
     </view>
   </view>
 </template>
@@ -164,14 +166,15 @@ export default {
 </script>
 
 <style scoped>
-.body { padding: 24rpx 28rpx 48rpx; }
+.body { padding: 16rpx 24rpx 48rpx; }
 .field { margin-bottom: 24rpx; }
-.lab { font-size: 26rpx; color: #374151; display: block; margin-bottom: 10rpx; }
-.box { min-height: 92rpx; background: #fff; border-radius: 16rpx; padding: 22rpx 24rpx; font-size: 30rpx; border: 1rpx solid rgba(17,24,39,0.06); }
+.lab { font-size: 26rpx; color: #6B7280; display: block; margin-bottom: 10rpx; }
+.box { min-height: 92rpx; background: #fff; border-radius: 16rpx; padding: 22rpx 24rpx; font-size: 30rpx; color: #111827; border: 1rpx solid rgba(17,24,39,0.06); }
 .box.tall { min-height: 180rpx; }
-.box textarea, .box input { width: 100%; font-size: 30rpx; }
+.box textarea, .box input { width: 100%; font-size: 30rpx; color: #111827; }
 .inv { padding: 24rpx; margin-bottom: 16rpx; }
-.inv .box { margin-top: 12rpx; }
-.link { color: #1677FF; font-size: 28rpx; display: block; margin-bottom: 20rpx; }
-.hint { font-size: 24rpx; color: #6B7280; line-height: 1.5; }
+.inv .box { margin-top: 12rpx; background: #F5F7FA; }
+.link { color: #1677FF; font-size: 28rpx; font-weight: 600; display: block; margin: 4rpx 8rpx 24rpx; }
+.hint { font-size: 26rpx; color: #111827; line-height: 1.5; }
+.submit { margin-top: 8rpx; }
 </style>
diff --git a/pages/coop/create.vue b/pages/coop/create.vue
index c7038ff..fb37de3 100644
--- a/pages/coop/create.vue
+++ b/pages/coop/create.vue
@@ -16,7 +16,9 @@
         <text class="lab">说明</text>
         <view class="box tall"><textarea v-model="content" /></view>
       </view>
-      <view class="btn-primary" @click="ok">创建</view>
+      <view class="submit">
+        <wd-button type="primary" block size="large" @click="ok">创建</wd-button>
+      </view>
     </view>
   </view>
 </template>
@@ -65,10 +67,11 @@ export default {
 </script>
 
 <style scoped>
-.body { padding: 24rpx; }
-.field { margin-bottom: 20rpx; }
-.lab { font-size: 24rpx; color: #4B5563; display: block; margin-bottom: 8rpx; }
-.box { min-height: 88rpx; background: #fff; border-radius: 16rpx; padding: 20rpx 24rpx; }
-.box.tall { min-height: 160rpx; }
-.box input, .box textarea { width: 100%; }
+.body { padding: 16rpx 24rpx 48rpx; }
+.field { margin-bottom: 24rpx; }
+.lab { font-size: 26rpx; color: #6B7280; display: block; margin-bottom: 10rpx; }
+.box { min-height: 92rpx; background: #fff; border-radius: 16rpx; padding: 22rpx 24rpx; border: 1rpx solid rgba(17,24,39,0.06); }
+.box.tall { min-height: 180rpx; }
+.box input, .box textarea { width: 100%; font-size: 30rpx; color: #111827; }
+.submit { margin-top: 8rpx; }
 </style>
diff --git a/pages/coop/detail.vue b/pages/coop/detail.vue
index 6031c30..2718d4b 100644
--- a/pages/coop/detail.vue
+++ b/pages/coop/detail.vue
@@ -3,10 +3,20 @@
     <fy-header title="协同详情" back />
     <view v-if="row" class="body">
       <view class="card">
+        <view class="top">
+          <text class="type">协同</text>
+          <wd-tag :type="row.status === 'done' ? 'success' : 'primary'" plain>{{ row.status === 'done' ? '已办结' : '待办理' }}</wd-tag>
+        </view>
         <text class="t">{{ row.title }}</text>
-        <text class="s">发起 {{ row.assignerName || '' }} · 办理 {{ row.assigneeName || '' }}</text>
-        <text class="s">{{ row.content || row.remark || '' }}</text>
-        <text class="chip">{{ row.status === 'done' ? '已办结' : '待办理' }}</text>
+        <view class="kv">
+          <text class="k">发起</text>
+          <text class="v">{{ row.assignerName || '-' }}</text>
+        </view>
+        <view class="kv">
+          <text class="k">办理</text>
+          <text class="v">{{ row.assigneeName || '-' }}</text>
+        </view>
+        <text v-if="row.content || row.remark" class="c">{{ row.content || row.remark }}</text>
       </view>
       <view v-if="canDone" class="btn-primary" @click="done">标记已办理</view>
     </view>
@@ -55,9 +65,14 @@ export default {
 </script>
 
 <style scoped>
-.body { padding: 24rpx; }
+.body { padding: 16rpx 24rpx 48rpx; }
 .card { padding: 28rpx; margin-bottom: 24rpx; }
-.t { display: block; font-size: 34rpx; font-weight: 700; }
-.s { display: block; font-size: 24rpx; color: #6B7280; margin-top: 8rpx; }
-.chip { display: inline-block; margin-top: 16rpx; }
+.top { display: flex; align-items: center; justify-content: space-between; }
+.type { font-size: 22rpx; color: #1677FF; background: #E8F1FF; border-radius: 8rpx; padding: 2rpx 10rpx; }
+.t { display: block; margin-top: 16rpx; font-size: 34rpx; font-weight: 650; color: #111827; line-height: 1.4; }
+.kv { display: flex; justify-content: space-between; padding: 20rpx 0; }
+.kv + .kv { border-top: 1rpx solid #F0F2F5; }
+.k { color: #6B7280; font-size: 26rpx; }
+.v { font-size: 26rpx; color: #111827; }
+.c { display: block; margin-top: 8rpx; padding-top: 16rpx; border-top: 1rpx solid #F0F2F5; font-size: 28rpx; color: #374151; line-height: 1.65; }
 </style>
diff --git a/pages/password/password.vue b/pages/password/password.vue
index ded1395..f038cf1 100644
--- a/pages/password/password.vue
+++ b/pages/password/password.vue
@@ -3,15 +3,17 @@
     <fy-header title="修改密码" back />
     <view class="body">
       <text class="hint">首次登录或管理员要求改密，请设置新密码后继续。</text>
-      <view class="field">
-        <text class="lab">新密码</text>
-        <view class="box"><input v-model="next" password placeholder="至少 6 位" /></view>
+      <view class="card group">
+        <view class="field">
+          <text class="lab">新密码</text>
+          <view class="box"><input v-model="next" password placeholder="至少 6 位" /></view>
+        </view>
+        <view class="field">
+          <text class="lab">确认新密码</text>
+          <view class="box"><input v-model="confirm" password placeholder="再输入一次" /></view>
+        </view>
       </view>
-      <view class="field">
-        <text class="lab">确认新密码</text>
-        <view class="box"><input v-model="confirm" password placeholder="再输入一次" /></view>
-      </view>
-      <view class="btn-primary" @click="ok">确认修改</view>
+      <wd-button type="primary" block size="large" @click="ok">确认修改</wd-button>
       <text v-if="error" class="err">{{ error }}</text>
     </view>
   </view>
@@ -51,11 +53,12 @@ export default {
 </script>
 
 <style scoped>
-.body { padding: 40rpx; }
-.hint { font-size: 26rpx; color: #6B7280; display: block; margin-bottom: 32rpx; }
-.field { margin-bottom: 24rpx; }
-.lab { font-size: 24rpx; color: #4B5563; display: block; margin-bottom: 8rpx; }
-.box { height: 96rpx; background: #fff; border-radius: 16rpx; padding: 0 24rpx; display: flex; align-items: center; }
-.box input { flex: 1; }
+.body { padding: 16rpx 24rpx 48rpx; }
+.hint { font-size: 26rpx; color: #6B7280; display: block; margin: 8rpx 8rpx 20rpx; line-height: 1.5; }
+.group { padding: 8rpx 24rpx 24rpx; margin-bottom: 24rpx; }
+.field { margin-top: 20rpx; }
+.lab { font-size: 26rpx; color: #6B7280; display: block; margin-bottom: 10rpx; }
+.box { height: 92rpx; background: #F5F7FA; border-radius: 16rpx; padding: 0 24rpx; display: flex; align-items: center; }
+.box input { flex: 1; font-size: 30rpx; color: #111827; }
 .err { color: #DC2626; font-size: 24rpx; margin-top: 16rpx; display: block; }
 </style>
diff --git a/pages/reports/list.vue b/pages/reports/list.vue
index 1c30620..8f46590 100644
--- a/pages/reports/list.vue
+++ b/pages/reports/list.vue
@@ -1,32 +1,38 @@
 <template>
-  <view class="page">
+  <view class="page edge">
     <fy-header title="工作汇报" back />
     <view v-if="!can" class="deny">当前账号没有写汇报权限</view>
-    <view v-else>
+    <fy-scroll v-else class="edge-scroll" @refresh="load">
       <view class="card form">
+        <text class="lab">类型</text>
         <picker :range="kinds" @change="(e) => kind = kinds[e.detail.value]">
           <view class="box">{{ kind }}</view>
         </picker>
+        <text class="lab">内容</text>
         <view class="box tall"><textarea v-model="content" placeholder="今日工作内容 / 周报摘要" /></view>
-        <view class="btn-primary" @click="submit">提交汇报</view>
+        <wd-button type="primary" block size="large" @click="submit">提交汇报</wd-button>
       </view>
+      <wd-status-tip v-if="!rows.length" image="content" tip="暂无汇报" />
       <view v-for="r in rows" :key="r.id" class="card item">
-        <text class="t">{{ r.title || r.kind || '汇报' }}</text>
-        <text class="s">{{ r.createdAt || r.date || '' }}</text>
-        <text class="c">{{ r.content || r.summary || '' }}</text>
+        <view class="top">
+          <text class="type">{{ r.kind || r.title || '汇报' }}</text>
+          <text class="s">{{ r.createdAt || r.date || '' }}</text>
+        </view>
+        <text class="c">{{ r.content || r.summary || r.title || '' }}</text>
       </view>
-    </view>
+    </fy-scroll>
   </view>
 </template>
 
 <script>
 import FyHeader from '../../components/fy-header.vue'
+import FyScroll from '../../components/fy-scroll.vue'
 import { store } from '../../utils/store.js'
 import { asList, toast } from '../../utils/format.js'
 import { oaGet, oaPost } from '../../utils/api.js'
 
 export default {
-  components: { FyHeader },
+  components: { FyHeader, FyScroll },
   data() {
     return { kinds: ['日报', '周报', '月报', '工时'], kind: '日报', content: '', rows: [] }
   },
@@ -58,12 +64,15 @@ export default {
 </script>
 
 <style scoped>
-.form { margin: 24rpx; padding: 24rpx; }
-.box { background: #F3F6FB; border-radius: 12rpx; padding: 20rpx; margin-bottom: 16rpx; }
-.box.tall { min-height: 160rpx; }
+.form { margin: 16rpx 24rpx; padding: 24rpx; }
+.lab { display: block; font-size: 26rpx; color: #6B7280; margin-bottom: 10rpx; }
+.box { background: #F5F7FA; border-radius: 16rpx; padding: 22rpx 24rpx; margin-bottom: 20rpx; font-size: 30rpx; color: #111827; }
+.box.tall { min-height: 180rpx; }
+.box textarea { width: 100%; font-size: 30rpx; }
 .item { margin: 0 24rpx 16rpx; padding: 24rpx; }
-.t { display: block; font-weight: 600; }
-.s { font-size: 22rpx; color: #6B7280; }
-.c { display: block; font-size: 26rpx; margin-top: 8rpx; }
-.deny { padding: 80rpx; text-align: center; color: #6B7280; }
+.top { display: flex; align-items: center; justify-content: space-between; }
+.type { font-size: 22rpx; color: #1677FF; background: #E8F1FF; border-radius: 8rpx; padding: 2rpx 10rpx; }
+.s { font-size: 22rpx; color: #9CA3AF; }
+.c { display: block; font-size: 28rpx; margin-top: 14rpx; color: #374151; line-height: 1.65; }
+.deny { padding: 120rpx 40rpx; text-align: center; color: #6B7280; font-size: 28rpx; }
 </style>
diff --git a/pages/todo/detail.vue b/pages/todo/detail.vue
index f211cdc..603f9ab 100644
--- a/pages/todo/detail.vue
+++ b/pages/todo/detail.vue
@@ -3,8 +3,12 @@
     <fy-header title="审批详情" back />
     <view v-if="row" class="body">
       <view class="card">
+        <view class="top">
+          <text class="type">{{ row.typeLabel || row.type || '审批' }}</text>
+          <wd-tag type="primary" plain>{{ row.status || '待处理' }}</wd-tag>
+        </view>
         <text class="t">{{ row.title || row.no }}</text>
-        <text class="s">{{ row.typeLabel || row.type }} · {{ row.submitter || '' }}</text>
+        <text class="s">{{ row.submitter || '' }}</text>
         <text class="s">单号 {{ row.no }}</text>
         <text v-if="row.node" class="s">当前节点 {{ row.node }}</text>
         <text v-if="row.amount != null && row.amount !== ''" class="amt">¥ {{ row.amount }}</text>
@@ -56,7 +60,7 @@
         </view>
       </view>
     </view>
-    <view v-else class="empty">{{ err || '加载中…' }}</view>
+    <wd-status-tip v-else image="content" :tip="err || '加载中…'" />
   </view>
 </template>
 
@@ -155,6 +159,8 @@ export default {
 <style scoped>
 .body { padding: 24rpx 28rpx 200rpx; }
 .card { padding: 28rpx; margin-bottom: 16rpx; }
+.top { display: flex; align-items: center; justify-content: space-between; margin-bottom: 12rpx; }
+.type { font-size: 22rpx; color: #1677FF; background: #E8F1FF; border-radius: 8rpx; padding: 2rpx 10rpx; }
 .block { padding: 24rpx 28rpx; }
 .h { display: block; font-size: 30rpx; font-weight: 650; margin-bottom: 16rpx; }
 .t { display: block; font-size: 34rpx; font-weight: 650; line-height: 1.4; }