feat：更新

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "小葫芦",
     "appid" : "__UNI__6259019",
     "description" : "",
-    "versionName" : "1.0.3",
-    "versionCode" : 103,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/pages.json

@@ -29,13 +29,15 @@
 		{
 			"path": "pages/repair/index",
 			"style": {
-				"navigationBarTitleText": "维修中心"
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/repair/components/apply/index",
 			"style": {
-				"navigationBarTitleText": "申请维修"
+				"navigationBarTitleText": "手表维保"
 			}
 		},
 		{
@@ -79,10 +81,10 @@
 		"fontSize": "12px",
 		"list": [
 			{
-				"text": "维修中心",
+				"text": "手表服务",
 				"pagePath": "pages/repair/index",
-				"iconPath": "static/tabs/repair.png",
-				"selectedIconPath": "static/tabs/repair-active.png",
+				"iconPath": "static/tabs/watch.png",
+				"selectedIconPath": "static/tabs/watch-active.png",
 				"visible": true
 			}
 		]

src/pages/login/index.vue

@@ -40,6 +40,8 @@ import { ref, onMounted } from 'vue'
 import { loginApi } from '@/apis/login'
 import type { Login_Params, userInfo_Result } from '@/types/login'
 import { computed } from 'vue'
+import type { login_Result } from '@/types/login'
+
 const remember = computed(() => {
 	return checkboxs.value.length > 0
 })
@@ -113,6 +115,10 @@ const changeRemember = (value: string[]) => {
 }
 const loginFormRef = ref<any>(null)
 const loading = ref<boolean>(false)
+const loginResult = ref<login_Result>({
+	access_token: '',
+	expires_in: 0
+})
 const handleLogin = () => {
 	loginFormRef.value.validate().then(async () => {
 		loading.value = true
@@ -123,17 +129,25 @@ const handleLogin = () => {
 			uni.removeStorageSync('username');
 			uni.removeStorageSync('password');
 		}
-		const res = await loginApi.login(form.value)
-		uni.setStorageSync('token', res.data.access_token)
-		const infoRes = await loginApi.getInfo()
-		uni.setStorageSync('userInfo', infoRes.user)
+		loginApi.login(form.value).then(async(res: any) => {
+			loginResult.value = res.data
+			uni.setStorageSync('token', loginResult.value.access_token)
+			const infoRes = await loginApi.getInfo()
+			uni.setStorageSync('userInfo', infoRes.user)
+			uni.showToast({ title: '登录成功', icon: 'success' })
+			loading.value = false
+			setTimeout(() => {
+				uni.reLaunch({ url: '/pages/repair/index' })
+			}, 50)
+		}).catch((err: any) => {
+			loading.value = false
+			uni.$u.toast(err[0].message);
+			return
+		})
+		
+	}).catch((err: any) => {
 		loading.value = false
-		uni.showToast({ title: '登录成功', icon: 'success' })
-		setTimeout(() => {
-			uni.reLaunch({ url: '/pages/repair/index' })
-		}, 50)
-	}).catch((res: any) => {
-		uni.$u.toast(res[0].message);
+		uni.$u.toast(err[0].message);
 	})
 }
 

src/pages/repair/components/apply/index.vue

@@ -1,65 +1,87 @@
 <template>
   <view class="repair-apply">
-    <!-- 步骤指示器 -->
-    <view class="steps-indicator">
-      <view v-for="(step, index) in steps" :key="index" class="step-item"
-        :class="{ active: currentStep === index + 1, completed: currentStep > index + 1 }">
-        <view class="step-number">{{ index + 1 }}</view>
-        <text class="step-text">{{ step }}</text>
+    <up-form :model="formData" :rules="rules" ref="formRef">
+      <!-- 业务类型选择：我要维修 / 我要养护 -->
+      <view class="form-section">
+        <view class="section-title">申请类型</view>
+        <up-form-item label="业务类型" prop="orderType" required :label-width="80">
+          <up-select showOptionsLabel v-model="formData.orderType" :options="orderTypeOptions"
+            :label="formData.orderType ? '' : '请选择业务类型'" @select="selectOrderType">
+            <template #text>
+              <text>{{ formData.orderType }}</text>
+            </template>
+          </up-select>
+        </up-form-item>
       </view>
-    </view>
 
-    <!-- 步骤内容 -->
-    <view class="step-content">
-      <!-- 步骤1：选择服务 -->
-      <view v-if="currentStep === 1" class="step-1">
-        <up-form :model="formData" :rules="rules" ref="formRef">
-          <view class="service-cards">
-            <view v-for="service in services" :key="service.value" class="service-card"
-              :class="{ active: formData.serviceType === service.value }" @click="formData.serviceType = service.value">
-              <view class="service-icon">{{ service.icon }}</view>
-              <text class="service-name">{{ service.name }}</text>
-              <text class="service-desc">{{ service.desc }}</text>
+      <!-- ===================== 我要维修 ===================== -->
+      <template v-if="formData.orderTypeId === 'repair'">
+        <!-- 服务方式 -->
+        <view class="form-section">
+          <view class="section-title">选择服务</view>
+          <up-form-item label="服务方式" prop="serviceType" required :label-width="80">
+            <up-select showOptionsLabel v-model="formData.serviceType" :options="serviceOptions"
+              :label="formData.serviceType ? '' : '请选择服务方式'" @select="selectServiceItem">
+              <template #text>
+                <text>{{ formData.serviceType }}</text>
+              </template>
+            </up-select>
+          </up-form-item>
+        </view>
+        <!-- 故障描述 -->
+        <view class="form-section">
+          <view class="section-title">故障描述</view>
+          <up-form-item label="故障现象" labelPosition="top" :label-width="80">
+            <up-checkbox-group v-model="formData.faultTypes">
+              <up-checkbox v-for="(fault, index) in faultTypeOptions" :key="index" :label="fault.name"
+                :name="fault.name">{{
+                fault.name }}</up-checkbox>
+            </up-checkbox-group>
+          </up-form-item>
+          <up-form-item label="详细描述" labelPosition="top" :label-width="80">
+            <up-textarea v-model="formData.faultDescription" placeholder="请详细描述故障情况" rows="4" />
+          </up-form-item>
+          <up-form-item label="故障特写图" labelPosition="top" :label-width="90">
+            <view class="upload-images">
+              <view v-for="(image, index) in formData.faultImages" :key="index" class="uploaded-image">
+                <image :src="image" mode="aspectFill"></image>
+                <view class="image-remove" @click="removeFaultImage(index)">×</view>
+              </view>
+              <view class="upload-btn" @click="uploadFaultImage">
+                <u-icon name="camera" size="32"></u-icon>
+                <text>上传图片</text>
+              </view>
             </view>
-          </view>
-        </up-form>
-      </view>
-
-      <!-- 步骤2：手表信息 -->
-      <view v-if="currentStep === 2" class="step-2">
-        <up-form :model="formData" :rules="rules" ref="formRef">
-          <up-form-item prop="brand" label="品牌" required>
+          </up-form-item>
+        </view>
+        <!-- 手表信息 -->
+        <view class="form-section">
+          <view class="section-title">手表信息</view>
+          <up-form-item label="品牌" :label-width="80">
             <up-select v-model="formData.brand" :options="brands" label="请选择品牌" @select="selectBrandItem">
-              <template #text="{ label }">
+              <template #text>
                 <text>{{ formData.brand }}</text>
               </template>
             </up-select>
           </up-form-item>
-
-          <up-form-item prop="model" label="型号" required>
+          <up-form-item label="型号" :label-width="80">
             <up-input v-model="formData.model" placeholder="请输入手表型号" />
           </up-form-item>
-
-          <up-form-item prop="movementType" label="机芯类型" required labelPosition="top" :label-width="70">
+          <up-form-item label="机芯类型" labelPosition="top" :label-width="80">
             <up-radio-group v-model="formData.movementType" size="default">
-              <up-radio v-for="type in movementTypes" :key="type" :label="type" :name="type">
-                {{ type }}
-              </up-radio>
+              <up-radio v-for="type in movementTypes" :key="type" :label="type" :name="type">{{ type }}</up-radio>
             </up-radio-group>
           </up-form-item>
-
-          <up-form-item prop="watchNumber" label="表身编号" required labelPosition="top" :label-width="70">
+          <up-form-item label="表身编号" labelPosition="top" :label-width="80">
             <up-input v-model="formData.watchNumber" placeholder="请输入表身编号" />
           </up-form-item>
-
-          <up-form-item prop="inWarranty" label="是否在保" required labelPosition="top" :label-width="70">
+          <up-form-item label="是否在保" labelPosition="top" :label-width="80">
             <up-radio-group v-model="formData.inWarranty" size="default">
               <up-radio label="是" name="true"></up-radio>
               <up-radio label="否" name="false"></up-radio>
             </up-radio-group>
           </up-form-item>
-
-          <up-form-item prop="images" label="上传图片" labelPosition="top" :label-width="70">
+          <up-form-item label="上传图片" labelPosition="top" :label-width="80">
             <view class="upload-images">
               <view v-for="(image, index) in formData.images" :key="index" class="uploaded-image">
                 <image :src="image" mode="aspectFill"></image>
@@ -71,71 +93,139 @@
               </view>
             </view>
           </up-form-item>
-        </up-form>
-      </view>
-
-      <!-- 步骤3：故障描述 -->
-      <view v-if="currentStep === 3" class="step-3">
-        <up-form :model="formData" :rules="rules" ref="formRef" :label-width="70" labelPosition="top">
-          <up-form-item prop="faultTypes" label="故障现象" required>
-            <up-checkbox-group v-model="formData.faultTypes">
-              <up-checkbox v-for="(fault, index) in faultTypeOptions" :key="index" :label="fault.name"
-                :name="fault.name">{{
-                  fault.name }}</up-checkbox>
+        </view>
+      </template>
+
+      <!-- ===================== 我要养护 ===================== -->
+      <template v-if="formData.orderTypeId === 'maintenance'">
+        <!-- 养护项目 -->
+        <view class="form-section">
+          <view class="section-title">养护项目</view>
+          <up-form-item label="养护类型" labelPosition="top" :label-width="80">
+            <up-checkbox-group v-model="formData.maintenanceTypes">
+              <up-checkbox v-for="item in maintenanceTypeOptions" :key="item.value" :label="item.label"
+                :name="item.value">{{ item.label }}</up-checkbox>
             </up-checkbox-group>
           </up-form-item>
-
-          <up-form-item prop="faultDescription" label="详细描述" required labelPosition="top">
-            <up-textarea v-model="formData.faultDescription" placeholder="请详细描述故障情况" rows="4" />
+          <up-form-item label="上次养护时间" :label-width="100" @click="lastMaintenanceDateShow = true">
+            <up-datetime-picker hasInput :show="lastMaintenanceDateShow" v-model="formData.lastMaintenanceDate"
+              mode="date" @cancel="lastMaintenanceDateShow = false" @confirm="(v: any) => datetimeConfirm(v)"
+              placeholder="请选择上次养护时间"></up-datetime-picker>
+          </up-form-item>
+          <up-form-item label="特殊要求" labelPosition="top" :label-width="80">
+            <up-textarea v-model="formData.maintenanceRemark" placeholder="如有特殊养护要求，请在此说明" rows="3" />
           </up-form-item>
+        </view>
 
-          <up-form-item prop="faultImages" label="上传故障特写图" labelPosition="top" :label-width="120">
+        <!-- 手表信息（养护） -->
+        <view class="form-section">
+          <view class="section-title">手表信息</view>
+          <up-form-item label="品牌" :label-width="80">
+            <up-select v-model="formData.brand" :options="brands" label="请选择品牌" @select="selectBrandItem">
+              <template #text>
+                <text>{{ formData.brand }}</text>
+              </template>
+            </up-select>
+          </up-form-item>
+          <up-form-item label="型号" :label-width="80">
+            <up-input v-model="formData.model" placeholder="请输入手表型号" />
+          </up-form-item>
+          <up-form-item label="表身编号" :label-width="80">
+            <up-input v-model="formData.watchNumber" placeholder="请输入表身编号" />
+          </up-form-item>
+          <up-form-item label="上传手表图片" labelPosition="top" :label-width="100">
             <view class="upload-images">
-              <view v-for="(image, index) in formData.faultImages" :key="index" class="uploaded-image">
+              <view v-for="(image, index) in formData.images" :key="index" class="uploaded-image">
                 <image :src="image" mode="aspectFill"></image>
-                <view class="image-remove" @click="removeFaultImage(index)">×</view>
+                <view class="image-remove" @click="removeImage(index)">×</view>
               </view>
-              <view class="upload-btn" @click="uploadFaultImage">
+              <view v-if="formData.images.length < 5" class="upload-btn" @click="uploadImage">
                 <u-icon name="camera" size="32"></u-icon>
                 <text>上传图片</text>
               </view>
             </view>
           </up-form-item>
-        </up-form>
-      </view>
-
-      <!-- 步骤4：提交订单 -->
-      <view v-if="currentStep === 4" class="step-4">
-        <up-form :model="formData" :rules="rules" ref="formRef">
-          <up-form-item prop="contactName" label="姓名" required>
-            <up-input v-model="formData.contactName" placeholder="请输入您的姓名" />
+        </view>
+      </template>
+
+      <!-- 联系方式（维修和养护共用） -->
+      <view class="form-section">
+        <view class="section-title">联系方式</view>
+        <up-form-item label="姓名" prop="contactName" required :label-width="80">
+          <up-input v-model="formData.contactName" placeholder="请输入您的姓名" />
+        </up-form-item>
+        <up-form-item label="电话" prop="contactPhone" required :label-width="80">
+          <up-input v-model="formData.contactPhone" placeholder="请输入您的电话" />
+        </up-form-item>
+
+        <!-- 维修：地址/门店/上门时间/快递单号 -->
+        <template v-if="formData.orderTypeId === 'repair'">
+          <up-form-item v-if="
+            formData.serviceId === 'home' || formData.serviceId === 'mail'
+          " prop="address" label="地址" required :label-width="80">
+            <up-textarea v-model="formData.address" placeholder="请输入您的地址"></up-textarea>
           </up-form-item>
-
-          <up-form-item prop="contactPhone" label="电话" required>
-            <up-input v-model="formData.contactPhone" placeholder="请输入您的电话" />
+          <up-form-item v-if="formData.serviceId === 'store'" prop="storeName" label="选择门店" required :label-width="80">
+            <up-select v-model="formData.storeName" :options="stores" label="请选择门店" @select="selectStoreItem">
+              <template #text>
+                <text>{{ formData.storeName }}</text>
+              </template>
+            </up-select>
           </up-form-item>
-
-          <up-form-item v-if="formData.serviceType === 'home' || formData.serviceType === 'mail'" prop="address"
-            label="地址" required>
+          <up-form-item v-if="formData.serviceId === 'home'" prop="delivery" label="上门时间" required :label-width="80"
+            labelPosition="top">
+            <up-cate-tab height="300px" :tab-list="deliveryOptions" v-model:current="deliveryCurrent">
+              <template v-slot:itemList="{ item }">
+                <view class="delivery-time-container">
+                  <view class="item-title"><text>{{ item.name }}</text></view>
+                  <view class="item-container">
+                    <up-choose v-model="item.selectedIndex" :options="item.times" item-width="300rpx"
+                      item-height="40rpx" @update:modelValue="(idx: any) => onDeliveryTimeChange(item, idx)">
+                    </up-choose>
+                  </view>
+                </view>
+              </template>
+            </up-cate-tab>
+          </up-form-item>
+          <up-form-item v-if="formData.serviceId === 'mail'" prop="expressNumber" label="快递单号" required
+            :label-width="80">
+            <view class="express">
+              <up-input v-model="formData.expressNumber" placeholder="请输入快递单号" />
+              <text class="express-hint">建议使用顺丰快递，确保手表安全</text>
+            </view>
+          </up-form-item>
+        </template>
+
+        <!-- 养护：服务方式 + 对应字段 -->
+        <template v-if="formData.orderTypeId === 'maintenance'">
+          <up-form-item label="服务方式" prop="maintenanceServiceType" required :label-width="80">
+            <up-select showOptionsLabel v-model="formData.maintenanceServiceType" :options="serviceOptions"
+              :label="formData.maintenanceServiceType ? '' : '请选择服务方式'" @select="selectMaintenanceServiceItem">
+              <template #text>
+                <text>{{ formData.maintenanceServiceType }}</text>
+              </template>
+            </up-select>
+          </up-form-item>
+          <up-form-item v-if="
+            formData.maintenanceServiceId === 'home' ||
+            formData.maintenanceServiceId === 'mail'
+          " prop="address" label="地址" required :label-width="80">
             <up-textarea v-model="formData.address" placeholder="请输入您的地址"></up-textarea>
           </up-form-item>
-
-          <up-form-item v-if="formData.serviceType === 'store'" prop="storeName" label="选择门店" required label-width="70">
+          <up-form-item v-if="formData.maintenanceServiceId === 'store'" prop="storeName" label="选择门店" required
+            :label-width="80">
             <up-select v-model="formData.storeName" :options="stores" label="请选择门店" @select="selectStoreItem">
-              <template #text="{ label }">
+              <template #text>
                 <text>{{ formData.storeName }}</text>
               </template>
             </up-select>
           </up-form-item>
-
-          <up-form-item v-if="formData.serviceType === 'home'" prop="delivery" label="上门时间" required :label-width="70"
-            @click="datetimerShow = true" labelPosition="top">
+          <up-form-item v-if="formData.maintenanceServiceId === 'home'" prop="delivery" label="上门时间" required
+            :label-width="80" labelPosition="top">
             <up-cate-tab height="300px" :tab-list="deliveryOptions" v-model:current="deliveryCurrent">
               <template v-slot:itemList="{ item }">
                 <view class="delivery-time-container">
-                  <view class="item-title">
-                    <text>{{ item.name }}</text>
-                  </view>
+                  <view class="item-title"><text>{{ item.name }}</text></view>
                   <view class="item-container">
                     <up-choose v-model="item.selectedIndex" :options="item.times" item-width="300rpx"
                       item-height="40rpx" @update:modelValue="(idx: any) => onDeliveryTimeChange(item, idx)">
@@ -145,27 +235,20 @@
               </template>
             </up-cate-tab>
           </up-form-item>
-
-          <up-form-item v-if="formData.serviceType === 'mail'" prop="expressNumber" label="快递单号" required
-            :label-width="70">
+          <up-form-item v-if="formData.maintenanceServiceId === 'mail'" prop="expressNumber" label="快递单号" required
+            :label-width="80">
             <view class="express">
               <up-input v-model="formData.expressNumber" placeholder="请输入快递单号" />
               <text class="express-hint">建议使用顺丰快递，确保手表安全</text>
             </view>
           </up-form-item>
-        </up-form>
+        </template>
       </view>
-    </view>
+    </up-form>
 
-    <!-- 底部按钮 -->
+    <!-- 底部提交按钮 -->
     <view class="bottom-buttons">
-      <u-button v-if="currentStep > 1" type="default" size="large" @click="prevStep">
-        上一步
-      </u-button>
-      <u-button v-if="currentStep < 4" type="primary" size="large" :disabled="!canNext" @click="nextStep">
-        下一步
-      </u-button>
-      <u-button v-if="currentStep === 4" type="primary" size="large" :disabled="!canSubmit" @click="submitOrder">
+      <u-button type="primary" size="large" @click="submitOrder">
         提交订单
       </u-button>
     </view>
@@ -173,71 +256,66 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, reactive } from 'vue'
-import type { repair_Params } from '@/types/repair'
-import { deliveryOptions, steps, services, movementTypes, brands, faultTypeOptions, stores } from '../public'
-const currentStep = ref<number>(1)
-const datetimerShow = ref<boolean>(false)
-const deliveryCurrent = ref<number>(0)
+import { ref, computed, reactive } from "vue";
+import type { repair_Params } from "@/types/repair";
+import {
+  deliveryOptions,
+  services,
+  movementTypes,
+  brands,
+  faultTypeOptions,
+  stores,
+  orderTypeOptions,
+  maintenanceTypeOptions,
+} from "../public";
+
+const deliveryCurrent = ref<number>(0);
+const lastMaintenanceDateShow = ref<boolean>(false);
+
+// 维修服务方式选项
+const serviceOptions = services.map((s) => ({ name: s.name, id: s.value }));
 
 // 表单数据
 const formData = reactive<repair_Params>({
-  // 步骤1
-  serviceType: '',
-  // 步骤2
-  brand: '',
-  model: '',
-  movementType: '',
-  watchNumber: '',
+  orderType: "维修", // 默认：我要维修
+  orderTypeId: "repair",
+  serviceType: "邮寄",
+  serviceId: "mail",
+  brand: "",
+  model: "",
+  movementType: "",
+  watchNumber: "",
   inWarranty: false,
   images: [],
-  // 步骤3
   faultTypes: [],
-  faultDescription: '',
+  faultDescription: "",
   faultImages: [],
-  // 步骤4
-  contactName: '',
-  contactPhone: '',
-  address: '',
-  delivery: '',
-  storeName: '',
-  expressNumber: '',
-})
+  maintenanceTypes: [],
+  lastMaintenanceDate: "",
+  maintenanceRemark: "",
+  maintenanceServiceType: "邮寄", // 默认邮寄
+  maintenanceServiceId: "mail",
+  contactName: "",
+  contactPhone: "",
+  address: "",
+  delivery: "",
+  storeName: "",
+  expressNumber: "",
+});
+const datetimeConfirm = (v: any) => {
+  formData.lastMaintenanceDate = v.value;
+  lastMaintenanceDateShow.value = false;
+};
+
 // 表单验证规则
 const rules = {
-  // 步骤1
+  orderType: [{ required: true, message: "请选择业务类型", trigger: "change" }],
   serviceType: [
-    { required: true, message: '请选择服务类型', trigger: 'change' }
-  ],
-  // 步骤2
-  brand: [
-    { required: true, message: '请选择品牌', trigger: 'change' }
-  ],
-  model: [
-    { required: true, message: '请输入型号', trigger: 'blur' }
-  ],
-  movementType: [
-    { required: true, message: '请选择机芯类型', trigger: 'change' }
-  ],
-  watchNumber: [
-    { required: true, message: '请输入表身编号', trigger: 'blur' }
-  ],
-  inWarranty: [
-    { required: true, message: '请选择是否在保', trigger: 'change' }
-  ],
-  // 步骤3
-  faultTypes: [
-    { required: true, message: '请选择故障现象', trigger: 'change', type: 'array' }
-  ],
-  faultDescription: [
-    { required: true, message: '请输入详细描述', trigger: 'blur' }
-  ],
-  // 步骤4
-  contactName: [
-    { required: true, message: '请输入姓名', trigger: 'blur' }
+    { required: true, message: "请选择服务方式", trigger: "change" },
   ],
+  contactName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
   contactPhone: [
-    { required: true, message: '请输入电话', trigger: 'blur' },
+    { required: true, message: "请输入电话", trigger: "blur" },
     {
       validator: (rule: any, value: string, callback: Function) => {
         if (!value) return callback();
@@ -245,322 +323,179 @@ const rules = {
         if (reg.test(value)) {
           callback();
         } else {
-          callback(new Error('请输入正确的手机号'));
+          callback(new Error("请输入正确的手机号"));
         }
       },
-      message: '请输入正确的手机号',
-      trigger: 'blur'
-    }
-  ],
-  address: [
-    { required: true, message: '请输入地址', trigger: 'blur' }
-  ],
-  delivery: [
-    { required: true, message: '请选择上门时间', trigger: 'change' }
-  ],
-  storeName: [
-    { required: true, message: '请选择门店', trigger: 'change' }
+      message: "请输入正确的手机号",
+      trigger: "blur",
+    },
   ],
+  address: [{ required: true, message: "请输入地址", trigger: "blur" }],
+  delivery: [{ required: true, message: "请选择上门时间", trigger: "change" }],
+  storeName: [{ required: true, message: "请选择门店", trigger: "change" }],
   expressNumber: [
-    { required: true, message: '请输入快递单号', trigger: 'blur' }
-  ]
-}
+    { required: true, message: "请输入快递单号", trigger: "blur" },
+  ],
+};
 
 // 表单引用
-const formRef = ref()
-
-// 计算属性
-const canNext = computed(() => {
-  switch (currentStep.value) {
-    case 1: return !!formData.serviceType
-    case 2: return formData.brand && formData.model && formData.movementType && formData.watchNumber
-    case 3: return formData.faultTypes.length > 0 && formData.faultDescription
-    default: return false
-  }
-})
-
-const canSubmit = computed(() => {
-  if (formData.serviceType === 'store') {
-    return formData.contactName && formData.contactPhone && formData.storeName
-  } else if (formData.serviceType === 'home') {
-    return formData.contactName && formData.contactPhone && formData.address && formData.delivery
-  } else if (formData.serviceType === 'mail') {
-    return formData.contactName && formData.contactPhone && formData.address && formData.expressNumber
-  }
-  return false
-})
+const formRef = ref();
+
+// 选择业务类型
+const selectOrderType = (item: any) => {
+  formData.orderType = item.name;
+  formData.orderTypeId = item.id;
+};
+
+// 选择服务方式（维修）
+const selectServiceItem = (item: any) => {
+  formData.serviceType = item.name;
+  formData.serviceId = item.id;
+};
+
+// 选择服务方式（养护）
+const selectMaintenanceServiceItem = (item: any) => {
+  formData.maintenanceServiceType = item.name;
+  formData.maintenanceServiceId = item.id;
+};
 
 // 选择品牌
 const selectBrandItem = (item: any) => {
-  formData.brand = item.id
-}
+  formData.brand = item.id;
+};
 
 // 选择门店
 const selectStoreItem = (item: any) => {
-  formData.storeName = item.name
-}
+  formData.storeName = item.name;
+};
 
-// 下一步
-const nextStep = async () => {
-  if (canNext.value) {
-    // 验证当前步骤的表单
-    const isValid = await formRef.value?.validate()
-    if (isValid) {
-      currentStep.value++
-    }
-  }
-}
-// 上一步
-const prevStep = () => {
-  if (currentStep.value > 1) {
-    currentStep.value--
-  }
-}
 // 选择上门时间
 const onDeliveryTimeChange = (item: any, index: number) => {
-  // 清除其他分组的选中状态
-  deliveryOptions.forEach(opt => {
-    if (opt !== item) opt.selectedIndex = -1
-  })
-  item.selectedIndex = index
-  const selectedTime = item.times[index]
+  deliveryOptions.forEach((opt) => {
+    if (opt !== item) opt.selectedIndex = -1;
+  });
+  item.selectedIndex = index;
+  const selectedTime = item.times[index];
   if (selectedTime) {
-    formData.delivery = selectedTime.title
+    formData.delivery = selectedTime.title;
   }
-}
-// 模拟上传图片
+};
+
+// 上传图片
 const uploadImage = () => {
-  formData.images.push('')
-}
-// 删除图片
+  formData.images.push("");
+};
 const removeImage = (index: number) => {
-  formData.images.splice(index, 1)
-}
-
-// 模拟上传图片
+  formData.images.splice(index, 1);
+};
 const uploadFaultImage = () => {
-  formData.faultImages.push('')
-}
-// 删除故障图片
+  formData.faultImages.push("");
+};
 const removeFaultImage = (index: number) => {
-  formData.faultImages.splice(index, 1)
-}
+  formData.faultImages.splice(index, 1);
+};
+
 // 提交订单
 const submitOrder = async () => {
-  console.log(formData);
-  if (canSubmit.value) {
-    const isValid = await formRef.value?.validate()
-    if (isValid) {
-      console.log(formData);
-
-      const orderId = 1
-      uni.navigateTo({
-        url: '/pages/repair/components/progress/index?orderId=' + orderId
-      })
-    }
+  const isValid = await formRef.value?.validate();
+  if (isValid) {
+    console.log(formData);
+    const orderId = 1;
+    uni.navigateTo({
+      url: "/pages/repair/components/progress/index?orderId=" + orderId,
+    });
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
 .repair-apply {
   min-height: 100vh;
   background: #f5f7fa;
-  padding-bottom: 100rpx;
+  padding-bottom: 120rpx;
 
-  /* 步骤指示器 */
-  .steps-indicator {
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    padding: 32rpx 0;
-    background: #fff;
-    margin-bottom: 20rpx;
-    position: relative;
-
-    /* 横线 */
-    &::before {
-      content: '';
-      position: absolute;
-      top: 56rpx;
-      left: 10%;
-      right: 10%;
-      height: 4rpx;
-      background: #e8e8e8;
-      z-index: 1;
-    }
-
-    .step-item {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      position: relative;
-      z-index: 2;
-      flex: 1;
-
-      .step-number {
-        width: 48rpx;
-        height: 48rpx;
-        border-radius: 50%;
-        background: #e8e8e8;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-weight: bold;
-        margin-bottom: 8rpx;
-        transition: all 0.3s;
-      }
-
-      .step-text {
-        font-size: 24rpx;
-        color: #999;
-        transition: all 0.3s;
-      }
-
-      &.active {
-        .step-number {
-          background: #2c94f6;
-          color: #fff;
-        }
-
-        .step-text {
-          color: #2c94f6;
-          font-weight: bold;
-        }
-      }
-
-      &.completed {
-        .step-number {
-          background: #52c41a;
-          color: #fff;
-        }
-
-        .step-text {
-          color: #52c41a;
-        }
-      }
-    }
-  }
-
-  /* 步骤内容 */
-  .step-content {
+  /* 表单分区 */
+  .form-section {
     background: #fff;
+    margin: 20rpx 0;
     padding: 32rpx;
 
-    /* 服务卡片 */
-    .service-cards {
-      display: flex;
-      flex-direction: column;
-      gap: 24rpx;
-
-      .service-card {
-        border: 2rpx solid #e8e8e8;
-        border-radius: 16rpx;
-        padding: 32rpx;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        transition: all 0.3s;
-
-        &:active {
-          transform: scale(0.98);
-        }
-
-        &.active {
-          border-color: #2c94f6;
-          background: #eaf5ff;
-        }
-
-        .service-icon {
-          font-size: 64rpx;
-          margin-bottom: 16rpx;
-        }
-
-        .service-name {
-          font-size: 32rpx;
-          font-weight: bold;
-          margin-bottom: 8rpx;
-        }
-
-        .service-desc {
-          font-size: 24rpx;
-          color: #666;
-        }
-      }
+    .section-title {
+      font-size: 30rpx;
+      font-weight: bold;
+      color: #333;
+      margin-bottom: 24rpx;
+      padding-left: 16rpx;
+      border-left: 6rpx solid #2c94f6;
     }
+  }
 
-    /* 上传图片 */
-    .upload-images {
-      display: flex;
-      gap: 24rpx;
-      flex-wrap: wrap;
-      margin-top: 16rpx;
-
-      .uploaded-image {
-        position: relative;
-        width: 160rpx;
-        height: 160rpx;
-        border-radius: 12rpx;
-        overflow: hidden;
-
-        image {
-          width: 100%;
-          height: 100%;
-        }
+  /* 上传图片 */
+  .upload-images {
+    display: flex;
+    gap: 24rpx;
+    flex-wrap: wrap;
+    margin-top: 16rpx;
 
-        .image-remove {
-          position: absolute;
-          top: 8rpx;
-          right: 8rpx;
-          width: 32rpx;
-          height: 32rpx;
-          background: rgba(0, 0, 0, 0.6);
-          color: #fff;
-          border-radius: 50%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          font-size: 24rpx;
-        }
+    .uploaded-image {
+      position: relative;
+      width: 160rpx;
+      height: 160rpx;
+      border-radius: 12rpx;
+      overflow: hidden;
+
+      image {
+        width: 100%;
+        height: 100%;
       }
 
-      .upload-btn {
-        width: 160rpx;
-        height: 160rpx;
-        border: 2rpx dashed #e8e8e8;
-        border-radius: 12rpx;
+      .image-remove {
+        position: absolute;
+        top: 8rpx;
+        right: 8rpx;
+        width: 32rpx;
+        height: 32rpx;
+        background: rgba(0, 0, 0, 0.6);
+        color: #fff;
+        border-radius: 50%;
         display: flex;
-        flex-direction: column;
         align-items: center;
         justify-content: center;
-        color: #999;
-
-        text {
-          font-size: 20rpx;
-          margin-top: 8rpx;
-        }
+        font-size: 24rpx;
       }
     }
 
-    /* 隐藏的表单项 */
-    .hidden-item {
-      display: none;
-    }
-
-    /* 快递提示 */
-    .express {
+    .upload-btn {
+      width: 160rpx;
+      height: 160rpx;
+      border: 2rpx dashed #e8e8e8;
+      border-radius: 12rpx;
       display: flex;
       flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      color: #999;
 
-      .express-hint {
+      text {
         font-size: 20rpx;
-        color: #999;
         margin-top: 8rpx;
-        display: block;
       }
     }
   }
 
+  /* 快递提示 */
+  .express {
+    display: flex;
+    flex-direction: column;
+
+    .express-hint {
+      font-size: 20rpx;
+      color: #999;
+      margin-top: 8rpx;
+      display: block;
+    }
+  }
+
   /* 底部按钮 */
   .bottom-buttons {
     position: fixed;
@@ -570,14 +505,12 @@ const submitOrder = async () => {
     background: #fff;
     padding: 24rpx 32rpx;
     box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.1);
-    display: flex;
-    gap: 24rpx;
 
     button {
-      flex: 1;
+      width: 100%;
       height: 88rpx;
       border-radius: 44rpx;
     }
   }
 }
-</style>
+</style>

src/pages/repair/components/charts/line.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="chart-box">
-        <ucharts type="area" :chartData="chartData" :opts="opts" />
+        <ucharts type="line" :chartData="chartData" :opts="opts" />
     </view>
 </template>
 
@@ -13,31 +13,30 @@ const props = defineProps({
         type: Object,
         default: () => ({
             categories: [
-                '2000',
-                '2001',
-                '2002',
-                '2003',
-                '2004',
-                '2005',
-                '2006',
-                '2007',
-                '2008',
-                '2009',
-                '2010',
-                '2011',
-                '2012',
-                '2013',
-                '2014',
-                '2015',
-                '2016',
-                '2017',
-                '2018',
-                '2019',
-                '2020',
+                '260319',
+                '260320',
+                '260321',
+                '260322',
+                '260323',
+                '260324',
+                '260325',
+                '260319',
+                '260320',
+                '260321',
+                '260322',
+                '260323',
+                '260324',
+                '260325',
+                '260319',
+                '260320',
+                '260321',
+                '260322',
+                '260323',
+                '260324',
+                '260325',
             ],
             series: [
                 {
-                    name: '',
                     data: [
                         35, 8, 25, 37, 4, 20, 35, 8, 25, 37, 4, 20, 35, 8, 25, 37, 4, 20,
                         11, 20, 15,
@@ -52,19 +51,40 @@ const props = defineProps({
     },
 })
 const opts = {
-    color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
-    padding: [10, 0, 0, 0],
-    dataLabel: true,
+    color: ["#1890FF"],
+    padding: [10, 10, 10, 10],
+    dataLabel: false,
+    dataPointShape: false,
     enableScroll: false,
+    legend: {
+        show: false
+    },
+    xAxis: {
+        disableGrid: true,
+        rotateLabel: true,
+        rotateAngle: 45,
+    },
+    yAxis: {
+        showTitle:true,
+        gridType: "dash",
+        dashLength: 2,
+        axisLabel: {
+            show: false
+        },
+        data:[
+            {
+                title: '日服务量/单',
+            }
+        ]
+    },
     extra: {
-        map: {
-            border: true,
-            borderWidth: 1,
-            borderColor: "#666666",
-            fillOpacity: 0.6,
-            activeBorderColor: "#F04864",
-            activeFillColor: "#FACC14",
-            activeFillOpacity: 1
+        line: {
+            type: "curve",
+            width: 3,
+            activeType: "hollow",
+            linearType: "custom",
+            onShadow: true,
+            animation: "horizontal"
         }
     }
 }

src/pages/repair/components/orderDetail/index.vue

@@ -4,278 +4,378 @@
     <view class="status-card">
       <view class="status-header">
         <text class="order-number">工单号：{{ orderInfo.orderId }}</text>
-        <text class="order-status" :style="{ color: orderStatusColor }">{{ orderInfo.status }}</text>
+        <text class="order-status" :style="{ color: orderStatusColor }">{{ orderStatusFormatter(orderInfo.status) }}</text>
       </view>
       <view class="status-footer">
         <text class="order-time">下单时间：{{ orderInfo.createTime }}</text>
-        <text class="payment-status" :style="{ color: paymentStatusColor }">{{ orderInfo.paymentStatus }}</text>
+        <text class="payment-status" v-if="!isRejected" :style="{ color: paymentStatusColor }">{{ paymentStatusFormatter(orderInfo.paymentStatus) }}</text>
       </view>
       <view class="status-service">
-        <text class="service-type">服务类型：{{  serviceTypeFormatter(orderInfo.serviceType) }}</text>
+        <text class="service-type">业务类型：{{ orderInfo.orderType }}</text>
       </view>
-    </view>
-
-    <!-- 客户信息 -->
-    <view class="info-section">
-      <view class="section-header">
-        <text class="section-title">客户信息</text>
+      <view class="status-service">
+        <text class="service-type">服务类型：{{ serviceTypeFormatter(orderInfo.serviceType) }}</text>
       </view>
-      <view class="section-content">
-        <view class="info-item">
-          <text class="info-label">姓名</text>
-          <text class="info-value">{{ orderInfo.customer.name }}</text>
-        </view>
-        <view class="info-item">
-          <text class="info-label">电话</text>
-          <text class="info-value">{{ orderInfo.customer.phone }}</text>
-        </view>
-        <view class="info-item" v-if="orderInfo.serviceType === 'home' || orderInfo.serviceType === 'mail'">
-          <text class="info-label">地址</text>
-          <text class="info-value">{{ orderInfo.customer.address }}</text>
-        </view>
+      <view class="review-btn">
+        <up-button size="small" type="error" @click="handleRefund" v-if="orderInfo.paymentStatus === 'PAID' && hasRole('SERVICESALESREP', false)">
+          退款
+        </up-button>
+        <up-button size="small" type="warning" @click="handleProgress">
+          进度查询
+        </up-button>
+        <up-button size="small" type="primary" @click="handleQuote" v-if="orderInfo.status === 'INSPECTED' && hasRole('REPAIRMAN', false)">
+          报价
+        </up-button>
+        <up-button v-if="orderInfo.status === OrderStatus.DELIVERED" type="success" size="small" @click="handleReview">
+          评价
+        </up-button>
       </view>
+      <up-modal :show="showReviewModal" showCancelButton @confirm="handleSubmitReview"
+        @cancel="showReviewModal = false">
+        <up-rate :count="reviewCount" v-model="reviewValue" active-color="#2c94f6"></up-rate>
+      </up-modal>
     </view>
 
-    <!-- 手表信息 -->
-    <view class="info-section">
-      <view class="section-header">
-        <text class="section-title">手表信息</text>
-      </view>
-      <view class="section-content">
-        <view class="info-item">
-          <text class="info-label">品牌</text>
-          <text class="info-value">{{ orderInfo.watch.brand }}</text>
-        </view>
-        <view class="info-item">
-          <text class="info-label">型号</text>
-          <text class="info-value">{{ orderInfo.watch.model }}</text>
-        </view>
-        <view class="info-item">
-          <text class="info-label">机芯类型</text>
-          <text class="info-value">{{ orderInfo.watch.movementType }}</text>
-        </view>
-        <view class="info-item">
-          <text class="info-label">表身编号</text>
-          <text class="info-value">{{ orderInfo.watch.serialNumber }}</text>
-        </view>
-        <view class="info-item">
-          <text class="info-label">是否在保</text>
-          <text class="info-value">{{ orderInfo.watch.inWarranty ? '是' : '否' }}</text>
-        </view>
-        <view class="info-item">
-          <text class="info-label">手表图片</text>
-          <view class="image-grid">
-            <image v-for="(img, index) in orderInfo.watch.images" :key="index" :src="img" class="grid-image" mode="aspectFill"></image>
+    <!-- ========== 维修专属区块 ========== -->
+    <template v-if="orderInfo.orderTypeId === 'repair'">
+      <!-- 故障描述 -->
+      <view class="info-section row">
+        <view class="section-header">
+          <text class="section-title">故障描述</text>
+        </view>
+        <view class="section-content col">
+          <view class="info-item">
+            <text class="info-label">故障现象：</text>
+            <text class="info-value">{{ orderInfo.fault.description.join('、') }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">详细描述：</text>
+            <text class="info-value">{{ orderInfo.fault.details }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label ">故障图片：</text>
+            <view class="image-grid">
+              <image v-for="(img, index) in orderInfo.fault.images" :key="index" :src="img" class="grid-image"
+                mode="aspectFill"></image>
+            </view>
           </view>
         </view>
       </view>
-    </view>
 
-    <!-- 故障描述 -->
-    <view class="info-section">
-      <view class="section-header">
-        <text class="section-title">故障描述</text>
-      </view>
-      <view class="section-content">
-        <view class="info-item">
-          <text class="info-label">故障现象</text>
-          <text class="info-value">{{ orderInfo.fault.description.join('、') }}</text>
+      <!-- 维修信息 -->
+      <view class="info-section">
+        <view class="section-header">
+          <text class="section-title">维保信息</text>
         </view>
-        <view class="info-item">
-          <text class="info-label">详细描述</text>
-          <text class="info-value">{{ orderInfo.fault.details }}</text>
-        </view>
-        <view class="info-item">
-          <text class="info-label">故障图片</text>
-          <view class="image-grid">
-            <image v-for="(img, index) in orderInfo.fault.images" :key="index" :src="img" class="grid-image" mode="aspectFill"></image>
+        <view class="section-content col">
+          <view class="info-item">
+            <text class="info-label">维保项目：</text>
+            <text class="info-value">{{ orderInfo.repairInfo.items.join('、') }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">维保工时：</text>
+            <text class="info-value">{{ orderInfo.repairInfo.laborHours }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">维保技师：</text>
+            <text class="info-value">{{ orderInfo.repairInfo.technician }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">预计完成日期：</text>
+            <text class="info-value">{{ orderInfo.repairInfo.estimatedCompletionDate }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">紧急程度：</text>
+            <text class="info-value">{{ orderInfo.repairInfo.urgency }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">备注：</text>
+            <text class="info-value">{{ orderInfo.repairInfo.remarks }}</text>
           </view>
         </view>
       </view>
-    </view>
 
-    <!-- 维修信息 -->
-    <view class="info-section">
-      <view class="section-header">
-        <text class="section-title">维修信息</text>
-      </view>
-      <view class="section-content">
-        <view class="info-item">
-          <text class="info-label">维修项目</text>
-          <text class="info-value">{{ orderInfo.repairInfo.items.join('、') }}</text>
-        </view>
-        <view class="info-item">
-          <text class="info-label">维修工时</text>
-          <text class="info-value">{{ orderInfo.repairInfo.laborHours }}</text>
+      <!-- 服务信息（维修） -->
+      <view class="info-section" v-if="orderInfo.serviceType === 'home'">
+        <view class="section-header">
+          <text class="section-title">服务信息</text>
         </view>
-        <view class="info-item">
-          <text class="info-label">维修技师</text>
-          <text class="info-value">{{ orderInfo.repairInfo.technician }}</text>
+        <view class="section-content col">
+          <view class="info-item">
+            <text class="info-label">上门服务时间</text>
+            <text class="info-value">{{ orderInfo.serviceInfo.deliveryTime }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">服务地址</text>
+            <text class="info-value">{{ orderInfo.serviceInfo.serviceAddress }}</text>
+          </view>
         </view>
-        <view class="info-item">
-          <text class="info-label">预计完成日期</text>
-          <text class="info-value">{{ orderInfo.repairInfo.estimatedCompletionDate }}</text>
+      </view>
+      <view class="info-section" v-if="orderInfo.serviceType === 'mail'">
+        <view class="section-header">
+          <text class="section-title">服务信息</text>
+        </view>
+        <view class="section-content col">
+          <view class="info-item">
+            <text class="info-label">快递单号</text>
+            <text class="info-value">{{ orderInfo.serviceInfo.expressNumber }}</text>
+          </view>
         </view>
-        <view class="info-item">
-          <text class="info-label">紧急程度</text>
-          <text class="info-value">{{ orderInfo.repairInfo.urgency }}</text>
+      </view>
+
+      <!-- 维修车间视频 -->
+      <view class="info-section" v-if="orderInfo.status === OrderStatus.REPAIRING">
+        <view class="section-header">
+          <text class="section-title">维保车间视频</text>
         </view>
-        <view class="info-item">
-          <text class="info-label">备注</text>
-          <text class="info-value">{{ orderInfo.repairInfo.remarks }}</text>
+        <view class="section-content">
+          <view class="video-section">
+            <video id="repairVideo" :src="videoUrl" class="video-player" controls></video>
+            <text class="video-hint">实时查看维修情况</text>
+          </view>
         </view>
       </view>
-    </view>
 
-    <!-- 服务信息 -->
-    <view class="info-section" v-if="orderInfo.serviceType === 'home'">
-      <view class="section-header">
-        <text class="section-title">服务信息</text>
+      <!-- 维修记录 -->
+      <view class="info-section">
+        <view class="section-header">
+          <text class="section-title">维保记录</text>
+        </view>
+        <view class="section-content">
+          <view v-for="(record, index) in orderInfo.repairRecords" :key="index" class="record-item">
+            <view class="record-header">
+              <text class="record-title">{{ record.title }}</text>
+              <text class="record-time">{{ record.time }}</text>
+            </view>
+            <text class="record-content">{{ record.content }}</text>
+          </view>
+        </view>
       </view>
-      <view class="section-content">
-        <view class="info-item">
-          <text class="info-label">上门服务时间</text>
-          <text class="info-value">{{ orderInfo.serviceInfo.deliveryTime }}</text>
+
+      <!-- 质保期 -->
+      <view class="info-section">
+        <view class="section-header">
+          <text class="section-title">质保期：</text>
         </view>
-        <view class="info-item">
-          <text class="info-label">服务地址</text>
-          <text class="info-value">{{ orderInfo.serviceInfo.serviceAddress }}</text>
+        <view class="section-content col">
+          <view class="info-item">
+            <text class="info-label">质保开始日期：</text>
+            <text class="info-value">{{ orderInfo.warranty.startDate }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">质保结束日期：</text>
+            <text class="info-value">{{ orderInfo.warranty.endDate }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">质保范围：</text>
+            <text class="info-value">{{ orderInfo.warranty.coverage }}</text>
+          </view>
         </view>
       </view>
-    </view>
-    <view class="info-item" v-if="orderInfo.serviceType === 'mail'">
-      <text class="info-label">快递单号</text>
-      <text class="info-value">{{ orderInfo.serviceInfo.expressNumber }}</text>
-    </view>
-    <!-- 维修车间视频 -->
-    <view class="info-section" v-if="orderInfo.status === OrderStatus.IN_REPAIR">
-      <view class="section-header">
-        <text class="section-title">维修车间视频</text>
-      </view>
-      <view class="section-content">
-        <view class="video-section">
-          <video id="repairVideo" :src="videoUrl" class="video-player" controls></video>
-          <text class="video-hint">实时查看维修情况</text>
+    </template>
+
+    <!-- ========== 养护专属区块 ========== -->
+    <template v-if="orderInfo.orderTypeId === 'maintenance'">
+      <!-- 养护项目 -->
+      <view class="info-section">
+        <view class="section-header">
+          <text class="section-title">养护项目</text>
+        </view>
+        <view class="section-content col">
+          <view class="info-item">
+            <text class="info-label">养护类型：</text>
+            <text class="info-value">{{ maintenanceTypesFormatter(orderInfo.maintenance.maintenanceTypes) }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">上次养护时间：</text>
+            <text class="info-value">{{ orderInfo.maintenance.lastMaintenanceDate || '-' }}</text>
+          </view>
+          <view class="info-item">
+            <text class="info-label">特殊要求：</text>
+            <text class="info-value">{{ orderInfo.maintenance.maintenanceRemark || '-' }}</text>
+          </view>
         </view>
       </view>
-    </view>
 
-    <!-- 维修记录 -->
-    <view class="info-section">
-      <view class="section-header">
-        <text class="section-title">维修记录</text>
+      <!-- 养护服务信息 -->
+      <view class="info-section">
+        <view class="section-header">
+          <text class="section-title">服务信息</text>
+        </view>
+        <view class="section-content col">
+          <view class="info-item">
+            <text class="info-label">服务方式：</text>
+            <text class="info-value">{{ maintenanceServiceFormatter(orderInfo.maintenance.maintenanceServiceId)
+            }}</text>
+          </view>
+          <view class="info-item"
+            v-if="orderInfo.maintenance.maintenanceServiceId === 'home' || orderInfo.maintenance.maintenanceServiceId === 'mail'">
+            <text class="info-label">地址：</text>
+            <text class="info-value">{{ orderInfo.maintenance.address || '-' }}</text>
+          </view>
+          <view class="info-item" v-if="orderInfo.maintenance.maintenanceServiceId === 'store'">
+            <text class="info-label">门店：</text>
+            <text class="info-value">{{ orderInfo.maintenance.storeName || '-' }}</text>
+          </view>
+          <view class="info-item" v-if="orderInfo.maintenance.maintenanceServiceId === 'home'">
+            <text class="info-label">上门时间：</text>
+            <text class="info-value">{{ orderInfo.maintenance.delivery || '-' }}</text>
+          </view>
+          <view class="info-item" v-if="orderInfo.maintenance.maintenanceServiceId === 'mail'">
+            <text class="info-label">快递单号：</text>
+            <text class="info-value">{{ orderInfo.maintenance.expressNumber || '-' }}</text>
+          </view>
+        </view>
       </view>
-      <view class="section-content">
-        <view v-for="(record, index) in orderInfo.repairRecords" :key="index" class="record-item">
-          <view class="record-header">
-            <text class="record-title">{{ record.title }}</text>
-            <text class="record-time">{{ record.time }}</text>
+
+      <!-- 养护记录 -->
+      <view class="info-section">
+        <view class="section-header">
+          <text class="section-title">养护记录</text>
+        </view>
+        <view class="section-content">
+          <view v-for="(record, index) in orderInfo.repairRecords" :key="index" class="record-item">
+            <view class="record-header">
+              <text class="record-title">{{ record.title }}</text>
+              <text class="record-time">{{ record.time }}</text>
+            </view>
+            <text class="record-content">{{ record.content }}</text>
           </view>
-          <text class="record-content">{{ record.content }}</text>
         </view>
       </view>
-    </view>
+    </template>
 
-    <!-- 费用明细 -->
+    <!-- 手表信息 -->
     <view class="info-section">
       <view class="section-header">
-        <text class="section-title">费用明细</text>
+        <text class="section-title">手表信息</text>
       </view>
-      <view class="section-content">
-        <view class="info-item">
-          <text class="info-label">维修项目</text>
-          <text class="info-value">{{ orderInfo.cost.items.join('、') }}</text>
-        </view>
+      <view class="section-content grid">
         <view class="info-item">
-          <text class="info-label">配件费</text>
-          <text class="info-value">¥{{ orderInfo.cost.partsFee.toFixed(2) }}</text>
+          <text class="info-label">品牌：</text>
+          <text class="info-value">{{ orderInfo.watch.brand }}</text>
         </view>
         <view class="info-item">
-          <text class="info-label">工时费</text>
-          <text class="info-value">¥{{ orderInfo.cost.laborFee.toFixed(2) }}</text>
+          <text class="info-label">型号：</text>
+          <text class="info-value">{{ orderInfo.watch.model }}</text>
         </view>
         <view class="info-item">
-          <text class="info-label">其他费用</text>
-          <text class="info-value">¥{{ orderInfo.cost.otherFee.toFixed(2) }}</text>
+          <text class="info-label">机芯类型：</text>
+          <text class="info-value">{{ orderInfo.watch.movementType }}</text>
         </view>
         <view class="info-item">
-          <text class="info-label">折扣率</text>
-          <text class="info-value">{{ orderInfo.cost.discountRate }}%</text>
+          <text class="info-label">表身编号：</text>
+          <text class="info-value">{{ orderInfo.watch.serialNumber }}</text>
         </view>
         <view class="info-item">
-          <text class="info-label">折扣金额</text>
-          <text class="info-value">-¥{{ orderInfo.cost.discountAmount.toFixed(2) }}</text>
-        </view>
-        <view class="info-item total">
-          <text class="info-label">最终金额</text>
-          <text class="info-value total-value">¥{{ orderInfo.cost.finalAmount.toFixed(2) }}</text>
+          <text class="info-label">是否在保：</text>
+          <text class="info-value">{{ orderInfo.watch.inWarranty ? '是' : '否' }}</text>
         </view>
-        
-        <!-- 详细费用明细 -->
-        <view class="cost-details">
-          <view class="cost-details-title">详细费用</view>
-          <view v-for="(item, index) in orderInfo.cost.details" :key="index" class="cost-detail-item">
-            <text class="cost-detail-type">{{ item.type }}</text>
-            <text class="cost-detail-amount">¥{{ item.amount.toFixed(2) }}</text>
-            <text class="cost-detail-description">{{ item.description }}</text>
+        <view class="info-item row">
+          <text class="info-label ">手表图片：</text>
+          <view class="image-grid">
+            <image v-for="(img, index) in orderInfo.watch.images" :key="index" :src="img" class="grid-image"
+              mode="aspectFill"></image>
           </view>
         </view>
       </view>
     </view>
-
-    <!-- 质保期 -->
+    <!-- 客户信息 -->
     <view class="info-section">
       <view class="section-header">
-        <text class="section-title">质保期</text>
+        <text class="section-title">客户信息：</text>
       </view>
-      <view class="section-content">
+      <view class="section-content col">
         <view class="info-item">
-          <text class="info-label">质保开始日期</text>
-          <text class="info-value">{{ orderInfo.warranty.startDate }}</text>
+          <text class="info-label">姓名：</text>
+          <text class="info-value">{{ orderInfo.customer.name }}</text>
         </view>
         <view class="info-item">
-          <text class="info-label">质保结束日期</text>
-          <text class="info-value">{{ orderInfo.warranty.endDate }}</text>
+          <text class="info-label">电话：</text>
+          <text class="info-value">{{ orderInfo.customer.phone }}</text>
         </view>
-        <view class="info-item">
-          <text class="info-label">质保范围</text>
-          <text class="info-value">{{ orderInfo.warranty.coverage }}</text>
+        <view class="info-item" v-if="orderInfo.serviceType === 'home' || orderInfo.serviceType === 'mail'">
+          <text class="info-label">地址：</text>
+          <text class="info-value">{{ orderInfo.customer.address }}</text>
         </view>
       </view>
     </view>
 
     <!-- 底部按钮 -->
     <view class="bottom-buttons">
-      <up-button v-if="orderInfo.paymentStatus === PaymentStatus.UNPAID" type="primary" size="normal"
+      <up-button v-if="orderInfo.paymentStatus === 'UNPAID' && orderInfo.status === 'QUOTED'" type="primary" size="small"
         @click="handlePayment">
         支付
       </up-button>
-      <up-button v-if="orderInfo.status === OrderStatus.COMPLETED" type="success" size="normal" @click="handleReview">
-        评价
-      </up-button>
-      <up-button type="warning" size="normal" plain @click="contactService">
+      <up-button type="warning" size="small" plain @click="contactService">
         联系客服
       </up-button>
-      <up-button size="normal" plain @click="closeOrder">
-        关闭订单
+      <!-- 维修师傅按钮 -->
+      <up-button type="primary" size="small" plain @click="acceptOrder"
+        v-if="orderInfo.status === 'SENT_REPAIR' && hasRole('REPAIRMAN', false)">
+        接单
+      </up-button>
+      <up-button type="error" size="small" plain @click="rejectOrder"
+        v-if="orderInfo.status === 'SENT_REPAIR' && hasRole('REPAIRMAN', false)">
+        拒单
+      </up-button>
+      <up-button type="primary" size="small" plain @click="rejectOrder"
+        v-if="orderInfo.status === 'PAID' && hasRole('REPAIRMAN', false)">
+        开始维修
+      </up-button>
+      <up-button type="success" size="small" plain @click="rejectOrder"
+        v-if="orderInfo.status === 'REPAIRING' && hasRole('REPAIRMAN', false)">
+        完成维修
+      </up-button>
+      <!-- 业务员按钮 -->
+      <up-button type="primary" size="small" plain v-if="orderInfo.status === 'REPAIRED' && hasRole('SERVICESALESREP', false)">
+        开始质检
+      </up-button>
+      <up-button type="success" size="small" plain v-if="orderInfo.status === 'CHECKING' && hasRole('SERVICESALESREP', false)">
+        完成质检
+      </up-button>
+      <up-button type="primary" size="small" plain v-if="orderInfo.status === 'CHECKED' && hasRole('SERVICESALESREP', false)">
+        开始交付
       </up-button>
+      <up-button type="success" size="small" plain v-if="orderInfo.status === 'DELIVERING' && hasRole('SERVICESALESREP', false)">
+        完成交付
+      </up-button>
+      <!-- 检测员按钮 -->
+      <up-button type="primary" size="small" plain @click="inspectOrder" v-if="orderInfo.status === 'ACCEPTED' && hasRole('INSPECTOR', false)">
+        检测
+      </up-button>
+      <up-modal :show="showInspectPopup" showCancelButton title="检测" @confirm="submitInspectForm"  @cancel="closeInspectPopup" class="inspect-modal">
+        <up-form labelPosition="top" :model="inspectForm">
+          <up-form-item label="图片">
+            <up-upload :fileList="inspectForm.imgList" @afterRead="inspectImgAfterRead" @delete="inspectImgdeletePic" name="1" multiple accept="image"
+              :maxCount="10"></up-upload>
+          </up-form-item> 
+          <up-form-item label="视频">
+            <up-upload :fileList="inspectForm.videoList" @afterRead="inspectVideoafterRead" @delete="inspectImgdeleteVideo" name="2" multiple accept="video"
+              :maxCount="10"></up-upload>
+          </up-form-item>
+        </up-form>
+      </up-modal>
     </view>
   </view>
 </template>
 
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
-import {  paymentStatusColors, orderStatusColors,OrderStatus,PaymentStatus } from '../public'
+import { paymentStatusColors, orderStatusColors, OrderStatus, PaymentStatus, maintenanceTypeOptions } from '../public'
+import { hasRole } from '@/utils/utils'
+import { onLoad } from '@dcloudio/uni-app'
 
 // 视频文件路径
 const videoUrl = ref('/static/video/2.mp4')
-
 // 订单信息
 const orderInfo = ref({
   orderId: 'WX20260304001',
-  status: OrderStatus.IN_REPAIR,
+  orderType: '维修',
+  orderTypeId: 'repair', // 'repair' | 'maintenance'
+  status: 'QUOTED',
   createTime: '2026-03-04 10:30:00',
-  paymentStatus: PaymentStatus.UNPAID,
+  paymentStatus: 'PAID',
   serviceType: 'store',
   customer: {
     name: '张三',
@@ -359,30 +459,92 @@ const orderInfo = ref({
     startDate: '2026-03-05',
     endDate: '2027-03-05',
     coverage: '维修项目质保1年'
+  },
+  // 养护信息（orderTypeId === 'maintenance' 时使用）
+  maintenance: {
+    maintenanceTypes: ['MOVEMENT_CLEAN', 'CASE_POLISH'],
+    lastMaintenanceDate: '2025-09-01',
+    maintenanceRemark: '请轻拿轻放',
+    maintenanceServiceType: '邮寄维修',
+    maintenanceServiceId: 'mail',
+    address: '北京市朝阳区某某小区1号楼101室',
+    storeName: '',
+    delivery: '',
+    expressNumber: 'SF1234567890'
   }
 })
+const showReviewModal = ref(false)
+const reviewCount = ref(5)
+const reviewValue = ref(0)
+const showInspectPopup = ref(false)
 
 // 计算属性
 const orderStatusColor = computed(() => {
-  return orderStatusColors[orderInfo.value.status]
+  return orderStatusColors[orderStatusFormatter(orderInfo.value.status)]
 })
-
 const paymentStatusColor = computed(() => {
-  return paymentStatusColors[orderInfo.value.paymentStatus]
+  return paymentStatusColors[paymentStatusFormatter(orderInfo.value.paymentStatus)]
 })
+const orderStatusFormatter = (status: string) => {
+  return OrderStatus[status as keyof typeof OrderStatus]
+}
+const paymentStatusFormatter = (status: string) => {
+  return PaymentStatus[status as keyof typeof PaymentStatus]
+}
+// 退款
+const handleRefund = () => {
+  uni.showToast({
+    title: '退款成功',
+    icon: 'success'
+  })
+}
+// 判断是否拒单,拒单后,禁止支付、评价、检测、报价、维修、质检、交付
+const isRejected = computed(() => {
+  return orderInfo.value.status === 'REJECTED'
+})
+const handleProgress = () => {
+  console.log('处理进度查询')
+  uni.navigateTo({
+    url: '/pages/repair/components/progress/index?orderId=' + orderInfo.value.orderId
+  })
+}
 
+const handleQuote = () => {
+  uni.navigateTo({
+    url: '/pages/repair/components/price/index?orderId=' + orderInfo.value.orderId
+  })
+}
 // 服务类型格式化
 const serviceTypeFormatter = (type: string) => {
   return type === 'store' ? '到店维修' : type === 'home' ? '上门维修' : type === 'mail' ? '邮寄维修' : '-'
 }
 
+// 养护服务方式格式化
+const maintenanceServiceFormatter = (id: string) => {
+  return id === 'store' ? '到店养护' : id === 'home' ? '上门取送' : id === 'mail' ? '邮寄养护' : '-'
+}
+
+// 养护类型格式化（value数组 → 名称列表）
+const maintenanceTypesFormatter = (values: string[]) => {
+  if (!values || values.length === 0) return '-'
+  return values.map(v => {
+    const found = maintenanceTypeOptions.find(o => o.value === v)
+    return found ? found.label : v
+  }).join('、')
+}
+
 // 方法
 const handlePayment = () => {
   console.log('处理支付')
 }
 
 const handleReview = () => {
+  showReviewModal.value = true
+}
+const handleSubmitReview = () => {
   console.log('处理评价')
+  console.log(reviewValue.value, reviewCount.value)
+  showReviewModal.value = false
 }
 
 const contactService = () => {
@@ -390,15 +552,40 @@ const contactService = () => {
     phoneNumber: '400-123-4567'
   })
 }
-
-const closeOrder = () => {
-  console.log('关闭订单')
+const acceptOrder = () => {
+  console.log('接单')
 }
-
-// 生命周期
-onMounted(() => {
-  // 这里可以添加获取订单详情的逻辑
-  console.log('获取订单详情')
+const rejectOrder = () => {
+  console.log('拒单')
+}
+const inspectForm = ref<any>({
+  imgList: [],
+  videoList: []
+})
+const inspectOrder = () => {
+  console.log('检测')
+  showInspectPopup.value = true
+}
+const closeInspectPopup = () => {
+  showInspectPopup.value = false
+}
+const submitInspectForm = () => {
+  showInspectPopup.value = false
+}
+const inspectImgAfterRead = (file: any) => {
+  inspectForm.value.imgList.push(file)
+}
+const inspectImgdeletePic = (index: number) => {
+  inspectForm.value.imgList.splice(index, 1)
+}
+const inspectImgdeleteVideo = (index: number) => {
+  inspectForm.value.videoList.splice(index, 1)
+}
+const inspectVideoafterRead = (file: any) => {
+  inspectForm.value.videoList.push(file)
+}
+onLoad((options: any) => {
+  console.log(options)
 })
 </script>
 
@@ -411,54 +598,65 @@ onMounted(() => {
 
   /* 顶部状态卡片 */
   .status-card {
-      background: linear-gradient(135deg, #2c94f6 0%, #1e88e5 100%);
-      border-radius: 16rpx;
-      padding: 32rpx;
-      margin-bottom: 32rpx;
-      color: #fff;
-      box-shadow: 0 4rpx 12rpx rgba(44, 148, 246, 0.3);
+    background: linear-gradient(135deg, #2c94f6 0%, #1e88e5 100%);
+    border-radius: 16rpx;
+    padding: 32rpx;
+    margin-bottom: 32rpx;
+    color: #fff;
+    box-shadow: 0 4rpx 12rpx rgba(44, 148, 246, 0.3);
+
+    .status-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 16rpx;
+
+      .order-number {
+        font-size: 28rpx;
+        font-weight: bold;
+      }
 
-      .status-header {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 16rpx;
+      .order-status {
+        font-size: 32rpx;
+        font-weight: bold;
+      }
+    }
 
-        .order-number {
-          font-size: 28rpx;
-          font-weight: bold;
-        }
+    .status-footer {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
 
-        .order-status {
-          font-size: 32rpx;
-          font-weight: bold;
-        }
+      .order-time {
+        font-size: 24rpx;
+        opacity: 0.9;
       }
 
-      .status-footer {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 16rpx;
-
-        .order-time {
-          font-size: 24rpx;
-          opacity: 0.9;
-        }
+      .payment-status {
+        font-size: 24rpx;
+        font-weight: bold;
+      }
+    }
 
-        .payment-status {
-          font-size: 24rpx;
-          font-weight: bold;
-        }
+    .status-service {
+      .service-type {
+        font-size: 24rpx;
+        opacity: 0.9;
       }
+    }
 
-      .status-service {
-        .service-type {
-          font-size: 24rpx;
-          opacity: 0.9;
-        }
+    .review-btn {
+      width: 100%;
+      display: flex;
+      justify-content: flex-end;
+      gap: 12rpx;
+
+      :deep(.u-button) {
+        width: fit-content;
+        margin: 0;
       }
     }
+  }
 
   /* 信息区块 */
   .info-section {
@@ -478,6 +676,19 @@ onMounted(() => {
       }
     }
 
+    .grid {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      grid-gap: 12rpx;
+
+    }
+
+    .col {
+      display: grid;
+      grid-template-columns: 1fr;
+      grid-gap: 12rpx;
+    }
+
     .section-content {
       padding: 32rpx;
 
@@ -485,7 +696,6 @@ onMounted(() => {
         display: flex;
         justify-content: space-between;
         align-items: flex-start;
-        margin-bottom: 24rpx;
 
         &:last-child {
           margin-bottom: 0;
@@ -497,24 +707,29 @@ onMounted(() => {
           margin-top: 8rpx;
         }
 
+        &.row {
+          grid-column: span 2;
+        }
+
         .info-label {
           font-size: 28rpx;
           color: #666;
           flex-shrink: 0;
-          min-width: 170rpx;
+          // min-width: 170rpx;
         }
 
         .info-value {
           font-size: 28rpx;
           color: #333;
           flex: 1;
-          text-align: right;
+          text-align: left;
         }
 
         .total-value {
           font-size: 32rpx;
           font-weight: bold;
           color: #ff6b6b;
+          text-align: right;
         }
 
         /* 图片网格 */
@@ -560,7 +775,6 @@ onMounted(() => {
             font-size: 26rpx;
             color: #666;
             flex-shrink: 0;
-            min-width: 120rpx;
           }
 
           .cost-detail-amount {
@@ -583,6 +797,7 @@ onMounted(() => {
       /* 视频区域 */
       .video-section {
         .video-player {
+          z-index: 0;
           width: 100%;
           height: 400rpx;
           border-radius: 16rpx;
@@ -671,11 +886,10 @@ onMounted(() => {
     box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.1);
     display: flex;
     gap: 24rpx;
-
-    button {
-      flex: 1;
-      height: 88rpx;
-      border-radius: 44rpx;
+  }
+  .inspect-modal{
+    :deep(.u-modal__content){
+      justify-content: left;
     }
   }
 }

src/pages/repair/components/orderList/index.vue

@@ -2,56 +2,74 @@
     <view class="order-list">
         <!-- 搜索和筛选 -->
         <view class="list-header">
-            <up-search v-model="searchKeyword" placeholder="搜索工单号或客户姓名" :show-action="false" :bg-color="'#f5f7fa'"
-                shape="round" @search="handleSearch"></up-search>
+            <up-search v-model="searchKeyword" placeholder="输入内容点击左侧图标搜索" actionText="筛选" :bg-color="'#f5f7fa'"
+                clearabled shape="round" @clickIcon="handleSearch" @clear="handleClear"
+                @custom="openFilter"></up-search>
             <view class="filter-bar">
-                <up-tabs v-model="activeFilter" :list="filterTabs" @click="handleFilter"></up-tabs>
+                <up-tabs :current="activeFilter" :list="filterTabs" @click="openFilter"></up-tabs>
             </view>
+            <up-popup :show="showFilter" @close="closeFilter" @open="openFilter" :round="10" mode="bottom" closeable
+                safeAreaInsetTop>
+                <up-form labelPosition="left" :model="filterForm" class="filter-form">
+                    <up-form-item label="订单状态" label-width="70">
+                        <up-choose v-model="filterForm.typeValue" :options="filterTypeOptions"
+                            item-height="50rpx"></up-choose>
+                    </up-form-item>
+                    <view class="filter-btn">
+                        <up-button plain type="primary" @click="handleClearFilter">清空筛选</up-button>
+                        <up-button type="primary" @click="handleFilter">确定</up-button>
+                    </view>
+                </up-form>
+            </up-popup>
         </view>
 
         <!-- 订单列表 -->
         <up-list @scroll-to-lower="loadMore" @refresh="refresh" :refreshing="refreshing" :loading="loading"
             loading-text="加载中..." finish-text="没有更多数据了">
             <up-list-item v-for="(item, index) in filteredOrders" :key="item.id">
-                <view class="order-item">
-                    <up-swipe-action>
+                <view class="order-item" @click="handleSwipeAction({ index: 1 }, item)">
+                    <!-- <up-swipe-action>
                         <up-swipe-action-item :threshold="100" v-model:show="swipeShow" :options="swipeOptions"
-                            @click="(val: any) => handleSwipeAction(val, item)">
-                            <view class="more-btn" @tap.stop="openPopover(item, index)">
-                                <up-icon name="more-dot-fill" size="40rpx" color="#999"></up-icon>
-                            </view>
-                            <view class="order-header">
-                                <view class="order-info">
-                                    <text class="order-number">工单号：{{ item.orderId }}</text>
-                                    <text class="order-time">{{ formatTime(item.createTime) }}</text>
-                                </view>
-                                <view class="order-right">
+                            @click="(val: any) => handleSwipeAction(val, item)"> -->
+                    <view class="more-btn" @tap.stop="openPopover(item, index)">
+                        <up-icon name="more-dot-fill" size="40rpx" color="#999"></up-icon>
+                    </view>
+                    <view class="order-header">
+                        <view class="order-info">
+                            <text class="order-number">工单号：{{ item.orderId }}</text>
+                            <text class="order-time">{{ formatTime(item.createTime) }}</text>
+                        </view>
+                        <view>
+                            <text :style="{ color: getOrderTypeColors(item.oderTypeId) }">{{
+                                formatOrderType(item.oderTypeId) }}</text>
+                        </view>
+                        <!-- <view class="order-right">
                                     <text :style="{ color: getStatusColor(item.status) }" class="status-text">{{
                                         item.status
                                     }}</text>
-                                </view>
-                            </view>
-                            <view class="order-content">
-                                <view class="watch-info">
-                                    <text class="watch-brand">{{ item.watchBrand }}</text>
-                                    <text class="watch-model">{{ item.watchModel }}</text>
-                                </view>
-                                <text class="fault-description">{{ item.faultDescription }}</text>
-                            </view>
-                            <view class="order-footer">
-                                <view class="customer-info">
-                                    <text class="customer-name">{{ item.customerName }}</text>
-                                    <text v-if="item.estimatedCompletionTime" class="estimated-time">
-                                        预计完成：{{ formatDate(item.estimatedCompletionTime) }}
-                                    </text>
-                                </view>
-                                <view class="amount-info">
-                                    <text class="amount-label">总价：</text>
-                                    <text class="amount-value">¥{{ item.totalAmount.toFixed(2) }}</text>
-                                </view>
-                            </view>
-                        </up-swipe-action-item>
-                    </up-swipe-action>
+                                </view> -->
+                    </view>
+                    <view class="order-content">
+                        <view class="watch-info">
+                            <text class="watch-brand">{{ item.watchBrand }}</text>
+                            <text class="watch-model">{{ item.watchModel }}</text>
+                        </view>
+                        <text class="fault-description">{{ item.faultDescription }}</text>
+                    </view>
+                    <view class="order-footer">
+                        <view class="customer-info">
+                            <text class="customer-name">{{ item.customerName }}</text>
+                            <text v-if="item.estimatedCompletionTime" class="estimated-time">
+                                预计完成：{{ formatDate(item.estimatedCompletionTime) }}
+                            </text>
+                        </view>
+                        <view class="amount-info">
+                            <text class="amount-label">总价：</text>
+                            <text class="amount-value">¥{{ item.totalAmount.toFixed(2) }}</text>
+                        </view>
+                    </view>
+                    <!-- </up-swipe-action-item>
+                    </up-swipe-action> -->
 
                     <!-- 浮层蒙版（点击空白关闭） -->
                     <view v-if="popoverIndex === index" class="popover-mask" @tap.stop="closePopover"></view>
@@ -67,7 +85,8 @@
                             <text class="popover-text">详情</text>
                         </view>
                         <view class="popover-divider"></view>
-                        <view class="popover-item" @tap="handlePopoverAction({ index: 2 }, item)">
+                        <view class="popover-item" @tap="handlePopoverAction({ index: 2 }, item)"
+                            v-if="item.status === 'INSPECTED' && hasRole('REPAIRMAN', false)">
                             <up-icon name="rmb-circle" size="32rpx" color="#FF9900"></up-icon>
                             <text class="popover-text">报价</text>
                         </view>
@@ -87,20 +106,18 @@ import { onLoad } from '@dcloudio/uni-app'
 import {
     orderStatusColors,
     OrderStatus,
-    PaymentStatus
+    PaymentStatus,
+    OrderType,
+    orderTypeColors,
+    filterTabs,
+    filterTypeOptions
 } from '../public'
 import type { OrderListItem_Result } from '@/types/repair'
 import { repairApi } from '@/apis/repair'
 import { hasRole } from '@/utils/utils'
 
 
-
-// Props
 const props = defineProps({
-    type: {
-        type: String,
-        default: '已支付'
-    }
 })
 
 // 响应式数据
@@ -130,33 +147,55 @@ const swipeOptions = [
         }
     }
 ]
+const showFilter = ref(false)
+const filterForm = ref({
+    typeValue: ''
+})
 
-// 筛选标签
-const filterTabs = [
-    { name: '全部', value: 'all' },
-    { name: '待确认', value: 'PENDING_CONFIRM' },
-    { name: '维修中', value: 'IN_REPAIR' },
-    { name: '已完成', value: 'COMPLETED' }
-]
 
 // 计算属性
 const filteredOrders = computed(() => {
     return orders.value
 })
-
+const openFilter = () => {
+    showFilter.value = true
+}
+const closeFilter = () => {
+    showFilter.value = false
+}
 // 方法
 const handleSearch = () => {
     // 搜索逻辑
+    console.log(1);
+
+}
+const handleClear = () => {
+    console.log(2);
+    searchKeyword.value = ''
+    refresh()
+}
+const handleClearFilter = () => {
+    filterForm.value.typeValue = ''
+    refresh()
 }
 
-const handleFilter = () => {
-    // 筛选逻辑
+const handleFilter = (e: any) => {
+    console.log(e);
+    showFilter.value = false
 }
 
 const getStatusColor = (status: string) => {
     return orderStatusColors[status]
 }
 
+const getOrderTypeColors = (type: string) => {
+    return orderTypeColors[type]
+}
+
+const formatOrderType = (type: string) => {
+    return type === OrderType.REPAIR ? '维修' : '保养'
+}
+
 const formatTime = (time: string) => {
     return time
 }
@@ -165,16 +204,16 @@ const formatDate = (date: string) => {
     return date.split(' ')[0]
 }
 const handleSwipeAction = (val: any, item: any) => {
-    if(val.index == 0){//进度
+    if (val.index == 0) {//进度
         uni.navigateTo({
             url: '/pages/repair/components/progress/index?orderId=' + item.id,
         })
-    }else if(val.index == 1){//详情
+    } else if (val.index == 1) {//详情
         uni.navigateTo({
             url: '/pages/repair/components/orderDetail/index?orderId=' + item.id,
         })
-    }else if(val.index == 2){//报价
-        if(!hasRole('REPAIRMAN')) return false
+    } else if (val.index == 2) {//报价
+        if (!hasRole('REPAIRMAN')) return false
         uni.navigateTo({
             url: '/pages/repair/components/price/index?orderId=' + item.id,
         })
@@ -200,7 +239,7 @@ const closePopover = () => {
     currentPopoverItem.value = null
 }
 
-const handlePopoverAction = (val:object, item: OrderListItem_Result) => {
+const handlePopoverAction = (val: object, item: OrderListItem_Result) => {
     closePopover()
     handleSwipeAction(val, item)
 }
@@ -224,6 +263,8 @@ const refresh = () => {
     refreshing.value = true
     orders.value = [
         {
+            orderType: '维修',
+            oderTypeId: 'repair',
             id: '1',
             orderId: '202312010001',
             createTime: '2023-12-01 09:00:00',
@@ -234,8 +275,24 @@ const refresh = () => {
             customerName: '张三',
             estimatedCompletionTime: '2023-12-01 10:00:00',
             totalAmount: 200,
-            status: OrderStatus.PENDING_CONFIRM,
-            paymentStatus: PaymentStatus.PAID,
+            status: 'INSPECTED',
+            paymentStatus: 'PAID',
+        },
+        {
+            orderType: '保养',
+            oderTypeId: 'maintenance',
+            id: '2',
+            orderId: '202312010002',
+            createTime: '2023-12-01 10:00:00',
+            type: 'MAINTENANCE',
+            watchBrand: 'Apple',
+            watchModel: 'Apple Watch Series 7',
+            faultDescription: '屏幕故障',
+            customerName: '李四',
+            estimatedCompletionTime: '2023-12-01 10:00:00',
+            totalAmount: 200,
+            status: 'IN_REPAIR',
+            paymentStatus: 'PAID',
         },
     ]
     // repairApi.getOrderList({
@@ -247,7 +304,13 @@ const refresh = () => {
     //     refreshing.value = false
     // })
 }
-
+onLoad((options: any) => {
+    if (options.activeFilter == 'IN_PROGRESS') {
+        activeFilter.value = 2
+    } else {
+        activeFilter.value = 0
+    }
+})
 onMounted(() => {
     refresh()
 })
@@ -281,12 +344,14 @@ onMounted(() => {
         border-radius: 20rpx;
         margin: 20rpx 20rpx;
         position: relative;
+
         .more-btn {
             display: flex;
             align-items: center;
             justify-content: flex-end;
             border-radius: 50%;
         }
+
         .order-header {
             display: flex;
             justify-content: space-between;
@@ -320,7 +385,7 @@ onMounted(() => {
                     font-weight: bold;
                 }
 
-                
+
             }
         }
 
@@ -417,6 +482,8 @@ onMounted(() => {
             align-items: center;
             gap: 16rpx;
             padding: 20rpx 32rpx;
+            border-bottom: 1px solid #f0f0f0;
+
             &:active {
                 background: #f5f7fa;
             }
@@ -462,4 +529,12 @@ onMounted(() => {
         }
     }
 }
+
+.filter-form {
+    padding: 32rpx;
+    .filter-btn {
+        display: flex;
+        gap: 20rpx;
+    }
+}
 </style>

src/pages/repair/components/price/index.vue

@@ -114,8 +114,9 @@
 
     <!-- 底部按钮 -->
     <view class="bottom-buttons">
-      <up-button type="info" size="large" plain @click="handleCancel">取消</up-button>
-      <up-button type="primary" size="large" @click="handleSubmit">提交报价</up-button>
+      <up-button type="primary" size="small" @click="handleSubmit">提交报价</up-button>
+      <up-button type="success" plain size="small" @click="handleDetail">详情</up-button>
+      <up-button type="warning" plain size="small" @click="handleProgress">进度</up-button>
     </view>
   </view>
 </template>
@@ -185,7 +186,16 @@ const discountAmount = computed(() => {
 const finalAmount = computed(() => {
   return totalAmount.value - discountAmount.value
 })
-
+const handleDetail = () => {
+  uni.navigateTo({
+    url: '/pages/repair/components/orderDetail/index?orderId=' + formData.value.orderId,
+  })
+}
+const handleProgress = () => {
+  uni.navigateTo({
+    url: '/pages/repair/components/progress/index?orderId=' + formData.value.orderId,
+  })
+}
 // 方法
 const addCost = () => {
   formData.value.costs.push({
@@ -218,17 +228,6 @@ const handleSubmit = () => {
   })
 }
 
-const handleCancel = () => {
-  uni.showModal({
-    title: '提示',
-    content: '确定要取消报价吗？',
-    success: (res) => {
-      if (res.confirm) {
-        uni.navigateBack()
-      }
-    }
-  })
-}
 
 const handleLaborHoursSelect = (value: any) => {
   formData.value.laborHours = value.name
@@ -383,12 +382,6 @@ onMounted(() => {
     box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.1);
     display: flex;
     gap: 24rpx;
-
-    button {
-      flex: 1;
-      height: 88rpx;
-      border-radius: 44rpx;
-    }
   }
 }
 </style>

src/pages/repair/components/progress/index.vue

@@ -57,12 +57,18 @@
 
     <!-- 按钮区域 -->
     <view class="button-area">
-      <up-button v-if="status === '待确认'" type="primary" size="large" @click="confirmQuote">
+      <up-button v-if="status === '待确认'" type="primary" size="small" @click="confirmQuote">
         确认报价
       </up-button>
-      <up-button type="info" size="large" plain @click="contactService">
+      <up-button type="warning" size="small" plain @click="contactService">
         联系客服
       </up-button>
+      <up-button type="success" size="small" plain @click="handleDetail">
+        详情
+      </up-button>
+      <up-button type="primary" size="small" plain @click="handleQuote" v-if="hasRole('REPAIRMAN', false)">
+        报价
+      </up-button>
     </view>
 
   </view>
@@ -71,6 +77,7 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
 import {  repairStatusColors, repairProgressSteps } from '../public'
+import { hasRole } from '@/utils/utils'
 
 // 订单信息
 const orderId = ref('WX20260304001')
@@ -93,6 +100,20 @@ const statusColor = computed(() => {
   return repairStatusColors[status.value]
 })
 
+// 处理详情点击事件
+const handleDetail = () => {
+  // 这里可以添加跳转详情页的逻辑
+  uni.navigateTo({
+    url: '/pages/repair/components/orderDetail/index?orderId=' + orderId.value
+  })
+}
+
+// 处理报价点击事件
+const handleQuote = () => {
+  uni.navigateTo({
+    url: '/pages/repair/components/price/index?orderId=' + orderId.value
+  })
+}
 // 方法
 const confirmQuote = () => {
   status.value = '维修中'
@@ -299,18 +320,15 @@ onMounted(() => {
 
   /* 按钮区域 */
   .button-area {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: #fff;
+    padding: 24rpx 32rpx;
+    box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.1);
     display: flex;
     gap: 24rpx;
-    position: fixed;
-    bottom: 20rpx;
-    left: 10rpx;
-    right: 10rpx;
-
-    button {
-      flex: 1;
-      height: 88rpx;
-      border-radius: 44rpx;
-    }
   }
 
   /* 底部预计完成时间 */

src/pages/repair/components/public.ts

@@ -71,7 +71,7 @@ export const deliveryOptions: DeliveryOption_Result[] = [
 ]
 export const gridList = [
   {
-    name: '我要维修',
+    name: '手表维保',
     src: '/static/repair/1.png',
     bgColor: '#2c94f6',
     path: '/pages/repair/components/apply/index',
@@ -99,6 +99,14 @@ export const gridList = [
     label: 'order'
   }
 ]
+
+// 筛选标签
+export const filterTabs = [
+    { name: '全部', value: 'all' },
+    { name: '待确认', value: 'PENDING_CONFIRM' },
+    { name: '进行中', value: 'IN_PROGRESS' },
+    { name: '已完成', value: 'COMPLETED' }
+]
 export const steps = ['选择服务', '手表信息', '故障描述', '提交订单']
 // 服务流程选项
 export const processSteps = [
@@ -111,10 +119,15 @@ export const processSteps = [
 ]
 // 服务类型选项
 export const services = [
-  { value: 'store', name: '到店送修', desc: '前往门店进行维修', icon: '🏪' },
+  { value: 'store', name: '到店', desc: '前往门店进行维修', icon: '🏪' },
   { value: 'home', name: '上门取送', desc: '专业人员上门取送', icon: '🚪' },
-  { value: 'mail', name: '邮寄维修', desc: '邮寄至维修中心', icon: '📦' }
+  { value: 'mail', name: '邮寄', desc: '邮寄至维修中心', icon: '📦' }
 ]
+// 业务类型选项
+export const orderTypeOptions = [
+  { id: 'repair', name: '维修' },
+  { id: 'maintenance', name: '养护' },
+];
 // 机芯类型选项
 export const movementTypes = ['机械', '石英', '智能']
 // 品牌选项
@@ -136,7 +149,7 @@ export const stores = [
 // 故障类型选项
 export const faultTypeOptions = [
   {
-    name: '停走',
+    name: '完全停走',
     disabled: false
   },
   {
@@ -144,11 +157,39 @@ export const faultTypeOptions = [
     disabled: false
   },
   {
-    name: '进水',
+    name: '走时偏快',
+    disabled: false
+  },
+  {
+    name: '走时偏慢',
+    disabled: false
+  },
+  {
+    name: '走走停停',
+    disabled: false
+  },
+  {
+    name: '受磁走快',
+    disabled: false
+  },
+  {
+    name: '进水起雾',
     disabled: false
   },
   {
-    name: '磕碰',
+    name: '进水生锈',
+    disabled: false
+  },
+  {
+    name: '磕碰损坏',
+    disabled: false
+  },
+  {
+    name: '表镜碎裂',
+    disabled: false
+  },
+  {
+    name: '表镜刮花',
     disabled: false
   },
   {
@@ -156,17 +197,121 @@ export const faultTypeOptions = [
     disabled: false
   },
   {
+    name: '日历卡滞',
+    disabled: false
+  },
+  {
+    name: '日历跳错',
+    disabled: false
+  },
+  {
     name: '表带损坏',
     disabled: false
   },
   {
-    name: '表镜碎裂',
+    name: '表带断裂',
+    disabled: false
+  },
+  {
+    name: '表带松动',
+    disabled: false
+  },
+  {
+    name: '表冠松动',
+    disabled: false
+  },
+  {
+    name: '表冠打滑',
+    disabled: false
+  },
+  {
+    name: '表冠脱落',
+    disabled: false
+  },
+  {
+    name: '无法调时',
+    disabled: false
+  },
+  {
+    name: '无法上弦',
+    disabled: false
+  },
+  {
+    name: '上弦过紧',
+    disabled: false
+  },
+  {
+    name: '自动上弦失效',
     disabled: false
   },
   {
-    name: '其他',
+    name: '机芯异响',
     disabled: false
   },
+  {
+    name: '机芯磨损',
+    disabled: false
+  },
+  {
+    name: '电池没电',
+    disabled: false
+  },
+  {
+    name: '电池漏液',
+    disabled: false
+  },
+  {
+    name: '秒针跳针',
+    disabled: false
+  },
+  {
+    name: '表盘氧化',
+    disabled: false
+  },
+  {
+    name: '表盘脱落',
+    disabled: false
+  },
+  {
+    name: '指针松动',
+    disabled: false
+  },
+  {
+    name: '指针弯曲',
+    disabled: false
+  },
+  {
+    name: '夜光失效',
+    disabled: false
+  },
+  {
+    name: '计时功能失灵',
+    disabled: false
+  },
+  {
+    name: '计时不归零',
+    disabled: false
+  },
+  {
+    name: '按键失灵',
+    disabled: false
+  },
+  {
+    name: '表壳变形',
+    disabled: false
+  },
+  {
+    name: '表底盖松动',
+    disabled: false
+  },
+  {
+    name: '密封圈老化',
+    disabled: false
+  },
+  {
+    name: '其他故障',
+    disabled: false
+  }
 ]
 
 // 维修状态枚举
@@ -185,12 +330,20 @@ export const repairStatusColors: Record<string, string> = {
 
 // 维修进度步骤
 export const repairProgressSteps = [
-  { key: 'received', label: '已接单' },
-  { key: 'inspected', label: '已检测' },
-  { key: 'pending_quote', label: '待您确认报价' },
-  { key: 'repairing', label: '维修中' },
-  { key: 'quality_check', label: '质检完成' },
-  { key: 'deliver', label: '待取件 / 已发货' }
+  { key: 'sentRepair', label: '已送修' },//已送修,待接单/拒单
+  { key: 'rejected', label: '已拒单' },//已拒单
+  // { key: 'receiving', label: '接单中' },//接单中
+  { key: 'received', label: '已接单' },//已接单,待检测
+  // { key: 'inspecting', label: '检测中' },//检测中
+  { key: 'inspected', label: '已检测' },//已检测,待报价
+  // { key: 'quoting', label: '报价中' },//报价中
+  { key: 'quoted', label: '已报价' },//已报价,待维修
+  // { key: 'repairing', label: '维修中' },//维修中
+  { key: 'repaired', label: '已维修' },//已维修,待质检
+  // { key: 'checking', label: '质检中' },//质检中
+  { key: 'checked', label: '已质检' },//已质检,待交付
+  // { key: 'delivering', label: '交付中' },//交付中
+  { key: 'delivered', label: '已交付' }//已交付,已完成
 ]
 
 // 支付状态枚举
@@ -209,25 +362,47 @@ export const paymentStatusColors: Record<string, string> = {
 
 // 订单状态枚举
 export enum OrderStatus {
-  PENDING_CONFIRM = '待确认',
-  IN_REPAIR = '维修中',
-  COMPLETED = '已完成',
-  CANCELLED = '已取消'
+  SENT_REPAIR = '已送修',
+  REJECTED = '已拒单',
+  ACCEPTED = '已接单',
+  // INSPECTING = '检测中',
+  INSPECTED = '已检测',
+  // QUOTING = '报价中',
+  QUOTED = '已报价',
+  PAID = '已支付',
+  REPAIRING = '维修中',
+  REPAIRED = '已维修',
+  CHECKING = '质检中',
+  CHECKED = '已质检',
+  DELIVERING = '交付中',
+  DELIVERED = '已交付',
 }
 
 // 订单状态颜色
 export const orderStatusColors: Record<string, string> = {
-  [OrderStatus.PENDING_CONFIRM]: '#ff9800',
-  [OrderStatus.IN_REPAIR]: '#f3d421',
-  [OrderStatus.COMPLETED]: '#4caf50',
-  [OrderStatus.CANCELLED]: '#9e9e9e'
+  [OrderStatus.SENT_REPAIR]: '#ffae00ff',//已送检,待接单/拒单
+  [OrderStatus.REJECTED]: '#f01b1bff',//已拒单
+  [OrderStatus.ACCEPTED]: '#2caf50',//已接单,待检测
+  // [OrderStatus.INSPECTING]: '#21dbf3ff',//检测中
+  [OrderStatus.INSPECTED]: '#4c7fafff',//已检测,待报价
+  // [OrderStatus.QUOTING]: '#2159f3ff',//报价中
+  [OrderStatus.QUOTED]: '#534cafff',//已报价,待支付
+  [OrderStatus.PAID]: '#4caf50',//已支付,待维修
+  [OrderStatus.REPAIRING]: '#f321f3ff',//维修中
+  [OrderStatus.REPAIRED]: '#af4c96ff',//已维修,待质检
+  [OrderStatus.CHECKING]: '#b4f321ff',//质检中
+  [OrderStatus.CHECKED]: '#81af4cff',//已质检,待交付
+  [OrderStatus.DELIVERING]: '#21f39cff',//交付中
+  [OrderStatus.DELIVERED]: '#1ee649ff',//已交付,已完成
 }
-
 // 订单类型枚举
 export enum OrderType {
   REPAIR = 'repair',
   MAINTENANCE = 'maintenance',
-  CUSTOMIZATION = 'customization'
+}
+export const orderTypeColors: Record<string, string> = {
+  [OrderType.REPAIR]: '#ff9800',
+  [OrderType.MAINTENANCE]: '#21f33dff',
 }
 
 // 维修项目列表
@@ -288,3 +463,44 @@ export const warrantyPeriodOptions = [
   { id: '2年', name: '2年' },
   { id: '3年', name: '3年' }
 ]
+
+// 养护类型选项
+export const maintenanceTypeOptions = [
+  { label: '机芯清洗保养', value: 'MOVEMENT_CLEAN' },
+  { label: '表壳抛光翻新', value: 'CASE_POLISH' },
+  { label: '表带清洗保养', value: 'STRAP_CLEAN' },
+  { label: '防水检测', value: 'WATERPROOF_CHECK' },
+  { label: '电池更换', value: 'BATTERY' },
+  { label: '整表全面保养', value: 'FULL_MAINTENANCE' },
+  { label: '表镜抛光', value: 'CRYSTAL_POLISH' },
+  { label: '磁化检测消磁', value: 'DEMAGNETIZE' },
+  { label: '表冠更换/保养', value: 'CROWN_MAINTENANCE' },
+  { label: '密封圈更换', value: 'SEAL_RING_REPLACE' },
+  { label: '指针调校', value: 'POINTER_ADJUST' },
+  { label: '日历功能调校', value: 'CALENDAR_ADJUST' },
+  { label: '表扣保养/更换', value: 'BUCKLE_MAINTENANCE' },
+  { label: '表底盖密封处理', value: 'CASE_BACK_SEAL' },
+  { label: '计时功能校准', value: 'TIMER_CALIBRATE' },
+  { label: '表油加注', value: 'LUBRICANT_ADD' },
+  { label: '表壳缝隙清洁', value: 'CASE_GAP_CLEAN' },
+  { label: '金属表带打磨', value: 'METAL_STRAP_POLISH' },
+  { label: '皮质表带养护', value: 'LEATHER_STRAP_CARE' },
+  { label: '陶瓷部件保养', value: 'CERAMIC_PART_CARE' },
+  { label: '夜光涂层修复', value: 'LUMINOUS_REPAIR' },
+  { label: '走时精度校准', value: 'TIME_ACCURACY_CALIBRATE' },
+  { label: '螺丝紧固/更换', value: 'SCREW_FIX_REPLACE' }
+];
+export const filterTypeOptions = [
+    {
+        id: 'all',
+        title: '全部'
+    },
+    {
+        id: 'repair',
+        title: '维修'
+    },
+    {
+        id: 'maintenance',
+        title: '保养'
+    },
+]

src/pages/repair/index.vue

@@ -1,9 +1,5 @@
 <template>
   <view class="repair-home">
-    <!-- 顶部导航栏 -->
-    <view class="nav-bar">
-      <text class="nav-title">手表维修服务</text>
-    </view>
 
     <!-- 搜索栏 -->
     <view class="search-wrap">
@@ -16,6 +12,14 @@
       ></up-search>
     </view>
 
+    <!-- 新增：待处理工单提示 -->
+    <view class="order-tips" v-if="pendingOrders.length" @click="goToOrderList">
+      <view class="tips-icon">
+        <u-icon name="warning" color="#FF9500" size="24"></u-icon>
+      </view>
+      <text class="tips-text">您有 {{ pendingOrders.length }} 个工单待跟进</text>
+    </view>
+
     <!-- 功能宫格（Grid 布局） -->
     <view class="grid-container">
       <view
@@ -32,6 +36,24 @@
       </view>
     </view>
 
+    <!-- 图表组件 -->
+    <view class="chart-container">
+      <LineChart />
+    </view>
+
+    <!-- 新增：保养小贴士 -->
+    <view class="maintain-tips">
+      <view class="tips-header">
+        <u-icon name="bell" color="#FFCC00" size="28"></u-icon>
+        <text class="tips-title">保养小贴士</text>
+      </view>
+      <swiper class="tips-swiper" autoplay circular :interval="5000">
+        <swiper-item v-for="(tip, index) in maintainTipsList" :key="index">
+          <text class="tips-content">{{ tip.content }}</text>
+        </swiper-item>
+      </swiper>
+    </view>
+
     <!-- 服务流程卡片 -->
     <view class="process-card">
       <view class="process-header">
@@ -44,29 +66,76 @@
         </view>
       </view>
     </view>
-    <!-- 图表组件 -->
-    <view class="chart-container">
-      <LineChart />
-    </view>
-    <!-- 退出登录按钮 -->
-    <view class="logout-btn-wrap">
+
+    <!-- 调整：退出登录 + 客服按钮 -->
+    <view class="bottom-actions">
       <up-button type="primary" @click="handleLogout">退出登录</up-button>
+      <up-button type="info" icon="phone" @click="callService">联系客服</up-button>
     </view>
   </view>
 </template>
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import type { Repair_Result } from '@/types/repair'
-import { gridList,processSteps} from './components/public'
+import type { Repair_Result, OrderListItem_Result } from '@/types/repair'
+import { gridList, processSteps, OrderStatus, PaymentStatus, filterTabs } from './components/public'
 import LineChart from './components/charts/line.vue'
 import { loginApi } from '@/apis/login'
+
+// 搜索关键词
 const searchKeyword = ref<string>('')
+
+// 新增：待处理工单数据
+const pendingOrders = ref<OrderListItem_Result[]>([
+  {   
+      orderType:'维修',
+      oderTypeId:'repair',
+      id: '1',
+      orderId: '202312010001',
+      createTime: '2023-12-01 09:00:00',
+      type: 'REPAIR',
+      watchBrand: 'Apple',
+      watchModel: 'Apple Watch Series 7',
+      faultDescription: '屏幕故障',
+      customerName: '张三',
+      estimatedCompletionTime: '2023-12-01 10:00:00',
+      totalAmount: 200,
+      status: OrderStatus.PENDING_CONFIRM,
+      paymentStatus: PaymentStatus.PAID,
+  },
+  {   
+      orderType:'保养',
+      oderTypeId:'maintain',
+      id: '2',
+      orderId: '202312010002',
+      createTime: '2023-12-01 10:00:00',
+      type: 'MAINTAIN',
+      watchBrand: 'Apple',
+      watchModel: 'Apple Watch Series 7',
+      faultDescription: '电池故障',
+      customerName: '李四',
+      estimatedCompletionTime: '2023-12-01 11:00:00',
+      totalAmount: 150,
+      status: OrderStatus.PENDING_CONFIRM,
+      paymentStatus: PaymentStatus.PAID,
+  },
+])
+
+// 新增：保养小贴士数据
+const maintainTipsList = ref([
+  { content: '机械表建议每2-3年进行一次全面保养，延长使用寿命' },
+  { content: '石英表电池更换后需重新检测防水性能，避免进水' },
+  { content: '避免手表接触高温、磁场环境，防止机芯损坏' }
+])
+
+// 功能宫格点击事件
 const handleGridClick = (item: Repair_Result) => {
   uni.navigateTo({
     url: item.path,
   })
 }
+
+// 退出登录事件
 const handleLogout = () => {
   uni.removeStorageSync('userInfo')
   uni.removeStorageSync('token')
@@ -83,30 +152,34 @@ const handleLogout = () => {
     console.error('退出登录接口调用失败:', err)
   })
 }
+
+const goToOrderList = () => {
+  if(pendingOrders.value.length === 1) {
+    uni.navigateTo({ url: '/pages/repair/components/orderDetail/index?orderId=' + pendingOrders.value[0].id })
+    return
+  }
+  uni.navigateTo({ url: '/pages/repair/components/orderList/index?activeFilter=' + filterTabs[2].value })
+}
+
+const callService = () => {
+  uni.makePhoneCall({
+    phoneNumber: '123-456-7890',
+    fail: (err) => {
+      uni.showToast({ title: '拨打电话失败', icon: 'none' })
+    }
+  })
+}
 </script>
 
 <style lang="scss" scoped>
+page{
+  height:100%;
+}
 .repair-home {
-  min-height: 100vh;
+  min-height: calc(100%);
   background: linear-gradient(180deg, #eaf5ff 0%, #f5faff 100%);
 }
 
-/* 顶部导航栏 */
-.nav-bar {
-  background: #165DFF;
-  padding: 32rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  box-shadow: 0 4rpx 12rpx rgba(22, 93, 255, 0.1);
-
-  .nav-title {
-    font-size: 32rpx;
-    font-weight: bold;
-    color: #fff;
-  }
-}
-
 /* 搜索栏 */
 .search-wrap {
   padding: 32rpx;
@@ -116,6 +189,28 @@ const handleLogout = () => {
   }
 }
 
+/* 新增：待处理工单提示 */
+.order-tips {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20rpx 32rpx;
+  margin: 0 32rpx 24rpx;
+  background: #FFF8E6;
+  border-radius: 16rpx;
+  border-left: 6rpx solid #FF9500;
+
+  .tips-icon {
+    margin-right: 12rpx;
+  }
+
+  .tips-text {
+    font-size: 26rpx;
+    color: #FF8C00;
+    line-height: 1.4;
+  }
+}
+
 /* 功能宫格 */
 .grid-container {
   display: grid;
@@ -161,6 +256,41 @@ const handleLogout = () => {
   }
 }
 
+
+/* 图表组件 */
+.chart-container {
+  padding: 32rpx;
+}
+
+.maintain-tips {
+  margin: 0 32rpx 32rpx;
+  background: #F0F8FF;
+  border-radius: 20rpx;
+
+  .tips-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 16rpx;
+
+    .tips-title {
+      font-size: 28rpx;
+      font-weight: 600;
+      color: #FFCC00;
+      margin-left: 12rpx;
+    }
+  }
+
+  .tips-swiper {
+    height: 60rpx;
+
+    .tips-content {
+      font-size: 26rpx;
+      color: #666;
+      line-height: 1.5;
+    }
+  }
+}
+
 /* 服务流程卡片 */
 .process-card {
   background: #fff;
@@ -234,14 +364,15 @@ const handleLogout = () => {
   }
 }
 
-/* 图表组件 */
-.chart-container {
+.bottom-actions {
+  display: flex;
+  gap: 24rpx;
   padding: 32rpx;
-}
-.logout-btn-wrap{
-  .u-button{
-    width: 200rpx;
-    margin-top: 32rpx;
+  justify-content: center;
+
+  .u-button {
+    flex: 1;
+    max-width: 200rpx;
   }
 }
 </style>

src/types/repair.d.ts

@@ -8,6 +8,11 @@ export interface Repair_Result {
   label: string
 }
 export interface repair_Params {
+  // 业务类型：维修 / 养护
+  orderType: string;
+  orderTypeId: string;
+  // 维修相关
+  serviceId: string;
   serviceType: string;
   brand: string;
   model: string;
@@ -18,6 +23,13 @@ export interface repair_Params {
   faultTypes: string[];
   faultDescription: string;
   faultImages: string[];
+  // 养护相关
+  maintenanceTypes: string[];
+  lastMaintenanceDate: string;
+  maintenanceRemark: string;
+  maintenanceServiceType: string;
+  maintenanceServiceId: string;
+  // 联系方式
   contactName: string;
   contactPhone: string;
   address: string;
@@ -61,11 +73,13 @@ export interface RepairQuoteForm_Params {
 
 // 订单列表项类型
 export interface OrderListItem_Result {
+  orderType: string
+  oderTypeId: string
   id: string
   orderId: string
   type: OrderType
-  status: OrderStatus
-  paymentStatus: PaymentStatus
+  status: string
+  paymentStatus: string
   createTime: string
   customerName: string
   watchBrand: string

src/utils/utils.ts

@@ -2,6 +2,9 @@ export function getRoles() {
     return uni.getStorageSync('userInfo')?.roles.map((item: any) => item.roleKey) || []
 }
 export function hasRole(roleName: string, showToast: boolean = true) {
+    if(getRoles().includes('admin') || getRoles().includes('ADMIN')){
+        return true
+    }
     let hasRole = getRoles().includes(roleName) || getRoles().some((role: any) => role.roleKey && role.roleKey.includes(roleName))
     if (hasRole) {
         return true