diff --git a/App.vue b/App.vue
index cf53a6a..b1bbf76 100644
--- a/App.vue
+++ b/App.vue
@@ -123,4 +123,9 @@ page {
   padding-left: 15px;
   padding-right: 15px;
 }
+
+.common-text-color{
+  font-size: 14px;
+  color: #606266
+}
 </style>
\ No newline at end of file
diff --git a/common/utils/useUploadImgs.ts b/common/utils/useUploadImgs.js
index 6f17211..9e470f6 100644
--- a/common/utils/useUploadImgs.ts
+++ b/common/utils/useUploadImgs.js
@@ -1,69 +1,68 @@
-import { ref, type Ref } from 'vue'
+import { ref } from 'vue'
 import { uploadImages } from '@/common/utils/upload'
-import type { UniFormRef } from '@/uni_modules/uview-plus/types'
-
-// 定义上传配置类型
-export interface UploadImgConfig {
-    maxCount?: number // 最大上传数量，默认3
-    uploadText?: string // 上传按钮文案
-    sizeType?: UniApp.UploadFileOption['sizeType'] // 图片压缩类型
-    formRef: Ref<UniFormRef | null> // 表单ref，用于校验
-    fieldName: string // 表单校验字段名（如problemImgs）
-}
-
-// 定义图片项类型
-export interface UploadImgItem {
-    url: string
-    status: 'uploading' | 'success' | 'failed'
-    message: string
-    [key: string]: any // 兼容其他字段
-}
 
 /**
- * 图片上传组合式函数（支持多实例复用）
+ * 图片上传组合式函数（兼容非TS环境，纯数组格式）
  * @param config 上传配置
  * @returns 上传相关方法和状态
  */
-export function useUploadImgs(config: UploadImgConfig) {
+export function useUploadImgs(config) {
     // 默认配置
     const defaultConfig = {
         maxCount: 3,
         uploadText: '选择图片',
-        sizeType: ['compressed'] as UniApp.UploadFileOption['sizeType'],
+        sizeType: ['compressed'],
         ...config
     }
 
-    // 图片列表
-    const imgList = ref<UploadImgItem[]>([])
+    // 核心修复：初始化为纯数组，且格式适配u-upload
+    const imgList = ref([])
 
     /**
      * 删除图片
      */
-    const deleteImg = (event: { index: number }) => {
-        imgList.value.splice(event.index, 1)
+    const deleteImg = (event) => {
+        // 确保index是有效数字
+        const index = Number(event.index)
+        if (isNaN(index) || index < 0 || index >= imgList.value.length) return
+
+        imgList.value.splice(index, 1)
         // 删除后重新校验
         defaultConfig.formRef.value?.validateField(defaultConfig.fieldName)
         uni.showToast({ title: '图片删除成功', icon: 'success' })
     }
 
     /**
-     * 上传图片
+     * 上传图片（适配u-upload的file格式）
      */
-    const uploadImgs = async (event: { file: UniApp.ChooseImageSuccessCallbackResult | UniApp.ChooseImageSuccessCallbackResult[] }) => {
-        const fileList = Array.isArray(event.file) ? event.file : [event.file]
+    const uploadImgs = async (event) => {
+        // 核心修复：标准化file数据格式
+        const rawFile = event.file || {}
+        const fileList = Array.isArray(rawFile) ? rawFile : [rawFile]
+
+        // 过滤无效文件
+        const validFiles = fileList.filter(file => file && file.url)
+        if (validFiles.length === 0) {
+            uni.showToast({ title: '请选择有效图片', icon: 'none' })
+            return
+        }
+
         const targetImgList = imgList.value
 
-        // 过滤超出最大数量的图片
-        if (targetImgList.length + fileList.length > defaultConfig.maxCount) {
+        // 校验最大数量
+        if (targetImgList.length + validFiles.length > defaultConfig.maxCount) {
             uni.showToast({ title: `最多只能上传${defaultConfig.maxCount}张图片`, icon: 'none' })
             return
         }
 
-        const filePaths = fileList.map(item => item.url)
-        const tempItems = fileList.map(item => ({
-            ...item,
-            status: 'uploading' as const,
-            message: '上传中'
+        // 核心修复：转换为u-upload兼容的格式
+        const filePaths = validFiles.map(item => item.url)
+        const tempItems = validFiles.map(item => ({
+            url: item.url,
+            status: 'uploading',
+            message: '上传中',
+            name: item.name || '',
+            size: item.size || 0
         }))
         const startIndex = targetImgList.length
         targetImgList.push(...tempItems)
@@ -78,29 +77,32 @@ export function useUploadImgs(config: UploadImgConfig) {
             uploadResultUrls.forEach((url, index) => {
                 if (targetImgList[startIndex + index]) {
                     targetImgList.splice(startIndex + index, 1, {
-                        ...fileList[index],
-                        status: 'success' as const,
+                        url: url,
+                        status: 'success',
                         message: '',
-                        url: url
+                        name: validFiles[index].name || '',
+                        size: validFiles[index].size || 0
                     })
                 }
             })
 
             // 处理上传失败的图片
-            if (uploadResultUrls.length < fileList.length) {
-                const failCount = fileList.length - uploadResultUrls.length
-                for (let i = uploadResultUrls.length; i < fileList.length; i++) {
+            if (uploadResultUrls.length < validFiles.length) {
+                const failCount = validFiles.length - uploadResultUrls.length
+                for (let i = uploadResultUrls.length; i < validFiles.length; i++) {
                     if (targetImgList[startIndex + i]) {
                         targetImgList.splice(startIndex + i, 1, {
-                            ...fileList[i],
-                            status: 'failed' as const,
-                            message: '上传失败'
+                            url: validFiles[i].url,
+                            status: 'failed',
+                            message: '上传失败',
+                            name: validFiles[i].name || '',
+                            size: validFiles[i].size || 0
                         })
                     }
                 }
                 uni.showToast({ title: `成功上传${uploadResultUrls.length}张，失败${failCount}张`, icon: 'none' })
             } else {
-                uni.showToast({ title: `成功上传${fileList.length}张图片`, icon: 'success' })
+                uni.showToast({ title: `成功上传${validFiles.length}张图片`, icon: 'success' })
             }
 
             // 上传完成后校验
@@ -108,12 +110,14 @@ export function useUploadImgs(config: UploadImgConfig) {
         } catch (err) {
             console.error(`【${defaultConfig.fieldName}】图片上传失败：`, err)
             // 标记所有上传失败
-            for (let i = 0; i < fileList.length; i++) {
+            for (let i = 0; i < validFiles.length; i++) {
                 if (targetImgList[startIndex + i]) {
                     targetImgList.splice(startIndex + i, 1, {
-                        ...fileList[i],
-                        status: 'failed' as const,
-                        message: '上传失败'
+                        url: validFiles[i].url,
+                        status: 'failed',
+                        message: '上传失败',
+                        name: validFiles[i].name || '',
+                        size: validFiles[i].size || 0
                     })
                 }
             }
@@ -137,14 +141,15 @@ export function useUploadImgs(config: UploadImgConfig) {
         required: true,
         message: `请上传${defaultConfig.uploadText.replace('选择', '')}`,
         trigger: 'change',
-        validator: (rule: any, value: any, callback: (error?: Error) => void) => {
+        validator: (rule, value, callback) => {
             const hasSuccessImg = imgList.value.some(item => item.status === 'success')
             hasSuccessImg ? callback() : callback(new Error(`请上传至少1张${defaultConfig.uploadText.replace('选择', '')}`))
         }
     }
 
     return {
-        imgList,
+        imgList: imgList.value, // 核心修复：返回纯数组（解除响应式代理）
+        rawImgList: imgList,    // 保留响应式引用（内部使用）
         uploadImgs,
         deleteImg,
         getSuccessImgUrls,
diff --git a/pages-sub/daily/maintain-manage/finish-plan-detail.vue b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
index ab86727..f72c6ee 100644
--- a/pages-sub/daily/maintain-manage/finish-plan-detail.vue
+++ b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
@@ -71,7 +71,7 @@
               <view  style="min-width: 200rpx">巡查描述</view>
             </template>
             <template #value>
-              <view  class="up-line-1" style="color: #606266">{{i.remark || '--'}}</view>
+              <view  class="up-line-1 common-text-color" >{{i.remark || '--'}}</view>
             </template>
           </up-cell>
 
diff --git a/pages-sub/daily/patrol-manage/finish-plan-detail.vue b/pages-sub/daily/patrol-manage/finish-plan-detail.vue
index 972ca3e..3b62805 100644
--- a/pages-sub/daily/patrol-manage/finish-plan-detail.vue
+++ b/pages-sub/daily/patrol-manage/finish-plan-detail.vue
@@ -72,7 +72,7 @@
               <view  style="min-width: 200rpx">巡查描述</view>
             </template>
             <template #value>
-              <view  class="up-line-1" style="color: #606266">{{i.remark || '--'}}</view>
+              <view  class="up-line-1 common-text-color">{{i.remark || '--'}}</view>
             </template>
           </up-cell>
 
diff --git a/pages-sub/daily/quick-order/add-order.vue b/pages-sub/daily/quick-order/add-order.vue
index 82ba3cc..8a27550 100644
--- a/pages-sub/daily/quick-order/add-order.vue
+++ b/pages-sub/daily/quick-order/add-order.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="u-page">
+  <view class="page-container">
     <!-- 核心：将所有 up-form-item 包裹在同一个 up-form 内 -->
     <view class="work-order-form-content commonPageLRpadding">
       <up-form
@@ -35,14 +35,14 @@
         >
           <up-input
               v-model="workOrderForm.roadName"
-              disabled
+              readonly
               disabled-color="#ffffff"
               placeholder="请先选择工单位置"
               border="none"
-              :placeholder-style="workOrderForm.workLocation ? '' : 'color:#999;'"
+
           ></up-input>
           <template #right>
-            <up-icon name="arrow-right" size="16" :color="workOrderForm.workLocation ? '#333' : '#999'"></up-icon>
+            <up-icon name="arrow-right" size="16" ></up-icon>
           </template>
         </up-form-item>
 
@@ -74,7 +74,7 @@
         >
           <up-textarea
               placeholder="请输入情况描述（最多200字）"
-              v-model="workOrderForm.problemDesc"
+              v-model.trim="workOrderForm.problemDesc"
               count
               maxlength="200"
               rows="4"
@@ -111,7 +111,7 @@
         <up-form-item label="处理结果" prop="handleResult" class="mt-20">
           <up-textarea
               placeholder="请输入处理结果描述（最多200字，选填）"
-              v-model="workOrderForm.handleResult"
+              v-model.trim="workOrderForm.handleResult"
               count
               maxlength="200"
               rows="4"
@@ -206,7 +206,7 @@ export default {
         ],
         problemDesc: [
           {type: 'string', required: true, message: '请输入情况描述', trigger: ['change', 'blur']},
-          {type: 'string', min: 3, max: 200, message: '情况描述需3-150字', trigger: ['change', 'blur']}
+          {type: 'string', min: 3, max: 200, message: '情况描述需3-200字', trigger: ['change', 'blur']}
         ],
         problemImgs: [
           {
@@ -447,8 +447,8 @@ export default {
           roadName: this.workOrderForm.roadName,
           imgs: this.getImgUrlList(this.problemImgsList),
           longRangeImgList: this.getImgUrlList(this.completeImgsList),
-          remark: this.workOrderForm.problemDesc,
-          handleResult: this.workOrderForm.handleResult,
+          remark: this.workOrderForm.problemDesc.trim(),
+          handleResult: this.workOrderForm.handleResult.trim(),
           latLonType: 2,
           lat: this.workOrderForm.lat,
           lon: this.workOrderForm.lon,
@@ -509,13 +509,14 @@ export default {
 
 <style lang="scss" scoped>
 // 全局页面样式
-.u-page {
+.page-container {
   min-height: 100vh;
 }
 
 // 工单表单内容容器
 .work-order-form-content {
   background: #fff;
+  margin-bottom: 100rpx;
 }
 
 
diff --git a/pages-sub/daily/quick-order/order-detail.vue b/pages-sub/daily/quick-order/order-detail.vue
index 826a742..764e42f 100644
--- a/pages-sub/daily/quick-order/order-detail.vue
+++ b/pages-sub/daily/quick-order/order-detail.vue
@@ -33,7 +33,7 @@
             <view  style="min-width: 200rpx">工单位置</view>
           </template>
           <template #value>
-            <view  class="up-line-1">{{orderDetail.roadName || '--'}}</view>
+            <view  class="up-line-1 common-text-color" >{{orderDetail.roadName || '--'}}</view>
           </template>
 
         </up-cell>
@@ -54,7 +54,7 @@
             <view  style="min-width: 200rpx">情况描述</view>
           </template>
           <template #value>
-            <view  class="up-line-1">{{orderDetail.remark || '--'}}</view>
+            <view  class="up-line-1 common-text-color" >{{orderDetail.remark || '--'}}</view>
           </template>
         </up-cell>
 
@@ -101,7 +101,7 @@
             <view  style="min-width: 200rpx">处理结果</view>
           </template>
           <template #value>
-            <view  class="up-line-1">{{orderDetail.handleResult || '--'}}</view>
+            <view  class="up-line-1 common-text-color" >{{orderDetail.handleResult || '--'}}</view>
           </template>
         </up-cell>
       </up-cell-group>
diff --git a/pages-sub/problem/work-order-manage/add-order.vue b/pages-sub/problem/work-order-manage/add-order.vue
index 4f7b89e..d709bd6 100644
--- a/pages-sub/problem/work-order-manage/add-order.vue
+++ b/pages-sub/problem/work-order-manage/add-order.vue
@@ -1,6 +1,5 @@
 <template>
-  <view class="u-page">
-    <!-- 核心：将所有 up-form-item 包裹在同一个 up-form 内 -->
+  <view class="page-container">
     <view class="work-order-form-content commonPageLRpadding">
       <up-form
           label-position="left"
@@ -25,7 +24,7 @@
           ></up-input>
         </up-form-item>
 
-        <!-- 2. 道路名称（下拉框：位置选择后才可点击） -->
+        <!-- 2. 道路名称（下拉框） -->
         <up-form-item
             label="道路名称"
             prop="roadName"
@@ -98,25 +97,26 @@
               count
               maxlength="200"
               rows="4"
-              @blur="() => $refs.workOrderFormRef.validateField('problemDesc')"
+              @blur="() => workOrderFormRef.validateField('problemDesc')"
           ></up-textarea>
         </up-form-item>
 
-        <!-- 问题照片（移除完成照片相关代码） -->
+        <!-- 问题照片（核心修复：绑定纯数组） -->
         <up-form-item label="问题照片" prop="problemImgs" required>
           <up-upload
-              :file-list="problemImgsList"
-              @after-read="(event) => uploadImgs(event, 'problemImgsList')"
-              @delete="(event) => deleteImg(event, 'problemImgsList')"
+              :file-list="problemImgs.imgList"
+              @after-read="problemImgs.uploadImgs"
+              @delete="problemImgs.deleteImg"
               multiple
-              :max-count="3"
-              upload-text="选择问题照片"
+              :max-count="problemImgs.uploadConfig.maxCount"
+              :upload-text="problemImgs.uploadConfig.uploadText"
+              :size-type="problemImgs.uploadConfig.sizeType"
           ></up-upload>
         </up-form-item>
 
         <!-- 完成时间 -->
         <up-form-item
-            label="完成时间"
+            label="希望完成时间"
             prop="finishTime"
             @click="show=true;hideKeyboard()"
         >
@@ -163,402 +163,307 @@
   </view>
 </template>
 
-<script setup lang="ts">
-import {ref} from 'vue'
-import type {UniFormRef} from '@/uni_modules/uview-plus/types'
-// 定义ref供选项式API使用
-const workOrderFormRef = ref<UniFormRef>(null)
-</script>
+<script setup>
+import { ref, reactive, watch } from 'vue'
+import { onReady, onShow } from '@dcloudio/uni-app';
+import { useUploadImgs } from '@/common/utils/useUploadImgs' // 引入改造后的上传逻辑
+import { getRoadListByLatLng } from '@/api/common'
+import { createQuick } from '@/api/quick-order/quick-order'
+import { timeFormat } from '@/uni_modules/uview-plus'
+
+// ========== 表单Ref ==========
+const workOrderFormRef = ref(null)
+
+// ========== 公共上传逻辑复用 ==========
+const problemImgs = useUploadImgs({
+  maxCount: 3,
+  uploadText: '选择问题照片',
+  sizeType: ['compressed'],
+  formRef: workOrderFormRef,
+  fieldName: 'problemImgs'
+})
+
+// 核心修复：监听响应式数组变化，同步更新纯数组（解决u-upload不刷新问题）
+watch(() => problemImgs.rawImgList.value, (newVal) => {
+  problemImgs.imgList = newVal
+}, { deep: true })
+
+// ========== 页面状态 ==========
+// 通用弹窗控制
+const showActionSheet = ref(false)
+// 当前弹窗配置
+const currentActionSheetData = reactive({
+  type: '',
+  list: [],
+  title: ''
+})
+// 完成时间选择器控制
+const show = ref(false)
+const finishTime = ref(Date.now())
+
+// ========== 下拉列表数据 ==========
+const roadNameList = ref([])
+const orderNameList = ref([])
+const pressingTypeList = ref([])
+
+// ========== 工单表单数据 ==========
+const workOrderForm = reactive({
+  roadId: 0,                     // 道路ID
+  roadName: '',                  // 道路名称
+  workLocation: '',              // 工单位置
+  orderName: '',                 // 工单名称
+  pressingType: 0,               // 紧急程度值（提交接口用）
+  pressingTypeName: '',          // 紧急程度名称（显示用）
+  problemDesc: '',               // 情况描述
+  lat: 0,                        // 纬度
+  lon: 0,                        // 经度
+  finishTime: '',                // 完成时间
+})
+
+// ========== 表单校验规则 ==========
+const workOrderFormRules = reactive({
+  workLocation: [
+    { type: 'string', required: true, message: '请选择工单位置', trigger: ['change', 'blur'] }
+  ],
+  roadName: [
+    { type: 'string', required: true, message: '请选择道路名称', trigger: ['change', 'blur'] }
+  ],
+  orderName: [
+    { type: 'string', required: true, message: '请选择工单名称', trigger: ['change', 'blur'] }
+  ],
+  pressingType: [
+    { type: 'number', required: true, message: '请选择紧急程度', trigger: ['change'] }
+  ],
+  problemDesc: [
+    { type: 'string', required: true, message: '请输入情况描述', trigger: ['change', 'blur'] },
+    { type: 'string', min: 3, max: 200, message: '情况描述需3-200字', trigger: ['change', 'blur'] }
+  ],
+  problemImgs: [problemImgs.imgValidateRule] // 复用上传校验规则
+})
+
+// ========== 生命周期 ==========
+onReady(() => {
+  // 设置表单校验规则
+  if (workOrderFormRef.value) {
+    workOrderFormRef.value.setRules(workOrderFormRules)
+  }
+  console.log('工单表单规则初始化完成')
+})
+
+onShow(() => {
+  console.log(uni.$dict.getDictLabel('ai_image_status', 20))
+  console.log(uni.$dict.getDictSimpleList('work_name'))
+
+  // 初始化工单名称列表
+  orderNameList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'))
+  console.log('工单名称列表：', orderNameList.value)
+
+  // 初始化紧急程度列表
+  pressingTypeList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('workorder_pressing_type'))
+  console.log('紧急程度列表：', pressingTypeList.value)
+})
+
+// ========== 方法定义 ==========
+/**
+ * 打开通用下拉弹窗
+ */
+const handleActionSheetOpen = (type) => {
+  // 道路名称需先校验工单位置是否选择
+  if (type === 'roadName' && !workOrderForm.workLocation) {
+    uni.showToast({ title: '请先选择工单位置', icon: 'none' })
+    return
+  }
 
-<script lang="ts">
-import {getRoadListByLatLng} from '@/api/common'
-import {uploadImages} from '@/common/utils/upload';
-import {createQuick} from '@/api/quick-order/quick-order'
-import { timeFormat } from '@/uni_modules/uview-plus' // 引入时间格式化工具
-
-export default {
-  data() {
-    return {
-      // 问题照片列表
-      problemImgsList: [],
-      // 通用弹窗控制
-      showActionSheet: false,
-      // 当前弹窗配置（类型 + 数据 + 标题）
-      currentActionSheetData: {
-        type: '', // roadName / orderName / pressingType
-        list: [], // 对应类型的选项列表
-        title: '' // 弹窗标题
-      },
-      // 完成时间选择器控制
-      show: false,
-      finishTime: Date.now(),
-      // 下拉列表数据
-      roadNameList: [],
-      orderNameList: [],
-      pressingTypeList: [],
-      // 工单表单数据
-      workOrderForm: {
-        roadId: 0,                     // 道路ID
-        roadName: '',                  // 道路名称
-        workLocation: '',              // 工单位置
-        orderName: '',                 // 工单名称
-        pressingType: 0,               // 紧急程度值（提交接口用）
-        pressingTypeName: '',          // 紧急程度名称（显示用）
-        problemDesc: '',               // 情况描述
-        lat: 0,                        // 纬度
-        lon: 0,                        // 经度
-        finishTime: '',                // 完成时间
-      },
-
-      // 表单校验规则
-      workOrderFormRules: {
-        workLocation: [
-          {type: 'string', required: true, message: '请选择工单位置', trigger: ['change', 'blur']}
-        ],
-        roadName: [
-          {type: 'string', required: true, message: '请选择道路名称', trigger: ['change', 'blur']}
-        ],
-        orderName: [
-          {type: 'string', required: true, message: '请选择工单名称', trigger: ['change', 'blur']}
-        ],
-        pressingType: [
-          {type: 'number', required: true, message: '请选择紧急程度', trigger: ['change']}
-        ],
-        problemDesc: [
-          {type: 'string', required: true, message: '请输入情况描述', trigger: ['change', 'blur']},
-          {type: 'string', min: 3, max: 200, message: '情况描述需3-200字', trigger: ['change', 'blur']}
-        ],
-        problemImgs: [
-          {
-            required: true,
-            message: '请上传问题照片',
-            trigger: 'change',
-            validator: (rule, value, callback) => {
-              const hasSuccessImg = this.problemImgsList.some(item => item.status === 'success')
-              hasSuccessImg ? callback() : callback(new Error('请上传至少1张问题照片'))
-            }
-          }
-        ]
-      }
+  // 配置当前弹窗参数
+  const configMap = {
+    roadName: {
+      title: '请选择道路名称',
+      list: roadNameList.value
+    },
+    orderName: {
+      title: '请选择工单名称',
+      list: orderNameList.value
+    },
+    pressingType: {
+      title: '请选择紧急程度',
+      list: pressingTypeList.value
     }
-  },
-
-  onReady() {
-    // 兼容微信小程序，通过setRules设置校验规则
-    this.$refs.workOrderFormRef.setRules(this.workOrderFormRules)
-    console.log('工单表单规则初始化完成')
-  },
-
-  onShow(){
-    console.log(uni.$dict.getDictLabel('ai_image_status', 20))
-    console.log(uni.$dict.getDictSimpleList('work_name'))
-
-    // 初始化工单名称列表
-    this.orderNameList = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'))
-    console.log('工单名称列表：', this.orderNameList)
-
-    // 初始化紧急程度列表
-    this.pressingTypeList = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('workorder_pressing_type'))
-    console.log('紧急程度列表：', this.pressingTypeList)
-  },
-
-  methods: {
-    /**
-     * 打开通用下拉弹窗
-     * @param type 弹窗类型：roadName / orderName / pressingType
-     */
-    handleActionSheetOpen(type) {
-      // 道路名称需先校验工单位置是否选择
-      if (type === 'roadName' && !this.workOrderForm.workLocation) {
-        uni.showToast({title: '请先选择工单位置', icon: 'none'})
-        return
-      }
+  }
 
-      // 配置当前弹窗参数
-      const configMap = {
-        roadName: {
-          title: '请选择道路名称',
-          list: this.roadNameList
-        },
-        orderName: {
-          title: '请选择工单名称',
-          list: this.orderNameList
-        },
-        pressingType: {
-          title: '请选择紧急程度',
-          list: this.pressingTypeList
-        }
-      }
+  currentActionSheetData.type = type
+  currentActionSheetData.title = configMap[type].title
+  currentActionSheetData.list = configMap[type].list
+  showActionSheet.value = true
+}
 
-      this.currentActionSheetData = {
-        type,
-        title: configMap[type].title,
-        list: configMap[type].list
-      }
-      this.showActionSheet = true
-    },
+/**
+ * 关闭通用下拉弹窗
+ */
+const handleActionSheetClose = () => {
+  showActionSheet.value = false
+  // 重置当前弹窗配置
+  currentActionSheetData.type = ''
+  currentActionSheetData.list = []
+  currentActionSheetData.title = ''
+}
 
-    /**
-     * 关闭通用下拉弹窗
-     */
-    handleActionSheetClose() {
-      this.showActionSheet = false
-      // 重置当前弹窗配置（可选，防止数据残留）
-      this.currentActionSheetData = { type: '', list: [], title: '' }
-    },
+/**
+ * 通用下拉弹窗选择事件
+ */
+const handleActionSheetSelect = (e) => {
+  const { type } = currentActionSheetData
+  // 根据类型处理不同的选择逻辑
+  switch (type) {
+    case 'roadName':
+      workOrderForm.roadName = e.name
+      workOrderForm.roadId = e.code
+      workOrderFormRef.value?.validateField('roadName')
+      break
+    case 'orderName':
+      workOrderForm.orderName = e.name
+      workOrderFormRef.value?.validateField('orderName')
+      break
+    case 'pressingType':
+      workOrderForm.pressingType = Number(e.value)
+      workOrderForm.pressingTypeName = e.name
+      workOrderFormRef.value?.validateField('pressingType')
+      break
+  }
+  // 关闭弹窗
+  showActionSheet.value = false
+}
 
-    /**
-     * 通用下拉弹窗选择事件
-     * @param e 选择的项
-     */
-    handleActionSheetSelect(e) {
-      const { type } = this.currentActionSheetData
-      // 根据类型处理不同的选择逻辑
-      switch (type) {
-        case 'roadName':
-          this.workOrderForm.roadName = e.name
-          this.workOrderForm.roadId = e.code
-          this.$refs.workOrderFormRef.validateField('roadName')
-          break
-        case 'orderName':
-          this.workOrderForm.orderName = e.name
-          this.$refs.workOrderFormRef.validateField('orderName')
-          break
-        case 'pressingType':
-          this.workOrderForm.pressingType = Number(e.value)
-          this.workOrderForm.pressingTypeName = e.name
-          this.$refs.workOrderFormRef.validateField('pressingType')
-          break
-      }
-      // 关闭弹窗
-      this.showActionSheet = false
-    },
+/**
+ * 返回上一页
+ */
+const navigateBack = () => {
+  uni.navigateBack()
+}
 
-    /**
-     * 返回上一页
-     */
-    navigateBack() {
-      uni.navigateBack()
-    },
+/**
+ * 选择工单位置
+ */
+const chooseWorkLocation = () => {
+  uni.chooseLocation({
+    success: async (res) => {
+      workOrderForm.roadName = ''
+      workOrderForm.roadId = 0
+      roadNameList.value = []
 
-    /**
-     * 删除图片
-     */
-    deleteImg(event, type) {
-      console.log('删除图片事件：', event, '类型：', type)
-      if (type === 'problemImgsList') {
-        this.problemImgsList.splice(event.index, 1)
-        this.$refs.workOrderFormRef.validateField('problemImgs')
-      }
-      uni.showToast({title: '图片删除成功', icon: 'success'})
-    },
+      workOrderForm.workLocation = res.name
+      workOrderForm.lat = res.latitude
+      workOrderForm.lon = res.longitude
 
-    /**
-     * 上传图片
-     */
-    async uploadImgs(event, type) {
-      console.log('上传图片事件：', event, '类型：', type)
-      if (type !== 'problemImgsList') return
-
-      const fileList = Array.isArray(event.file) ? event.file : [event.file]
-      const targetImgList = this.problemImgsList
-
-      const filePaths = fileList.map(item => item.url)
-      const tempItems = fileList.map(item => ({
-        ...item,
-        status: 'uploading',
-        message: '上传中'
-      }))
-      const startIndex = targetImgList.length
-      targetImgList.push(...tempItems)
+      workOrderFormRef.value?.validateField('workLocation')
+      workOrderFormRef.value?.validateField('roadName')
 
       try {
-        const uploadResultUrls = await uploadImages({
-          filePaths: filePaths,
-          ignoreError: true
-        })
-        console.log('上传成功的URL列表：', uploadResultUrls)
-
-        uploadResultUrls.forEach((url, index) => {
-          if (targetImgList[startIndex + index]) {
-            targetImgList.splice(startIndex + index, 1, {
-              ...fileList[index],
-              status: 'success',
-              message: '',
-              url: url
-            })
-          }
+        uni.showLoading({ title: '获取道路名称中...' })
+        const roadRes = await getRoadListByLatLng({
+          companyCode: 'sls',
+          latitude: res.latitude,
+          longitude: res.longitude
         })
+        uni.hideLoading()
 
-        if (uploadResultUrls.length < fileList.length) {
-          const failCount = fileList.length - uploadResultUrls.length
-          for (let i = uploadResultUrls.length; i < fileList.length; i++) {
-            if (targetImgList[startIndex + i]) {
-              targetImgList.splice(startIndex + i, 1, {
-                ...fileList[i],
-                status: 'failed',
-                message: '上传失败'
-              })
-            }
-          }
-          uni.showToast({title: `成功上传${uploadResultUrls.length}张，失败${failCount}张`, icon: 'none'})
+        if (Array.isArray(roadRes)) {
+          roadNameList.value = roadRes.map((item) => ({
+            name: item.roadName || '',
+            code: item.roadCode || '',
+            id: item.roadId || 0
+          }))
         } else {
-          uni.showToast({title: `成功上传${fileList.length}张图片`, icon: 'success'})
+          roadNameList.value = [{ name: '未查询到道路名称', code: '', id: 0 }]
+          uni.showToast({ title: '未查询到该位置的道路信息', icon: 'none' })
         }
-
-        this.$refs.workOrderFormRef.validateField('problemImgs')
       } catch (err) {
-        console.error('图片上传失败：', err)
-        for (let i = 0; i < fileList.length; i++) {
-          if (targetImgList[startIndex + i]) {
-            targetImgList.splice(startIndex + i, 1, {
-              ...fileList[i],
-              status: 'failed',
-              message: '上传失败'
-            })
-          }
-        }
-        uni.showToast({title: '图片上传失败，请重试', icon: 'none'})
-        this.$refs.workOrderFormRef.validateField('problemImgs')
+        uni.hideLoading()
+        console.error('获取道路名称失败：', err)
+        uni.showToast({ title: '获取道路名称失败，请重试', icon: 'none' })
+        roadNameList.value = [{ name: '获取失败，请重新选择位置', code: '', id: 0 }]
       }
     },
+    fail: (err) => {
+      console.error('选择位置失败：', err)
+      uni.showToast({ title: '选择位置失败：' + err.errMsg, icon: 'none' })
+    }
+  })
+}
 
-    /**
-     * 选择工单位置
-     */
-    chooseWorkLocation() {
-      let that = this
-      uni.chooseLocation({
-        success: async (res) => {
-          that.workOrderForm.roadName = ''
-          that.workOrderForm.roadId = 0
-          that.roadNameList = []
-
-          that.workOrderForm.workLocation = res.name
-          that.workOrderForm.lat = res.latitude
-          that.workOrderForm.lon = res.longitude
-
-          that.$refs.workOrderFormRef.validateField('workLocation')
-          that.$refs.workOrderFormRef.validateField('roadName')
-
-          try {
-            uni.showLoading({title: '获取道路名称中...'})
-            const roadRes = await getRoadListByLatLng({
-              companyCode: 'sls',
-              latitude: res.latitude,
-              longitude: res.longitude
-            })
-            uni.hideLoading()
-
-            if (Array.isArray(roadRes)) {
-              that.roadNameList = roadRes.map((item) => ({
-                name: item.roadName || '',
-                code: item.roadCode || '',
-                id: item.roadId || 0
-              }))
-            } else {
-              that.roadNameList = [{name: '未查询到道路名称', code: '', id: 0}]
-              uni.showToast({title: '未查询到该位置的道路信息', icon: 'none'})
-            }
-          } catch (err) {
-            uni.hideLoading()
-            console.error('获取道路名称失败：', err)
-            uni.showToast({title: '获取道路名称失败，请重试', icon: 'none'})
-            that.roadNameList = [{name: '获取失败，请重新选择位置', code: '', id: 0}]
-          }
-        },
-        fail: (err) => {
-          console.error('选择位置失败：', err)
-          uni.showToast({title: '选择位置失败：' + err.errMsg, icon: 'none'})
-        }
-      })
-    },
-
-    /**
-     * 完成时间确认
-     */
-    finishTimeConfirm(e) {
-      console.log('选择的完成时间：', e)
-      this.workOrderForm.finishTime = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
-      this.show = false
-    },
-
-    /**
-     * 隐藏键盘
-     */
-    hideKeyboard() {
-      uni.hideKeyboard()
-    },
-
-    /**
-     * 提取图片URL数组
-     */
-    getImgUrlList(imgList) {
-      return imgList.filter(item => item.status === 'success').map(item => item.url)
-    },
+/**
+ * 完成时间确认
+ */
+const finishTimeConfirm = (e) => {
+  console.log('选择的完成时间：', e)
+  workOrderForm.finishTime = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
+  show.value = false
+}
 
-    /**
-     * 提交工单
-     */
-    async submitWorkOrder() {
-      try {
-        // 先执行表单校验
-        await this.$refs.workOrderFormRef.validate()
-
-        const submitData = {
-          roadId: this.workOrderForm.roadId,
-          roadName: this.workOrderForm.roadName,
-          imgs: this.getImgUrlList(this.problemImgsList),
-          remark: this.workOrderForm.problemDesc,
-          latLonType: 2,
-          lat: this.workOrderForm.lat,
-          lon: this.workOrderForm.lon,
-          lonLatAddress: this.workOrderForm.workLocation,
-          pressingType: this.workOrderForm.pressingType,
-          orderName: this.workOrderForm.orderName,
-          finishTime: this.workOrderForm.finishTime,
-          sourceId: 1,
-          sourceName: '园林',
-          thirdWorkNo: '',
-          busiLine: 'yl'
-        }
+/**
+ * 隐藏键盘
+ */
+const hideKeyboard = () => {
+  uni.hideKeyboard()
+}
 
-        // 显示加载中
-        uni.showLoading({title: '提交中...'})
+/**
+ * 提交工单
+ */
+const submitWorkOrder = async () => {
+  try {
+    // 先执行表单校验
+    await workOrderFormRef.value.validate()
+
+    const submitData = {
+      roadId: workOrderForm.roadId,
+      roadName: workOrderForm.roadName,
+      imgs: problemImgs.getSuccessImgUrls(), // 复用上传逻辑的URL获取方法
+      remark: workOrderForm.problemDesc,
+      latLonType: 2,
+      lat: workOrderForm.lat,
+      lon: workOrderForm.lon,
+      lonLatAddress: workOrderForm.workLocation,
+      pressingType: workOrderForm.pressingType,
+      orderName: workOrderForm.orderName,
+      finishTime: workOrderForm.finishTime,
+      sourceId: 1,
+      sourceName: '园林',
+      thirdWorkNo: '',
+      busiLine: 'yl'
+    }
 
-        // 调用提交接口
-        const res = await createQuick(submitData)
+    // 显示加载中
+    uni.showLoading({ title: '提交中...' })
 
-        uni.hideLoading()
-        uni.showToast({
-          title: '工单提交成功',
-          icon: 'success',
-          duration: 1000
-        })
+    // 调用提交接口
+    const res = await createQuick(submitData)
 
-        // 延迟跳转
-        setTimeout(() => {
-          uni.redirectTo({
-            url: '/pages-sub/daily/quick-order/index'
-          })
-        }, 1000)
-      } catch (error) {
-        // 隐藏加载框
-        uni.hideLoading()
+    uni.hideLoading()
+    uni.showToast({
+      title: '工单提交成功',
+      icon: 'success',
+      duration: 1000
+    })
 
-        // 区分是表单校验失败还是接口调用失败
-        if (Array.isArray(error)) {
-          // 表单校验失败（无需额外提示，uView会自动提示）
-        } else {
-          // 接口调用失败
-          console.error('工单提交失败：', error)
-          uni.showToast({
-            title: '提交失败，请重试',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      }
+    // 延迟跳转
+    setTimeout(() => {
+      uni.redirectTo({
+        url: '/pages-sub/daily/quick-order/index'
+      })
+    }, 1000)
+  } catch (error) {
+    // 隐藏加载框
+    uni.hideLoading()
+
+    // 区分是表单校验失败还是接口调用失败
+    if (!Array.isArray(error)) {
+      // 接口调用失败
+      console.error('工单提交失败：', error)
+      uni.showToast({
+        title: '提交失败，请重试',
+        icon: 'none',
+        duration: 2000
+      })
     }
   }
 }
@@ -566,8 +471,9 @@ export default {
 
 <style lang="scss" scoped>
 // 全局页面样式
-.u-page {
+.page-container {
   min-height: 100vh;
+  padding-bottom: 100rpx; // 给底部按钮留空间
 }
 
 // 工单表单内容容器
@@ -575,5 +481,4 @@ export default {
   background: #fff;
 }
 
-
 </style>
\ No newline at end of file