Merge remote-tracking branch 'origin/master'

pages/index/index.uvue

@@ -24,7 +24,7 @@
 							<image class="db-image" src="/static/images/map/2.png"></image>
 						</view>
 					</view>
-					<text class="db-text">评分工单</text>
+					<text class="db-text">待评分工单</text>
 				</view>
 				<view class="db-box" @click="navigateToOverdueOrders">
 					<view v-if="overdueCount > 0" class="badge"><text class="count">{{ overdueCount }}</text></view>
@@ -106,7 +106,10 @@
 							</view>
 							<view class="info-row">
 								<text class="text-gray">工单编码：{{ getWorkOrderProjectNo(item) }}</text>
-								<text class="text-gray overdue-title">{{ getRemark(item) }}</text>
+								<!-- <text class="text-gray overdue-title">{{ getRemark(item) }}</text> -->
+							</view>
+							<view class="info-row">
+								<text class="overdue-title">{{ getRemark(item) }}</text>
 							</view>
 						</view>
 					</view>
@@ -289,6 +292,7 @@
 	const loadOverdueList = async (): Promise<void> => {
 		try {
 			overdueLoading.value = true
+			// const result = await getOrderList(1, 2, '','assigned,to_finish,to_approve,suspended')
 			const result = await overdueList(1, 2, '') // 获取前2条
 			const resultObj = result as UTSJSONObject
 
@@ -527,7 +531,7 @@
 		try {
 			// 跳转到工单详情页
 			uni.navigateTo({
-			    url: `/pages/order/detail/index?id=${orderItem['id']}&orderType=${orderItem['orderType']}`
+				url: `/pages/order/detail/acceptIndex?id=${orderItem.id}&orderType=${orderItem.orderType}`
 			})
 		} catch (e) {
 			console.error('处理超时工单点击事件失败:', e)
@@ -576,6 +580,10 @@
 		uni.$on('refreshOverdueCount', () => {
 			loadOverdueCount()
 		})
+		// 监听接单成功的事件，刷新列表
+		uni.$on('refreshOrderList', () => {
+			loadOverdueList()
+		})
     })
 </script>
 
@@ -808,6 +816,8 @@
 
 	/* 已超时工单标题红色样式 */
 	.overdue-title {
+		margin-top: 16rpx;
+		font-size: 26rpx;
 		color: #ff4d4f;
 	}
 

pages/order/overdue.uvue

@@ -284,7 +284,7 @@ import { getDictDataByType } from '../../api/dict/index'
         const orderItem = item as acceptOrderInfo
 		// 跳转到工单详情页
 		uni.navigateTo({
-		    url: `/pages/order/detail/index?id=${orderItem.id}&orderType=${orderItem.orderType}`
+		    url: `/pages/order/detail/acceptIndex?id=${orderItem.id}&orderType=${orderItem.orderType}`
 		})
     }
 
@@ -299,12 +299,19 @@ import { getDictDataByType } from '../../api/dict/index'
 	onMounted(() => {
 	    loadStatusDictList()
 	    loadData(true as boolean | null)
+		// 监听接单成功的事件，刷新列表
+		uni.$on('refreshOrderList', () => {
+			page.value = 1
+			loadData(true)
+		})
 	})
 
     // 组件卸载前清理事件监听
     onBeforeUnmount(() => {
         refreshing.value = false
         loading.value = false
+		// 移除事件监听
+		uni.$off('refreshOrderList',{})
     })
 </script>