diff --git a/App.vue b/App.vue
index 0336607..fa480ff 100644
--- a/App.vue
+++ b/App.vue
@@ -129,5 +129,41 @@ page {
   color: #606266
 }
 
+// 通用按钮样式（支持任意top值，无需批量生成类名）
+.common-custom-btn {
+  position: absolute;
+  // 核心：用CSS变量接收动态top值，默认100px
+  top: var(--btn-top, 100px);
+  right: 15px;
+  //transform: translateX(-50%);
+  background-color: #3c9cff;
+  color: #ffffff;
+  border: none;
+  border-radius: 4px;
+  padding: 4px 10px;
+  font-size: 14px;
+  text-align: center;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  white-space: nowrap;
+  z-index: 99;
+
+  // 点击态
+  &:active {
+    background-color: #2b88ee;
+    opacity: 0.9;
+  }
+
+  // 禁用态
+  &.disabled {
+    background-color: #a0c8f5;
+    cursor: not-allowed;
+    opacity: 0.7;
+  }
+}
+
+
+
+
 
 </style>
\ No newline at end of file
diff --git a/pages-sub/daily/maintain-manage/finish-plan-detail.vue b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
index 32183d4..d195d2c 100644
--- a/pages-sub/daily/maintain-manage/finish-plan-detail.vue
+++ b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
@@ -69,7 +69,7 @@
           <!-- 7. 处理结果 -->
           <up-cell align="middle">
             <template #title>
-              <view style="min-width: 200rpx">巡查描述</view>
+              <view style="min-width: 200rpx">养护描述</view>
             </template>
             <template #value>
               <view class="up-line-1 common-text-color">{{i.remark || '--'}}</view>
@@ -78,7 +78,7 @@
 
           <up-cell
               title="提交时间"
-              :value="timeFormat(i.finishTime,'yyyy-mm-dd hh:MM:ss') || '--'"
+              :value="i.finishTime==null?'--':timeFormat(i.finishTime,'yyyy-mm-dd hh:MM:ss')"
               align="middle"
           ></up-cell>
 
diff --git a/pages-sub/daily/maintain-manage/index.vue b/pages-sub/daily/maintain-manage/index.vue
index bca6498..3602cf3 100644
--- a/pages-sub/daily/maintain-manage/index.vue
+++ b/pages-sub/daily/maintain-manage/index.vue
@@ -70,6 +70,20 @@
         >
           <template #body>
             <view class="card-body">
+<!--              <view class="">-->
+<!--                <up-button-->
+<!--                    type="primary"-->
+<!--                    size="mini"-->
+<!--                    @click="goToDetail(item)"-->
+<!--                    class="submit-record-btn"-->
+<!--                >-->
+<!--                  计划明细-->
+<!--                </up-button>-->
+<!--              </view>-->
+
+              <view class="common-custom-btn " style="--btn-top: 68px;"  @click="goToDetail(item)">
+                计划明细
+              </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">道路名称：</view>
                 <view class="u-line-1 u-body-value">{{ item.roadName || '-' }}</view>
@@ -83,16 +97,7 @@
 
               <view class="u-body-item u-flex common-item-center common-justify-between">
                 <view class="u-body-item-title">养护级别： {{uni.$dict.getDictLabel('conserve_level', item.levelId) || '-'}}</view>
-                <view class="">
-                  <up-button
-                      type="primary"
-                      size="mini"
-                      @click="goToDetail(item)"
-                      class="submit-record-btn"
-                  >
-                    计划明细
-                  </up-button>
-                </view>
+
               </view>
 
 <!--              <view class="u-body-item u-flex">-->
@@ -125,6 +130,9 @@
 
           <template #body>
             <view class="card-body">
+              <view class="common-custom-btn "  v-if="item.finishState!==3" style="--btn-top: 100px;"    @click="submitRecord(item)">
+                提交记录
+              </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">计划编码：</view>
                 <view class="u-line-1 u-body-value">{{ item.planNo || '-' }}</view>
@@ -138,16 +146,16 @@
 
               <view class="u-body-item u-flex common-item-center common-justify-between">
                 <view class="u-body-item-title">计划完成次数： {{ item.planNum || 0 }}</view>
-                <view class="" v-if="item.finishState!==3">
-                  <up-button
-                      type="primary"
-                      size="mini"
-                      @click="submitRecord(item)"
-                      class="submit-record-btn"
-                  >
-                    提交记录
-                  </up-button>
-                </view>
+<!--                <view class="" v-if="item.finishState!==3">-->
+<!--                  <up-button-->
+<!--                      type="primary"-->
+<!--                      size="mini"-->
+<!--                      @click="submitRecord(item)"-->
+<!--                      class="submit-record-btn"-->
+<!--                  >-->
+<!--                    提交记录-->
+<!--                  </up-button>-->
+<!--                </view>-->
               </view>
 
               <view class="u-body-item u-flex">
diff --git a/pages-sub/daily/maintain-manage/pending-plan-detail.vue b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
index f8da365..eebb207 100644
--- a/pages-sub/daily/maintain-manage/pending-plan-detail.vue
+++ b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
@@ -18,6 +18,20 @@
         <!-- 卡片主体内容（原详情项） -->
         <template #body>
           <view class="card-body">
+<!--            <view class="">-->
+<!--              <up-button-->
+<!--                  type="primary"-->
+<!--                  size="mini"-->
+<!--                  @click="gotoFinishPlanDetail(i)"-->
+<!--                  class="submit-record-btn"-->
+
+<!--              >-->
+<!--                查看记录-->
+<!--              </up-button>-->
+<!--            </view>-->
+            <view class="common-custom-btn "  style="--btn-top: 100px;"    @click="gotoFinishPlanDetail(i)">
+              查看记录
+            </view>
             <!-- 计划编码 -->
             <view class="u-body-item u-flex">
               <view class="u-body-item-title">计划编码：</view>
@@ -41,17 +55,7 @@
             <!-- 已完成次数 + 查看记录按钮 -->
             <view class="u-body-item u-flex common-item-center common-justify-between">
               <view class="u-body-item-title">已完成次数： {{ i.planFinishNum || 0 }} 次</view>
-              <view class="">
-                <up-button
-                    type="primary"
-                    size="mini"
-                    @click="gotoFinishPlanDetail(i)"
-                    class="submit-record-btn"
-
-                >
-                  查看记录
-                </up-button>
-              </view>
+
             </view>
 
             <!-- 计划有效期 -->
diff --git a/pages-sub/daily/maintain-manage/record-detail-list.vue b/pages-sub/daily/maintain-manage/record-detail-list.vue
index 21a5c25..d017e02 100644
--- a/pages-sub/daily/maintain-manage/record-detail-list.vue
+++ b/pages-sub/daily/maintain-manage/record-detail-list.vue
@@ -67,7 +67,7 @@
 
           <!-- 7. 处理结果 -->
           <up-cell
-              title="巡查描述"
+              title="养护描述"
               :value="i.remark || '--'"
               class="up-line-1"
               align="middle"
diff --git a/pages-sub/daily/maintain-manage/road-detail-list.vue b/pages-sub/daily/maintain-manage/road-detail-list.vue
index 8deda6d..307e60a 100644
--- a/pages-sub/daily/maintain-manage/road-detail-list.vue
+++ b/pages-sub/daily/maintain-manage/road-detail-list.vue
@@ -63,6 +63,27 @@
 
           <template #body>
             <view class="card-body">
+
+<!--              <view class="">-->
+<!--                <up-button-->
+<!--                    type="primary"-->
+<!--                    size="mini"-->
+<!--                    @click="submitRecord(item)"-->
+<!--                    class="submit-record-btn"-->
+<!--                    :disabled="item.finishState == 3"-->
+<!--                >-->
+<!--                  {{ item.finishState ==3 ? '补交记录' : '提交记录' }}-->
+<!--                </up-button>-->
+<!--              </view>-->
+
+              <view class="common-custom-btn " v-if="item.finishState ==3" style="--btn-top: 100px;" >
+                补交记录
+              </view>
+              <view class="common-custom-btn " v-else style="--btn-top: 100px;"  @click="submitRecord(item)">
+                提交记录
+              </view>
+
+
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">计划编码：</view>
                 <view class="u-line-1 u-body-value">{{ item.planNo || '-' }}</view>
@@ -76,42 +97,17 @@
 
               <view class="u-body-item u-flex common-item-center common-justify-between">
                 <view class="u-body-item-title">计划完成次数： {{ item.planNum || 0 }}</view>
-                <view class="">
-                  <up-button
-                      type="primary"
-                      size="mini"
-                      @click="submitRecord(item)"
-                      class="submit-record-btn"
-
-                      :disabled="item.finishState == 3"
-
-                  >
-
-                    {{ item.finishState ==3 ? '补交记录' : '提交记录' }}
-                  </up-button>
-
-<!--                  :class="{ 'disabled-btn': item.finishState ==3 }"-->
+<!--                <view class="">-->
 <!--                  <up-button-->
-<!--                      v-if="item.finishState ==3"-->
 <!--                      type="primary"-->
 <!--                      size="mini"-->
-<!--                      @click=""-->
+<!--                      @click="submitRecord(item)"-->
 <!--                      class="submit-record-btn"-->
-<!--                      :disabled="true"-->
+<!--                      :disabled="item.finishState == 3"-->
 <!--                  >-->
-<!--                    补交记录-->
+<!--                    {{ item.finishState ==3 ? '补交记录' : '提交记录' }}-->
 <!--                  </up-button>-->
-
-<!--                  <up-button-->
-<!--                      v-if="item.finishState !== '3' && item.planFinishNum>0"-->
-<!--                      type="primary"-->
-<!--                      size="mini"-->
-<!--                      @click="gotoFinishPlanDetail(item)"-->
-<!--                      class="submit-record-btn"-->
-<!--                  >-->
-<!--                    提交记录-->
-<!--                  </up-button>-->
-                </view>
+<!--                </view>-->
               </view>
 
               <view class="u-body-item u-flex">
diff --git a/pages-sub/daily/patrol-manage/finish-plan-detail.vue b/pages-sub/daily/patrol-manage/finish-plan-detail.vue
index c199661..c98ce70 100644
--- a/pages-sub/daily/patrol-manage/finish-plan-detail.vue
+++ b/pages-sub/daily/patrol-manage/finish-plan-detail.vue
@@ -79,7 +79,7 @@
 
             <up-cell
                 title="提交时间"
-                :value="timeFormat(i.finishTime,'yyyy-mm-dd hh:MM:ss') || '--'"
+                :value="i.finishTime==null?'--':timeFormat(i.finishTime,'yyyy-mm-dd hh:MM:ss') "
                 align="middle"
 
             ></up-cell>
diff --git a/pages-sub/daily/patrol-manage/index.vue b/pages-sub/daily/patrol-manage/index.vue
index 90bbd64..2ac74c7 100644
--- a/pages-sub/daily/patrol-manage/index.vue
+++ b/pages-sub/daily/patrol-manage/index.vue
@@ -56,6 +56,9 @@
         >
           <template #body>
             <view class="card-body">
+              <view class="common-custom-btn " style="--btn-top: 80px;"  @click="gotoDetail(item)">
+                计划明细
+              </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">道路名称：</view>
                 <view class="u-line-1 u-body-value">{{ item.roadName || '-' }}</view>
@@ -71,16 +74,7 @@
 
               <view class="u-body-item u-flex common-item-center common-justify-between">
                 <view class="u-body-item-title">养护级别： {{uni.$dict.getDictLabel('conserve_level', item.levelId) || '-'}}</view>
-                <view class="">
-                  <up-button
-                      type="primary"
-                      size="mini"
-                      @click="gotoDetail(item)"
-                      class="submit-record-btn"
-                  >
-                    计划明细
-                  </up-button>
-                </view>
+
               </view>
 
               <view class="u-body-item u-flex">
diff --git a/pages-sub/daily/patrol-manage/pending-plan-detail.vue b/pages-sub/daily/patrol-manage/pending-plan-detail.vue
index 0ec9be4..e033114 100644
--- a/pages-sub/daily/patrol-manage/pending-plan-detail.vue
+++ b/pages-sub/daily/patrol-manage/pending-plan-detail.vue
@@ -23,55 +23,84 @@
 
         <template #body>
           <view class="card-body">
-            <view class="u-body-item u-flex">
-              <view class="u-body-item-title">计划编码：</view>
-              <view class="u-line-1 u-body-value">{{ item.planNo || '-' }}</view>
-            </view>
-            <view class="u-body-item u-flex">
-              <view class="u-body-item-title">养护周期：</view>
-              <view class="u-line-1 u-body-value">{{ item.rate || '-' }}
-                {{ uni.$dict.getDictLabel('cycle_id_type', item.cycleId) }}
+
+              <!--                <up-button-->
+              <!--                    v-if="item.finishState ==3"-->
+              <!--                    type="primary"-->
+              <!--                    size="mini"-->
+              <!--                    @click=""-->
+              <!--                    class="submit-record-btn"-->
+              <!--                    :disabled="true"-->
+              <!--                >-->
+              <!--                  补交记录-->
+              <!--                </up-button>-->
+
+              <!--                <up-button-->
+              <!--                    v-if="item.finishState !== 3 && item.planFinishNum > 0"-->
+              <!--                    type="primary"-->
+              <!--                    size="mini"-->
+              <!--                    @click="gotoFinishPlanDetail(item)"-->
+              <!--                    class="submit-record-btn"-->
+              <!--                >-->
+              <!--                  提交记录-->
+              <!--                </up-button>-->
+              <!--              </view>-->
+              <view class="common-custom-btn disable" style="--btn-top: 120px;" v-if="item.finishState ==3">
+                补交记录
+              </view>
+              <view class="common-custom-btn " style="--btn-top: 120px;"
+                    v-if="item.finishState !== 3 && item.planFinishNum > 0" @click="gotoFinishPlanDetail(item)">
+                提交记录
+              </view>
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">计划编码：</view>
+                <view class="u-line-1 u-body-value">{{ item.planNo || '-' }}</view>
+              </view>
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">养护周期：</view>
+                <view class="u-line-1 u-body-value">{{ item.rate || '-' }}
+                  {{ uni.$dict.getDictLabel('cycle_id_type', item.cycleId) }}
+                </view>
               </view>
-            </view>
 
-            <view class="u-body-item u-flex common-item-center common-justify-between">
-              <view class="u-body-item-title">计划完成次数： {{ item.planNum || 0 }}</view>
-              <view class="">
-                <up-button
-                    v-if="item.finishState ==3"
-                    type="primary"
-                    size="mini"
-                    @click=""
-                    class="submit-record-btn"
-                    :disabled="true"
-                >
-                  补交记录
-                </up-button>
+              <view class="u-body-item u-flex common-item-center common-justify-between">
+                <view class="u-body-item-title">计划完成次数： {{ item.planNum || 0 }}</view>
+                <!--              <view class="">-->
+                <!--                <up-button-->
+                <!--                    v-if="item.finishState ==3"-->
+                <!--                    type="primary"-->
+                <!--                    size="mini"-->
+                <!--                    @click=""-->
+                <!--                    class="submit-record-btn"-->
+                <!--                    :disabled="true"-->
+                <!--                >-->
+                <!--                  补交记录-->
+                <!--                </up-button>-->
 
-                <up-button
-                    v-if="item.finishState !== 3 && item.planFinishNum > 0"
-                    type="primary"
-                    size="mini"
-                    @click="gotoFinishPlanDetail(item)"
-                    class="submit-record-btn"
-                >
-                  提交记录
-                </up-button>
+                <!--                <up-button-->
+                <!--                    v-if="item.finishState !== 3 && item.planFinishNum > 0"-->
+                <!--                    type="primary"-->
+                <!--                    size="mini"-->
+                <!--                    @click="gotoFinishPlanDetail(item)"-->
+                <!--                    class="submit-record-btn"-->
+                <!--                >-->
+                <!--                  提交记录-->
+                <!--                </up-button>-->
+                <!--              </view>-->
               </view>
-            </view>
 
-            <view class="u-body-item u-flex">
-              <view class="u-body-item-title">已完成次数：</view>
-              <view class="u-line-1 u-body-value">{{ item.planFinishNum || 0 }}</view>
-            </view>
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">已完成次数：</view>
+                <view class="u-line-1 u-body-value">{{ item.planFinishNum || 0 }}</view>
+              </view>
 
-            <view class="u-body-item u-flex">
-              <view class="u-body-item-title">计划有效期：</view>
-              <view class="u-line-1 u-body-value">{{ timeFormat(item.beginTime, 'yyyy-mm-dd') || '-' }} 至
-                {{ timeFormat(item.endTime, 'yyyy-mm-dd') || '-' }}
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">计划有效期：</view>
+                <view class="u-line-1 u-body-value">{{ timeFormat(item.beginTime, 'yyyy-mm-dd') || '-' }} 至
+                  {{ timeFormat(item.endTime, 'yyyy-mm-dd') || '-' }}
+                </view>
               </view>
             </view>
-          </view>
         </template>
       </up-card>
     </view>
diff --git a/pages-sub/daily/quick-order/index.vue b/pages-sub/daily/quick-order/index.vue
index 5e1313f..b97afe6 100644
--- a/pages-sub/daily/quick-order/index.vue
+++ b/pages-sub/daily/quick-order/index.vue
@@ -54,6 +54,17 @@
 
           <template #body>
             <view class="card-body">
+              <view class="common-custom-btn " style="--btn-top: 64px;"  @click="handleDetail(item)">
+                工单详情
+                <!--                  <up-button-->
+                <!--                      type="primary"-->
+
+                <!--                      @click="gotoDetail(item)"-->
+                <!--                      class="submit-record-btn"-->
+                <!--                  >-->
+                <!--                    计划明细-->
+                <!--                  </up-button>-->
+              </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">工单编号：</view>
                 <view class="u-line-1 u-body-value">{{ item.orderNo || '-' }}</view>
@@ -75,16 +86,16 @@
 
               <view class="u-body-item u-flex common-item-center common-justify-between">
                 <view class="u-body-item-title u-body-value">提交时间：{{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
-                <view class="">
-                  <up-button
-                      type="primary"
-                      size="mini"
-                      @click="handleDetail(item)"
-
-                  >
-                    工单详情
-                  </up-button>
-                </view>
+<!--                <view class="">-->
+<!--                  <up-button-->
+<!--                      type="primary"-->
+<!--                      size="mini"-->
+<!--                      @click="handleDetail(item)"-->
+
+<!--                  >-->
+<!--                    工单详情-->
+<!--                  </up-button>-->
+<!--                </view>-->
 
               </view>
             </view>
diff --git a/pages-sub/problem/regional-order-manage/index.vue b/pages-sub/problem/regional-order-manage/index.vue
index 844e9ca..c3ce7aa 100644
--- a/pages-sub/problem/regional-order-manage/index.vue
+++ b/pages-sub/problem/regional-order-manage/index.vue
@@ -62,6 +62,14 @@
         >
           <template #body>
             <view class="card-body">
+<!--              <view v-if="activeTab !== 0" class="ml-10">-->
+<!--                <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>-->
+<!--              </view>-->
+
+              <view class="common-custom-btn " v-if="activeTab !== 0"  style="--btn-top: 130px;"  @click="handleDetail(item)">
+                工单详情
+              </view>
+
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">工单编号：</view>
                 <view class="u-line-1 u-body-value">{{ item.orderNo || '-' }}</view>
@@ -78,16 +86,16 @@
                 <view class="u-body-item-title">情况描述：</view>
                 <view class="u-line-1 u-body-value">{{ item.remark || '无' }}</view>
               </view>
-              <!-- 核心修改：紧急程度行 合并工单详情按钮 【我发起的/已办】放到该行最右侧 -->
+
               <view class="u-body-item u-flex common-justify-between common-item-center">
                 <view class="u-body-item-title">紧急程度：{{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) || '-' }}</view>
 <!--                <view class="u-line-1 u-body-value flex-1 text-right">-->
 <!--                  {{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) || '-' }}-->
 <!--                </view>-->
                 <!-- 只有 我发起的(1)、已办(2) 显示该行的详情按钮 -->
-                <view v-if="activeTab !== 0" class="ml-10">
-                  <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>
-                </view>
+<!--                <view v-if="activeTab !== 0" class="ml-10">-->
+<!--                  <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>-->
+<!--                </view>-->
               </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">工单状态：</view>
@@ -99,11 +107,11 @@
               </view>
 
               <!-- 待办工单(0) 保留原来的操作按钮区 不变 -->
-              <view v-if="activeTab === 0" class="u-body-item u-flex common-justify-between common-item-center mt-20">
-                <up-button type="warning" size="mini" @click="handleReject(item)" v-show="nextStepMap[item.taskKey].backShow">回退</up-button>
-                <up-button type="success" size="mini" @click="handleRenew(item)" v-show="nextStepMap[item.taskKey].renewShow">重新提交</up-button>
-                <up-button type="primary" size="mini" @click="handleProcess(item)">{{ nextStepMap[item.taskKey].btnText }}</up-button>
-                <up-button type="info" size="mini" @click="handleDetail(item)">详情</up-button>
+              <view v-if="activeTab === 0" class="u-body-item u-body-item-btn-wrap u-flex common-justify-between common-item-center mt-20">
+                <up-button type="warning" size="large" @click="handleReject(item)" v-show="nextStepMap[item.taskKey].backShow">回退</up-button>
+                <up-button type="success" size="large" @click="handleRenew(item)" v-show="nextStepMap[item.taskKey].renewShow">重新提交</up-button>
+                <up-button type="primary" size="large" @click="handleProcess(item)">{{ nextStepMap[item.taskKey].btnText }}</up-button>
+                <up-button type="info" size="large" @click="handleDetail(item)">详情</up-button>
               </view>
 
               <!-- 已删除：原来单独的【我发起的/已办】按钮区，不需要了 -->
@@ -222,8 +230,8 @@ const USER_ROLES = userStore.userInfo?.roles || [];
 
 // ========== 基础状态 (按模块分组，语义化更强) ==========
 // tab切换
-const activeTab = ref(0); // 0-待办 1-我发起的 2-已办
-const tabList = [{name: '待办'}, {name: '我发起的任务'}, {name: '已办'}];
+const activeTab = ref(0); // 0-待办 1-已办 2-我发起的任务
+const tabList = [{name: '待办'}, {name: '已办'}, {name: '我发起的任务'}];
 // 排序与搜索
 const selectedSortValue = ref(1);
 const sortOptions = ref([
@@ -347,8 +355,9 @@ const queryList = async (pageNo, pageSize) => {
   try {
     const params = getQueryParams(pageNo, pageSize);
     let res;
+    // 0-待办 1-已办 2-我发起的任务
     if (activeTab.value === 0) res = await todoBuzSimplePage(params);
-    else if (activeTab.value === 1) res = await myBuzSimplePage(params);
+    else if (activeTab.value === 2) res = await myBuzSimplePage(params);
     else res = await doneBuzSimplePage(params);
     pagingHandle('complete', res?.list || [], res?.total || 0);
   } catch (error) {
@@ -592,6 +601,11 @@ onLoad(() => {
   box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 }
 
+.u-body-item-btn-wrap :deep(.u-button--large){
+  height: 28px;
+}
+
+
 // 新增样式：解决按钮和文字间距、排版问题
 .flex-1 { flex: 1; }
 .text-right { text-align: right; }
diff --git a/pages-sub/problem/regional-order-manage/order-detail.vue b/pages-sub/problem/regional-order-manage/order-detail.vue
index d6410f2..d03a378 100644
--- a/pages-sub/problem/regional-order-manage/order-detail.vue
+++ b/pages-sub/problem/regional-order-manage/order-detail.vue
@@ -203,7 +203,7 @@
 
                     <!-- 2. 原描述内容：时间 + 处理说明（最多200字） -->
                     <view class="step-desc">
-                      <view class="operator-name up-line-1">
+                      <view class="operator-name up-line-1"  v-if="item.tasks">
                         处理人：
                         <text>{{ item.tasks?.map(itemName => itemName.assigneeUser?.nickname).filter(Boolean).join('，') }}</text>
                       </view>
@@ -545,7 +545,8 @@ const getLimitReason = (reason: string | null | undefined) => {
 const getCurrentStepIndex = () => {
   const {activityNodes} = processData.value;
   if (!activityNodes || !activityNodes.length) return 0;
-  return activityNodes.length - 1;
+  // return activityNodes.length - 1;
+  return activityNodes.length;
 }
 
 /**
@@ -557,12 +558,12 @@ const DetailQuery = async (taskIdStr: string) => {
     loading.value = true;
     const tabType = Number(activeTab.value);
     let res: any;
-
+    // 0-待办 1-已办 2-我发起的任务
     if (tabType === 0) {
       res = await getTodoTaskDetail({taskId: taskIdStr});
-    } else if (tabType === 1) {
-      res = await getMyTaskDetail({taskId: taskIdStr});
     } else if (tabType === 2) {
+      res = await getMyTaskDetail({taskId: taskIdStr});
+    } else if (tabType === 1) {
       res = await getDoneTaskDetail({taskId: taskIdStr});
     } else {
       uni.showToast({title: '无效的工单类型', icon: 'none'});
diff --git a/pages-sub/problem/work-order-manage/index.vue b/pages-sub/problem/work-order-manage/index.vue
index 70a1155..f91c296 100644
--- a/pages-sub/problem/work-order-manage/index.vue
+++ b/pages-sub/problem/work-order-manage/index.vue
@@ -101,20 +101,20 @@
                 <view class="u-line-1 u-body-value">{{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
               </view>
               <!-- 操作按钮行 -->
-              <view class="u-body-item u-flex common-justify-between common-item-center mt-20">
-                <up-button type="warning" size="mini" @click="handleReject(item)"
+              <view class="u-body-item u-body-item-btn-wrap u-flex common-justify-between common-item-center mt-20">
+                <up-button type="warning" size="large" @click="handleReject(item)"
                            v-show="nextStepMap[item.taskKey].backShow">回退
                 </up-button>
 
-                <up-button type="success" size="mini" @click="handleRenew(item)"
+                <up-button type="success" size="large" @click="handleRenew(item)"
                            v-show="nextStepMap[item.taskKey].renewShow">重新提交
                 </up-button>
 
-                <up-button type="primary" size="mini" @click="handleProcess(item)">{{
+                <up-button type="primary" size="large" @click="handleProcess(item)">{{
                     nextStepMap[item.taskKey].btnText
                   }}
                 </up-button>
-                <up-button type="info" size="mini" @click="handleDetail(item)">详情</up-button>
+                <up-button type="info" size="large" @click="handleDetail(item)">详情</up-button>
               </view>
             </view>
           </template>
@@ -132,6 +132,14 @@
         >
           <template #body>
             <view class="card-body">
+
+<!--              <view class=" ">-->
+<!--                <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>-->
+<!--              </view>-->
+              <view class="common-custom-btn " style="--btn-top: 130px;"  @click="handleDetail(item)">
+                工单详情
+              </view>
+
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">工单编号：</view>
                 <view class="u-line-1 u-body-value">{{ item.orderNo || '-' }}</view>
@@ -152,9 +160,9 @@
               <view class="u-body-item u-flex common-justify-between common-item-center">
                 <view class="u-body-item-title">紧急程度：{{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) }}
                 </view>
-                <view class=" ">
-                  <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>
-                </view>
+<!--                <view class=" ">-->
+<!--                  <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>-->
+<!--                </view>-->
               </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">工单状态：</view>
@@ -286,11 +294,11 @@ import { useUploadImgs } from '@/common/utils/useUploadImgs'
 // ========== 状态管理 ==========
 const userStore = useUserStore();
 // 标签页切换
-const activeTab = ref(0); // 0-待办 1-我发起的 2-已办
+const activeTab = ref(0); //0-待办 1-已办 2-我发起的任务
 const tabList = ref([
   {name: '待办'},
-  {name: '我发起的任务'},
-  {name: '已办'}
+  {name: '已办'},
+  {name: '我发起的任务'}
 ]);
 // 排序下拉框
 const selectedSortValue = ref(1);
@@ -353,10 +361,11 @@ const queryList = async (pageNo, pageSize) => {
       type: selectedSortValue.value // 1-位置 2-工单名称 3-情况描述 4-工单编号
     };
     let res;
+    // 0-待办 1-已办 2-我发起的任务
     if (activeTab.value == 0) {
       // 待办工单
       res = await todoBuzSimplePage(apiParams);
-    } else if (activeTab.value == 1) {
+    } else if (activeTab.value == 2) {
       // 我发起的任务
       res = await myBuzSimplePage(apiParams);
     } else {
@@ -403,7 +412,7 @@ const handleSearch = (val) => {
 // };
 // 工单详情
 const handleDetail = (item) => {
-  // 0-待办 1我发起的- 2-已办
+  // 0-待办 1-已办 2-我发起的任务
   uni.navigateTo({
     url: `/pages-sub/problem/work-order-manage/order-detail?taskId=${item.taskId}&activeTab=${activeTab.value}&processInstanceId=${item.processInstanceId}`,
     events: {
@@ -609,7 +618,7 @@ const handleAcceptModalCancel = () => {
 // 验收弹窗 - 确定按钮（含returnImgs传参）
 const handleAcceptModalConfirm = async () => {
   // 1. 校验验收原因是否为空
-  if (!acceptReason.value.trim()) {
+  if (acceptRadioValue.value == 1 && !acceptReason.value.trim()) {
     uni.showToast({title: '请填写验收原因', icon: 'none', duration: 1000});
     return;
   }
@@ -706,10 +715,11 @@ onLoad(() => {
   border-radius: 12rpx;
   box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 }
+.u-body-item-btn-wrap :deep(.u-button--large){
+  height: 28px;
+}
 
-.card-body {
 
-}
 
 // 回退modal样式
 .reject-modal-content {
diff --git a/pages-sub/problem/work-order-manage/order-detail.vue b/pages-sub/problem/work-order-manage/order-detail.vue
index fff5c60..11e183d 100644
--- a/pages-sub/problem/work-order-manage/order-detail.vue
+++ b/pages-sub/problem/work-order-manage/order-detail.vue
@@ -202,7 +202,7 @@
 
                     <!-- 2. 原描述内容：时间 + 处理说明（最多200字） -->
                     <view class="step-desc">
-                      <view class="operator-name up-line-1">
+                      <view class="operator-name up-line-1" v-if="item.tasks">
                         处理人：
                         <text>{{ item.tasks?.map(itemName => itemName.assigneeUser?.nickname).filter(Boolean).join('，') }}</text>
                       </view>
@@ -492,7 +492,8 @@ const getCurrentStepIndex = () => {
   if (!activityNodes || !activityNodes.length) return 0;
 
   // 2. 若没有处理中的节点（全部已完成），则激活最后一个节点
-  return activityNodes.length - 1;
+  // return activityNodes.length - 1;
+  return activityNodes.length;
 }
 
 /**
@@ -505,12 +506,12 @@ const DetailQuery = async (taskIdStr: string) => {
     // 转换activeTab为数字类型，避免类型不一致导致接口调用失败
     const tabType = Number(activeTab.value);
     let res: any;
-
+    // 0-待办 1-已办 2-我发起的任务
     if (tabType === 0) {
       res = await getTodoTaskDetail({taskId: taskIdStr});
-    } else if (tabType === 1) {
-      res = await getMyTaskDetail({taskId: taskIdStr});
     } else if (tabType === 2) {
+      res = await getMyTaskDetail({taskId: taskIdStr});
+    } else if (tabType === 1) {
       res = await getDoneTaskDetail({taskId: taskIdStr});
     } else {
       uni.showToast({title: '无效的工单类型', icon: 'none'});
@@ -547,10 +548,11 @@ const activeTopTabClick = async (item: any) => {
     // 关键：格式化数据，补充up-steps要求的title字段
     if (res && res.activityNodes && res.activityNodes.length) {
       // 1. 先过滤：剔除 name 为 "结束" 的节点
-      const filteredActivityNodes = res.activityNodes.filter(node => {
-        // 返回 true 保留节点，返回 false 剔除节点
-        return node.name !== '结束';
-      });
+      // const filteredActivityNodes = res.activityNodes.filter(node => {
+      //   // 返回 true 保留节点，返回 false 剔除节点
+      //   return node.name !== '结束';
+      // });
+      const filteredActivityNodes = res.activityNodes
       const formatActivityNodes = filteredActivityNodes.map(node => ({
         ...node,
         title: node.name // 补充强制字段，满足3.3.48版本组件要求
@@ -785,7 +787,7 @@ const handleAcceptModalCancel = () => {
 // ========== 验收弹窗确认按钮（新增returnImgs传参） ==========
 const handleAcceptModalConfirm = async () => {
   // 1. 校验验收原因是否为空
-  if (!acceptReason.value.trim()) {
+  if (acceptRadioValue.value == 1 && !acceptReason.value.trim()) {
     uni.showToast({title: '请填写验收原因', icon: 'none', duration: 1000});
     return;
   }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8177b29..48a32b9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -32,13 +32,18 @@
                 placeholder="请选择日期范围"
                 @confirm="handleDateConfirm"
                 :max-date="maxDate"
+
+                @popup-show="handlePopupShow"
+                @popup-hide="handlePopupHide"
             />
+<!--            :minDate="minDate"-->
           </view>
         </view>
 
         <!-- 双折线K线图 -->
         <view class="chart-container">
           <uni-charts
+              v-if="!isDatePickerOpen"
               type="line"
               :data="klineChartData"
               :categories="klineCategories"
@@ -75,6 +80,7 @@
           :page-size="10"
           use-page-scroll
       >
+
         <template #empty>
           <up-empty/>
         </template>
@@ -122,8 +128,23 @@ import {getTaskCompletionSummary, getTaskDetails} from "@/api/index/index";
 const msgCount = ref(0);
 const currentTab = ref('todo'); // todo:待办 done:已办
 const dateRange = ref([]);
-const maxDate = ref(timeFormat(new Date(), 'yyyy-mm-dd'));
+const yesterday = new Date();
+yesterday.setDate(yesterday.getDate() - 1); // 日期减1天 = 昨天
+const maxDate = ref(timeFormat(yesterday, 'yyyy-mm-dd'));
+const minDate = '2026-01-06'
+
+// 新增响应式变量：标记日期选择器弹窗是否打开
+const isDatePickerOpen = ref(false);
+
+// 弹窗打开时触发
+const handlePopupShow = () => {
+  isDatePickerOpen.value = true;
+};
 
+// 弹窗关闭时触发
+const handlePopupHide = () => {
+  isDatePickerOpen.value = false;
+};
 //  Tab列表配置
 const tabList = ref([]);
 const todoTotal = ref(0); // 待办事项总数
@@ -193,16 +214,18 @@ const rpx2px = (rpx) => {
 
 
 const initRecent7Days = async () => {
-  const now = new Date();
-  const sevenDaysAgo = new Date();
-  sevenDaysAgo.setDate(now.getDate() - 6);
+  const yesterday = new Date();
+  yesterday.setDate(yesterday.getDate() - 1); // 结束时间 = 昨天
+  const sevenDaysAgo = new Date(yesterday);
+  sevenDaysAgo.setDate(yesterday.getDate() - 6); // 开始时间 = 昨天往前推6天（共7天）
+
   // 格式化日期为 YYYY-MM-DD 格式
   dateRange.value = [
     timeFormat(sevenDaysAgo, 'yyyy-mm-dd'),
-    timeFormat(now, 'yyyy-mm-dd')
+    timeFormat(yesterday, 'yyyy-mm-dd')
   ];
 
-  initChartData(timeFormat(sevenDaysAgo, 'yyyy-mm-dd'), timeFormat(now, 'yyyy-mm-dd'));
+  initChartData(timeFormat(sevenDaysAgo, 'yyyy-mm-dd'), timeFormat(yesterday, 'yyyy-mm-dd'));
 };
 
 const getUnread = async () => {
@@ -381,8 +404,8 @@ $border-color: #e5e5e5; // 新增边框颜色变量
   justify-content: space-between;
   align-items: center;
   color: #fff;
-  position: relative;
-  z-index: 1;
+  //position: relative;
+  //z-index: 1;
 
   .username {
     font-size: 16px;
@@ -415,8 +438,8 @@ $border-color: #e5e5e5; // 新增边框颜色变量
   margin-top: -122px;
   border-radius: $border-radius $border-radius 0 0;
   background-color: $bg-color;
-  position: relative;
-  z-index: 999;
+  //position: relative;
+  //z-index: 999;
   overflow: hidden;
   padding-bottom: $spacing-lg;
 }
@@ -446,7 +469,8 @@ $border-color: #e5e5e5; // 新增边框颜色变量
       padding: 2px 4px;
       border-radius: 3px;
       transition: background-color 0.2s;
-
+      position: relative;
+      z-index: 999;
       &:active {
         background-color: $bg-color;
       }
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 3b46f95..aa0aa28 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -17,11 +17,11 @@
           :activeStyle="{
             color: '#3c9cff',
             fontWeight:'500',
-            fontSize: '14'
+            fontSize: '14px' // 补充单位，避免样式异常
         }"
           :inactiveStyle="{
            color: '#606060',
-            fontSize: '14'
+            fontSize: '14px' // 补充单位，避免样式异常
         }"
       ></up-tabs>
 
@@ -44,8 +44,6 @@
               :disabled="isLoading"
               shape="circle"
               placeholder="请输入手机号"
-              selectionStart="10"
-              selectionEnd="10"
               @blur="() => loginFormRef.validateField('mobile')"
           />
         </up-form-item>
@@ -95,8 +93,8 @@
               iconSize="14"
               labelSize="14"
               labelColor="'#3F3F3F'"
-              usedAlone
-              v-model:checked="rememberPwd"
+          usedAlone
+          v-model:checked="rememberPwd"
           >
           </up-checkbox>
         </view>
@@ -126,20 +124,14 @@ import { useUserStore } from '@/pinia/user';
 import globalConfig from '@/common/config/global';
 import CryptoJS from 'crypto-js';
 
-// ========== 加密工具函数（建议抽离到 @/utils/encrypt.js） ==========
-// 密钥配置：生产环境建议从后端接口获取，不要硬编码
+// ========== 加密工具函数 ==========
 const CRYPTO_CONFIG = {
-  key: CryptoJS.enc.Utf8.parse('jcsscrypto123abc'), // 16位key（AES-128）
+  key: CryptoJS.enc.Utf8.parse('jcsscrypto123abc'), // 16位key
   iv: CryptoJS.enc.Utf8.parse('abc123jcsscrypto'),  // 16位iv
   mode: CryptoJS.mode.CBC,
   padding: CryptoJS.pad.Pkcs7
 };
 
-/**
- * AES加密
- * @param {string} text 待加密文本
- * @returns {string} 加密后的字符串
- */
 const aesEncrypt = (text) => {
   if (!text) return '';
   try {
@@ -154,11 +146,6 @@ const aesEncrypt = (text) => {
   }
 };
 
-/**
- * AES解密
- * @param {string} encryptedText 加密后的字符串
- * @returns {string} 解密后的原始文本
- */
 const aesDecrypt = (encryptedText) => {
   if (!encryptedText) return '';
   try {
@@ -191,9 +178,9 @@ const rememberPwd = ref(true);
 
 // 表单数据
 const form = reactive({
-  account: '',
-  mobile: '',
-  password: ''
+  account: '',  // 账号
+  mobile: '',   // 手机号
+  password: ''  // 密码
 });
 
 // 表单校验规则
@@ -212,15 +199,12 @@ const loginFormRules = reactive({
   ]
 });
 
-// Tabs切换事件
+// Tabs切换事件：移除清空输入框的逻辑
 const handleTabChange = ({ name }) => {
   if (isLoading.value) return;
+  console.log('切换到:', name);
   loginType.value = name;
-  if (name === '手机号登录') {
-    form.account = '';
-  } else {
-    form.mobile = '';
-  }
+  // 只清空校验状态，不清除输入框内容
   nextTick(() => {
     loginFormRef.value?.clearValidate();
   });
@@ -260,20 +244,20 @@ const handleLogin = async () => {
     // 保存数据：账号/密码 均用AES加密
     if (rememberPwd.value) {
       try {
+        console.log('123+'+loginType.value)
         if (loginType.value === '手机号登录') {
           uni.setStorageSync('login_mobile', aesEncrypt(form.mobile));
-          uni.removeStorageSync('login_account');
+          uni.removeStorageSync('login_account'); // 确保只存一种类型
         } else {
           uni.setStorageSync('login_account', aesEncrypt(form.account));
-          uni.removeStorageSync('login_mobile');
+          uni.removeStorageSync('login_mobile'); // 确保只存一种类型
         }
-        // 密码加密存储（可解密还原）
         uni.setStorageSync('login_password', aesEncrypt(form.password));
       } catch (err) {
         console.warn('保存登录信息失败:', err);
       }
     } else {
-      // 清除缓存
+      // 清除所有缓存
       uni.removeStorageSync('login_account');
       uni.removeStorageSync('login_mobile');
       uni.removeStorageSync('login_password');
@@ -308,21 +292,23 @@ onMounted(() => {
   nextTick(() => {
     loginFormRef.value?.setRules(loginFormRules);
   });
-  // 读取缓存并解密填充
+  // 读取缓存并解密填充：修复逻辑漏洞，确保只填充当前登录类型的输入框
   if (rememberPwd.value) {
     try {
       const savedAccount = aesDecrypt(uni.getStorageSync('login_account') || '');
       const savedMobile = aesDecrypt(uni.getStorageSync('login_mobile') || '');
       const savedPwd = aesDecrypt(uni.getStorageSync('login_password') || '');
 
+      // 核心修正：只填充对应类型的输入框，另一类置空
       if (savedAccount) {
         form.account = savedAccount;
-        loginType.value = '账号登录';
+        form.mobile = ''; // 清空手机号输入框
+        // loginType.value = '账号登录';
       } else if (savedMobile) {
         form.mobile = savedMobile;
-        loginType.value = '手机号登录';
+        form.account = ''; // 清空账号输入框
+        // loginType.value = '手机号登录';
       }
-      // 密码解密后填充到输入框（可展示）
       form.password = savedPwd;
     } catch (err) {
       console.warn('读取缓存失败:', err);
@@ -332,7 +318,6 @@ onMounted(() => {
 </script>
 
 <style scoped lang="scss">
-
 .top-title {
   background: url("https://img.jichengshanshui.com.cn:28207/appimg/bg.jpg") no-repeat;
   background-size: 100% 100%;
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 86696aa..754a4ac 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -11,7 +11,7 @@
 
       <!-- 用户名+手机号 -->
       <view class="user-info-content">
-        <view class="user-name">{{ userStore.isLogin ? userInfo.username : '未登录' }}</view>
+        <view class="user-name">{{ userStore.isLogin ? userInfo.nickname : '未登录' }}</view>
 <!--        <view class="user-phone">{{ userStore.isLogin ? userInfo.nickname : '&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;' }}</view>-->
         <view class="user-phone">上次登录时间   {{ timeFormat(userInfo.loginDate)}}</view>
 
@@ -129,7 +129,7 @@ export default {
   background-size: 100% 100%;
   z-index: -1;
   display: flex;
-  padding: 80px 0 0 20px;
+  padding: 80px 0 0 15px;
 }
 .mine-content{
   margin-top: -150px;