feat: 用户修改按钮

guzijian
1 parent ff4f8ac1
Showing 11 changed files with 253 additions and 270 deletions
garbage-removal/src/pages.json
garbage-removal/src/pages/home/clean/index.vue
garbage-removal/src/pages/order/driver-home/detail/index.vue
garbage-removal/src/pages/order/driver-home/swiper-list-item/index.vue
garbage-removal/src/pages/order/handler-home/index.vue
garbage-removal/src/pages/order/handler-home/scan-detail/index.vue
garbage-removal/src/pages/order/handler-home/transport-detail/index.vue
garbage-removal/src/pages/order/other-home/detail/index.vue
garbage-removal/src/pages/order/other-home/swiper-list-item/index.vue
garbage-removal/src/pages/wode/index.vue
garbage-removal/src/uview-plus/components/u-action-sheet/u-action-sheet.vue
@@ -168,8 +168,8 @@
 		},{
 			"path": "pages/wode/index",
 			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#ffffff",
+				"navigationStyle":"custom",
+				"navigationBarBackgroundColorr":"#ffffff00",
 				"enablePullDownRefresh": false
 			}
 		}
@@ -260,7 +260,6 @@ const paramFrom = ref({
   carType: "",
   garbageType: ["装修垃圾"],
   garInCarStore: false
-
 })
 const dayTime = ref()
 <template>
-  <clashDriverDispatch ref="clashDriverDispatchRef" :valueKey="'licensePlateNumber'"
-    :onconfirm="handleDriverDispatchConfirm" :dataList="driverPersonnelList">
-  </clashDriverDispatch>
-  <clashDisposalDispatch ref="clashDisposalDispatchRef" :valueKey="'companyName'"
-    :onconfirm="handleDisposalDispatchConfirm" :dataList="driverPersonnelList">
-  </clashDisposalDispatch>
   <view class="order-detail-container" v-if="dataGram != null || dataGram != undefined">
     <view class="order-detail-container-box">
       <view class="order-detail-top">
@@ -125,7 +119,7 @@
           <view class="order-detail-container-header-card-uicon"></view>
           处理信息
         </view>
-        <view v-if="dataGram.garOrderHandlerId" style="width: 100%;">
+        <view v-if="putDownImages.length || putOnImages.length" style="width: 100%;">
           <!-- <view class="order-detail-container-header-item">
             <text class="order-detail-container-header-title">负责人：</text>
             <view class="order-detail-container-header-content">
@@ -192,11 +186,6 @@
           <u-button @click="handleEvaluateDetail(orderId, userType)"
             v-if="dataGram.garEvaluateFlag === 1 && userType === '用户'" shape="square" color="#a9e08f"
             text="查看评价"></u-button>
-          <u-button v-if="dataGram.garOrderHandlerStatus === 1 && userType == '运输企业负责人'"
-            @click="handleDisposalDispatchClick(orderId)" shape="square" color="#a9e08f" text="分配处置场所"></u-button>
-
-          <!-- <u-button v-if="dataGram.garOrderHandlerStatus === 1 && dataGram.garCancelFlag === 0 && userType != '清运车辆驾驶员'"
-            @click="handleSubmitSuccess(orderId)" shape="square" color="#a9e08f" text="完成订单"></u-button> -->
         </view>
       </view>
     </view>
@@ -211,20 +200,15 @@
 </template>
 <script setup>
-import { createHandlerQrCode, dispatchDisposalOrders, dispatchOrders, queryDisposalDispatch, queryOrderDetail, queryOrderDispatch, updateOrder } from "@/apis/order.js";
+import { createHandlerQrCode, queryOrderDetail, updateOrder } from "@/apis/order.js";
 import { createQrCode } from '@/apis/qrcode.js';
 import uqrcode from '@/components/Sansnn-uQRCode_4.0.6/components/uqrcode/uqrcode.vue';
-import clashDisposalDispatch from '@/components/clash-disposal-dispatch/index.vue';
-import clashDriverDispatch from '@/components/clash-driver-dispatch/index.vue';
 import zStatic from '@/components/z-paging/js/z-paging-static';
 import { useMainStore } from '@/stores/index.js';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { computed, ref } from 'vue';
 const isOnloadIn = ref(false)
 const clashDriverDispatchRef = ref()
-const clashDisposalDispatchRef = ref()
-const driverPersonnelList = ref([])
-const disposalPersonnelList = ref([])
 const store = useMainStore();
 const userType = computed(() => store.userType)
 const dataGram = ref();
@@ -308,30 +292,6 @@ const handleQrCodeClick = (orderId) =&gt; {
   // #endif
 }
-const handleOrderDispatchClick = (orderId) => {
-  // 获取驾驶员人员
-  queryOrderDispatch(orderId).then(res => {
-    if (res.data.success) {
-      driverPersonnelList.value = res.data.data
-      clashDriverDispatchRef.value.open(res.data.data)
-    } else {
-      uni.$u.toast(res.data.message)
-    }
-  })
-}
-const handleDisposalDispatchClick = (orderId) => {
-  // 获取处置场所人员
-  queryDisposalDispatch(orderId).then(res => {
-    if (res.data.success) {
-      disposalPersonnelList.value = res.data.data
-      clashDisposalDispatchRef.value.open(res.data.data)
-    } else {
-      uni.$u.toast(res.data.message)
-    }
-  })
-}
-
-
 const handleClose = (e) => {
   cancelShow.value = false
@@ -386,14 +346,6 @@ const handlerJumpOtherApp = (latitude, longitude, garCoordinate) =&gt; {
 }
 /**
- * 取消订单
- * @param {*} orderId
- */
-const handleOderCancelClick = () => {
-  cancelShow.value = true;
-}
-
-/**
  * 提交取消订单
  */
 const submitFunction = (otherReason) => {
@@ -421,26 +373,7 @@ const submitFunction = (otherReason) =&gt; {
     }
   })
 }
-// 提交完成
-const handleSubmitSuccess = (orderId) => {
-  uni.showModal({
-    title: '提示',
-    content: '订单已经清运完成了吗？',
-    success: function (res) {
-      if (res.confirm) {
-        updateOrder({ garOrderId: orderId, handleType: 3 }).then(res => {
-          if (res.data.success) {
-            uni.$u.toast("已完成")
-            handleOrderDetail(orderId)
-          }
-        })
-      } else if (res.cancel) {
-      }
-    }
-  });
-  // uni.$u.route(`pages/order/success/index?orderId=${orderId}`)
-}
 const handleEvaluate = (orderId, userType) => {
   uni.$u.route(`pages/order/other-home/evaluate/index?orderId=${orderId}&userType=${userType}`)
 }
@@ -520,61 +453,7 @@ const createQrCodeValid = (val) =&gt; {
  * @param {string} putType
  */
 const handleUploadImage = (orderId, putType) => {
-  uni.$u.route(`pages/order/other-home/upload/index?orderId=${orderId}`)
-}
-const handleDisposalDispatchConfirm = (val) => {
-  console.log(val);
-  if (!val) {
-    return
-  }
-  let data = {
-    garOrderId: orderId.value,
-    dispatchList: []
-  }
-  for (const key in val) {
-    data.dispatchList.push({
-      ...val[key]
-    });
-  }
-  console.log(data);
-  dispatchDisposalOrders(data).then(res => {
-    if (res.data.success) {
-      uni.$u.toast(res.data.msg)
-    } else {
-      uni.$u.toast("指定人员失败，请重试")
-    }
-    clashDriverDispatchRef.value.close()
-  })
-}
-
-const handlerUpdateOrderClick = () => {
-  // TODO  照搬一键清运得弹窗
-  console.log("点击了修改订单按钮");
-}
-// 指定人员
-const handleDriverDispatchConfirm = (val) => {
-  console.log(val);
-  if (!val) {
-    return
-  }
-  let data = {
-    garOrderId: orderId.value,
-    dispatchList: []
-  }
-  for (const key in val) {
-    data.dispatchList.push({
-      ...val[key]
-    });
-  }
-  console.log(data);
-  dispatchOrders(data).then(res => {
-    if (res.data.success) {
-      uni.$u.toast(res.data.msg)
-    } else {
-      uni.$u.toast("指定人员失败，请重试")
-    }
-    clashDriverDispatchRef.value.close()
-  })
+  uni.$u.route(`pages/order/driver-home/upload/index?orderId=${orderId}`)
 }
 /**
@@ -11,8 +11,8 @@
               <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
             </view>
             <view style="display: flex;align-items: center;">
-              <text v-if="item.garOrderHandlerStatus != 3 && item.garOrderStatus === 3 && userType === '清运车辆驾驶员'"
-                style="font-size: small;color: #f56c6c;">订单已经完成了。</text>
+              <!-- <text v-if="item.garOrderHandlerStatus != 3 && item.garOrderStatus === 3 && userType === '清运车辆驾驶员'"
+                style="font-size: small;color: #f56c6c;">订单已经完成了。</text> -->
               <view v-if="item.garOrderHandlerStatus === 0 && item.garCancelFlag === 0" class="right">待清运 </view>
               <view v-if="item.garOrderHandlerStatus === 1 && item.garCancelFlag === 0" class="right">清运中 </view>
               <view v-if="item.garOrderHandlerStatus === 3 && userType === '清运车辆驾驶员'" class="right">已完成 </view>
@@ -44,7 +44,7 @@ const translation = (e) =&gt; {
 const handleScan = () => {
   // 调用uniapi开启二维码扫描
   // 允许从相机和相册扫码
-  checkCode("1789590734475624449,1730466747975798786,501684").then(res => {
+  checkCode("1789622015702335490,1730466747975798786,956117").then(res => {
     console.log(res);
     if (res.data.code == 200) {
       uni.$u.route({
@@ -76,7 +76,7 @@
     </view>
     <view class="scan-submit-button-box" v-if="isNew">
       <view class="scan-submit-button-btn">
-        <u-button type="primary" @click="handlerSubmit" text="确认"></u-button>
+        <u-button type="primary" @tap="handlerSubmit" text="确认"></u-button>
       </view>
     </view>
   </view>
@@ -122,8 +122,7 @@ const afterRead = async (event) =&gt; {
   }
 };
-const handlerSubmit = () => {
-  console.log("确认提交");
+const handlerSubmit = async () => {
   // 校验参数
   let params = {
     ...details.value,
@@ -131,11 +130,19 @@ const handlerSubmit = () =&gt; {
     garOrderHandlerCompanyName: details.value.garOrderCompanyName,
     garOrderHandlerCompanyId: details.value.garOrderCompanyId
   }
-  if (!validateParams(params)) {
-    askTransport(params).then((res) => {
+  if (validateParams(params)) {
+    await askTransport(params).then((res) => {
       console.log(res);
+      if (res.data.code == 200) {
+        uni.$u.toast("当前趟次记录完毕！")
+      }
+    }).catch((err) => {
+      uni.$u.toast("当前趟次记录失败")
     })
-    uni.$u.toast("确认提交了")
+    // 返回上级
+    // uni.navigateBack({
+    //   delta: 1
+    // })
   }
 }
@@ -153,13 +160,13 @@ const validateParams = (params) =&gt; {
     return false;
   }
   if (!validateImage(params.fillImageList)) {
-    return
+    return false;
   }
+  return true;
 }
 const validateImage = (fillImageList) => {
-  console.log(fillImageList);
-  if (fillImageList instanceof Array) {
+  if (fillImageList instanceof Array && fillImageList.length > 0) {
     for (let index = 0; index < fillImageList.length; index++) {
       const str = fillImageList[index];
       if (!str.startsWith("/profile/upload")) {
@@ -91,23 +91,7 @@ const dataGram = ref();
 const orderId = ref(null)
 const currentImages = ref([])
 const emptyBase64Image = ref(zStatic.base64Empty)
-const showUQRcode = ref(false)
 const spaceStr = ref("")
-const qrCodeRef = ref()
-const qrCodeText = ref()
-
-// 创建二维码
-const createQrCodeLocal = (orderId) => {
-  // 获取本地地址拼接订单id
-  showUQRcode.value = true;
-  const hostname = window.location.hostname;
-  const port = window.location.port;
-  const protocol = window.location.protocol;
-  const localAddress = `${protocol}//${hostname}:${port}`;
-  // const localAddress = `http://localhost:5173`;
-  qrCodeText.value = localAddress + "/pages/order/other-home/guest/index?orderId=" + orderId;
-  console.log(qrCodeRef.value);
-}
 const goTransportDetail = (val) => {
   uni.$u.route({
     url: `pages/order/handler-home/scan-detail/index`
@@ -5,6 +5,37 @@
   <clashDisposalDispatch ref="clashDisposalDispatchRef" :valueKey="'companyName'"
     :onconfirm="handleDisposalDispatchConfirm" :dataList="driverPersonnelList">
   </clashDisposalDispatch>
+  <u-popup :zIndex="10074" closeOnClickOverlay :show="carPopupShowFlag" :round="10" @close="handlePopupClick(false)"
+    @open="handlePopupClick(true)">
+    <view class="company-clean-container-car-popup">
+      <!-- 主要内容 -->
+      <view class="company-clean-container-car-popup-content">
+        <view class="company-clean-container-car-popup-content-title">
+          <view style="text-align: center;">
+            车辆类型
+          </view>
+        </view>
+        <view class="company-clean-container-car-popup-content-box">
+          <view class="company-clean-container-car-popup-content-box-item" v-for="(item, index) in garCarInfoList"
+            :key="index">
+            <view class="company-clean-container-car-popup-content-box-item-text">
+              {{ item.garOrderCarType }}
+            </view>
+            <view class="company-clean-container-car-popup-content-box-item-number" hover-class="hoverClickStyle">
+              <u-number-box :min="0" :max="9999" integer buttonSize="46" :inputWidth="100"
+                v-model="garCarInfoList[item.garOrderCarType].garOrderCarNumber" :disabledInput="true"></u-number-box>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 占位盒子 -->
+      <view class="company-clean-container-car-popup-button-safe">
+        <view class="company-clean-container-car-popup-button-safe-btn">
+          <u-button type="primary" color="#19a97c" @click="submitUpdateCarInfo">确定</u-button>
+        </view>
+      </view>
+    </view>
+  </u-popup>
   <view class="order-detail-container" v-if="dataGram != null || dataGram != undefined">
     <view class="order-detail-container-box">
       <view class="order-detail-top">
@@ -133,19 +164,7 @@
           <view class="order-detail-container-header-card-uicon"></view>
           处理信息
         </view>
-        <view v-if="dataGram.garOrderHandlerId" style="width: 100%;">
-          <!-- <view class="order-detail-container-header-item">
-            <text class="order-detail-container-header-title">负责人：</text>
-            <view class="order-detail-container-header-content">
-              {{ dataGram.garOrderHandleName }}
-            </view>
-          </view> -->
-          <view class="order-detail-container-header-item">
-            <text class="order-detail-container-header-title">服务电话：</text>
-            <view class="order-detail-container-header-content">
-              {{ dataGram.garOrderCompanyTel }}
-            </view>
-          </view>
+        <view v-if="putDownImages.length || putOnImages.length" style="width: 100%;">
           <view class="order-detail-container-header-item">
             <text class=" order-detail-container-header-title">装车照片：</text>
             <view class="order-detail-container-header-content">
@@ -172,45 +191,33 @@
     <view class="order-detail-bottom">
       <view class="order-detail-bottom-box">
         <view class=" order-detail-bottom-left">
-          <u-button
-            v-if="dataGram.garOrderHandlerStatus === 1 && dataGram.garCancelFlag === 0 && userType === '清运车辆驾驶员'"
-            @click="createQrCodeValid(orderId)" shape="square" color="#a9e08f" text="出示二维码"></u-button>
           <u-button v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.garCancelFlag === 0"
-            @click="handleOderCancelClick()" shape="square" color="#a9e08f" text="取消订单"></u-button>
+            @click="handleOderCancelClick()" shape="square" color="#19a97c" text="取消订单"></u-button>
           <u-button v-if="dataGram.garOrderScanHandlerFlag === 0 && userType == '用户' && dataGram.garCancelFlag === 0"
-            @click="handlerUpdateOrderClick()" shape="square" color="#a9e08f" text="修改订单"></u-button>
+            @click="handlerUpdateOrderClick()" shape="square" color="#19a97c" text="修改车辆信息"></u-button>
           <u-button v-if="dataGram.garOrderHandlerStatus === 1 && userType == '运输企业负责人'"
-            @click="handleOrderDispatchClick(orderId)" shape="square" color="#a9e08f" text="分配驾驶员"></u-button>
+            @click="handleOrderDispatchClick(orderId)" shape="square" color="#19a97c" text="分配驾驶员"></u-button>
         </view>
         <view class="order-detail-bottom-right">
           <u-button v-if="dataGram.garOrderHandlerStatus === 0 && userType == '用户' && dataGram.garCancelFlag === 0"
-            @click="handleOderCancelClick()" shape="square" color="#a9e08f" text="取消订单"></u-button>
-          <u-button @click="driverHandleOrder(orderId)"
-            v-if="dataGram.garOrderHandlerStatus === 0 && dataGram.handleFlag && dataGram.garCancelFlag === 0 && userType === '清运车辆驾驶员'"
-            shape="square" color="#a9e08f" text="处理订单"></u-button>
+            @click="handleOderCancelClick()" shape="square" color="#19a97c" text="取消订单"></u-button>
           <u-button @click="handleOrder(orderId)"
             v-if="dataGram.garOrderHandlerStatus === 0 && dataGram.handleFlag && dataGram.garCancelFlag === 0 && userType === '运输企业负责人'"
-            shape="square" color="#a9e08f" text="处理订单"></u-button>
-          <u-button @click="handleUploadImage(orderId, 'putOnImages')"
-            v-if="dataGram.garOrderHandlerStatus === 1 && dataGram.garCancelFlag === 0 && userType === '清运车辆驾驶员'"
-            shape="square" color="#a9e08f" text="上传图片"></u-button>
+            shape="square" color="#19a97c" text="处理订单"></u-button>
           <u-button @click="handleEvaluate(orderId, userType)"
-            v-if="dataGram.garEvaluateFlag === 0 && userType === '用户'" shape="square" color="#a9e08f"
+            v-if="dataGram.garEvaluateFlag === 0 && userType === '用户'" shape="square" color="#19a97c"
             text="去评价"></u-button>
           <u-button @click="handleEvaluate(orderId, userType)"
-            v-if="dataGram.garHandlerEvaluateFlag === 0 && userType === '运输企业负责人'" shape="square" color="#a9e08f"
+            v-if="dataGram.garHandlerEvaluateFlag === 0 && userType === '运输企业负责人'" shape="square" color="#19a97c"
             text="去评价"></u-button>
           <u-button @click="handleEvaluateDetail(orderId, userType)"
-            v-if="dataGram.garHandlerEvaluateFlag === 1 && userType === '运输企业负责人'" shape="square" color="#a9e08f"
+            v-if="dataGram.garHandlerEvaluateFlag === 1 && userType === '运输企业负责人'" shape="square" color="#19a97c"
             text="查看评价"></u-button>
           <u-button @click="handleEvaluateDetail(orderId, userType)"
-            v-if="dataGram.garEvaluateFlag === 1 && userType === '用户'" shape="square" color="#a9e08f"
+            v-if="dataGram.garEvaluateFlag === 1 && userType === '用户'" shape="square" color="#19a97c"
             text="查看评价"></u-button>
           <u-button v-if="dataGram.garOrderHandlerStatus === 1 && userType == '运输企业负责人'"
-            @click="handleDisposalDispatchClick(orderId)" shape="square" color="#a9e08f" text="分配处置场所"></u-button>
-
-          <!-- <u-button v-if="dataGram.garOrderHandlerStatus === 1 && dataGram.garCancelFlag === 0 && userType != '清运车辆驾驶员'"
-            @click="handleSubmitSuccess(orderId)" shape="square" color="#a9e08f" text="完成订单"></u-button> -->
+            @click="handleDisposalDispatchClick(orderId)" shape="square" color="#19a97c" text="分配处置场所"></u-button>
         </view>
       </view>
     </view>
@@ -225,7 +232,8 @@
 </template>
 <script setup>
-import { createHandlerQrCode, dispatchDisposalOrders, dispatchOrders, queryDisposalDispatch, queryOrderDetail, queryOrderDispatch, updateOrder } from "@/apis/order.js";
+import { queryCarList } from '@/apis/carinfo.js';
+import { dispatchDisposalOrders, dispatchOrders, queryDisposalDispatch, queryOrderDetail, queryOrderDispatch, updateOrder } from "@/apis/order.js";
 import { createQrCode } from '@/apis/qrcode.js';
 import uqrcode from '@/components/Sansnn-uQRCode_4.0.6/components/uqrcode/uqrcode.vue';
 import clashDisposalDispatch from '@/components/clash-disposal-dispatch/index.vue';
@@ -234,6 +242,12 @@ import zStatic from &#39;@/components/z-paging/js/z-paging-static&#39;;
 import { useMainStore } from '@/stores/index.js';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { computed, ref } from 'vue';
+const paramFrom = ref({
+  carNumber: 0,
+  carType: ""
+})
+const garCarInfoList = ref({})
+const carPopupShowFlag = ref(false)
 const isOnloadIn = ref(false)
 const clashDriverDispatchRef = ref()
 const clashDisposalDispatchRef = ref()
@@ -253,6 +267,9 @@ const cancelShow = ref(false)
 const currentCancelName = ref("")
 const qrCodeRef = ref()
 const qrCodeText = ref()
+const candidates = ref([])
+const garCarLabelInfoList = ref({})
+const garCarLabelInfoNow = ref()
 const list = computed(() => {
   let reason = [
     {
@@ -283,6 +300,9 @@ const list = computed(() =&gt; {
   return reason
 })
+const handlePopupClick = (val) => {
+  carPopupShowFlag.value = val
+}
 // 创建二维码
 const createQrCodeLocal = (orderId) => {
   // 获取本地地址拼接订单id
@@ -452,7 +472,6 @@ const handleSubmitSuccess = (orderId) =&gt; {
       }
     }
   });
-  // uni.$u.route(`pages/order/success/index?orderId=${orderId}`)
 }
 const handleEvaluate = (orderId, userType) => {
@@ -477,25 +496,6 @@ const handleOrder = (orderId) =&gt; {
   })
 }
-// 接收订单
-const driverHandleOrder = (orderId) => {
-  updateOrder({ garOrderId: orderId, handleType: 0 }).then(res => {
-    if (res.data.success) {
-      if (res.data.data === "订单已经被别人接受啦") {
-        uni.$u.toast(res.data.data)
-        uni.$u.route({
-          type: "reLaunch",
-          url: `pages/order/index`,
-        })
-      } else {
-        uni.$u.toast(res.data.data)
-        handleOrderDetail(orderId)
-      }
-    }
-  })
-}
-
-
 const currentStep = (step) => {
   if (step > 2) {
     return step - 1;
@@ -520,22 +520,7 @@ const cleanStatus = (status) =&gt; {
       return '清运完成';
   }
 }
-const createQrCodeValid = (val) => {
-  createHandlerQrCode(val).then(res => {
-    // 获取本地地址拼接订单id
-    showUQRcode.value = true;
-    // const localAddress = `http://localhost:5173`;
-    qrCodeText.value = res.data.data;
-  })
-}
-/**
- * 上传图片
- * @param {string} orderId
- * @param {string} putType
- */
-const handleUploadImage = (orderId, putType) => {
-  uni.$u.route(`pages/order/other-home/upload/index?orderId=${orderId}`)
-}
+
 const handleDisposalDispatchConfirm = (val) => {
   console.log(val);
   if (!val) {
@@ -562,8 +547,33 @@ const handleDisposalDispatchConfirm = (val) =&gt; {
 }
 const handlerUpdateOrderClick = () => {
+  carPopupShowFlag.value = true;
   // TODO  照搬一键清运得弹窗
   console.log("点击了修改订单按钮");
+  // TODO
+  queryCarList({
+    companyId: dataGram.value.garOrderCompanyId
+  }).then(res => {
+    // 设置车辆类型
+    candidates.value = [[...new Set(res.data.rows
+      .filter(item => item.containerVolume)
+      .map(item => {
+        garCarLabelInfoList.value[item.containerVolume + "方车"] = item
+        return item.containerVolume + "方车"
+      }))
+    ]];
+    // 设置初始车辆数量
+    candidates.value[0].forEach((item, index) => {
+      garCarInfoList.value[item] = {
+        garOrderCarNumber: 0,
+        garOrderCarType: item
+      }
+    })
+    // 设置默认车辆
+    paramFrom.value.carType = candidates.value[0][0];
+    garCarLabelInfoNow.value = garCarLabelInfoList.value[paramFrom.value.carType]
+    console.log(garCarLabelInfoList.value, garCarInfoList.value, paramFrom.value.carType);
+  })
 }
 // 指定人员
 const handleDriverDispatchConfirm = (val) => {
@@ -591,6 +601,30 @@ const handleDriverDispatchConfirm = (val) =&gt; {
   })
 }
+const submitUpdateCarInfo = () => {
+  let garCarInfos = [];
+  for (const key in garCarInfoList.value) {
+    garCarInfos.push(garCarInfoList.value[key])
+  }
+
+  let data = {
+    garOrderId: orderId.value,
+    garCarInfoList: garCarInfos,
+    updated: true
+  }
+  updateOrder(data).then(res => {
+    if (res.data.code == 200) {
+      uni.$u.toast("车辆信息修改成功")
+      // 更新数据
+      handleOrderDetail(orderId.value)
+      // 关闭弹窗
+      carPopupShowFlag.value = false
+    }
+  }).catch(err => {
+    uni.$u.toast("修改失败，请重试")
+  })
+}
+
 /**
  * 初始化信息
  */
@@ -727,7 +761,7 @@ $custom-bottom-height: 200rpx;
           display: flex;
           align-items: center;
           justify-content: center;
-          background-color: #a9e08f;
+          background-color: #19a97c;
           border-radius: 100%;
         }
       }
@@ -764,4 +798,58 @@ $custom-bottom-height: 200rpx;
   align-items: center;
   justify-content: center;
 }
+
+// 弹出框
+.company-clean-container-car-popup {
+  min-height: 450rpx;
+  padding: $custom-page-padding;
+  box-sizing: border-box;
+
+  .company-clean-container-car-popup-content {
+    font-size: 28rpx;
+
+    .company-clean-container-car-popup-content-box {
+      box-sizing: border-box;
+      padding: $custom-page-padding;
+      border: 2rpx solid #19a97c;
+      border-radius: 10rpx;
+
+      .company-clean-container-car-popup-content-box-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin: 20rpx 0;
+        box-sizing: border-box;
+
+        .company-clean-container-car-popup-content-box-item-text {}
+
+        .company-clean-container-car-popup-content-box-item-number {}
+      }
+    }
+
+    .company-clean-container-car-popup-content-title {
+      color: $u-main-color;
+      box-sizing: border-box;
+      margin-bottom: 20rpx;
+      font-size: 30rpx;
+      font-weight: bold;
+    }
+  }
+
+  .company-clean-container-car-popup-button-safe {
+    width: 100%;
+    height: $custom-bottom-height;
+    box-sizing: border-box;
+    padding: 20rpx;
+
+    .company-clean-container-car-popup-button-safe-btn {
+      width: 100%;
+      height: 100%;
+      border-radius: 10rpx;
+      font-size: 30rpx;
+      line-height: 100rpx;
+      text-align: center;
+    }
+  }
+}
 </style>
@@ -11,12 +11,9 @@
               <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
             </view>
             <view style="display: flex;align-items: center;">
-              <text v-if="item.garOrderHandlerStatus != 3 && item.garOrderStatus === 3 && userType === '清运车辆驾驶员'"
-                style="font-size: small;color: #f56c6c;">订单已经完成了。</text>
               <view v-if="item.garOrderHandlerStatus === 0 && item.garCancelFlag === 0" class="right">待清运 </view>
               <view v-if="item.garCancelFlag === 1" class="right">已取消 </view>
               <view v-if="item.garOrderHandlerStatus === 1 && item.garCancelFlag === 0" class="right">清运中 </view>
-              <view v-if="item.garOrderHandlerStatus === 3 && userType === '清运车辆驾驶员'" class="right">已完成 </view>
             </view>
             <view v-if="item.garEvaluateFlag === 0 && userType === '用户'" class="right">待评价
             </view>
@@ -37,8 +34,7 @@
               <view class="delivery-time">预约时间 {{ item.garOrderAgreementTime }}</view>
             </view>
           </view>
-          <view class="bottom"
-            v-if="item.garOrderHandlerStatus === 0 && item.garCancelFlag === 0 && userType != '清运车辆驾驶员'">
+          <view class="bottom" v-if="item.garOrderHandlerStatus === 0 && item.garCancelFlag === 0">
             <view class="more">
               <!-- <u-icon name="more-dot-fill" color="rgb(203,203,203)"></u-icon> -->
             </view>
 <template>
-  <view>
-    <view class="u-flex u-flex-y-center u-flex-around user-box u-p-l-30 u-p-r-20 u-p-b-30">
-      <view class="u-m-r-10">
+  <view class="wode-container">
+    <view class="head-top-box">
+      <view class="head-image-box">
         <u-avatar :src="pic" size="140"></u-avatar>
       </view>
-      <view class="u-flex-1">
-        <view class="u-font-18 u-p-b-20">{{ userInfo.userType }}</view>
-        <view class="manager-info" v-if="userInfo.userType === '清运车辆驾驶员'">
+      <view style="display: flex; flex-direction: column; width: 100%;">
+        <view class="manager-info">
           <view class="manager-info-transport-company-name">
-            <text style="margin-right: 20rpx;">所属运输公司:</text>
-            <text>{{ userInfo.transportCompanyName }}</text>
-          </view>
-        </view>
-        <view class="manager-info" v-if="userInfo.userType === '运输企业负责人'">
-          <view class="manager-info-transport-company-name">
-            <text style="margin-right: 20rpx;">所属运输公司:</text>
-            <text>{{ userInfo.transportCompanyName }}</text>
+            <view class="">
+              <text>{{ userInfo.transportCompanyName }}</text>
+            </view>
           </view>
+          <view class="choose-type-item-text-right-label">{{ userInfo.userType }}</view>
         </view>
       </view>
     </view>
@@ -84,17 +79,28 @@ const handleLoginOut = () =&gt; {
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 page {
-  background-color: #ededed;
+  background-color: #19a97c;
 }
-.camera {
-  width: 54px;
-  height: 44px;
+.wode-container {
+  height: 100%;
+  box-sizing: border-box;
+  background: linear-gradient(to bottom, #19a97c, $u-bg-color, $u-bg-color, $u-bg-color, $u-bg-color, $u-bg-color, $u-bg-color);
+
+  .head-top-box {
+    margin-top: 100rpx;
+    display: flex;
+    align-items: center;
-  &:active {
-    background-color: #ededed;
+    .head-image-box {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 200rpx;
+      height: 200rpx;
+    }
   }
 }
@@ -111,21 +117,46 @@ page {
 }
 .manager-info {
-  font-size: 25rpx;
-  color: $u-main-color;
-  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: space-around;
+  color: white;
+
+  .choose-tyep-item-text-right-info {
+    font-size: 28rpx;
+  }
-  .manager-info-parent-company-name {
+  .choose-tyep-item-text-right-compay {
+    font-weight: bolder;
+    line-height: 35rpx;
+    font-size: 32rpx;
+  }
-    text {
-      color: $u-info;
-    }
+  .choose-type-item-text-right-label {
+    font-size: 23rpx;
+    padding: 8rpx 15rpx;
+    border-radius: 5rpx;
+    color: $u-info-dark;
+    font-weight: 600;
+    margin-bottom: 10rpx;
+    background: #ffffffad;
+    border: 3rpx solid white;
   }
+}
-  .manager-info-transport-company-name {
-    text {
-      color: $u-info;
-    }
+.manager-info-parent-company-name {
+
+  text {
+    color: $u-info;
   }
 }
+
+.manager-info-transport-company-name {
+  display: flex;
+  color: white;
+  line-height: 80rpx;
+}
 </style>
-
 <template>
 	<u-popup :show="show" mode="bottom" @close="closeHandler" :safeAreaInsetBottom="safeAreaInsetBottom" :round="round">
 		<view class="u-action-sheet">
@@ -9,8 +8,8 @@
 				</view>
 			</view>
 			<text class="u-action-sheet__description" :style="[{
-				marginTop: `${title && description ? 0 : '18px'}`
-			}]" v-if="description">{{ description }}</text>
+		marginTop: `${title && description ? 0 : '18px'}`
+	}]" v-if="description">{{ description }}</text>
 			<slot>
 				<u-line v-if="description"></u-line>
 				<view class="u-action-sheet__item-wrap">
@@ -223,7 +222,7 @@ $u-action-sheet-cancel-text-hover-background-color: rgb(242, 243, 245) !default;
 .u-reset-button-btn {
 	margin: 20rpx 0;
-	background-color: $u-success;
+	background-color: #19a97c;
 	width: $u-action-sheet-reset-button-width;
 	box-sizing: border-box;
 }
@@ -293,7 +292,7 @@ $u-action-sheet-cancel-text-hover-background-color: rgb(242, 243, 245) !default;
 	}
 	&--active {
-		background-color: $u-success-light;
+		background-color: #19a97b79;
 	}
 }
 </style>