diff --git a/config.js b/config.js
index 6f0d247..8a030a3 100644
--- a/config.js
+++ b/config.js
@@ -1,12 +1,12 @@
 // 应用全局配置
 module.exports = {
-	// baseUrl: 'https://www.nuoyunr.com',
+	baseUrl: 'https://www.nuoyunr.com',
 	// baseUrl: 'http://192.168.1.17:48080',
 	// baseUrl: "http://192.168.1.4:48080",
-	baseUrl: "http://localhost:48080",
+	// baseUrl: "http://localhost:48080",
 	imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
 	baseImageUrl: 'https://www.nuoyunr.com/minio/',
-	wsUrl: 'wss://www.nuoyunr.com',
+	wsUrl: 'ws://192.168.1.17:48080',
 	// 应用信息
 	appInfo: {
 		// 应用名称
diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index 904ee36..c641279 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -3,175 +3,200 @@
     <view class="containerBody">
       <VNavigationBar background-color="#fff" title="工单详情" title-color="#333"></VNavigationBar>
       <view class="body" v-if="null!=ticketInfo">
-        <view class="card cardInfo carCard">
-          <view :class="{'end': ticketInfo.ticketsStatus == '02'}" class="orderFlag">
-            <template>
-              <image v-if="ticketInfo.ticketsStatus == '02'" mode="aspectFit" src="/static/icons/orderEnd.png"
-                     style="width: 48rpx;height: 48rpx"></image>
-              <image v-else mode="aspectFit" src="/static/icons/orderIng.png"
-                     style="width: 48rpx;height: 48rpx"></image>
-              <view class="flagBody">
-                <text>{{ ticketInfo.ticketsStatus == '02' ? '已完成' : ticketInfo.statusStr }}</text>
-                <text class="flagDesc">当前工单维修项目{{ ticketInfo.flag == '02' ? '已全部完成' : ticketInfo.statusStr }}</text>
-              </view>
-
-            </template>
+        <view class="orderInfo">
+          <view class="orderTypeInfo">
+            <text class="label">维修类别：</text>
+            <text class="value" style="font-size: 35rpx">{{ ticketInfo.repairTypeText }}</text>
           </view>
-          <view class="carTitle">服务顾问</view>
-          <view class="carDetail" @click="callPhone(ticketInfo.linkPhone)">
-            {{ticketInfo.adviserName}}  {{ticketInfo.linkPhone}}
+          <view class="orderStateInfo">
+            <text>当前工单状态：</text>
+            <text v-if="ticketInfo.statusStr=='待维修' || ticketInfo.statusStr=='已作废'" >{{ ticketInfo.statusStr }}</text>
+            <text v-else-if="ticketInfo.statusStr=='维修中'" style="color: #E8A321">{{ ticketInfo.statusStr }}</text>
+            <text v-else style="color: #2979FF;">{{ ticketInfo.statusStr }}</text>
           </view>
-
-          <view class="carTitle">车辆信息</view>
-          <view class="carDetail">
-            <view class="carHeader">
-              <image v-show="ticketInfo.carInfo.logoImg" :src="imgUrlPrex + ticketInfo.carInfo.logoImg" class="carImage" mode="aspectFill"></image>
-              <view class="carHeaderRight">
-                <text class="carNumber">{{ ticketInfo.carNo }}</text>
-                <text class="carType">{{ ticketInfo.carBrandName }}</text>
-              </view>
-            </view>
-            <view class="carBody">
-              <view style="display: flex;align-items: center">
-                <view class="infoItem" style="flex: 1">
-                  <view class="label">车架号</view>
-                  <view class="value">{{ ticketInfo.carVin }}</view>
-                </view>
-                <!--                <view class="infoItem" style="flex: 1">-->
-                <!--                  <view class="label">发动机号</view>-->
-                <!--                  <view class="value">{{ ticketInfo.fdjNo }}</view>-->
-                <!--                </view>-->
-                <view class="infoItem" style="flex: 1">
-                  <view class="label">注册日期</view>
-                  <view class="value">{{ ticketInfo.carRegisterDate }}</view>
-                </view>
-              </view>
-              <template v-if="carInfo.showAll">
-                <view style="display: flex;align-items: center">
-                  <view class="infoItem" style="flex: 1">
-                    <view class="label">年检到期时间</view>
-                    <view class="value">{{ ticketInfo.inspectionDate }}</view>
-                  </view>
-                  <view class="infoItem" style="flex: 1">
-                    <view class="label">保险到期时间</view>
-                    <view class="value">{{ ticketInfo.insuranceDate }}</view>
-                  </view>
-                </view>
-
-              </template>
-            </view>
-            <view class="carFoot">
-              <template v-if="!carInfo.showAll">
-                <text @click="() => $set(carInfo, 'showAll', true)">展开</text>
-                <image mode="aspectFit" src="/static/icons/bottom.png" style="width: 28rpx;height: 28rpx"></image>
-              </template>
-              <template v-else>
-                <text @click="() => carInfo.showAll = false">收起</text>
-                <!--<image mode="aspectFit" src="/static/icons/bottom.png" style="width: 28rpx;height: 28rpx"></image>-->
-              </template>
-            </view>
+          <view class="orderDateInfo">
+            <text class="label">车辆进厂时间：</text>
+            <text class="value">{{ ticketInfo.inTime }}</text>
+          </view>
+          <view class="orderDateInfo">
+            <text class="label">预计竣工时间：</text>
+            <text class="value">{{ ticketInfo.outTime }}</text>
+          </view>
+          <view class="orderDateInfo" v-if="ticketInfo.realOverDate">
+            <text class="label">实际竣工时间：</text>
+            <text class="value">{{ ticketInfo.realOverDate }}</text>
           </view>
         </view>
-        <view class="card cardInfo userCard">
-          <view class="userTitle">客户信息</view>
-          <view class="userContainer">
-            <view style="display: flex;align-items: center">
-              <view class="infoItem" style="flex: 1">
-                <text class="label">姓名</text>
-                <text class="value">{{ ticketInfo.userName }}</text>
-              </view>
-              <view class="infoItem" style="flex: 1">
-                <text class="label">联系方式</text>
-                <text class="value">{{ ticketInfo.userMobile || "" }}</text>
+        <view class="card cardInfo carCard">
+          <view class="carDetail">
+            <view class="carHeader">
+              <image v-show="ticketInfo.carInfo.logoImg" :src="imgUrlPrex + ticketInfo.carInfo.logoImg" class="carImage" mode="aspectFit"></image>
+              <view class="carHeaderRight">
+                <text class="carNumber">{{ ticketInfo.carNo }}</text>
+                <text class="carType">{{ ticketInfo.carBrandName+"  " }} <text v-if="ticketInfo.carInfo && ticketInfo.carInfo.carModel"> - {{ticketInfo.carInfo.carModel}}</text></text>
               </view>
             </view>
-            <template v-if="userInfo.showAll">
-              <view style="display: flex;align-items: center">
-                <view class="infoItem" style="flex: 1">
+            <view class="line"></view>
+            <view class="carBody">
+              <view style="display: flex;flex-direction: column;">
+                <view class="infoItem">
+                  <view class="label">服务顾问</view>
+                  <view class="value">{{ ticketInfo.adviserName }}</view>
+                </view>
+                <view class="infoItem" @click="callPhone(ticketInfo.linkPhone)">
+                  <text class="label">服务顾问联系方式</text>
+                  <text class="value">{{ ticketInfo.linkPhone }}</text>
+                </view>
+                <view class="infoItem">
+                  <view class="label">车主</view>
+                  <view class="value">{{ ticketInfo.userName }}</view>
+                </view>
+                <view class="infoItem">
+                  <text class="label">联系方式</text>
+                  <text class="value">{{ ticketInfo.userMobile }}</text>
+                </view>
+                <view class="infoItem">
                   <text class="label">性别</text>
                   <text class="value">{{ ticketInfo.customerInfo.sex === '1' ? '女' : '男' }}</text>
                 </view>
-                <view class="infoItem" style="flex: 1">
-                  <text class="label">生日</text>
-                  <text class="value">{{ ticketInfo.birthday || "" }}</text>
+                <view class="infoItem" v-if="ticketInfo.handleName">
+                  <text class="label">经办人</text>
+                  <text class="value">{{ ticketInfo.handleName }}</text>
+                </view>
+                <view class="infoItem" v-if="ticketInfo.handleMobile">
+                  <text class="label">经办人电话</text>
+                  <text class="value">{{ ticketInfo.handleMobile }}</text>
+                </view>
+                <view class="line"></view>
+                <view class="infoItem">
+                  <view class="label">车架号</view>
+                  <view class="value">{{ ticketInfo.carVin }}</view>
+                </view>
+                <view class="infoItem">
+                  <view class="label">发动机号</view>
+                  <view class="value">{{ ticketInfo.carInfo.engineNumber }}</view>
+                </view>
+                <view class="infoItem">
+                  <view class="label">车辆注册日期</view>
+                  <view class="value">{{ ticketInfo.carRegisterDate }}</view>
+                </view>
+                <view class="infoItem">
+                  <view class="label">年检到期时间</view>
+                  <view class="value">{{ ticketInfo.nextInspectionDate}}</view>
+                </view>
+                <view class="infoItem">
+                  <view class="label">保险到期时间</view>
+                  <view class="value">{{ ticketInfo.insuranceExpiryDate}}</view>
+                </view>
+                <view class="infoItem">
+                  <view class="label">最近保养日期</view>
+                  <view class="value">{{ ticketInfo.maintenanceDate}}</view>
+                </view>
+                <view class="infoItem">
+                  <view class="label">最近保养公里数</view>
+                  <view class="value">{{ ticketInfo.maintenanceMileage}}</view>
                 </view>
               </view>
-            </template>
-          </view>
-          <view  class="userFoot">
-            <template v-if="!userInfo.showAll">
-              <text @click="() => $set(userInfo, 'showAll', true)">展开</text>
-              <image mode="aspectFit" src="/static/icons/bottom.png" style="width: 28rpx;height: 28rpx"></image>
-            </template>
-            <template v-else>
-              <text @click="() => userInfo.showAll = false">收起</text>
-            </template>
+            </view>
           </view>
         </view>
-        <view v-if="ticketInfo.projects && ticketInfo.projects.length > 0" class="card cardInfo projCard">
-          <view class="projTitle">维修项目</view>
-          <view class="projList">
-            <template>
-              <view v-for="item in ticketInfo.projects" :key="item.id" class="projEditItem">
-                <view class="projEditLine1">
-                  <text>{{ item.itemName }}</text>
-                  <text  class="projAmount" v-if="item.itemMoney">￥{{ item.itemMoney }}</text>
-                </view>
-                <view class="projBaseInfo" >
-                  <view>售价：{{ item.itemPrice || "" }}</view>
-                  <view>数量：{{ item.itemCount || ""  }}</view>
-                  <view>折扣：{{ item.itemDiscount || ""  }}</view>
-                  <view>金额：{{ item.itemMoney || ""  }}</view>
-                </view>
-                <view class="projEditFoot">
-                  <view class="block1">
-                    <template>
-                      <view class="editPeople">
-                        <view class="editForm">
-                          <text class="label">销售人员</text>
-                          <text >{{item.saleName || ""}}
-                          </text>
-                        </view>
-                      </view>
-                    </template>
-                  </view>
-                  <view class="line"></view>
-                  <view class="block2">
-                    <template>
-                      <view class="editPeople">
-                        <view class="editForm">
-                          <text class="label">施工人员</text>
-                          <text >{{ item.repairNames || "" }}</text>
-                        </view>
-                      </view>
-                    </template>
-                  </view>
-                </view>
+        <!-- 维修工时项目-只读 -->
+          <view class="card projDateCard" v-if="ticketInfo.projectList && ticketInfo.projectList.length > 0">
+            <view class="projTitle">维修工时项目</view>
+            <view class="projTabs">
+              <view @click="chooseProjTab(index)" v-for="(item, index) in ticketInfo.projectList" :key="item.groupId" class="projTabItem" :class="{ active: index === activeProjTabKey }">
+                {{ item.groupName }}
+                <view v-if="index === activeProjTabKey" class="activeLine"></view>
               </view>
-            </template>
+            </view>
+            <view class="projTabsBottomLine"></view>
+            <view class="workPerson">
+              <text>服务顾问：{{ticketInfo.projectList[activeProjTabKey].servicer}}</text>
+              <text>施工人员：{{ticketInfo.projectList[activeProjTabKey].worker}}</text>
+            </view>
+            <view class="projList">
+              <view class="projItem" v-for="(item, index) in ticketInfo.projectList[activeProjTabKey].wares.slice(0, 5)" :key="item.id">
+                <text class="projSeq">{{ index + 1 }}</text>
+                <text class="projName">{{ item.itemName }}</text>
+              </view>
+              <view v-if="ticketInfo.projectList[activeProjTabKey].showAll" class="projItem" v-for="(item, index) in ticketInfo.projectList[activeProjTabKey].wares.slice(5, ticketInfo.projectList[activeProjTabKey].wares.length)" :key="item.id">
+                <text class="projSeq">{{ 6 + index }}</text>
+                <text class="projName">{{ item.itemName }}</text>
+              </view>
+            </view>
+            <view v-if="ticketInfo.projectList[activeProjTabKey].wares.length > 5" class="action" @click="() => $set(ticketInfo.projectList[activeProjTabKey], 'showAll', !ticketInfo.projectList[activeProjTabKey].showAll)">
+              <text>{{ ticketInfo.projectList[activeProjTabKey].showAll ? '收起' : '展开' }}</text>
+              <uni-icons :type="ticketInfo.projectList[activeProjTabKey].showAll ? 'top' : 'bottom'" color="#0174f6"></uni-icons>
+            </view>
           </view>
-        </view>
-        <view v-if="ticketInfo.partShow=='1' && ticketInfo.wares && ticketInfo.wares.length > 0" class="card cardInfo projCard">
-          <view class="projTitle">维修配件 </view>
-          <view class="projList">
-            <template>
-              <view v-for="item in ticketInfo.wares" :key="item.id" class="projEditItem">
 
-                <view class="projEditLine1">
-                  <text>{{ item.itemName }}</text>
-                  <text class="projAmount" v-if="item.itemMoney">￥{{ item.itemMoney }}</text>
-                </view>
-                <view class="projBaseInfo">
-                  <view>售价：{{ item.itemPrice || ""   }}</view>
-                  <view>数量：{{ item.itemCount || ""   }}</view>
-                  <view>单位：{{ item.itemUnit || ""  }}</view>
-                  <view>折扣：{{ item.itemDiscount || ""   }}</view>
-                  <view>金额：{{ item.itemMoney || ""   }}</view>
-                </view>
-              </view>
-            </template>
+        <!-- 更换配件清单-编辑 -->
+        <!--        <view v-if="loginUser.roleCodes.includes('repair_warehouse') && isDetail == '0'">-->
+        <!--          <view v-if="ticketInfo.waresGroupList && ticketInfo.waresGroupList.length > 0" class="card cardInfo projCard">-->
+        <!--            <view class="projTitle">更换配件清单 <view class="dl-ifcus" v-if="canOpenCus"><text>是否开放给客户</text><switch :checked="ticketInfo.partShow == '1'" style="transform:scale(0.7)" @change="toPartShow" /></view></view>-->
+        <!--            <view class="projList">-->
+        <!--              <uni-collapse ref="collapse" >-->
+        <!--                <uni-collapse-item v-for="(groupItem,groupIndex) in ticketInfo.waresGroupList" :key="groupItem.groupId" :title="groupItem.groupName+'('+groupItem.nums+'类配件，合计：'+groupItem.totalAmount+'元)'" >-->
+        <!--                  <view class="content">-->
+        <!--                    <template>-->
+        <!--                      <view v-for="(item,index) in groupItem.wares" :key="item.id" class="projEditItem">-->
+        <!--                        <view >-->
+        <!--                          <view class="projEditLine1">-->
+        <!--                            <text>{{ item.itemName }}</text>-->
+        <!--                            <text  class="projAmount"><text v-if="canSeeMoney">￥{{ item.itemMoney }}</text><uni-icons @click="delWares(item,groupIndex,index)" type="trash" size="25" style="color: #0174F6"></uni-icons></text>-->
+        <!--                          </view>-->
+        <!--                          <view class="projBaseInfo"  >-->
+        <!--                            <view v-if="canSeeMoney">售价：<input @input="onKeyInput('sj',item)" style="background: white;padding: 0 10rpx" type="decimal" placeholder="请输入售价" v-model="item.itemPrice" /></view>-->
+        <!--                            <view>数量：<input @input="onKeyInput('sl',item)" style="background: white;padding: 0 10rpx" type="number" placeholder="请输入数量" v-model="item.itemCount" /></view>-->
+        <!--                            <view>单位：<input  style="padding: 0 10rpx" type="text"  v-model="item.unitText" disabled /></view>-->
+        <!--                            <view v-if="canSeeMoney">折扣：<input @input="onKeyInput('zk',item)" style="background: white;padding: 0 10rpx" type="decimal" placeholder="请输入折扣（0-1）" v-model="item.itemDiscount" /></view>-->
+        <!--                            <view v-if="canSeeMoney">金额：{{ item.itemMoney || "" }}</view>-->
+        <!--                          </view>-->
+        <!--                        </view>-->
+        <!--                      </view>-->
+        <!--                    </template>-->
+        <!--                  </view>-->
+        <!--                </uni-collapse-item>-->
+        <!--              </uni-collapse>-->
+        <!--            </view>-->
+        <!--          </view>-->
+        <!--        </view>-->
+        <!-- 更换配件清单 -->
+        <view class="card partCard" v-if="ticketInfo.partShow=='1' && ticketInfo.waresGroupList && ticketInfo.waresGroupList.length > 0">
+          <view class="projTitle">更换配件清单
           </view>
+          <view class="projTabs">
+            <view @click="choosePartTab(index)" v-for="(item, index) in ticketInfo.waresGroupList" :key="item.groupId"
+                  class="projTabItem" :class="{ active: index === activePartTabKey }">
+              {{ item.groupName }}
+              <view v-if="index === activePartTabKey" class="activeLine"></view>
+            </view>
+          </view>
+          <view class="projTabsBottomLine" style="margin-bottom: 0"></view>
+            <!--            只读状态-->
+            <view class="projList">
+              <view class="projItem"
+                    v-for="(item, index) in ticketInfo.waresGroupList[activePartTabKey].wares.slice(0, 5)" :key="item.id">
+                <text class="projSeq">{{ index + 1 }}</text>
+                <text class="projName">{{ item.itemName }}</text>
+                <text style="color: #636C8C;font-size: 32rpx;">x{{ item.itemCount || "0" }}</text>
+              </view>
+              <view v-if="ticketInfo.waresGroupList[activePartTabKey].showAll" class="projItem"
+                    v-for="(item, index) in ticketInfo.waresGroupList[activePartTabKey].wares.slice(5, ticketInfo.waresGroupList[activePartTabKey].wares.length)"
+                    :key="item.id">
+                <text class="projSeq">{{ 6 + index }}</text>
+                <text class="projName">{{ item.itemName }}</text>
+                <text style="color: #636C8C;font-size: 32rpx;">x{{ item.itemCount || "0" }}</text>
+              </view>
+            </view>
+            <view v-if="ticketInfo.waresGroupList[activePartTabKey].wares.length > 5" class="action"
+                  @click="() => $set(ticketInfo.waresGroupList[activePartTabKey], 'showAll', !ticketInfo.waresGroupList[activePartTabKey].showAll)">
+              <text>{{ ticketInfo.waresGroupList[activePartTabKey].showAll ? '收起' : '展开' }}</text>
+              <uni-icons :type="ticketInfo.waresGroupList[activePartTabKey].showAll ? 'top' : 'bottom'"
+                         color="#0174f6"></uni-icons>
+            </view>
         </view>
+
         <view class="card cardInfo projCard">
           <view class="projTitle">维修进度记录表</view>
           <view class="projList">
@@ -180,7 +205,7 @@
               <view class="tushi-item" style="color: #E8A321">维修中  </view>
               <view class="tushi-item" style="color: #2979FF;">已完成</view>
             </view>
-            <uni-steps :options="list2" active-color="#007AFF" :active="active" :doingActive="doingActive"  @prviewImage="prviewImage" direction="column" />
+            <uni-steps :options="list2" active-color="#007AFF" :active="active" :doingActive="doingActive" direction="column" @prviewImage="prviewImage" @sendCusImgManage="sendCusImgManage"/>
           </view>
         </view>
         <view class="card cardInfo projCard">
@@ -189,8 +214,7 @@
             <template>
               <view v-for="item in ticketInfo.records" :key="item.id" class="projItem">
                 <view class="projTop">
-                  <text class="projName">{{item.type }}【{{item.roleName}}-{{item.dealUserName}}】</text>
-                  <!--                  <text class="projAmount">${{ item.amount }}</text>-->
+                  <text class="projName">{{ item.type }}【{{item.roleName}}-{{item.dealUserName}}】</text>
                 </view>
                 <view class="projBody">
                   <view class="projDate" style="padding: 10rpx 0 0 0" v-if="item.projectName">
@@ -204,9 +228,15 @@
                     <view class="projDesc">
                       {{ item.remark }}
                     </view>
-                    <view class="projImg">
-                        <image v-for="(img, imgIndex) in item.itemList"  :key="imgIndex" @click="prviewImage(item.itemList,imgIndex)"  :src="imgUrlPrex + img.image"
-                               class="projImgItem"></image>
+                    <view class="projImg" v-if="item.itemList && item.itemList.length>0">
+                      <image v-for="(img, imgIndex) in item.itemList" @click="prviewImage(item.itemList,imgIndex)" :key="imgIndex" :src="imgUrlPrex + img.image"
+                             class="projImgItem"></image>
+                    </view>
+                    <view class="projSend" v-if="item.itemList.length>0 && canOpenCus">
+                      <template >
+                        <image mode="aspectFit" src="/static/icons/send.png" style="width: 28rpx;height: 28rpx"></image>
+                        <text style="color: #0174F6" @click="sendCusImgManage(item.itemList)">发送给客户</text>
+                      </template>
                     </view>
                   </template>
                 </view>
@@ -215,7 +245,6 @@
           </view>
         </view>
       </view>
-
     </view>
   </view>
 </template>
@@ -248,6 +277,8 @@
         doingActive: -1,
         //维修项目进度记录表
         list2: [],
+        activeProjTabKey: 0,
+        activePartTabKey: 0,
 			};
 		},
     onLoad(data){
@@ -259,7 +290,12 @@
       this.getProjItem()
     },
 		methods: {
-
+      chooseProjTab(index) {
+        this.activeProjTabKey = index
+      },
+      choosePartTab(index) {
+        this.activePartTabKey = index
+      },
       callPhone(phone){
         uni.makePhoneCall({
           phoneNumber: phone
@@ -339,18 +375,43 @@
           //注册日期
           if (null != resultObj.carInfo.carRegisterDate){
             resultObj.carRegisterDate = formatDate(resultObj.carInfo.carRegisterDate)
+          }else{
+            resultObj.carRegisterDate = '未知'
+          }
+          //进场日期
+          if (null != resultObj.inTime){
+            resultObj.inTime = formatDate(resultObj.inTime)
+          }else{
+            resultObj.inTime = '未知'
+          }
+          //最近保养日期
+          if (null != resultObj.maintenanceDate){
+            resultObj.maintenanceDate = formatDate(resultObj.maintenanceDate)
+          }else{
+            resultObj.maintenanceDate = '未知'
+          }
+          //最近保养公里数
+          if (!resultObj.maintenanceMileage){
+            resultObj.maintenanceMileage = '未知'
+          }
+          //预计竣工日期
+          if (null != resultObj.outTime){
+            resultObj.outTime = formatDate(resultObj.outTime)
+          }else{
+            resultObj.outTime = '未知'
           }
           //年检时间
-          if (null != resultObj.carInfo.inspectionDate){
-            resultObj.inspectionDate = formatDate(resultObj.carInfo.inspectionDate)
+          console.log(resultObj.carInfo)
+          if (null != resultObj.carInfo.nextInspectionDate){
+            resultObj.nextInspectionDate = formatDate(resultObj.carInfo.nextInspectionDate)
           } else {
-            resultObj.inspectionDate = '未知'
+            resultObj.nextInspectionDate = '未知'
           }
           //保险时间
-          if (null != resultObj.carInfo.insuranceDate) {
-            resultObj.insuranceDate = formatDate(resultObj.carInfo.insuranceDate)
+          if (null != resultObj.carInfo.insuranceExpiryDate) {
+            resultObj.insuranceExpiryDate = formatDate(resultObj.carInfo.insuranceExpiryDate)
           } else {
-            resultObj.insuranceDate = '未知'
+            resultObj.insuranceExpiryDate = '未知'
           }
           //生日
           if (null != resultObj.customerInfo.birthday) {
@@ -358,6 +419,12 @@
           } else {
             resultObj.birthday = '未知'
           }
+          //维修记录格式化时间
+          if (null != resultObj.records){
+            resultObj.records.map((item)=>{
+              item.createTime = formatTimestamp(item.createTime)
+            })
+          }
           console.log(resultObj,"resultObj")
           this.buildRecords(resultObj)
         })
@@ -390,6 +457,9 @@
     flex: 1;
     height: 0;
     overflow: auto;
+    position: relative;
+    background-size: 100% 600rpx;
+    background: linear-gradient(180deg, #CEE5FF 0%, rgba(206, 229, 255, 0) 100%) no-repeat;
   }
 
   .card {
@@ -413,7 +483,7 @@
 
       .desc {
         font-weight: 500;
-        font-size: 24rpx;
+        font-size: 28rpx;
         color: rgba(255, 255, 255, 0.7);
       }
     }
@@ -449,6 +519,7 @@
   }
 
   .cardInfo {
+    overflow: hidden;
     .noReviewPart {
       padding: 10rpx 36rpx 10rpx 36rpx;
       display: flex;
@@ -498,16 +569,21 @@
   .projTitle, .userTitle, .carTitle {
     padding: 30rpx;
     font-weight: bold;
-    font-size: 32rpx;
+    font-size: 36rpx;
     color: #333333;
   }
 
+  .dl-ifcus{
+    font-size: 14px;
+    float: right;
+  }
+
   .carCard {
     .orderFlag {
       display: flex;
       align-items: center;
       column-gap: 14rpx;
-      padding: 40rpx 30rpx;
+      padding: 20rpx 30rpx;
       background: #FFFBF3;
       border-radius: 8rpx 8rpx 0rpx 0rpx;
       border-top: 8rpx solid #E8A321;
@@ -527,7 +603,7 @@
 
         .flagDesc {
           font-weight: 500;
-          font-size: 24rpx;
+          font-size: 28rpx;
           color: #999999;
         }
       }
@@ -536,7 +612,7 @@
 
     .carDetail {
       background-size: 100% 184rpx;
-      padding: 0 30rpx;
+      padding: 30rpx 30rpx;
 
       .carHeader {
         border-radius: 8rpx 8rpx 8rpx 8rpx;
@@ -550,7 +626,7 @@
         .carImage {
           width: 192rpx;
           height: 120rpx;
-          background: #F2F2F7;
+          //background: #F2F2F7;
           border-radius: 8rpx 8rpx 8rpx 8rpx;
         }
 
@@ -559,23 +635,25 @@
           flex-direction: column;
           row-gap: 20rpx;
           font-weight: bold;
-          font-size: 32rpx;
+          font-size: 36rpx;
           color: #333333;
 
           .carType {
             font-weight: 500;
-            font-size: 28rpx;
+            font-size: 32rpx;
             color: #858BA0;
           }
         }
       }
-
+      .line {
+        height: 1rpx;
+        background-color: #ddd;
+      }
       .carBody {
         display: flex;
         flex-direction: column;
         row-gap: 30rpx;
         padding-top: 30rpx;
-        border-top: 1rpx solid #DDDDDD;
       }
 
       .carFoot {
@@ -588,13 +666,15 @@
     padding-bottom: 30rpx;
 
     .projList {
-      padding: 0 30rpx;
+      padding: 0 20rpx;
       display: flex;
       flex-direction: column;
-      gap: 20rpx;
+      //gap: 20rpx;
 
       .tushi-box{
-        font-size: 16px;
+        font-weight: 500;
+        font-size: 32rpx;
+        line-height: 40rpx;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -606,18 +686,19 @@
 
       .projItem {
         background: #FFFFFF;
-        border-radius: 4rpx 4rpx 4rpx 4rpx;
-        border: 2rpx solid #DDDDDD;
+        border-radius: 8rpx 8rpx 8rpx 8rpx;
+        border: 1rpx solid #DDDDDD;
         padding: 0 20rpx;
+        margin-bottom: 10rpx;
 
         .projTop {
           padding: 20rpx 0;
-          border-bottom: 1rpx solid #DDDDDD;
+          border-bottom: 1rpx solid #eee;
           display: flex;
           align-items: center;
           justify-content: space-between;
           font-weight: 500;
-          font-size: 28rpx;
+          font-size: 32rpx;
           color: #333333;
 
           .projAmount {
@@ -631,8 +712,8 @@
 
           .projDate {
             font-weight: 500;
-            font-size: 28rpx;
-            color: #858BA0;
+            font-size: 30rpx;
+            color: #636C8C;
 
             display: flex;
             align-items: center;
@@ -643,7 +724,7 @@
 
           .projDesc {
             font-weight: 500;
-            font-size: 28rpx;
+            font-size: 30rpx;
             color: #858BA0;
           }
 
@@ -674,10 +755,21 @@
       }
 
       .projEditItem {
+        margin-bottom: 17rpx;
         padding: 0 20rpx;
         background: #F2F2F7;
         border-radius: 4rpx 4rpx 4rpx 4rpx;
-
+        position: relative;
+        .del-proj-box{
+          position: absolute;
+          top: -10px;
+          right: -10px;
+        }
+        .del-wares-box{
+          position: absolute;
+          top: 0;
+          right: 0;
+        }
         .projEditLine1 {
           display: flex;
           align-items: center;
@@ -687,7 +779,7 @@
           font-size: 28rpx;
           color: #333333;
 
-          padding: 30rpx 0;
+          padding: 15rpx 0;
 
           .projAmount {
             color: #0174F6;
@@ -697,14 +789,14 @@
         .projBaseInfo {
           display: grid;
           grid-template-columns: 1fr 1fr;
-          font-size: 27rpx;
+          font-size: 28rpx;
           color: #999999;
           gap: 20rpx;
           margin-bottom: 20rpx;
         }
 
         .projEditFoot {
-          padding: 30rpx 0;
+          padding: 10rpx 0;
           border-top: 1px solid #DDDDDD;
 
           display: flex;
@@ -757,6 +849,193 @@
       }
     }
   }
+  .projEditItem {
+    //margin-bottom: 25rpx;
+    padding: 0 20rpx 10rpx 20rpx;
+    border-bottom: 1rpx solid #F2F2F7;
+    //background: #F2F2F7;
+    border-radius: 4rpx 4rpx 4rpx 4rpx;
+    position: relative;
+    .del-proj-box{
+      position: absolute;
+      top: -10px;
+      right: -10px;
+    }
+    .del-wares-box{
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
+    .projEditLine1 {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      font-weight: 500;
+      font-size: 28rpx;
+      color: #333333;
+
+      padding: 15rpx 0;
+
+      .projAmount {
+        color: #0174F6;
+      }
+    }
+
+    .projBaseInfo {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      font-size: 28rpx;
+      color: #999999;
+      gap: 20rpx;
+      margin-bottom: 20rpx;
+    }
+
+    .projEditFoot {
+      padding: 10rpx 0;
+      border-top: 1px solid #DDDDDD;
+
+      display: flex;
+      align-items: center;
+      column-gap: 10rpx;
+
+      .block1, .block2 {
+        flex: 1;
+        width: 0;
+
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        column-gap: 8rpx;
+
+        font-size: 28rpx;
+        color: #0174F6;
+        line-height: 28rpx;
+
+        .editPeople {
+          flex: 1;
+          width: 0;
+
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+
+          .editForm {
+            display: flex;
+            flex-direction: column;
+            row-gap: 10rpx;
+            font-size: 28rpx;
+            color: #333333;
+
+            .label {
+              font-size: 28rpx;
+              color: #999999;
+            }
+          }
+        }
+      }
+
+      .line {
+        height: 28rpx;
+        width: 2rpx;
+        background-color: #DDDDDD;
+      }
+
+    }
+  }
+  .projDateCard, .partCard {
+    line-height: 1;
+    .projTabs {
+      display: flex;
+      overflow: scroll;
+      .projTabItem {
+        padding: 10rpx 20rpx 30rpx;
+        flex-shrink: 0;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #636C8C;
+        &.active {
+          font-weight: bold;
+          color: #0174F6;
+          position: relative;
+        }
+        .activeLine {
+          position: absolute;
+          bottom: 0;
+          left: 50%;
+          transform: translateX(-50%);
+          width: 36rpx;
+          height: 8rpx;
+          background: #0174F6;
+          border-radius: 4rpx 4rpx 4rpx 4rpx;
+        }
+      }
+    }
+    .projTabsBottomLine {
+      width: 686rpx;
+      height: 1rpx;
+      background-color: #eee;
+      margin-bottom: 20rpx;
+    }
+    .workPerson {
+      width: 646rpx;
+      margin: 0 auto;
+      padding: 30rpx 20rpx;
+      background: #F3F5F7;
+      border-radius: 6rpx 6rpx 6rpx 6rpx;
+
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      flex-wrap: wrap;
+
+      font-weight: 500;
+      font-size: 30rpx;
+      color: #636C8C;
+    }
+
+    .projList {
+      padding: 0 20rpx;
+      .projItem {
+        padding: 40rpx 0;
+        font-weight: 500;
+        font-size: 32rpx;
+        line-height: 40rpx;
+        color: #333333;
+        border-bottom: 1rpx solid #EEEEEE;
+        display: flex;
+        column-gap: 10rpx;
+      }
+      .projSeq {
+        width: 40rpx;
+        height: 40rpx;
+        background: #0174F6;
+        border-radius: 50%;
+        display: inline-block;
+        text-align: center;
+        line-height: 40rpx;
+        font-weight: 500;
+        font-size: 16px;
+        color: #FFFFFF;
+      }
+      .projName {
+        flex: 1;
+        width: 0;
+        word-break: break-all;
+      }
+      .projItem:last-child {
+        border-bottom: none;
+      }
+    }
+
+    .action {
+      font-weight: 500;
+      font-size: 30rpx;
+      color: #0174F6;
+      text-align: center;
+      padding-bottom: 30rpx;
+    }
+  }
 
   .userCard {
     .userContainer {
@@ -769,24 +1048,24 @@
   }
 
   .infoItem {
+    padding: 20rpx 0;
     display: flex;
-    flex-direction: column;
+    justify-content: space-between;
+    font-weight: 500;
+    font-size: 32rpx;
+    line-height: 1;
 
     .label {
-      font-weight: 500;
-      font-size: 28rpx;
-      color: #858BA0;
+      color: #636C8C;
     }
 
     .value {
-      font-weight: 500;
-      font-size: 28rpx;
       color: #333333;
     }
   }
 
   .projFoot, .userFoot, .carFoot {
-    padding: 30rpx;
+    padding: 20rpx;
     font-weight: 500;
     font-size: 28rpx;
     color: #0174F6;
@@ -816,5 +1095,131 @@
       color: #FFFFFF;
     }
   }
+
+  .formItem {
+    padding: 40rpx 0;
+    margin: 0 32rpx;
+    border-bottom: 1rpx solid #EEEEEE;
+  }
+
+  .formLabel {
+    font-weight: 500;
+    font-size: 28rpx;
+    color: #333333;
+    padding-bottom: 20rpx;
+  }
+
+  .edit-proj-input{
+    background: white;
+    width: 90%;
+    padding: 3rpx 5rpx;
+    border-radius: 5px;
+  }
+}
+.orderInfo {
+  padding: 0 32rpx;
+  margin: 40rpx 0;
+  line-height: 1;
+  display: flex;
+  flex-direction: column;
+  .orderTypeInfo {
+    padding: 10rpx 0;
+    font-weight: bold;
+    font-size: 40rpx;
+    color: #333333;
+  }
+  .orderStateInfo {
+    padding: 10rpx 0;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #666666;
+  }
+  .orderDateInfo {
+    padding: 10rpx 0;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #0174F6;
+  }
+}
+.processCard {
+  line-height: 1;
+  .tushi-box {
+    display: flex;
+    align-items: center;
+    column-gap: 40rpx;
+    justify-content: center;
+    padding-bottom: 30rpx;
+    font-weight: 500;
+    font-size: 32rpx;
+    line-height: 40rpx;
+  }
+  .processList {
+    padding: 0 20rpx;
+  }
+  .processItem {
+    display: flex;
+    column-gap: 14rpx;
+    margin-bottom: 20rpx;
+    display: flex;
+    align-items: stretch;
+    .left {
+      padding-bottom: 24rpx;
+      display: flex;
+      flex-direction: column;
+      row-gap: 8rpx;
+      .processSeq {
+        width: 32rpx;
+        height: 32rpx;
+        background: #0174F6;
+        border-radius: 18rpx 18rpx 18rpx 18rpx;
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #FFFFFF;
+        line-height: 32rpx;
+        text-align: center;
+      }
+      .line {
+        flex: 1;
+        height: 0;
+        width: 2rpx;
+        background-color: #0174f6;
+        margin: 0 auto;
+      }
+    }
+    .right {
+      padding-bottom: 20rpx;
+      border-bottom: 1rpx solid #eee;
+      display: flex;
+      flex-direction: column;
+      row-gap: 20rpx;
+      .processName {
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #333333;
+      }
+      .processDate {
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #858BA0;
+      }
+      .processImgList {
+        display: flex;
+        gap: 10rpx;
+      }
+      .processImgItem {
+        width: 120rpx;
+        height: 120rpx;
+        background-color: #eee;
+      }
+      .processSendUser {
+        display: flex;
+        column-gap: 10rpx;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #0174F6;
+      }
+    }
+  }
 }
 </style>
+
diff --git a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
index 6117006..4631bd0 100644
--- a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
+++ b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
@@ -32,7 +32,7 @@
 					v-for="(item,index) in options" :key="index" :style="{height: direction === 'column'?heightArr[index]+'px':'14px'}">
 					<view
 						:class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--before':'uni-steps__row-line--before']"
-						:style="{backgroundColor:index<=active&&index!==0?activeColor:index===0?'transparent':deactiveColor}">
+						>
 					</view>
 <!--					<view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']"-->
 <!--						v-if="index === active">-->
@@ -200,7 +200,7 @@
 	}
 
 	.uni-steps__column-text {
-		padding: 6px 0px;
+		padding: 10px 0 2px 0;
 		border-bottom-style: solid;
 		border-bottom-width: 1px;
 		border-bottom-color: $uni-border-color;
@@ -217,9 +217,9 @@
 	}
 
 	.uni-steps__column-title {
-		font-size: 28rpx;
-		text-align: left;
-		line-height: 32rpx;
+    font-weight: 500;
+    font-size: 32rpx;
+    line-height: 40rpx;
 	}
 
 	.uni-steps__row-desc {
@@ -229,9 +229,11 @@
 	}
 
 	.uni-steps__column-desc {
-		font-size: 25rpx;
+		font-size: 30rpx;
 		text-align: left;
 		line-height: 32rpx;
+    padding: 10rpx 0;
+
 	}
 
 	.uni-steps__row-container {
@@ -278,7 +280,7 @@
 
 	.uni-steps__column-line {
 		width: 1px;
-		background-color: #B7BDC6;
+		//background-color: #B7BDC6;
 	}
 
 	.uni-steps__row-line--after {
@@ -300,20 +302,29 @@
 	}
 
 	.uni-steps__row-circle {
-		width: 20px;
-		height: 20px;
+    width: 40rpx;
+    height: 40rpx;
+    text-align: center;
 		border-radius: 50%;
 		background-color: #B7BDC6;
 		margin: 0px 3px;
+    display: inline-block;
+    line-height: 40rpx;
+    font-weight: 500;
+    font-size: 16px;
 	}
 
 	.uni-steps__column-circle {
-		width: 20px;
-		height: 20px;
+    width: 40rpx;
+    height: 40rpx;
     text-align: center;
 		border-radius: 50%;
 		background-color: #B7BDC6;
 		margin: 4px 0px 5px 0px;
+    display: inline-block;
+    line-height: 40rpx;
+    font-weight: 500;
+    font-size: 16px;
 	}
 
 	.uni-steps__row-check {
diff --git a/utils/utils.js b/utils/utils.js
index 651f7c4..4d0da75 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -37,19 +37,25 @@ function getOrderStatusText(ticketsStatus,workStatus){
 	let str = "";
 	if("04"==ticketsStatus){
 		//待派工
-		str = "待派工"
-	}else if("05"==ticketsStatus || "07"==ticketsStatus){
+		str = "待维修"
+	}else if("05"==ticketsStatus){
 		//维修中
 		str = "维修中"
 	}else if("01"==ticketsStatus){
-		//待结算
-		str = "待取车结算"
+		//待取车结算
+		str = "已竣工"
 	}else if("06"==ticketsStatus){
 		//挂单/记账
-		str = "挂单/记账"
+		str = "已结算"
+	}else if("07"==ticketsStatus){
+		//待通知客户取车
+		str = "已竣工"
+	}else if("08"==ticketsStatus){
+		//已交车
+		str = "已交车"
 	}else if("02"==ticketsStatus){
 		//已结账
-		str = "已结账"
+		str = "已结算"
 	}else if("03"==ticketsStatus){
 		//已作废
 		str = "已作废"