From 4022a1ebcdab0a257ffeaec40913a9f227725cec Mon Sep 17 00:00:00 2001
From: qiuyuan <qiuyuan@yonyou.com>
Date: Wed, 6 Aug 2025 17:55:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue           |    8 +-
 pages/myTickets/index.vue       |   57 +-
 pages/myTicketsDetail/index.vue |   60 +-
 pages/serviceTickets/index.vue  | 1129 +++++++++++++++++--------------
 4 files changed, 718 insertions(+), 536 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index e68885b..0426f69 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -96,7 +96,7 @@
 							<text class="card-desc">维修方便便捷</text>
 							<view class="card-bg"></view>
 						</view>
-						<image class="card-icon" src="/static/imgs/index/weixiu.png"></image>
+						<image class="card-icon" src="/static/imgs/index/weixiu.png" style="width: 80rpx;height: 80rpx;bottom: 32rpx;"></image>
 					</view>
 
 					<!-- <view class="service-card large card-3" @click="goDetail('neighborList')" hover-class="card-hover">
@@ -522,13 +522,13 @@
 
 					&.card-2 {
 						.card-bg {
-							background: #ff7e7e;
-							top: -30rpx;
+							background: #5b9cf8;
+							top: -50rpx;
 							right: -30rpx;
 						}
 
 						.card-icon {
-							filter: drop-shadow(0 4rpx 8rpx rgba(255, 126, 126, 0.3));
+							filter: drop-shadow(0 4rpx 8rpx rgba(91, 156, 248, 0.3));
 						}
 					}
 
diff --git a/pages/myTickets/index.vue b/pages/myTickets/index.vue
index 4209bbe..169e143 100644
--- a/pages/myTickets/index.vue
+++ b/pages/myTickets/index.vue
@@ -42,7 +42,7 @@
 						 <view class="date">{{ formatTime(order.createdAt,"YYYY-MM-DD") }}</view>
 					</view>
 					<view class="order-description">{{ order.title }}</view>
-					<button @click="handleAction(order)" class="order-action" v-if="order.status == 1 || order.status == 2 || order.status == 99">撤回</button>
+					<button @click.stop="handleAction(order, $event)" class="order-action" v-if="order.status == 1 || order.status == 2 || order.status == 99">撤回</button>
 				</view>
 			</view>
 			<!-- 空状态提示 -->
@@ -73,7 +73,7 @@
 <script>
 	// import Header from '@/components/header_common.vue';
 	import Footer from '@/components/footer_common.vue';
-	import { get, post } from '@/utils/request';
+	import { get, post,put } from '@/utils/request';
 	import { IMAGE_BASE_URL,BASE_URL } from '@/utils/config';
 	import { formatTime, formatRelativeTime } from '@/utils/timeFormat';
 	export default {
@@ -116,7 +116,7 @@
 					2: '进行中',
 					3: '已完成',
 					99:'驳回',
-					98:'已删除'
+					98:'已撤回'
 				};
 				return statusMap[status] || '未知状态';
 			},
@@ -153,22 +153,41 @@
 				uni.navigateTo({ url: '/pages/serviceTickets/index' });
 			},
 			// 工单操作处理
-			handleAction(order) {
-				if (order.actionText === '撤回') {
-					uni.showModal({
-						title: '提示',
-						content: '确定要撤回这个工单吗？',
-						success: (res) => {
-							if (res.confirm) {
-								// 执行撤回逻辑
-								uni.showToast({
-									title: '工单已撤回',
-									icon: 'success'
-								});
-							}
-						}
-					});
-				}
+			handleAction(order, e) {
+			  // 阻止事件冒泡
+			  e.stopPropagation();
+			  
+			  if (order.status == 1 || order.status == 2 || order.status == 99) {
+			    uni.showModal({
+			      title: '提示',
+			      content: '确定要撤回这个工单吗？',
+			      success: (res) => {
+			        if (res.confirm) {
+			          // 执行撤回逻辑
+			          this.withdrawOrder(order.id);
+			        }
+			      }
+			    });
+			  }
+			},
+			async withdrawOrder(orderId) {
+			  try {
+			   const res = await put(`/api/v1/app_auth/work-order/${orderId}`, {status:98});
+			    if (res?.success) {
+			      uni.showToast({
+			        title: '工单已撤回',
+			        icon: 'success'
+			      });
+			      // 刷新列表
+			      this.getWorkOrderList();
+			    }
+			  } catch (err) {
+			    console.error('撤回工单失败:', err);
+			    uni.showToast({
+			      title: '撤回失败',
+			      icon: 'none'
+			    });
+			  }
 			},
 			goDetail(i){
 				uni.setStorageSync("Detail",i)
diff --git a/pages/myTicketsDetail/index.vue b/pages/myTicketsDetail/index.vue
index 340b9df..953578f 100644
--- a/pages/myTicketsDetail/index.vue
+++ b/pages/myTicketsDetail/index.vue
@@ -3,18 +3,37 @@
 		
 		<!-- 图片区域 - 编辑状态下可修改 -->
 		<view class="image-area card">
-			<view class="img-container">
-				<image 
-					class="work-order-img" 
-					:src="!isEditing ? `${IMAGE_BASE_URL}${detailObj.images[0] || ''}` : workOrderImg" 
-					mode="widthFix"
-					:lazy-load="true"
-				></image>
-				<view class="upload-btn" @click="uploadImage" v-if="isEditing">
-					<u-icon name="camera" size="28" color="#fff"></u-icon>
-					<text class="upload-text">更换图片</text>
-				</view>
-			</view>
+		  <view class="img-container">
+		    <!-- 非编辑状态显示服务器图片 -->
+		    <image 
+		      class="work-order-img" 
+		      :src="`${IMAGE_BASE_URL}${detailObj.images[0]}`" 
+		      mode="widthFix"
+		      lazy-load="true"
+		      v-if="!isEditing && detailObj.images && detailObj.images.length > 0"
+		    ></image>
+		    
+		    <!-- 编辑状态显示本地选择的图片 -->
+		    <image 
+		      class="work-order-img" 
+		      :src="workOrderImg" 
+		      mode="widthFix"
+		      lazy-load="true"
+		      v-if="isEditing && workOrderImg"
+		    ></image>
+		    
+		    <!-- 没有图片时的占位 -->
+		    <view class="empty-placeholder" v-if="(!detailObj.images || detailObj.images.length === 0) && !isEditing">
+		      <u-icon name="photo" size="48" color="#c0c4cc"></u-icon>
+		      <text class="empty-text">暂无图片</text>
+		    </view>
+		    
+		    <!-- 编辑状态的上传按钮 -->
+		    <view class="upload-btn" @click="uploadImage" v-if="isEditing">
+		      <u-icon name="camera" size="28" color="#fff"></u-icon>
+		      <text class="upload-text">{{ workOrderImg ? '更换图片' : '上传图片' }}</text>
+		    </view>
+		  </view>
 		</view>
 		
 		<!-- 标题与日期 -->
@@ -298,7 +317,22 @@
 			margin-bottom: 0;
 		}
 	}
-	
+	.empty-placeholder {
+	  width: 100%;
+	  height: 300rpx;
+	  display: flex;
+	  flex-direction: column;
+	  justify-content: center;
+	  align-items: center;
+	  background-color: #f5f7fa;
+	  border-radius: 8rpx;
+	  
+	  .empty-text {
+	    margin-top: 16rpx;
+	    font-size: 28rpx;
+	    color: #909399;
+	  }
+	}
 	/* 页面容器 */
 	.work-order-detail {
 		background-color: $bg-color;
diff --git a/pages/serviceTickets/index.vue b/pages/serviceTickets/index.vue
index be1bc58..1e318c6 100644
--- a/pages/serviceTickets/index.vue
+++ b/pages/serviceTickets/index.vue
@@ -1,516 +1,645 @@
 <template>
-	<view class="container">
-		<view class="content">
-			<!-- 选择区域 -->
-			<view class="form-item">
-				<view class="label" @click="showTypeSelect = true" style="margin-bottom: 0;">
-					<u-icon name="list" color="#3B8CFF" size="38"></u-icon>
-					选择区域
-					<view class="select-box">
-						{{ workOrderArea || '请选择' }}
-						<u-icon name="arrow-down" color="#999" size="30"></u-icon>
-					</view>
-				</view> 
-				<u-picker 
-				     :show="showTypeSelect" 
-					 :columns="areaList" 
-					 keyName="title"
-					 @confirm="handleTypeConfirm"
-					 @cancel="showTypeSelect = false">
-				</u-picker>
-			</view>
-			
-			<!-- 工单分类 -->
-			<view class="form-item">
-				<view class="label" @click="showSelect = true" style="margin-bottom: 0;">
-					<u-icon name="list" color="#3B8CFF" size="38"></u-icon>
-					工单类型
-					<view class="select-box">
-						{{ workOrderCategory || '请选择' }}
-						<u-icon name="arrow-down" color="#999" size="30"></u-icon>
-					</view>
-				</view>
-				<u-picker :show="showSelect" :columns="categoryList" keyName="label" @confirm="handleConfirm"
-					@cancel="handleCancel">
-				</u-picker>
-			</view>
-			
-			
-			<view class="form-item">
-				<view class="label">
-					<u-icon name="order" color="#3B8CFF" size="38"></u-icon>
-					工单内容
-				</view>
-				<textarea v-model="workOrderContent" placeholder="请输入工单详细内容..." class="textarea" />
-				<view class="voice-icon">
-					<u-icon name="mic" color="#409EFF" size="36"></u-icon>
-				</view>
-			</view>
-			
-			<!-- 联系人信息 -->
-			<view class="form-item contact-info">
-				<view class="contact-row">
-					<view class="label">
-						<u-icon name="account" color="#3B8CFF" size="38"></u-icon>
-						联系人
-					</view>
-					<input v-model="concatName" placeholder="请输入联系人姓名" class="contact-input" />
-				</view>
-				<view class="contact-row">
-					<view class="label">
-						<u-icon name="phone" color="#3B8CFF" size="38"></u-icon>
-						电话
-					</view>
-					<input v-model="customerPhone" placeholder="请输入联系人电话" class="contact-input" type="number" />
-				</view>
-			</view>
-			
-			<!-- 上传照片/视频 -->
-			<view class="form-item">
-				<view class="label">
-					<u-icon name="photo" color="#3B8CFF" size="38"></u-icon>
-					上传照片/视频
-				</view>
-				<view class="upload-area">
-					<u-upload :fileList="fileList" @afterRead="handleAfterRead" @delete="handleDelete" :maxCount="8"
-						width="160" height="160" accept="image/*,video/*" :previewFullImage="true">
-					</u-upload>
-				</view>
-				<text class="note">注：照片可识别工单内容，支持分批上传，但最大数量为8</text>
-			</view>
+  <view class="container">
+    <view class="content">
+      <!-- 选择区域 -->
+      <view class="form-item">
+        <view class="label" @click="showTypeSelect = true" style="margin-bottom: 0;">
+          <u-icon name="list" color="#3B8CFF" size="38"></u-icon>
+          选择区域
+          <view class="select-box">
+            {{ workOrderArea || '请选择' }}
+            <u-icon name="arrow-down" color="#999" size="30"></u-icon>
+          </view>
+        </view>
+        <u-picker :show="showTypeSelect" :columns="areaList" keyName="title" @confirm="handleTypeConfirm"
+          @cancel="showTypeSelect = false">
+        </u-picker>
+      </view>
 
-			
-			<!-- 工单地点 -->
-			<view class="form-item">
-				<view class="label">
-					<u-icon name="map" color="#3B8CFF" size="38"></u-icon>
-					工作地点
-				</view>
-				<textarea v-model="workOrderLocation" placeholder="请输入详细工作地点..." class="textarea" />
-			</view>
+      <!-- 工单分类 -->
+      <view class="form-item">
+        <view class="label" @click="showSelect = true" style="margin-bottom: 0;">
+          <u-icon name="list" color="#3B8CFF" size="38"></u-icon>
+          工单类型
+          <view class="select-box">
+            {{ workOrderCategory || '请选择' }}
+            <u-icon name="arrow-down" color="#999" size="30"></u-icon>
+          </view>
+        </view>
+        <u-picker :show="showSelect" :columns="categoryList" keyName="label" @confirm="handleConfirm"
+          @cancel="handleCancel">
+        </u-picker>
+      </view>
 
-			<!-- 提交按钮 -->
-			<view class="submit-button">
-				<u-button type="primary" @click="handleSubmit" shape="circle">提交工单</u-button>
-			</view>
-		</view>
-		<Footer></Footer>
-	</view>
+      <view class="form-item">
+        <view class="label">
+          <u-icon name="order" color="#3B8CFF" size="38"></u-icon>
+          工单内容
+        </view>
+        <textarea v-model="workOrderContent" placeholder="请输入工单详细内容..." class="textarea" />
+        <view class="voice-icon">
+          <u-icon name="mic" color="#409EFF" size="36"></u-icon>
+        </view>
+      </view>
+
+      <!-- 联系人信息 -->
+      <view class="form-item contact-info">
+        <view class="contact-row">
+          <view class="label">
+            <u-icon name="account" color="#3B8CFF" size="38"></u-icon>
+            联系人
+          </view>
+          <input v-model="concatName" placeholder="请输入联系人姓名" class="contact-input" />
+        </view>
+        <view class="contact-row">
+          <view class="label">
+            <u-icon name="phone" color="#3B8CFF" size="38"></u-icon>
+            电话
+          </view>
+          <input v-model="customerPhone" placeholder="请输入联系人电话" class="contact-input" type="number" />
+        </view>
+      </view>
+
+      <!-- 上传照片/视频 - 完全重写的上传组件 -->
+      <view class="form-item">
+        <view class="label">
+          <u-icon name="photo" color="#3B8CFF" size="38"></u-icon>
+          上传照片/视频
+        </view>
+        <view class="upload-area">
+          <view class="upload-list">
+            <view class="upload-item" v-for="(item, index) in fileList" :key="index">
+              <image v-if="!item.isVideo" :src="item.url" mode="aspectFill" @click="previewImage(index)"></image>
+              <video v-else :src="item.url" controls></video>
+              <view class="delete-btn" @click="handleDelete(index)">
+                <u-icon name="close" color="#fff" size="24"></u-icon>
+              </view>
+            </view>
+            <view class="upload-btn" @click="showUploadAction" v-if="fileList.length < 8">
+              <u-icon name="plus" size="40" color="#c0c4cc"></u-icon>
+            </view>
+          </view>
+        </view>
+        <text class="note">注：照片可识别工单内容，支持分批上传，但最大数量为8</text>
+      </view>
+
+      <!-- 工单地点 -->
+      <view class="form-item">
+        <view class="label">
+          <u-icon name="map" color="#3B8CFF" size="38"></u-icon>
+          工作地点
+        </view>
+        <textarea v-model="workOrderLocation" placeholder="请输入详细工作地点..." class="textarea" />
+      </view>
+
+      <!-- 提交按钮 -->
+      <view class="submit-button">
+        <u-button type="primary" @click="handleSubmit" shape="circle">提交工单</u-button>
+      </view>
+    </view>
+    <Footer></Footer>
+
+    <!-- 上传操作菜单 -->
+    <u-action-sheet 
+      :list="actionList" 
+      v-model="showActionSheet" 
+      @click="handleActionClick"
+    ></u-action-sheet>
+  </view>
 </template>
 
 <script>
-	import Footer from '@/components/footer_common.vue';
-	import {
-		get,
-		post
-	} from '@/utils/request';
-	import {
-		IMAGE_BASE_URL,
-		BASE_URL
-	} from '@/utils/config';
-	export default {
-		components: {
-			Footer
-		},
-		data() {
-			return {
-				workOrderContent: '',
-				concatName: '',  // 新增联系人姓名字段
-				customerPhone: '',  // 新增联系人电话字段
-				fileList: [],
-				workOrderCategory: '',
-				workOrderCategoryID: '',
-				workOrderArea:'',
-				workOrderAreaID:'',
-				showSelect: false,
-				showTypeSelect:false,
-				categoryList: [],
-				workOrderLocation: '',
-				expectedTime: '',
-				uploadedImages: [],
-				uploadedVideos: [],
-				videoFormats: ['mp4', 'mov', 'avi', 'wmv', 'mpeg', '3gp', 'flv', 'mkv'],
-				areaList:[],
-			};
-		},
-		mounted() {
-			this.getOrderList();
-	        this.getOrderTypeList();
-		},
-		methods: {
-			handleBack() {
-				uni.navigateBack({
-					delta: 1
-				});
+import Footer from '@/components/footer_common.vue';
+import { get, post } from '@/utils/request';
+import { IMAGE_BASE_URL, BASE_URL } from '@/utils/config';
+import uActionSheet from 'uview-ui/components/u-action-sheet/u-action-sheet';
+
+export default {
+  components: {
+    Footer,uActionSheet
+  },
+  data() {
+    return {
+      workOrderContent: '',
+      concatName: '',
+      customerPhone: '',
+      fileList: [],
+      workOrderCategory: '',
+      workOrderCategoryID: '',
+      workOrderArea: '',
+      workOrderAreaID: '',
+      showSelect: false,
+      showTypeSelect: false,
+      categoryList: [],
+      workOrderLocation: '',
+      expectedTime: '',
+      uploadedImages: [],
+      uploadedVideos: [],
+      videoFormats: ['mp4', 'mov', 'avi', 'wmv', 'mpeg', '3gp', 'flv', 'mkv'],
+      areaList: [],
+      
+      // 上传相关
+      showActionSheet: false,
+      actionList: [
+        { text: '拍照', value: 'camera' },
+        { text: '从相册选择', value: 'album' }
+      ]
+    };
+  },
+  mounted() {
+    this.getOrderList();
+    this.getOrderTypeList();
+  },
+  methods: {
+    // 显示上传选项
+    showUploadAction() {
+      uni.showActionSheet({
+        itemList: ['拍照', '从相册选择'],
+        success: (res) => {
+          if (res.tapIndex === 0) {
+            this.chooseMedia('camera');
+          } else {
+            this.chooseMedia('album');
+          }
+        }
+      });
+    },
+    
+    // 处理上传选项选择
+    handleActionClick(index) {
+      const action = this.actionList[index].value;
+      if (action === 'camera') {
+        this.chooseMedia('camera');
+      } else {
+        this.chooseMedia('album');
+      }
+    },
+    
+    // 选择媒体文件
+	async chooseMedia(sourceType) {
+	  try {
+	    // 1. 选择图片
+	    const res = await new Promise((resolve, reject) => {
+	      uni.chooseImage({
+	        count: 8 - this.fileList.length,
+	        sourceType: [sourceType === 'camera' ? 'camera' : 'album'],
+	        success: resolve,
+	        fail: reject
+	      });
+	    });
+	    
+	    // 2. 添加到预览列表
+	    const newFiles = res.tempFilePaths.map(url => ({
+	      url,
+	      isVideo: false,
+	      status: 'uploading'
+	    }));
+	    this.fileList = [...this.fileList, ...newFiles];
+	    
+	    // 3. 逐个上传文件
+	    for (const file of newFiles) {
+	      await this.uploadFile(file);
+	    }
+	    
+	  } catch (err) {
+	    console.error('选择图片失败:', err);
+	    uni.showToast({ title: '选择图片失败', icon: 'none' });
+	  }
+	},
+	_chooseMedia(sourceType) {
+	  uni.chooseMedia({
+	    count: 8 - this.fileList.length,
+	    mediaType: ['image', 'video'],
+	    sourceType: [sourceType],
+	    success: async (res) => {
+	      // 添加到预览列表
+	      const newFiles = res.tempFiles.map(file => ({
+	        url: file.tempFilePath,
+	        isVideo: file.fileType === 'video',
+	        status: 'uploading' // 新增上传状态
+	      }));
+	      this.fileList = [...this.fileList, ...newFiles];
+	      
+	      // 逐个上传文件
+	      for (const file of newFiles) {
+	        await this.uploadFile(file); // 等待上传完成
+	      }
+	    }
+	  });
+	},
+    
+    // 上传文件
+    uploadFiles(files) {
+      files.forEach(file => {
+        this.uploadFile(file).then(res => {
+          const index = this.fileList.findIndex(item => item.url === file.url);
+          if (index !== -1) {
+            this.$set(this.fileList, index, {
+              ...file,
+              status: 'success',
+              serverUrl: res
+            });
+            
+            if (file.isVideo) {
+              this.uploadedVideos.push(res.replace(BASE_URL, ''));
+            } else {
+              this.uploadedImages.push(res.replace(BASE_URL, ''));
+            }
+          }
+        }).catch(err => {
+          const index = this.fileList.findIndex(item => item.url === file.url);
+          if (index !== -1) {
+            this.$set(this.fileList, index, {
+              ...file,
+              status: 'failed'
+            });
+          }
+          console.error('上传失败:', err);
+        });
+      });
+    },
+    
+    // 单个文件上传
+	async uploadFile(file) {
+	  try {
+		const res = await new Promise((resolve, reject) => {
+		  uni.uploadFile({
+			url: `${BASE_URL}/api/v1/upload`,
+			filePath: file.url,
+			name: 'file',
+			header: { 
+			  'Authorization': `Bearer ${uni.getStorageSync('token')}`,
+			  'Content-Type': 'multipart/form-data'
 			},
-
-			// 文件上传相关方法
-			handleAfterRead(event) {
-				const {
-					file
-				} = event;
-				let files = [].concat(file);
-
-				if (this.fileList.length + files.length > 8) {
-					uni.showToast({
-						title: '最多只能上传8个文件',
-						icon: 'none'
-					});
-					return;
-				}
-
-				files.forEach(item => {
-					const extension = this.getFileExtension(item.url);
-					const isVideo = this.videoFormats.includes(extension.toLowerCase());
-
-					this.fileList.push({
-						...item,
-						status: 'uploading',
-						message: '上传中...',
-						isVideo: isVideo
-					});
-
-					this.uploadFile(item, isVideo);
-				});
-			},
-
-			getFileExtension(filename) {
-				return filename.split('.').pop().split('?')[0];
-			},
-
-			handleDelete(event) {
-				const {
-					index
-				} = event;
-				const file = this.fileList[index];
-
-				if (file.isVideo) {
-					const videoIndex = this.uploadedVideos.indexOf(file.url);
-					if (videoIndex !== -1) this.uploadedVideos.splice(videoIndex, 1);
+			success: (uploadRes) => {
+			  try {
+				const data = JSON.parse(uploadRes.data);
+				if (data.success) {
+				  resolve(data.data); // 使用服务器返回的完整URL
 				} else {
-					const imageIndex = this.uploadedImages.indexOf(file.url);
-					if (imageIndex !== -1) this.uploadedImages.splice(imageIndex, 1);
+				  reject(data.message || '上传失败');
 				}
-
-				this.fileList.splice(index, 1);
+			  } catch (e) {
+				reject('解析响应失败');
+			  }
 			},
+			fail: (err) => reject(err)
+		  });
+		});
 
-			async uploadFile(file, isVideo) {
-				try {
-					const fullUrl = await this.uploadAvatar(file.url);
-					const relativePath = fullUrl.replace(BASE_URL, '');
-
-					const fileIndex = this.fileList.findIndex(item => item.url === file.url);
-					if (fileIndex !== -1) {
-						this.fileList[fileIndex] = {
-							...this.fileList[fileIndex],
-							status: 'success',
-							message: '上传成功',
-							url: fullUrl,
-							relativeUrl: relativePath,
-							isVideo: isVideo
-						};
-
-						if (isVideo) {
-							this.uploadedVideos.push(relativePath);
-						} else {
-							this.uploadedImages.push(relativePath);
-						}
-					}
-				} catch (error) {
-					const fileIndex = this.fileList.findIndex(item => item.url === file.url);
-					if (fileIndex !== -1) {
-						this.fileList[fileIndex] = {
-							...this.fileList[fileIndex],
-							status: 'failed',
-							message: '上传失败'
-						};
-					}
-					uni.showToast({
-						title: `${isVideo ? '视频' : '图片'}上传失败: ${error.message}`,
-						icon: 'none'
-					});
-				}
-			},
-
-			uploadAvatar(filePath) {
-				return new Promise((resolve, reject) => {
-					uni.uploadFile({
-						url: `${BASE_URL}/api/v1/upload`,
-						filePath: filePath,
-						name: 'file',
-						header: {
-							'Authorization': `Bearer ${uni.getStorageSync('token')}`
-						},
-						success: (uploadRes) => {
-							try {
-								const res = JSON.parse(uploadRes.data);
-								if (res && res.success) {
-									resolve(`${IMAGE_BASE_URL}${res.data}`);
-								} else {
-									reject(new Error(res.message || '上传失败'));
-								}
-							} catch (e) {
-								reject(new Error('解析响应失败'));
-							}
-						},
-						fail: (err) => {
-							reject(new Error('上传失败: ' + JSON.stringify(err)));
-						}
-					});
-				});
-			},
-
-			async handleSubmit() {
-				if (!this.workOrderContent) {
-					uni.showToast({
-						title: '请填写工单内容',
-						icon: 'none'
-					});
-					return;
-				}
-				
-				if (!this.concatName) {
-					uni.showToast({
-						title: '请填写联系人姓名',
-						icon: 'none'
-					});
-					return;
-				}
-				
-				if (!this.customerPhone) {
-					uni.showToast({
-						title: '请填写联系电话',
-						icon: 'none'
-					});
-					return;
-				}
-
-				if (!this.workOrderCategory) {
-					uni.showToast({
-						title: '请选择工单类型',
-						icon: 'none'
-					});
-					return;
-				}
-
-				if (!this.workOrderLocation) {
-					uni.showToast({
-						title: '请填写工作地点',
-						icon: 'none'
-					});
-					return;
-				}
-
-				const submitData = {
-					title: this.workOrderContent,
-					concatName: this.concatName,  // 新增联系人姓名
-					customerPhone: this.customerPhone,  // 新增联系人电话
-					orderTypeId: this.workOrderCategoryID,
-					orderAreaId:this.workOrderAreaID,
-					address: this.workOrderLocation,
-					images: this.uploadedImages,
-					videos: this.uploadedVideos,
-				};
-
-				console.log('提交数据:', submitData);
-
-				// 调用API保存信息
-				const res = await post('/api/v1/app_auth/work-order', submitData);
-
-				uni.hideLoading();
-
-				if (res && res.success) {
-					uni.showToast({
-						title: '提交成功',
-						icon: 'success',
-						duration: 2000
-					});
-					this.resetForm();
-					setTimeout(()=>{
-						uni.navigateTo({
-							url: `/pages/myTickets/index`,
-						});
-					},1000)
-				} else {
-					uni.showToast({
-						title: res?.message || '提交失败',
-						icon: 'none'
-					});
-				}
-			},
-			
-			resetForm() {
-				this.workOrderContent = '';
-				this.concatName = '';
-				this.customerPhone = '';
-				this.workOrderCategoryID = '';
-				this.workOrderCategory = '';
-				this.workOrderLocation = '';
-				this.fileList = [];
-				this.uploadedImages = [];
-				this.uploadedVideos = [];
-				this.workOrderArea = '';
-				this.workOrderAreaID = '';
-			},
-
-			handleConfirm(e) {
-				this.workOrderCategory = e.value[0].label;
-				this.workOrderCategoryID = e.value[0].id;
-				this.showSelect = false;
-			},
-			
-			handleTypeConfirm(e) {
-				this.workOrderArea = e.value[0].title;
-				this.workOrderAreaID = e.value[0].id;
-				this.showTypeSelect = false;
-			},
-
-			handleCancel() {
-				this.showSelect = false;
-			},
-
-			async getOrderList() {
-				try {
-					const res = await get('/api/v1/apps/work-order-type');
-					if (res?.success) {
-						this.categoryList = [
-							[...res.data]
-						]
-					}
-				} catch (err) {
-					console.error('获取工单类型失败:', err);
-					uni.showToast({
-						title: '获取工单类型失败',
-						icon: 'none'
-					});
-				}
-			},
-			
-			// 获取工作区域
-			async getOrderTypeList(){
-				try {
-					const res = await get('/api/v1/apps/work-order-area');
-					if (res?.success) {
-						this.areaList = [
-							[...res.data]
-						]
-					}
-				} catch (err) {
-					console.error('获取工作区域失败:', err);
-					uni.showToast({
-						title: '获取工作区域失败',
-						icon: 'none'
-					});
-				}
-			}
+		// 更新文件状态
+		const index = this.fileList.findIndex(f => f.url === file.url);
+		if (index !== -1) {
+		  this.$set(this.fileList, index, {
+			...file,
+			status: 'success',
+			serverUrl: res // 存储服务器返回的URL
+		  });
+		  
+		  // 添加到提交数组
+		  if (file.isVideo) {
+			this.uploadedVideos.push(res);
+		  } else {
+			this.uploadedImages.push(res);
+		  }
 		}
-	};
+		
+	  } catch (err) {
+		console.error('上传失败:', err);
+		const index = this.fileList.findIndex(f => f.url === file.url);
+		if (index !== -1) {
+		  this.$set(this.fileList, index, { 
+			...file, 
+			status: 'failed',
+			error: err.message || err 
+		  });
+		}
+		uni.showToast({ 
+		  title: `上传失败: ${err.message || err}`, 
+		  icon: 'none' 
+		});
+	  }
+	},
+    
+    // 预览图片
+    previewImage(index) {
+      const images = this.fileList
+        .filter(item => !item.isVideo)
+        .map(item => item.url);
+      
+      uni.previewImage({
+        current: index,
+        urls: images
+      });
+    },
+    
+    // 删除文件
+    handleDelete(index) {
+      const file = this.fileList[index];
+      
+      if (file.serverUrl) {
+        if (file.isVideo) {
+          const videoIndex = this.uploadedVideos.indexOf(file.serverUrl.replace(BASE_URL, ''));
+          if (videoIndex !== -1) this.uploadedVideos.splice(videoIndex, 1);
+        } else {
+          const imageIndex = this.uploadedImages.indexOf(file.serverUrl.replace(BASE_URL, ''));
+          if (imageIndex !== -1) this.uploadedImages.splice(imageIndex, 1);
+        }
+      }
+      
+      this.fileList.splice(index, 1);
+    },
+
+    // 其他原有方法保持不变...
+    async handleSubmit() {
+      if (!this.workOrderContent) {
+        uni.showToast({
+          title: '请填写工单内容',
+          icon: 'none'
+        });
+        return;
+      }
+
+      if (!this.concatName) {
+        uni.showToast({
+          title: '请填写联系人姓名',
+          icon: 'none'
+        });
+        return;
+      }
+
+      if (!this.customerPhone) {
+        uni.showToast({
+          title: '请填写联系电话',
+          icon: 'none'
+        });
+        return;
+      }
+
+      if (!this.workOrderCategory) {
+        uni.showToast({
+          title: '请选择工单类型',
+          icon: 'none'
+        });
+        return;
+      }
+
+      if (!this.workOrderLocation) {
+        uni.showToast({
+          title: '请填写工作地点',
+          icon: 'none'
+        });
+        return;
+      }
+
+      const submitData = {
+        title: this.workOrderContent,
+        concatName: this.concatName,
+        customerPhone: this.customerPhone,
+        orderTypeId: this.workOrderCategoryID,
+        orderAreaId: this.workOrderAreaID,
+        address: this.workOrderLocation,
+        images: this.uploadedImages,
+        videos: this.uploadedVideos,
+      };
+
+      console.log('提交数据:', submitData);
+
+      const res = await post('/api/v1/app_auth/work-order', submitData);
+
+      uni.hideLoading();
+
+      if (res && res.success) {
+        uni.showToast({
+          title: '提交成功',
+          icon: 'success',
+          duration: 2000
+        });
+        this.resetForm();
+        setTimeout(() => {
+          uni.navigateTo({
+            url: `/pages/myTickets/index`,
+          });
+        }, 1000)
+      } else {
+        uni.showToast({
+          title: res?.message || '提交失败',
+          icon: 'none'
+        });
+      }
+    },
+
+    resetForm() {
+      this.workOrderContent = '';
+      this.concatName = '';
+      this.customerPhone = '';
+      this.workOrderCategoryID = '';
+      this.workOrderCategory = '';
+      this.workOrderLocation = '';
+      this.fileList = [];
+      this.uploadedImages = [];
+      this.uploadedVideos = [];
+      this.workOrderArea = '';
+      this.workOrderAreaID = '';
+    },
+
+    handleConfirm(e) {
+      this.workOrderCategory = e.value[0].label;
+      this.workOrderCategoryID = e.value[0].id;
+      this.showSelect = false;
+    },
+
+    handleTypeConfirm(e) {
+      this.workOrderArea = e.value[0].title;
+      this.workOrderAreaID = e.value[0].id;
+      this.showTypeSelect = false;
+    },
+
+    handleCancel() {
+      this.showSelect = false;
+    },
+
+    async getOrderList() {
+      try {
+        const res = await get('/api/v1/apps/work-order-type');
+        if (res?.success) {
+          this.categoryList = [
+            [...res.data]
+          ]
+        }
+      } catch (err) {
+        console.error('获取工单类型失败:', err);
+        uni.showToast({
+          title: '获取工单类型失败',
+          icon: 'none'
+        });
+      }
+    },
+
+    async getOrderTypeList() {
+      try {
+        const res = await get('/api/v1/apps/work-order-area');
+        if (res?.success) {
+          this.areaList = [
+            [...res.data]
+          ]
+        }
+      } catch (err) {
+        console.error('获取工作区域失败:', err);
+        uni.showToast({
+          title: '获取工作区域失败',
+          icon: 'none'
+        });
+      }
+    }
+  }
+};
 </script>
 
 <style lang="scss" scoped>
-	.container {
-		width: 100%;
-		min-height: 100vh;
-		background: #f5f7fa;
-		padding-bottom: 120rpx;
-		
-		.content {
-			padding: 20rpx;
-			
-			.form-item {
-				background: #fff;
-				border-radius: 16rpx;
-				padding: 24rpx;
-				margin-bottom: 24rpx;
-				box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
-				
-				.label {
-					font-size: 32rpx;
-					color: #333;
-					font-weight: 500;
-					margin-bottom: 24rpx;
-					display: flex;
-					align-items: center;
-					
-					.u-icon {
-						margin-right: 12rpx;
-					}
-				}
-				
-				.textarea {
-					width: 95%;
-					height: 180rpx;
-					padding: 16rpx;
-					background: #f8f8f8;
-					border-radius: 8rpx;
-					font-size: 28rpx;
-				}
-				
-				.voice-icon {
-					position: absolute;
-					right: 40rpx;
-					bottom: 40rpx;
-				}
-				
-				.select-box {
-					margin-left: auto;
-					color: #666;
-					display: flex;
-					align-items: center;
-					font-size: 28rpx;
-					
-					.u-icon {
-						margin-left: 8rpx;
-					}
-				}
-				
-				.upload-area {
-					margin-top: 16rpx;
-				}
-				
-				.note {
-					font-size: 24rpx;
-					color: #999;
-					margin-top: 24rpx;
-					display: block;
-				}
-			}
-			
-			.contact-info {
-				.contact-row {
-					display: flex;
-					align-items: center;
-					margin-bottom: 20rpx;
-					
-					&:last-child {
-						margin-bottom: 0;
-					}
-					
-					.label {
-						margin-bottom: 0;
-						width: 160rpx;
-						flex-shrink: 0;
-					}
-					
-					.contact-input {
-						flex: 1;
-						padding: 16rpx;
-						background: #f8f8f8;
-						border-radius: 8rpx;
-						font-size: 28rpx;
-					}
-				}
-			}
-			
-			.submit-button {
-				margin-top: 40rpx;
-				
-				.u-button {
-					height: 88rpx;
-					font-size: 32rpx;
-				}
-			}
-		}
-	}
+.container {
+  width: 100%;
+  min-height: 100vh;
+  background: #f5f7fa;
+  padding-bottom: 120rpx;
+
+  .content {
+    padding: 20rpx;
+
+    .form-item {
+      background: #fff;
+      border-radius: 16rpx;
+      padding: 24rpx;
+      margin-bottom: 24rpx;
+      box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+
+      .label {
+        font-size: 32rpx;
+        color: #333;
+        font-weight: 500;
+        margin-bottom: 24rpx;
+        display: flex;
+        align-items: center;
+
+        .u-icon {
+          margin-right: 12rpx;
+        }
+      }
+
+      .textarea {
+        width: 95%;
+        height: 180rpx;
+        padding: 16rpx;
+        background: #f8f8f8;
+        border-radius: 8rpx;
+        font-size: 28rpx;
+      }
+
+      .voice-icon {
+        position: absolute;
+        right: 40rpx;
+        bottom: 40rpx;
+      }
+
+      .select-box {
+        margin-left: auto;
+        color: #666;
+        display: flex;
+        align-items: center;
+        font-size: 28rpx;
+
+        .u-icon {
+          margin-left: 8rpx;
+        }
+      }
+
+      .upload-area {
+        margin-top: 16rpx;
+        
+        .upload-list {
+          display: flex;
+          flex-wrap: wrap;
+          margin: -5rpx;
+          
+          .upload-item, .upload-btn {
+            width: 160rpx;
+            height: 160rpx;
+            margin: 5rpx;
+            position: relative;
+            background: #f8f8f8;
+            border-radius: 8rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            overflow: hidden;
+            
+            image, video {
+              width: 100%;
+              height: 100%;
+            }
+            
+            .delete-btn {
+              position: absolute;
+              right: 0;
+              top: 0;
+              width: 40rpx;
+              height: 40rpx;
+              background: rgba(0, 0, 0, 0.5);
+              border-radius: 0 0 0 8rpx;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+            }
+          }
+          
+          .upload-btn {
+            border: 1rpx dashed #c0c4cc;
+          }
+        }
+      }
+
+      .note {
+        font-size: 24rpx;
+        color: #999;
+        margin-top: 24rpx;
+        display: block;
+      }
+    }
+
+    .contact-info {
+      .contact-row {
+        display: flex;
+        align-items: center;
+        margin-bottom: 20rpx;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+
+        .label {
+          margin-bottom: 0;
+          width: 160rpx;
+          flex-shrink: 0;
+        }
+
+        .contact-input {
+          flex: 1;
+          padding: 16rpx;
+          background: #f8f8f8;
+          border-radius: 8rpx;
+          font-size: 28rpx;
+        }
+      }
+    }
+
+    .submit-button {
+      margin-top: 40rpx;
+
+      .u-button {
+        height: 88rpx;
+        font-size: 32rpx;
+      }
+    }
+  }
+}
 </style>
\ No newline at end of file