更新 .gitea/workflows/master.yml

.gitea/workflows/master.yml

@@ -0,0 +1,138 @@
+name: Uniapp 自动化打包 CI/CD
+
+# 触发条件：可根据需求调整（如 push 到 main 分支、打 tag 时触发）
+on:
+  push:
+    branches: [ master ]  # 分支触发
+  # tag:
+  #   - 'v*'  # 版本 tag 触发（可选）
+
+# 运行环境
+jobs:
+  build-and-deploy:
+    name: 打包 Uniapp 项目
+    runs-on: windows
+    timeout-minutes: 30
+# jobs:
+#   build:
+#     name: 打包 Uniapp 项目
+#     runs-on: windows  # 云 Runner 环境（自建 Runner 可替换为自定义名称）
+    steps:
+      ########################################################################
+      # 步骤 1：检出 Gitea 代码
+      ########################################################################
+      - name: 1. 检出项目代码
+        uses: http://git.missmoc.top/mocheng/checkout@v4  # Gitea 兼容的代码检出插件
+        with:
+          fetch-depth: 1  # 仅拉取最新代码，加速流程
+
+      ########################################################################
+      # 步骤 2：安装 Node.js 环境（Uniapp 依赖 Node 处理项目依赖）
+      ########################################################################
+      # - name: 2. 安装 Node.js
+      #   uses: actions/setup-node@v4
+      #   with:
+      #     node-version: '18.x'  # 推荐 16.x+，适配 Uniapp 依赖
+      #     cache: 'npm'  # 缓存 npm 依赖，加速后续构建
+
+      ########################################################################
+      # 步骤 3：安装 Uniapp 项目依赖
+      ########################################################################
+      # - name: 3. 安装项目依赖
+      #   run: |
+      #     echo "开始安装项目依赖..."
+      #     npm install --registry=https://registry.npmmirror.com  # 国内源加速（可选）
+      #     echo "项目依赖安装完成"
+
+      ########################################################################
+      # 步骤 4：下载并部署 HBuilderX CLI（若 Runner 未预装）
+      ########################################################################
+      - name: 4. 部署 HBuilderX CLI 到 /hbuilderxcli/HBuilderX
+        run: |
+          # 创建 CLI 目标目录
+          # sudo mkdir -p /hbuilderxcli/HBuilderX
+          # 下载 HBuilderX Linux 完整版（版本 ≥3.1.5，可替换为最新版）
+          # wget -O hbuilderx.zip https://download1.dcloud.net.cn/download/HBuilderX.4.0.14.20240528.full.zip
+          # 解压到目标目录
+          # unzip -q hbuilderx.zip -d /hbuilderxcli/HBuilderX
+          # 赋予 CLI 执行权限
+          # sudo chmod +x /hbuilderxcli/HBuilderX/cli
+          # 验证 CLI 版本（确保部署成功）
+          C:\Users\Administrator\Desktop\runner\HBuilderX\cli -v
+          echo "HBuilderX CLI 部署完成，路径：C:\Users\Administrator\Desktop\runner\HBuilderX\cli"
+
+      ########################################################################
+      # 步骤 5：HBuilderX 密钥登录（安全读取账户信息）
+      ########################################################################
+      - name: 5. HBuilderX 账户登录
+        id: hbx_login
+        run: |
+          echo "开始登录 HBuilderX 账户..."
+          # 执行登录命令（读取 Gitea Secrets 中的账户密码）
+          LOGIN_OUTPUT=$(C:\Users\Administrator\Desktop\runner\HBuilderX\cli user login --username ${{ secrets.HBUILDERX_USERNAME }} --password ${{ secrets.HBUILDERX_PASSWORD }})
+          # 打印登录输出（便于调试，无敏感信息）
+          echo "登录结果：$LOGIN_OUTPUT"
+          # 验证登录是否成功（根据文档，成功返回 "0:user login:OK"）
+          if [[ $? -ne 0 || $(echo "$LOGIN_OUTPUT" | grep -c "0:user login:OK") -eq 0 ]]; then
+            echo "HBuilderX 登录失败！"
+            exit 1  # 登录失败则终止 CI/CD 流程
+          fi
+          echo "HBuilderX 登录成功！"
+
+      ########################################################################
+      # 步骤 6：实时显示打包进度 + 执行 Uniapp 打包
+      ########################################################################
+      - name: 6. 打包 Uniapp（实时显示排队/进度）
+        id: uniapp_build
+        run: |
+          echo "开始打包 Uniapp 项目，当前时间：$(date +%Y-%m-%d_%H:%M:%S)"
+          echo "========================================"
+          echo "正在查询打包队列状态..."
+          # （可选）提前查询队列（部分场景下 HBuilderX 会返回排队信息）
+          C:\Users\Administrator\Desktop\runner\HBuilderX\cli publish --platform android --query-queue
+          echo "========================================"
+          echo "开始执行打包（实时输出进度）..."
+          # 执行打包命令（根据目标平台调整 --platform 参数，支持 android/ios/h5 等）
+          # --project：指定项目根目录（当前检出目录）
+          # --output：指定产物输出目录（便于后续归档）
+          BUILD_OUTPUT=$(C:\Users\Administrator\Desktop\runner\HBuilderX\cli publish \
+            --platform android \
+            --project ./ \
+            --output ./unpackage/dist/build/android \
+            --progress  # 强制输出打包进度（部分版本需显式指定）
+          )
+          # 实时打印打包日志（包含排队进度、编译进度等信息）
+          echo "$BUILD_OUTPUT"
+          # 验证打包是否成功（根据实际输出调整判断条件，示例：找 "打包成功" 关键字）
+          if [[ $? -ne 0 || $(echo "$BUILD_OUTPUT" | grep -c "打包成功") -eq 0 ]]; then
+            echo "Uniapp 打包失败！"
+            exit 1
+          fi
+          echo "========================================"
+          echo "Uniapp 打包完成！产物路径：./unpackage/dist/build/android"
+
+      ########################################################################
+      # 步骤 7：归档打包产物（便于下载和后续部署）
+      ########################################################################
+      - name: 7. 归档打包产物
+        uses: https://gitea.com/actions/upload-artifact@v1  # Gitea 产物归档插件
+        with:
+          name: uniapp-android-build  # 产物压缩包名称
+          path: ./unpackage/dist/build/android  # 产物目录（与步骤 6 的 --output 对应）
+          retention-days: 7  # 产物保留时间（7 天，可调整）
+
+    ########################################################################
+    # 后置步骤：无论打包成功/失败，均执行 HBuilderX 登出（安全规范）
+    ########################################################################
+    post:
+      - name: 8. HBuilderX 账户登出
+        run: |
+          echo "开始登出 HBuilderX 账户..."
+          LOGOUT_OUTPUT=$(C:\Users\Administrator\Desktop\runner\HBuilderX\cli user logout)
+          echo "登出结果：$LOGOUT_OUTPUT"
+          # 验证登出是否成功（根据文档，成功返回 "0:user logout:OK"）
+          if [[ $(echo "$LOGOUT_OUTPUT" | grep -c "0:user logout:OK") -eq 0 ]]; then
+            echo "HBuilderX 登出异常（非致命错误，不终止流程）"
+          else
+            echo "HBuilderX 登出成功！"
+          fi

common/config.js

@@ -30,5 +30,5 @@ const config = {
 config.baseUrl = 'http://183.230.235.66:11010/api';
 
 
-// config.baseUrl = 'http://9143b75.r28.cpolar.top';
+// config.baseUrl = 'http://378a061a.r28.cpolar.top'
 export default config;

common/http.api.js

@@ -60,6 +60,7 @@ const install = (Vue, vm) => {
 		
 		getWarnDetail:(params = {}, id) => vm.$u.get(config.adminPath+`/sis/alarmEvents/${id}`,params),
 		getWarnEventInfo:(params = {}, alarmId) => vm.$u.get(config.adminPath+`/sis/alarmEventProcess/query/result/${alarmId}`,params),
+		getWarnImages:(params = {}, alarmId) => vm.$u.get(config.adminPath+`/sis/alarmEventAttachments/query/${alarmId}`,params),
 
 		getImageUrl:(params = {}, ossIds) => vm.$u.get(config.adminPath+`/resource/oss/listByIds/${ossIds}`,params),
 		//巡检任务列表

manifest.json

@@ -1,7 +1,7 @@
 {
     "name" : "数字南川",
-    "appid" : "__UNI__3570A56",
+    "appid" : "__UNI__7AF1078",
-    "description" : "aidex敏捷开发平台",
+    "description" : "",
     "versionName" : "1.8.4",
     "versionCode" : "100",
     "transformPx" : false,
@@ -26,7 +26,9 @@
         "nvueCompiler" : "uni-app",
         "compilerVersion" : 3,
         "modules" : {
-            "Payment" : {}
+            "Payment" : {},
+            "Camera" : {},
+            "Barcode" : {}
         },
         "distribute" : {
             "android" : {
@@ -55,7 +57,9 @@
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
             },
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             "sdkConfigs" : {
                 "ad" : {},
                 "payment" : {
@@ -103,7 +107,7 @@
                 }
             },
             "splashscreen" : {
-                "androidStyle" : "default",
+                "androidStyle" : "common",
                 "android" : {
                     "hdpi" : "E:/vueworkspace/aidex-m2m/src/assets/logo.png",
                     "xhdpi" : "E:/vueworkspace/aidex-m2m/src/assets/logo.png",

pages/sys/user/myRepair/addRepair.vue

@@ -21,7 +21,7 @@
 					<text class="text-type">{{ selectedType }}</text>
 					<image class="right-arrow" src="/static/ic_right_arrow_g.png" />
 				</view>
-				<view class="add-repair-label">问题详情 <text class="add-repair-optional">(非必填)</text></view>
+				<view class="add-repair-label">备注 <text class="add-repair-optional">(非必填)</text></view>
 				<textarea v-model="repairInfo.remark" class="add-repair-detail-textarea"
 					placeholder="如果以上报事不能解决您的问题，可以在这里填写说明" />
 

pages/sys/user/myRepair/myRepair.vue

@@ -23,7 +23,7 @@
 
 			<!-- 有数据时 -->
 			<view v-else class="repair-list-box">
-				<view v-for="(item, idx) in records" :key="idx" class="repair-card" @click="showDetail(item)">
+				<view v-for="(item, idx) in records" :key="idx" class="repair-card" @click="goDetail(item)">
 					<view class="repair-row">
 						<view class="repair-no">工单号：{{ item.orderNo }}</view>
 						<view class="repair-status" :class="getStatusColor(item.status)">
@@ -172,6 +172,12 @@
 				};
 				return statusMap[status] || '';
 			},
+			goDetail(item) {
+			  const itemStr = encodeURIComponent(JSON.stringify(item));
+			  uni.navigateTo({
+			    url: "/pages/sys/workbench/order/orderDetail?item=" + itemStr,
+			  });
+			},
 			showDetail(item) {
 				this.detailItem = item;
 				if (item.status == 0) {

pages/sys/workbench/earlyWarning/earlyWarning.vue

@@ -40,7 +40,7 @@
           <view class="warn-info">预警位置：{{ item.deviceGroupName }}</view>
           <view class="warn-info">预警时间：{{ item.reportTime }}</view>
           <view class="warn-info">预警设备：{{ item.deviceName }}</view>
-          <view v-if="[20, 30, 31, 32].includes(item.state)" class="warn-eval-wrap" @click.stop="goDetail(item)">
+          <view v-if="[20, 30, 31, 32].includes(item.state)" class="warn-eval-wrap">
             <view class="warn-eval-btn">去处理</view>
           </view>
         </view>
@@ -141,17 +141,17 @@
 				this.tabLoaded[idx] = true;
 				this.loading = false;
 			},
-			goDetail(item) {
+			goDetail2(item) {
-				const itemStr = encodeURIComponent(JSON.stringify(item));
+				const itemStr = encodeURIComponent(JSON.stringify(item));
-				uni.navigateTo({
+				if([20, 30, 31, 32].includes(item.state)){
-					url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr,
+					uni.navigateTo({
-				});
+						url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr,
-			},
+					});
-			goDetail2(item) {
+				}else{
-				const itemStr = encodeURIComponent(JSON.stringify(item));
+					uni.navigateTo({
-				uni.navigateTo({
+						url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr + "&pageType=detail",
-					url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr + "&pageType=detail",
+					});
-				});
+				}
 			},
 			goStatistics() {
 				uni.navigateTo({

pages/sys/workbench/earlyWarning/warnDetail.vue

@@ -10,6 +10,20 @@
 					<text class="value">{{ item.value || '-' }}</text>
 				</view>
 			</view>
+			<!-- 显示上传的图片 -->
+			<view v-if="infoImages.length > 0">
+				<view class="add-warn-label">相关图片</view>
+				<view class="image-list">
+					<image
+						v-for="(img, idx) in infoImages"
+						:key="idx"
+						:src="img"
+						mode="aspectFill"
+						class="preview-image"
+						@click="previewImage2(idx)"
+					/>
+				</view>
+			</view>
 		</view>
 
 		<!-- 处理情况卡片 或 详情情况卡片 -->
@@ -108,6 +122,7 @@ export default {
 			statusList: ['未处理', '处理中', '已处理'],
 			selectedImages: [], // 存储已选图片
 			realImages: [],     // 上传后的真实图片url
+			infoImages:[],
 			loading: false
 		};
 	},
@@ -137,10 +152,16 @@ export default {
 	},
 	created() {
 		this.loadEevetInfo();
+		this.getWarnImages()
 	},
 	methods: {
-
+		async getWarnImages(){
-
+			let res = await this.$u.api.getWarnImages({}, this.warnInfo.id);
+			if (res.code == 200 && res.data) {
+				// 提取res.data数组中每个对象的url字段
+				this.infoImages = res.data.map(item => item.imagePath);
+			}			
+		},
 		async loadEevetInfo() {
 			let res = await this.$u.api.getWarnEventInfo({}, this.warnInfo.id);
 			if (res.code == "200") {
@@ -224,6 +245,13 @@ export default {
 				current: this.realImages[index],
 				urls: this.realImages
 			})
+		},
+		
+		previewImage2(index) {
+			uni.previewImage({
+				current: this.infoImages[index],
+				urls: this.infoImages
+			})
 		}
 	}
 };
@@ -252,6 +280,7 @@ export default {
 .card-content {
 	border-top: 1rpx solid #eee;
 	padding-top: 20rpx;
+	margin-bottom: 30rpx;
 }
 .info-item {
 	display: flex;

pages/sys/workbench/order/orderDetail.vue

@@ -1,319 +1,262 @@
-<template>
+<template>
-	<view class="page-container">
+  <view class="page-container">
-		<view class="top-line" />
+    <view class="top-line" />
-		<!-- 工单状态进度 -->
+
-		<view class="repair-detail-progress-box">
+    <view class="item-bg"><text class="detail-key">工单编号：</text>{{ detail.orderNo }}</view>
-			<view class="repair-detail-progress">
+    <view class="item-bg">
-				<view v-for="(step, idx) in progressSteps" :key="idx" class="repair-detail-step">
+      <view class="item-title">上报人信息</view>
-					<view
+      <view class="detail-key">发起人：{{ detail.initiatorPeople }}</view>
-						:class="['repair-detail-dot', detailStep >= idx ? 'active' : '', (detailStep === idx && detailStatus !== '已结束') ? 'current' : '']">
+      <view class="detail-key">联系电话：{{ detail.initiatorPhone }}</view>
-					</view>
+    </view>
-					<view v-if="idx < progressSteps.length - 1"
+    <view class="item-bg">
-						:class="['repair-detail-line', detailStep > idx ? 'active' : '']"></view>
+      <view class="item-title">保修信息</view>
-				</view>
+      <view class="detail-key">工单名称：{{ detail.orderName }}</view>
-			</view>
+      <view class="detail-key">工单类型：{{ detail.typeName }}</view>
-			<view class="repair-detail-progress-labels">
+      <view class="detail-key">处理地点：{{ detail.location }}</view>
-				<view v-for="(step, idx) in progressSteps" :key="idx" class="repair-detail-label">{{ step }}
+      <view class="detail-key">备注：{{ detail.remark }}</view>
-				</view>
+      <view class="detail-value"><text class="detail-key">工单图片：</text></view>
-			</view>
+      <view class="image-list" v-if="orderImgUrls.length > 0">
-		</view>
+        <u-image 
-
+          v-for="(imgUrl, index) in orderImgUrls" 
-		<!-- 工单详情 -->
+          :key="index" 
-		<view class="detail-list">
+          :src="imgUrl"
-			<view class="detail-value"><text class="detail-key">工单编号：</text>{{ detail.orderNo }}</view>
+          width="200rpx" 
-			<view class="detail-value"><text class="detail-key">工单名称：</text>{{ detail.orderName }}</view>
+          height="200rpx" 
-			<view class="detail-value"><text class="detail-key">工单类型：</text>{{ detail.typeName }}</view>
+          border-radius="10rpx"
-			<view class="detail-value"><text class="detail-key">处理地点：</text>{{ detail.location }}</view>
+          @click="previewImage(orderImgUrls, index)"
-			<view class="detail-value"><text class="detail-key">创建时间：</text>{{ detail.createTime }}</view>
+          style="margin-right: 20rpx; margin-bottom: 20rpx;"
-			<view class="detail-value"><text class="detail-key">发起单位/人：</text>{{ detail.initiatorPeople }}</view>
+          mode="aspectFill"
-			<view class="detail-value remark"><text>备注：</text>{{ detail.remark }}</view>
+        ></u-image>
-			<view class="detail-value"><text class="detail-key">工单图片：</text></view>
+      </view>
-			<view class="image-list" v-if="orderImgUrls.length > 0">
+    </view>
-				<u-image v-for="(imgUrl, index) in orderImgUrls" :key="index" :src="imgUrl"
+
-					width="200rpx" height="200rpx" border-radius="10rpx"
+    <view v-if="detail.status>1" class="item-bg">
-					@click="previewImage(orderImgUrls, index)"
+      <view class="item-title">负责人信息</view>
-					style="margin-right: 20rpx; margin-bottom: 20rpx;"></u-image>
+      <view class="detail-key">负责人：{{ detail.handlerText }}</view>
-			</view>
+      <view class="detail-key">联系电话：{{ detail.handlerPhone }}</view>
-
+    </view>
-		</view>
+
-
+    <!-- 纵向进度条 -->
-		<!-- 底部操作按钮 -->
+  <view class="item-bg">
-		<view
+        <view class="item-title">进度跟踪</view>
-			v-if="((!this.isManager&&this.detailStep != 0) || (this.isManager&&this.detailStep == 0))&&this.detailStep!=3"
+        <view v-for="(status, index) in detail.recordVoList" :key="index" class="repair-detail-step">
-			class="btn-group">
+          <view  class="step-left">
-			<button class="btn ghost"
+            <text class="step-date">{{ status.createTime.substring(0,11)}}</text>
-				@click="transfer(1)">{{this.isManager ? '指派':this.detailStep == 2 ? '完成':'开始'}}</button>
+            <text class="step-time">{{ status.createTime.substring(11,16) }}</text>
-			<button v-if="this.detailStep == 1" class="btn primary" @click="transfer(2)">转派</button>
+          </view>
-		</view>
+          <view  class="step-dot-container">
-
+            <view class="repair-detail-dot" ></view>
-		<SelectUser :visible.sync="showSelect" :list="users" :multiple="false" @confirm="onConfirm" />
+            <!-- 固定高度连线 -->
-	</view>
+            <view 
-</template>
+              v-if="index < detail.recordVoList.length - 1" class="repair-detail-line"
-
+            ></view>
-<script>
+          </view>
-	import SelectUser from '@/components/SelectUser.vue'
+          <view   class="step-right">
-	export default {
+            <text class="step-name">{{  getStatusLabel(status.status) }}</text>
-		components: {
+          </view>
-			SelectUser
+        </view>
-		},
+      </view>
-		data() {
+
-			return {
+    <!-- 底部操作按钮 -->
-				detailStep: 0,
+    <view
-				detailStatus: '',
+      v-if="((!isManager && detailStep != 0) || (isManager && detailStep == 0)) && detailStep != 3&&!isNaomalUser"
-				progressSteps: ['创建工单', '已接单', '处理中', '已结束'],
+      class="btn-group">
-				currentStatus: 2, // 0: 待分配，1: 已接单，2: 处理中，3: 已完成
+      <button class="btn ghost"
-				detail: {},
+        @click="transfer(1)">{{ isManager ? '指派' : (detailStep == 2 ? '完成' : '开始') }}</button>
-				isManager: false,
+      <button v-if="detailStep == 1" class="btn primary" @click="transfer(2)">转派</button>
-				showSelect: false,
+    </view>
-				users: [],
+	<view class="kg">	
-				orderImgUrls: [] // 添加用于存储处理后的图片URL数组
+	</view>
-			};
+    <SelectUser :visible.sync="showSelect" :list="users" :multiple="false" @confirm="onConfirm" />
-		},
+  </view>
-		onLoad(options) {
+</template>
-			this.isManager = this.vuex_user.roles[0].roleId == 1
+
-			if (options.item) {
+<script>
-				const item = JSON.parse(decodeURIComponent(options.item));
+import SelectUser from '@/components/SelectUser.vue'
-				this.detail = item;
+export default {
-				// 现在可以使用item对象了
+  components: { SelectUser },
-				// 进度映射
+  data() {
-				this.getStepInfo()
+    return {
-				// 处理图片URL
+      detailStep: 0,
-				
+      detailStatus: '',
-				this.getImageUrl()
+      currentStatus: 2,
-			}
+      detail: {},
-			if ((this.isManager && this.detailStep == 0) || (!this.isManager && this.detailStep == 1)) {
+      isManager: false,
-				this.getHandler()
+	  isNaomalUser:true,
-			}
+      showSelect: false,
-		},
+      users: [],
-		methods: {
+      orderImgUrls: []
-			goBack() {
+    };
-				uni.navigateBack();
+  },
-			},
+  onLoad(options) {
-			async getImageUrl() {
+    this.isManager = this.vuex_user?.roles?.[0]?.roleId < 3
-				if (!this.detail.orderImgUrl) return;
+	this.isNaomalUser = this.vuex_user?.roles?.[0]?.roleId >10
-				
+    if (options.item) {
-				const imgIds = this.detail.orderImgUrl.split(',');
+      const item = JSON.parse(decodeURIComponent(options.item));
-				const res = await this.$u.api.getImageUrl({}, imgIds);
+      this.detail = item;
-				if (res.code == 200 && res.data) {
+      this.getStepInfo()
-					// 提取res.data数组中每个对象的url字段
+      this.getImageUrl()
-					this.orderImgUrls = res.data.map(item => item.url);
+    }
-				}	
+    if ((this.isManager && this.detailStep == 0) || (!this.isManager && this.detailStep == 1)) {
-			},
+      this.getHandler()
-
+    }
-			async getHandler() {
+  },
-				let handlers = await this.$u.api.getHandler3({}, this.detail.type);
+  methods: {
-				if (handlers.code === 200) {
+    goBack() { uni.navigateBack(); },
-					this.users = [...this.users, ...handlers.data];
+    async getImageUrl() {
-				}
+      if (!this.detail.orderImgUrl) return;
-			},
+      const imgIds = this.detail.orderImgUrl.split(',');
-			getStepInfo(){
+      const res = await this.$u.api.getImageUrl({}, imgIds.join(','));
-				if (this.detail.status == 0) {
+      if (res.code == 200 && res.data) this.orderImgUrls = res.data.map(item => item.url);
-					this.detailStep = 0;
+    },
-					this.detailStatus = '创建工单';
+    async getHandler() {
-				} else if (this.detail.status == 4) {
+      let handlers = await this.$u.api.getHandler3({}, this.detail.type);
-					this.detailStep = 3;
+      if (handlers.code === 200) this.users = [...this.users, ...handlers.data];
-					this.detailStatus = '已结束';
+    },
-				} else if (this.detail.status == 3) {
+    getStepInfo() {
-					this.detailStep = 2;
+      let currentIndex = 0;
-					this.detailStatus = '处理中';
+      if (this.detail.status == 0) currentIndex = 0;
-				} else {
+      else if (this.detail.status == 1) currentIndex = 1;
-					this.detailStep = 1;
+      else if (this.detail.status == 3) currentIndex = 2;
-					this.detailStatus = '已接单';
+      else if (this.detail.status == 4) currentIndex = 3;
-				}
+      this.detailStep = currentIndex;
-			},
+
-			previewImage(urls, index) {
+    },
-				// 使用uView的图片预览组件
+	getStatusLabel(status) {
-				this.$u.previewImage({
+	  const statusMap = {
-					urls: urls.filter(url => url.trim() !== ''),
+	    0: "创建工单",
-					current: index
+	    1: "已接单",
-				});
+	    2: "已接单",
-			},
+	    3: "处理中",
-			async onConfirm(selected) {
+	    4: "已完成",
-				let params = this.detail
+	  };
-				params.handler = selected[0].value
+	  return statusMap[status] || "";
-				params.status = 1
+	},
-				let res = await this.$u.api.updateOrder2(params);
+    previewImage(urls, index) {
-				if (res.code == '200') {
+      const validUrls = urls.filter(url => url && url.trim() !== '');
-					// 关闭页面前发送事件通知前页面刷新
+      const currentIndex = validUrls.indexOf(urls[index]);
-					uni.$emit('refreshData', '');
+      uni.previewImage({
-					this.detail.handler = selected.value
+        urls: validUrls,
-					this.detail.status = 1
+        current: currentIndex >= 0 ? currentIndex : 0,
-					this.getStepInfo()
+        indicator: 'number',
-				}
+        backgroundColor: '#000'
-			},
+      })
-			async submit() {
+    },
-				let params = this.detail
+    async onConfirm(selected) {
-				if(this.detail.status == 1||this.detail.status == 2){
+      let params = this.detail
-					params.status = 3
+      params.handler = selected[0].value
-				}else {
+      params.status = 1
-					params.status = 4
+      let res = await this.$u.api.updateOrder2(params);
-				}
+      if (res.code == '200') {
-				let res = await this.$u.api.updateOrder2(params);
+        uni.$emit('refreshData', '');
-				if (res.code == '200') {
+		if(!this.isManager){
-					// 关闭页面前发送事件通知前页面刷新
+			uni.navigateBack(); 
-					uni.$emit('refreshData', '');
+			return
-					this.detail.status = params.status
+		}
-					this.getStepInfo()
+        this.detail.handler = selected.value
-				}
+        this.detail.status = 1
-			},
+		const d = new Date();
-			transfer(type) {
+		const z = n => n.toString().padStart(2, '0');
-				if (this.isManager || type == 2) {
+		let time = `${d.getFullYear()}-${z(d.getMonth()+1)}-${z(d.getDate())} ${z(d.getHours())}:${z(d.getMinutes())}:${z(d.getSeconds())}`;
-					this.showSelect = true
+		let step =  {}
-				} else {
+		step.id= this.detail.recordVoList[0].id,
-					this.submit()
+		step.orderId= this.detail.recordVoList[0].orderId,
-				}
+		step.status= '1',
-			},
+		step.handler='',
-		}
+		step.handlerName='',
-	};
+		step.createTime= time			
-</script>
+		this.detail.recordVoList.push(step)
-
+        this.getStepInfo()
-<style scoped>
+      }
-	.page-container {
+    },
-		background: #fff;
+    async submit() {
-	}
+      let params = this.detail
-
+      if (this.detail.status == 1 || this.detail.status == 2) params.status = 3
-	.top-line {
+      else params.status = 4
-		width: 100vw;
+      let res = await this.$u.api.updateOrder2(params);
-		height: 3rpx;
+      if (res.code == 200) {
-		background: #ECECEC;
+        uni.$emit('refreshData', '');
-	}
+        this.detail.status = params.status
-
+		if(params.status ==3){
-	.repair-detail-progress-box {
+			this.detail.handlerText = this.vuex_user.nickName
-		height: 107rpx;
+			this.detail.handlerPhone = this.vuex_user.phonenumber
-		margin-bottom: 41rpx;
+		}
-		display: flex;
+		const d = new Date();
-		flex-direction: column;
+		const z = n => n.toString().padStart(2, '0');
-		justify-content: center;
+		let time = `${d.getFullYear()}-${z(d.getMonth()+1)}-${z(d.getDate())} ${z(d.getHours())}:${z(d.getMinutes())}:${z(d.getSeconds())}`;
-		align-items: stretch;
+		let step =  {}
-	}
+		step.id= this.detail.recordVoList[0].id,
-
+		step.orderId= this.detail.recordVoList[0].orderId,
-	.repair-detail-progress {
+		step.status= params.status,
-		display: flex;
+		step.handler='',
-		align-items: center;
+		step.handlerName='',
-		justify-content: space-between;
+		step.createTime= time
-		margin-bottom: 5rpx;
+		this.detail.recordVoList.push(step)
-		margin-left: 85rpx;
+        this.getStepInfo()
-		width: 100%;
+      }
-	}
+    },
-
+
-	.repair-detail-step {
+
-		display: flex;
+    transfer(type) {
-		align-items: center;
+      if (this.isManager || type == 2) this.showSelect = true
-		flex: 1;
+      else this.submit()
-		position: relative;
+    }
-	}
+  }
-
+}
-	.repair-detail-dot {
+</script>
-		width: 22rpx;
+
-		height: 22rpx;
+<style scoped>
-		border-radius: 50%;
+.page-container { background: #f7f7f7; height: 100vh; }
-		background: #BDBDBD;
+.top-line { width: 100vw; height: 3rpx; background: #ECECEC; }
-		border: 2rpx solid #BDBDBD;
+.item-bg{ background: #fff; border-radius: 20rpx; margin-top: 10px; margin-left: 25rpx; margin-right: 25rpx; padding: 25rpx; }
-		position: relative;
+.item-title{ color: #000; font-size: 28rpx; font-weight: 600; margin-bottom: 20rpx; }
-		z-index: 2;
+
-	}
+.repair-detail-step-container { display: flex; flex-direction: column; }
-
+.repair-detail-step {
-	.repair-detail-dot.active {
+  display: flex;
-		background: #2186FF;
+  flex-direction: row;
-		border-color: #2186FF;
+  margin-bottom: 20rpx;
-	}
+}
-
+.step-left { flex: 1; display: flex; flex-direction: column; align-items: flex-end; padding-right: 20rpx; }
-	.repair-detail-dot.current {
+.step-date { font-size: 24rpx; color: #333; }
-		background: #EF8D00;
+.step-time { font-size: 24rpx; color: #666; margin-top: 10rpx; }
-		border-color: #EF8D00;
+.step-dot-container {
-	}
+  display: flex;
-
+  flex-direction: column;
-	.repair-detail-line {
+  align-items: center;
-		flex: 1;
+  width: 40rpx;
-		height: 4rpx;
+}
-		background: #BDBDBD;
+.repair-detail-dot {
-		margin: 0 2rpx;
+  width: 22rpx;
-		z-index: 1;
+  height: 22rpx;
-	}
+  border-radius: 50%;
-
+  background: #BDBDBD;
-	.repair-detail-line.active {
+  border: 2rpx solid #BDBDBD;
-		background: #2186FF;
+  z-index: 2;
-	}
+  background: #2186FF;
-
+  border-color: #2186FF;
-	.repair-detail-progress-labels {
+}
-		display: flex;
+
-		justify-content: space-between;
+/* 固定高度连线 */
-		margin-left: 0;
+.repair-detail-line {
-		width: 100%;
+  width: 4rpx;
-	}
+  height: 80rpx; /* 每条线的高度 */
-
+  background: #BDBDBD;
-	.repair-detail-label {
+  margin-top: 2rpx;
-		font-size: 22rpx;
+  background: #2186FF;
-		color: #888;
+}
-		text-align: center;
+
-		flex: 1;
+.step-right { flex: 1; display: flex; flex-direction: column; padding-left: 20rpx; }
-		position: relative;
+.step-name { font-size: 28rpx; color: #333; font-weight: bold; margin-bottom: 6rpx; }
-		top: 8rpx;
+.step-desc { font-size: 24rpx; color: #666; }
-	}
+.detail-key { color: #222; font-size: 28rpx; margin-bottom: 20rpx; }
-
+.detail-value { margin-bottom: 30rpx; color: #2F2F2F; }
-	.detail-list {
+.image-list { display: flex; flex-wrap: wrap; margin-top: 20rpx; }
-		font-size: 28rpx;
+.btn-group { display: flex; justify-content: space-around; margin-top: 60rpx; }
-		line-height: 2em;
+.btn { width: 276rpx; height: 88rpx; padding: 20rpx; font-size: 30rpx; border-radius: 50rpx; display: flex; align-items: center; justify-content: center; }
-		margin-left: 40rpx;
+.primary { background-color: #1890ff; color: #fff; }
-	}
+.ghost { background-color: #fff; color: #1890ff; border: 2rpx solid #1890ff; }
-
+.kg{
-	.detail-key {
+	height: 60rpx;
-		color: #595858;
+}
-	}
+</style>
-
-	.detail-value {
-		margin-bottom: 30rpx;
-		color: ##2F2F2F;
-	}
-
-	.remark {
-		white-space: pre-line;
-	}
-
-	.link {
-		color: #007CFF;
-		text-decoration: underline;
-	}
-
-	.image-list {
-		display: flex;
-		flex-wrap: wrap;
-		margin-top: 20rpx;
-	}
-
-	.image-item {
-		width: 200rpx;
-		height: 200rpx;
-		border-radius: 10rpx;
-		margin-right: 20rpx;
-		margin-bottom: 20rpx;
-	}
-
-	.btn-group {
-		display: flex;
-		justify-content: space-around;
-		margin-top: 60rpx;
-	}
-
-	.btn {
-		width: 276rpx;
-		height: 88rpx;
-		padding: 20rpx;
-		font-size: 30rpx;
-		border-radius: 50rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.primary {
-		background-color: #1890ff;
-		color: #fff;
-	}
-
-	.ghost {
-		background-color: #fff;
-		color: #1890ff;
-		border: 2rpx solid #1890ff;
-	}
-</style>