更新

2c2c2c
1 parent 793dde09
Showing 13 changed files with 1157 additions and 976 deletions
.idea/.gitignore
.idea/garbage-removal.iml
.idea/misc.xml
.idea/modules.xml
.idea/vcs.xml
garbage-removal/.env.dev
garbage-removal/.env.local
garbage-removal/package-lock.json
garbage-removal/src/components/liu-delivery-time/liu-delivery-time.vue
garbage-removal/src/pages/home-info/clean/index.vue
garbage-removal/src/pages/home/index.vue
garbage-removal/src/pages/order-info/order-other/detail/index.vue
garbage-removal/src/pages/order/order-disposal/index.vue
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="zulu-1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/garbage-removal.iml" filepath="$PROJECT_DIR$/.idea/garbage-removal.iml" />
+    </modules>
+  </component>
+</project>
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
 \ No newline at end of file
-VITE_BASE_URL=http://localhost:8080/workflow
+VITE_BASE_URL=http://127.0.0.1:8080/workflow
-VITE_STOMP_URL=http://localhost:8080/ws
+VITE_STOMP_URL=http://127.0.0.1:8080/ws
-VITE_BASE_URL=http://localhost:8080/workflow
+VITE_BASE_URL=http://127.0.0.1:8080/workflow
 VITE_BASE_FILE_UPLOAD_PREFIX=/order/upload
-VITE_STOMP_URL=http://localhost:8080/ws
+VITE_STOMP_URL=http://127.0.0.1:8080/ws
@@ -22,6 +22,7 @@
         "@dcloudio/uni-mp-weixin": "3.0.0-3090620231104002",
         "@dcloudio/uni-mp-xhs": "3.0.0-3090620231104002",
         "@dcloudio/uni-quickapp-webview": "3.0.0-3090620231104002",
+        "axios": "^0.27.2",
         "clipboard": "^2.0.11",
         "dayjs": "^1.11.10",
         "js-md5": "^0.8.3",
@@ -4592,9 +4593,7 @@
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true,
-      "peer": true
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/autoprefixer": {
       "version": "10.4.16",
@@ -4633,6 +4632,29 @@
         "postcss": "^8.1.0"
       }
     },
+    "node_modules/axios": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "dependencies": {
+        "follow-redirects": "^1.14.9",
+        "form-data": "^4.0.0"
+      }
+    },
+    "node_modules/axios/node_modules/form-data": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/babel-jest": {
       "version": "27.5.1",
       "resolved": "https://registry.npmmirror.com/babel-jest/-/babel-jest-27.5.1.tgz",
@@ -5081,6 +5103,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
@@ -5246,8 +5280,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "peer": true,
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -5553,8 +5585,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -5635,6 +5665,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
@@ -5698,12 +5741,53 @@
         "is-arrayish": "^0.2.1"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-module-lexer": {
       "version": "1.3.1",
       "resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
       "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==",
       "license": "MIT"
     },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/esbuild": {
       "version": "0.16.17",
       "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.16.17.tgz",
@@ -6113,6 +6197,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/follow-redirects": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/form-data": {
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/form-data/-/form-data-3.0.1.tgz",
@@ -6233,16 +6336,23 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
-      "dev": true,
-      "license": "MIT",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6258,6 +6368,18 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz",
@@ -6336,13 +6458,11 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6376,12 +6496,10 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -6389,12 +6507,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -6409,10 +6528,9 @@
       "license": "MIT"
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
-      "license": "MIT",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -8956,6 +9074,14 @@
         "tmpl": "1.0.5"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
@@ -105,9 +105,9 @@ const getFutureDays = () =&gt; {
 		const day = date.getDate().toString().padStart(2, '0');
 		if (i === 0) {
 			let hours = new Date().getHours();
-			if (hours >= 13) {
-				continue;
-			}
+			// if (hours >= 13) {
+			// 	continue;
+			// }
 			days.push({
 				day: `${year}-${month}-${day}`,
 				timeList: getCurrentDayTimeList(9, hours, 1)
@@ -25,7 +25,7 @@
           </view>
           <view @click.stop="handleTimeChoose" class="company-clean-container-header-reservation">
             <view class="company-clean-container-header-reservation-left">
-              <text style="color: red;">*</text> <u-icon name="calendar" size="40"></u-icon>预约时间
+              <text style="color: red;">*</text> <u-icon name="calendar" size="40"></u-icon>123预约时间123
             </view>
             <view class="company-clean-container-header-reservation-right">
               <text style="margin-right: 10rpx;">{{ dayTime ? dayTime : "请选择时间" }}</text> <u-icon name="arrow-right"
@@ -69,14 +69,6 @@
               </view>
             </view>
-            <view class="company-clean-container-car-main-content-type" >
-              <view class="company-clean-container-car-main-content-type-price-area">
-                <text style="color: red;">*</text>预估费用:
-              </view>
-              <view style=" width:100%;display:flex; color:#909399; align-items: center;">
-                <u-number-box :min="0" :max="999999" integer buttonSize="46" :inputWidth="100"  :adjust-position="false"  :cursor-spacing="0"  v-model="paramFrom.garEstimatedCost"></u-number-box>
-               </view>
-            </view>
             <view class="company-clean-container-car-main-content-type">
               <view class="company-clean-container-car-main-content-type-price-area">
@@ -417,15 +409,6 @@ const orderClick = ref(true)
  * 处理下单
  */
 const handleOderSure = async () => {
-  if(null == paramFrom.value.garEstimatedCost|| "" == paramFrom.value.garEstimatedCost || undefined == paramFrom.value.garEstimatedCost){
-    jumpPrompt("预估费用不能为空");
-    
-    return;
-  }
-  if(paramFrom.value.garEstimatedCost<=0){
-    jumpPrompt("预估费用必须大于0");
-    return;
-  }
   let garCarInfos = [];
   for (const key in garCarInfoList.value) {
     if(garCarInfoList.value[key]&& garCarInfoList.value[key].garOrderCarNumber && garCarInfoList.value[key].garOrderCarNumber>0){
@@ -586,9 +569,6 @@ const validateParams = (params) =&gt; {
         case "garOrderAgreementTime":
           jumpPrompt('请选择预约时间')
           break;
-        case "garEstimatedCost":
-           jumpPrompt('请输入预估费用')
-           break;
         case "garOrderCompanyTel":
           jumpPrompt('企业负责人手机号不能为空')
           break;
@@ -383,6 +383,7 @@ onShow(() =&gt; {
   initData()
   let flag = uni.getStorageSync("refreshFlag");
   if(flag){
+	console.log(paging.value);
     paging.value.reload();
     uni.removeStorageSync("refreshFlag");
   }
 <template>
-  <clashDriverDispatch ref="clashDriverDispatchRef" :valueKey="'licensePlateNumber'"
-    :onconfirm="handleDriverDispatchConfirm" :dataList="driverPersonnelList">
-  </clashDriverDispatch>
-  <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">
-        <view class="order-detail-top-box">
-          <view class="order-detail-top-box-step">
-            <u-steps :current="currentStep(dataGram.garOrderHandlerStatus)" dot>
-              <u-steps-item title="待清运"></u-steps-item>
-              <u-steps-item title="清运中"></u-steps-item>
-              <u-steps-item title="已完成"></u-steps-item>
-            </u-steps>
-          </view>
-        </view>
-      </view>
-      <!-- 信息提示 -->
-      <view class="order-detail-container-box-card">
-        <text v-if="dataGram.garCancelFlag == 0" style="color: red;">请于交易完成后线下支付！！</text>
-        <view v-else style="display: flex; color:red;">
-          <u-icon name="close-circle" color="red"></u-icon>
-          <text> &nbsp;&nbsp;订单已被取消！原因：{{ dataGram.garReason }}</text>
-        </view>
-      </view>
-      <!-- 订单信息 -->
-      <view class="order-detail-container-box-card">
-        <view class="order-detail-container-header-card-title">
-          <view class="order-detail-container-header-card-uicon"></view>
-          订单信息
-        </view>
-        <view class="order-detail-container-header-item"
-          @click.stop="handlerJumpOtherApp(dataGram.garLatitude, dataGram.garLongitude, dataGram.garCoordinate)">
-          <text class="order-detail-container-header-title">清运地点：</text>
-          <view class="order-detail-container-header-content" style="text-decoration: underline">
-            <text selectable='true'>{{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}</text>
-          </view>
-        </view>
-        <view class="order-detail-container-header-item">
-          <text class="order-detail-container-header-title">现场图片：</text>
-          <view class="order-detail-container-header-content">
-            <u-upload width="180" height="130" :fileList="currentImages" name="3" multiple :maxCount="10"
-              :previewFullImage="true" :isReadOnly="true"></u-upload>
-          </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.garOrderCompanyName }}
-          </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.garOrderTrashType }}
-          </view>
-        </view>      
-
-       <view class="order-detail-container-header-item" v-for="(disposal,index) in dataGram.disposalSites">
-        <view>
-            <text class="order-detail-container-header-title" v-if="index == 0" >处置场地：</text>
-            <text class="order-detail-container-header-title" v-else >&emsp;&emsp;&emsp;&emsp;&emsp;</text>
-        </view>
-        <view class="order-detail-container-header-content" style="text-decoration: underline"  @click.stop="handlerJumpOtherApp(disposal.latitude, disposal.longitude, dataGram.garCoordinate)">
-          <text>{{ disposal.addrStr }}</text> 
-        </view>
-      </view>
-
-        <view class="order-detail-container-header-item">
-          <text class="order-detail-container-header-title">订单号：</text>
-          <view class="order-detail-container-header-content">
-            <text selectable="true">{{ orderId }}</text>
-          </view>
-          <!-- 生成二维码 -->
-          <view class="order-detail-container-header-qrCode" style="display: flex; align-items: center;">
-            <view @click="handleQrCodeClick(orderId)" class="iconfont icon-erweima-xian"></view>
-          </view>
-        </view>
-      </view>
-      <!-- 车辆信息 -->
-      <view class="order-detail-container-box-card">
-        <view class="order-detail-container-header-card-title">
-          <view class="order-detail-container-header-card-uicon"></view>
-          车辆信息
-        </view>
-        <view class="order-detail-container-header-item" style="justify-content: space-between;"
-          v-for="(item) in dataGram.garCarInfoList" :key="item.garId">
-          <text class="order-detail-container-header-title" style="color: #303133;">{{ item.garOrderCarType }}
-          </text>
-          <view class="order-detail-container-header-content">
-            <text class="order-detail-container-header-title">
-              {{ cleanStatus(dataGram.garOrderHandlerStatus) }}
-            </text>
-          </view>
-        </view>
-      </view>
-      <!-- 订单记录 -->
-      <view class="order-detail-container-box-card">
-        <view class="order-detail-container-header-card-title">
-          <view class="order-detail-container-header-card-uicon"></view>
-          订单人员
-        </view>
-        <!-- <view class="order-detail-container-header-item">
+	<clashDriverDispatch ref="clashDriverDispatchRef" :valueKey="'licensePlateNumber'"
+		:onconfirm="handleDriverDispatchConfirm" :dataList="driverPersonnelList">
+	</clashDriverDispatch>
+	<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">
+				<view class="order-detail-top-box">
+					<view class="order-detail-top-box-step">
+						<u-steps :current="currentStep(dataGram.garOrderHandlerStatus)" dot>
+							<u-steps-item title="待清运"></u-steps-item>
+							<u-steps-item title="清运中"></u-steps-item>
+							<u-steps-item title="已完成"></u-steps-item>
+						</u-steps>
+					</view>
+				</view>
+			</view>
+			<!-- 信息提示 -->
+			<view class="order-detail-container-box-card">
+				<text v-if="dataGram.garCancelFlag == 0" style="color: red;">请于交易完成后线下支付！！</text>
+				<view v-else style="display: flex; color:red;">
+					<u-icon name="close-circle" color="red"></u-icon>
+					<text> &nbsp;&nbsp;订单已被取消！原因：{{ dataGram.garReason }}</text>
+				</view>
+			</view>
+			<!-- 订单信息 -->
+			<view class="order-detail-container-box-card">
+				<view class="order-detail-container-header-card-title">
+					<view class="order-detail-container-header-card-uicon"></view>
+					订单信息
+				</view>
+				<view class="order-detail-container-header-item"
+					@click.stop="handlerJumpOtherApp(dataGram.garLatitude, dataGram.garLongitude, dataGram.garCoordinate)">
+					<text class="order-detail-container-header-title">清运地点：</text>
+					<view class="order-detail-container-header-content" style="text-decoration: underline">
+						<text selectable='true'>{{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}</text>
+					</view>
+				</view>
+				<view class="order-detail-container-header-item">
+					<text class="order-detail-container-header-title">现场图片：</text>
+					<view class="order-detail-container-header-content">
+						<u-upload width="180" height="130" :fileList="currentImages" name="3" multiple :maxCount="10"
+							:previewFullImage="true" :isReadOnly="true"></u-upload>
+					</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.garOrderCompanyName }}
+					</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.garOrderTrashType }}
+					</view>
+				</view>
+
+				<view class="order-detail-container-header-item" v-for="(disposal,index) in dataGram.disposalSites">
+					<view>
+						<text class="order-detail-container-header-title" v-if="index == 0">处置场地：</text>
+						<text class="order-detail-container-header-title" v-else>&emsp;&emsp;&emsp;&emsp;&emsp;</text>
+					</view>
+					<view class="order-detail-container-header-content" style="text-decoration: underline"
+						@click.stop="handlerJumpOtherApp(disposal.latitude, disposal.longitude, dataGram.garCoordinate)">
+						<text>{{ disposal.addrStr }}</text>
+					</view>
+				</view>
+
+				<view class="order-detail-container-header-item">
+					<text class="order-detail-container-header-title">订单号：</text>
+					<view class="order-detail-container-header-content">
+						<text selectable="true">{{ orderId }}</text>
+					</view>
+					<!-- 生成二维码 -->
+					<view class="order-detail-container-header-qrCode" style="display: flex; align-items: center;">
+						<view @click="handleQrCodeClick(orderId)" class="iconfont icon-erweima-xian"></view>
+					</view>
+				</view>
+			</view>
+			<!-- 车辆信息 -->
+			<view class="order-detail-container-box-card">
+				<view class="order-detail-container-header-card-title">
+					<view class="order-detail-container-header-card-uicon"></view>
+					车辆信息
+				</view>
+				<view class="order-detail-container-header-item" style="justify-content: space-between;"
+					v-for="(item) in dataGram.garCarInfoList" :key="item.garId">
+					<text class="order-detail-container-header-title" style="color: #303133;">{{ item.garOrderCarType }}
+					</text>
+					<view class="order-detail-container-header-content">
+						<text class="order-detail-container-header-title">
+							{{ cleanStatus(dataGram.garOrderHandlerStatus) }}
+						</text>
+					</view>
+				</view>
+			</view>
+			<!-- 订单记录 -->
+			<view class="order-detail-container-box-card">
+				<view class="order-detail-container-header-card-title">
+					<view class="order-detail-container-header-card-uicon"></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.garCreateTime }}
           </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.garOrderAgreementTime }}
-          </view>
-        </view>
-        <view class="order-detail-container-header-item">
-          <text class="order-detail-container-header-title">联系电话：</text>
-          <view class="order-detail-container-header-content">
-            <text selectable="true">{{ dataGram.garOrderContactTel }}</text>
-            <view class="icon-box" style="display: flex; align-items: center; justify-content: center;">
-              <u-icon v-if="dataGram.handleFlag" name="phone" size="28"
-                @click="handleContactClick(dataGram.garOrderContactTel)"></u-icon>
-            </view>
-          </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.garOrderContactName }}
-          </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.garEstimatedCost }}
-          </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.garRemark }}
-          </view>
-        </view>
-      </view>
-      <!-- 处理信息 -->
-      <view class="order-detail-container-box-card">
-        <view class="order-detail-container-header-card-title">
-          <view class="order-detail-container-header-card-uicon"></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">
-              <u-upload width="180" height="130" :fileList="putOnImages" name="3" multiple :maxCount="20"
-                :previewFullImage="true" :isReadOnly="true"></u-upload>
-            </view>
-          </view>
-          <view class="order-detail-container-header-item">
-            <text class=" order-detail-container-header-title">卸车照片：</text>
-            <view class="order-detail-container-header-content">
-              <u-upload width="180" height="130" :fileList="putDownImages" name="3" multiple :maxCount="20"
-                :previewFullImage="true" :isReadOnly="true"></u-upload>
-            </view>
-          </view>
-        </view>
-        <view v-else class="empty-image"
-          style="width: 100%; display: flex; justify-content: center; align-items: center;">
-          <image class="image-style" style="width: 200rpx; height: 200rpx;" :src="emptyBase64Image"></image>
-        </view>
-      </view>
-      <view class="space-box">{{ spaceStr }}</view>
-    </view>
-    <!-- 占位符 -->
-    <view class="order-detail-bottom">
-      <view class="order-detail-bottom-box">
-        <view class=" order-detail-bottom-left">
-          <u-button v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.garCancelFlag === 0"
-            @click="handleOderCancelClick()" shape="square" color="#19a97c" text="取消订单"></u-button>
-          <u-button
-            v-if="dataGram.garOrderScanHandlerFlag === 0 && userType == '用户' && dataGram.garOrderHandlerStatus != 3"
-            @click="handlerUpdateOrderClick()" shape="square" color="#19a97c" text="修改车辆信息"></u-button>
-          <u-button v-if="dataGram.garOrderHandlerStatus === 1 && userType == '运输企业负责人'"
-            @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="#19a97c" text="取消订单"></u-button>
-          <u-button @click="handleOrder(orderId)"
-            v-if="dataGram.garOrderHandlerStatus === 0 && dataGram.handleFlag && dataGram.garCancelFlag === 0 && userType === '运输企业负责人'"
-            shape="square" color="#19a97c" text="处理订单"></u-button>
-          <u-button @click="handleEvaluate(orderId, userType)"
-            v-if="dataGram.garEvaluateFlag === 0 && userType === '用户'" shape="square" color="#19a97c"
-            text="去评价"></u-button>
-          <u-button @click="handleEvaluateDetail(orderId, userType)"
-            v-if="dataGram.garHandlerEvaluateFlag === 0 && userType === '运输企业负责人'  && dataGram.haveEvaluateOfClient==1" shape="square" color="#19a97c"
-            text="查看评价"></u-button>
-          <u-button @click="handleEvaluateDetail(orderId, userType)"
-            v-if="dataGram.garHandlerEvaluateFlag === 1 && userType === '运输企业负责人'  && dataGram.haveEvaluateOfClient==1" shape="square" color="#19a97c"
-            text="查看评价"></u-button>
-          <u-button @click="handleEvaluateDetail(orderId, userType)"
-            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="#19a97c" text="分配处置场所"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-action-sheet :closeOnClickOverlay="true" :closeOnClickAction="false" @actionSheetClose="handleClose"
-      @submitFunction="submitFunction" @select="selectClick" :actions="list" round="15" title="取消订单" :show="cancelShow">
-    </u-action-sheet>
-  </view>
-  <view v-if="showUQRcode" class="mask-container" @click="showUQRcode = false">
-    <uqrcode :h5SaveIsDownload="true" ref="qrCodeRef" canvas-id="qrcode" :value="qrCodeText"
-      :options="{ margin: 10, boxSizing: borderBox }"></uqrcode>
-  </view>
+				<view class="order-detail-container-header-item">
+					<text class="order-detail-container-header-title">预约时间：</text>
+					<view class="order-detail-container-header-content">
+						{{ dataGram.garOrderAgreementTime }}
+					</view>
+				</view>
+				<view class="order-detail-container-header-item">
+					<text class="order-detail-container-header-title">联系电话：</text>
+					<view class="order-detail-container-header-content">
+						<text selectable="true">{{ dataGram.garOrderContactTel }}</text>
+						<view class="icon-box" style="display: flex; align-items: center; justify-content: center;">
+							<u-icon v-if="dataGram.handleFlag" name="phone" size="28"
+								@click="handleContactClick(dataGram.garOrderContactTel)"></u-icon>
+						</view>
+					</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.garOrderContactName }}
+					</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.garRemark }}
+					</view>
+				</view>
+			</view>
+			<!-- 处理信息 -->
+			<view class="order-detail-container-box-card">
+				<view class="order-detail-container-header-card-title">
+					<view class="order-detail-container-header-card-uicon"></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">
+							<u-upload width="180" height="130" :fileList="putOnImages" name="3" multiple :maxCount="20"
+								:previewFullImage="true" :isReadOnly="true"></u-upload>
+						</view>
+					</view>
+					<view class="order-detail-container-header-item">
+						<text class=" order-detail-container-header-title">卸车照片：</text>
+						<view class="order-detail-container-header-content">
+							<u-upload width="180" height="130" :fileList="putDownImages" name="3" multiple
+								:maxCount="20" :previewFullImage="true" :isReadOnly="true"></u-upload>
+						</view>
+					</view>
+				</view>
+				<view v-else class="empty-image"
+					style="width: 100%; display: flex; justify-content: center; align-items: center;">
+					<image class="image-style" style="width: 200rpx; height: 200rpx;" :src="emptyBase64Image"></image>
+				</view>
+			</view>
+			<view class="space-box">{{ spaceStr }}</view>
+		</view>
+		<!-- 占位符 -->
+		<view class="order-detail-bottom">
+			<view class="order-detail-bottom-box">
+				<view class=" order-detail-bottom-left">
+					<u-button
+						v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.garCancelFlag === 0"
+						@click="handleOderCancelClick()" shape="square" color="#19a97c" text="取消订单"></u-button>
+					<u-button
+						v-if="dataGram.garOrderScanHandlerFlag === 0 && userType == '用户' && dataGram.garOrderHandlerStatus != 3"
+						@click="handlerUpdateOrderClick()" shape="square" color="#19a97c" text="修改车辆信息"></u-button>
+					<u-button v-if="dataGram.garOrderHandlerStatus === 1 && userType == '运输企业负责人'"
+						@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="#19a97c" text="取消订单"></u-button>
+					<u-button @click="handleOrder(orderId)"
+						v-if="dataGram.garOrderHandlerStatus === 0 && dataGram.handleFlag && dataGram.garCancelFlag === 0 && userType === '运输企业负责人'"
+						shape="square" color="#19a97c" text="处理订单"></u-button>
+					<u-button @click="handleEvaluate(orderId, userType)"
+						v-if="dataGram.garEvaluateFlag === 0 && userType === '用户'" shape="square" color="#19a97c"
+						text="去评价"></u-button>
+					<u-button @click="handleEvaluateDetail(orderId, userType)"
+						v-if="dataGram.garHandlerEvaluateFlag === 0 && userType === '运输企业负责人'  && dataGram.haveEvaluateOfClient==1"
+						shape="square" color="#19a97c" text="查看评价"></u-button>
+					<u-button @click="handleEvaluateDetail(orderId, userType)"
+						v-if="dataGram.garHandlerEvaluateFlag === 1 && userType === '运输企业负责人'  && dataGram.haveEvaluateOfClient==1"
+						shape="square" color="#19a97c" text="查看评价"></u-button>
+					<u-button @click="handleEvaluateDetail(orderId, userType)"
+						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="#19a97c"
+						text="分配处置场所"></u-button>
+				</view>
+			</view>
+		</view>
+		<u-action-sheet :closeOnClickOverlay="true" :closeOnClickAction="false" @actionSheetClose="handleClose"
+			@submitFunction="submitFunction" @select="selectClick" :actions="list" round="15" title="取消订单"
+			:show="cancelShow">
+		</u-action-sheet>
+	</view>
+	<view v-if="showUQRcode" class="mask-container" @click="showUQRcode = false">
+		<uqrcode :h5SaveIsDownload="true" ref="qrCodeRef" canvas-id="qrcode" :value="qrCodeText"
+			:options="{ margin: 10, boxSizing: borderBox }"></uqrcode>
+	</view>
 </template>
 <script setup>
-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';
-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 paramFrom = ref({
-  carNumber: 0,
-  carType: ""
-})
-const garCarInfoList = ref({})
-const carPopupShowFlag = ref(false)
-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();
-const orderId = ref(null)
-const currentImages = ref([])
-const putOnImages = ref([])
-const putDownImages = ref([])
-const emptyBase64Image = ref(zStatic.base64Empty)
-const showUQRcode = ref(false)
-const spaceStr = ref("")
-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 = [
-    {
-      name: '订单信息填写有误',
-    },
-    {
-      name: '线下协商有问题',
-    },
-    {
-      name: '不需要清运了',
-    },
-    {
-      name: '其他',
-    },
-    {
-      name: '提交',
-    }
-  ]
-  if (userType.value === '用户') {
-    reason.unshift({
-      name: '长时间无人接单',
-    })
-  }
-  return reason
-})
-
-const handlePopupClick = (val) => {
-  carPopupShowFlag.value = val
-}
-// 创建二维码
-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-info/order-other/guest/index?orderId=" + orderId;
-  console.log(qrCodeRef.value);
-}
-// 获取二维码
-const handleQrCodeClick = (orderId) => {
-  // 微信小程序可用
-  // #ifdef MP-WEIXIN
-  createQrCode(orderId).then((res) => {
-    if (res.data.success) {
-      uni.previewImage({
-        urls: [res.data.data],
-        longPressActions: {
-          itemList: ['发送给朋友', '保存图片', '收藏'],
-          success: function (res) {
-            console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
-          },
-          fail: function (res) {
-            console.log(res);
-          }
-        }
-      })
-    }
-  })
-  // #endif
-  // H5
-  // #ifdef H5
-  createQrCodeLocal(orderId)
-  // #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("驾驶员分配成功！")
-    }
-  })
-}
-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("处理场所分配成功！")
-    }
-  })
-}
-
-
-
-const handleClose = (e) => {
-  cancelShow.value = false
-}
-const handleEvaluateDetail = (orderId, userType) => {
-  uni.$u.route(`pages/order-info/order-other/evaluate-info/index`,
-    { orderId: orderId, userType: userType })
-}
-const selectClick = (index) => {
-  currentCancelName.value = index.name;
-}
-const handleOrderDetail = (orderId) => {
-  queryOrderDetail(orderId).then(res => {
-    dataGram.value = res.data.data;
-    console.log(res.data.data);
-    currentImages.value = res.data.data.currentImages.map(item => {
-      return { url: import.meta.env.VITE_BASE_URL + item };
-    });
-    putOnImages.value = res.data.data.putOnImages.map(item => {
-      return { url: import.meta.env.VITE_BASE_URL + item };
-    });
-    putDownImages.value = res.data.data.putDownImages.map(item => {
-      return { url: import.meta.env.VITE_BASE_URL + item };
-    });
-  })
-}
-/**
- * 拨打电话回调
- */
-const handleContactClick = (val) => {
-  uni.makePhoneCall({ phoneNumber: val }).then(res => {
-  }).catch(err => { });
-}
-
-const handlerJumpOtherApp = (latitude, longitude, garCoordinate) => {
-  console.log(latitude+"=================>"+longitude);
-  // 给出提示确定要跳转吗
-  uni.showModal({
-    title: '提示',
-    content: '是否跳转到app定位进行导航？',
-    success: function (res) {
-      if (res.confirm) {
-        uni.openLocation({
-          latitude: latitude,
-          longitude: longitude,
-          success: function () {
-            console.log('success');
-          }
-        });
-      }
-    }
-  })
-}
-
-/**
- * 取消订单
- * @param {*} orderId
- */
-const handleOderCancelClick = () => {
-  cancelShow.value = true;
-}
-
-/**
- * 提交取消订单
- */
-const submitFunction = (otherReason) => {
-  let reason = otherReason
-  if (currentCancelName.value != "其他") {
-    reason = currentCancelName.value
-  }
-  if (!reason) {
-    uni.$u.toast("请提供取消订单的原因")
-    return
-  }
-  let params = {
-    garOrderId: orderId.value,
-    garCancelFlag: 1,
-    garReason: reason
-  }
-  updateOrder(params).then(res => {
-    if (res.data.success) {
-      cancelShow.value = false
-      uni.$u.toast(res.data.data)
-      uni.$u.route({
-        type: "reLaunch",
-        url: `pages/order/index`,
-      })
-    }
-  })
-}
-// 提交完成
-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) {
-      }
-    }
-  });
-
-}
-const handleEvaluate = (orderId, userType) => {
-  uni.$u.route(`pages/order-info/order-other/evaluate/index?orderId=${orderId}&userType=${userType}`)
-}
-
-// 接收订单
-const handleOrder = (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;
-  }
-  return step;
-}
-
-/**
- * 清运状态
- * @param {*} status
- */
-const cleanStatus = (status) => {
-  if (dataGram.garCancelFlag === 1) {
-    return '取消清运';
-  }
-  switch (status) {
-    case 0:
-      return '准备清运';
-    case 1:
-      return '正在清运';
-    case 3:
-      return '清运完成';
-  }
-}
-
-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 = () => {
-  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.carType] = item
-        return item.carType
-      }))
-    ]];
-    // 设置初始车辆数量
-    candidates.value[0].forEach((item, index) => {
-      garCarInfoList.value[item] = {
-        garOrderCarNumber: 0,
-        garOrderCarType: item,
-        id: garCarLabelInfoList.value[item].id,
-        containerVolume: garCarLabelInfoList.value[item].containerVolume
-      }
-    })
-    // 设置默认车辆
-    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) => {
-  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()
-  })
-}
-
-const submitUpdateCarInfo = () => {
-  let garCarInfos = [];
-  for (const key in garCarInfoList.value) {
-    garCarInfos.push(garCarInfoList.value[key])
-  }
-
-  let data = {
-    garOrderId: orderId.value,
-    garCarInfoList: garCarInfos,
-    updated: true
-  }
-  if(dataGram.value.garOrderAgreementTime){
-    let index = dataGram.value.garOrderAgreementTime.indexOf(' ')+1;
-    if(index > 0){
-      let val =  dataGram.value.garOrderAgreementTime.substring(index,dataGram.value.garOrderAgreementTime.length);
-
-      
-      if(val == "07:00-08:00" || val == "08:00-09:00"|| val == "09:00-10:00" || val == "10:00-11:00" || val == "11:00-12:00"|| val == "12:00-13:00" || val == "13:00-14:00"
-       || val == "14:00-15:00" || val == "15:00-16:00"|| val == "16:00-17:00"|| val == "17:00-18:00" || val == "18:00-19:00"|| val == "19:00-20:00"|| val == "20:00-21:00"
-       || val == "21:00-22:00"){
-          let size = garCarInfos.length;
-          for (let index = 0; index < size; index++) {
-            if((garCarInfos[index].containerVolume=="8" || parseInt(garCarInfos[index].containerVolume) >=8) && garCarInfos[index].garOrderCarNumber > 0){
-              console.log(garCarInfos[index]);
-  
-              jumpPrompt("中大型车辆只能选择22:00-07:00时间段");
-              return;
-            }
-            
-          }
-       }
-      
-    }
-   
-  }
-  console.log(dataGram.value.garOrderAgreementTime );
-  console.log(garCarInfos);
-  console.log("=================================>");
-  
-
-  updateOrder(data).then(res => {
-    if (res.data.code == 200) {
-      uni.$u.toast("车辆信息修改成功")
-      // 更新数据
-      handleOrderDetail(orderId.value)
-      // 关闭弹窗
-      carPopupShowFlag.value = false
-    }
-  }).catch(err => {
-    uni.$u.toast("修改失败，请重试")
-  })
-}
-
-
-
-const jumpPrompt = (msg) => {
-  uni.showModal({
-    title: '提示',
-    content: msg,
-    showCancel: false,
-    success: function (res) {
-      if (res.confirm) {
-      } else if (res.cancel) {
-      }
-    }
-  });
-}
-
-/**
- * 初始化信息
- */
-onLoad((options) => {
-  orderId.value = options.orderId
-  handleOrderDetail(orderId.value)
-})
-
-onShow(() => {
-  try {
-    if (isOnloadIn.value) {
-      handleOrderDetail(orderId.value)
-    } else {
-      isOnloadIn.value = true
-    }
-  } catch (error) {
-    console.log(error);
-  }
-})
+	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';
+	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 paramFrom = ref({
+		carNumber: 0,
+		carType: ""
+	})
+	const garCarInfoList = ref({})
+	const carPopupShowFlag = ref(false)
+	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();
+	const orderId = ref(null)
+	const currentImages = ref([])
+	const putOnImages = ref([])
+	const putDownImages = ref([])
+	const emptyBase64Image = ref(zStatic.base64Empty)
+	const showUQRcode = ref(false)
+	const spaceStr = ref("")
+	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 = [{
+				name: '订单信息填写有误',
+			},
+			{
+				name: '线下协商有问题',
+			},
+			{
+				name: '不需要清运了',
+			},
+			{
+				name: '其他',
+			},
+			{
+				name: '提交',
+			}
+		]
+		if (userType.value === '用户') {
+			reason.unshift({
+				name: '长时间无人接单',
+			})
+		}
+		return reason
+	})
+
+	const handlePopupClick = (val) => {
+		carPopupShowFlag.value = val
+	}
+	// 创建二维码
+	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-info/order-other/guest/index?orderId=" + orderId;
+		console.log(qrCodeRef.value);
+	}
+	// 获取二维码
+	const handleQrCodeClick = (orderId) => {
+		// 微信小程序可用
+		// #ifdef MP-WEIXIN
+		createQrCode(orderId).then((res) => {
+			if (res.data.success) {
+				uni.previewImage({
+					urls: [res.data.data],
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(res) {
+							console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+						},
+						fail: function(res) {
+							console.log(res);
+						}
+					}
+				})
+			}
+		})
+		// #endif
+		// H5
+		// #ifdef H5
+		createQrCodeLocal(orderId)
+		// #endif
+	}
+
+	const handleOrderDispatchClick = (orderId) => {
+		// 获取驾驶员人员
+		queryOrderDispatch(orderId).then(res => {
+			console.log(res.data.data);
+			if (res.data.success) {
+				// 过滤车辆  非用户选择的车辆无法选中
+				driverPersonnelList.value = res.data.data
+				clashDriverDispatchRef.value.open(res.data.data)
+			} else {
+				uni.$u.toast("驾驶员分配成功！")
+			}
+		})
+	}
+	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("处理场所分配成功！")
+			}
+		})
+	}
+
+
+
+	const handleClose = (e) => {
+		cancelShow.value = false
+	}
+	const handleEvaluateDetail = (orderId, userType) => {
+		uni.$u.route(`pages/order-info/order-other/evaluate-info/index`, {
+			orderId: orderId,
+			userType: userType
+		})
+	}
+	const selectClick = (index) => {
+		currentCancelName.value = index.name;
+	}
+	const handleOrderDetail = (orderId) => {
+		queryOrderDetail(orderId).then(res => {
+			dataGram.value = res.data.data;
+			console.log(res.data.data);
+			currentImages.value = res.data.data.currentImages.map(item => {
+				return {
+					url: import.meta.env.VITE_BASE_URL + item
+				};
+			});
+			putOnImages.value = res.data.data.putOnImages.map(item => {
+				return {
+					url: import.meta.env.VITE_BASE_URL + item
+				};
+			});
+			putDownImages.value = res.data.data.putDownImages.map(item => {
+				return {
+					url: import.meta.env.VITE_BASE_URL + item
+				};
+			});
+		})
+	}
+	/**
+	 * 拨打电话回调
+	 */
+	const handleContactClick = (val) => {
+		uni.makePhoneCall({
+			phoneNumber: val
+		}).then(res => {}).catch(err => {});
+	}
+
+	const handlerJumpOtherApp = (latitude, longitude, garCoordinate) => {
+		console.log(latitude + "=================>" + longitude);
+		// 给出提示确定要跳转吗
+		uni.showModal({
+			title: '提示',
+			content: '是否跳转到app定位进行导航？',
+			success: function(res) {
+				if (res.confirm) {
+					uni.openLocation({
+						latitude: latitude,
+						longitude: longitude,
+						success: function() {
+							console.log('success');
+						}
+					});
+				}
+			}
+		})
+	}
+
+	/**
+	 * 取消订单
+	 * @param {*} orderId
+	 */
+	const handleOderCancelClick = () => {
+		cancelShow.value = true;
+	}
+
+	/**
+	 * 提交取消订单
+	 */
+	const submitFunction = (otherReason) => {
+		let reason = otherReason
+		if (currentCancelName.value != "其他") {
+			reason = currentCancelName.value
+		}
+		if (!reason) {
+			uni.$u.toast("请提供取消订单的原因")
+			return
+		}
+		let params = {
+			garOrderId: orderId.value,
+			garCancelFlag: 1,
+			garReason: reason
+		}
+		updateOrder(params).then(res => {
+			if (res.data.success) {
+				cancelShow.value = false
+				uni.$u.toast(res.data.data)
+				uni.$u.route({
+					type: "reLaunch",
+					url: `pages/order/index`,
+				})
+			}
+		})
+	}
+	// 提交完成
+	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) {}
+			}
+		});
+
+	}
+	const handleEvaluate = (orderId, userType) => {
+		uni.$u.route(`pages/order-info/order-other/evaluate/index?orderId=${orderId}&userType=${userType}`)
+	}
+
+	// 接收订单
+	const handleOrder = (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;
+		}
+		return step;
+	}
+
+	/**
+	 * 清运状态
+	 * @param {*} status
+	 */
+	const cleanStatus = (status) => {
+		if (dataGram.garCancelFlag === 1) {
+			return '取消清运';
+		}
+		switch (status) {
+			case 0:
+				return '准备清运';
+			case 1:
+				return '正在清运';
+			case 3:
+				return '清运完成';
+		}
+	}
+
+	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 = () => {
+		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.carType] = item
+						return item.carType
+					}))]
+			];
+			// 设置初始车辆数量
+			candidates.value[0].forEach((item, index) => {
+				garCarInfoList.value[item] = {
+					garOrderCarNumber: 0,
+					garOrderCarType: item,
+					id: garCarLabelInfoList.value[item].id,
+					containerVolume: garCarLabelInfoList.value[item].containerVolume
+				}
+			})
+			// 设置默认车辆
+			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) => {
+		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()
+		})
+	}
+
+	const submitUpdateCarInfo = () => {
+		let garCarInfos = [];
+		for (const key in garCarInfoList.value) {
+			garCarInfos.push(garCarInfoList.value[key])
+		}
+
+		let data = {
+			garOrderId: orderId.value,
+			garCarInfoList: garCarInfos,
+			updated: true
+		}
+		if (dataGram.value.garOrderAgreementTime) {
+			let index = dataGram.value.garOrderAgreementTime.indexOf(' ') + 1;
+			if (index > 0) {
+				let val = dataGram.value.garOrderAgreementTime.substring(index, dataGram.value.garOrderAgreementTime
+					.length);
+
+
+				if (val == "07:00-08:00" || val == "08:00-09:00" || val == "09:00-10:00" || val == "10:00-11:00" ||
+					val == "11:00-12:00" || val == "12:00-13:00" || val == "13:00-14:00" ||
+					val == "14:00-15:00" || val == "15:00-16:00" || val == "16:00-17:00" || val == "17:00-18:00" ||
+					val == "18:00-19:00" || val == "19:00-20:00" || val == "20:00-21:00" ||
+					val == "21:00-22:00") {
+					let size = garCarInfos.length;
+					for (let index = 0; index < size; index++) {
+						if ((garCarInfos[index].containerVolume == "8" || parseInt(garCarInfos[index]
+								.containerVolume) >= 8) && garCarInfos[index].garOrderCarNumber > 0) {
+							console.log(garCarInfos[index]);
+
+							jumpPrompt("中大型车辆只能选择22:00-07:00时间段");
+							return;
+						}
+
+					}
+				}
+
+			}
+
+		}
+		console.log(dataGram.value.garOrderAgreementTime);
+		console.log(garCarInfos);
+		console.log("=================================>");
+
+
+		updateOrder(data).then(res => {
+			if (res.data.code == 200) {
+				uni.$u.toast("车辆信息修改成功")
+				// 更新数据
+				handleOrderDetail(orderId.value)
+				// 关闭弹窗
+				carPopupShowFlag.value = false
+			}
+		}).catch(err => {
+			uni.$u.toast("修改失败，请重试")
+		})
+	}
+
+
+
+	const jumpPrompt = (msg) => {
+		uni.showModal({
+			title: '提示',
+			content: msg,
+			showCancel: false,
+			success: function(res) {
+				if (res.confirm) {} else if (res.cancel) {}
+			}
+		});
+	}
+
+	/**
+	 * 初始化信息
+	 */
+	onLoad((options) => {
+		orderId.value = options.orderId
+		handleOrderDetail(orderId.value)
+	})
+
+	onShow(() => {
+		try {
+			if (isOnloadIn.value) {
+				handleOrderDetail(orderId.value)
+			} else {
+				isOnloadIn.value = true
+			}
+		} catch (error) {
+			console.log(error);
+		}
+	})
 </script>
 <style lang="scss" scoped>
-$custom-marin-bottom: 20rpx;
-$custom-page-padding: 20rpx;
-$custom-border-radio: 20rpx;
-$custom-bottom-height: 200rpx;
-
-@mixin card {
-  padding: $custom-page-padding;
-  box-sizing: border-box;
-  background-color: #ffffff;
-  border-radius: $custom-border-radio;
-  margin-bottom: $custom-marin-bottom;
-}
-
-.order-detail-container {
-  height: 100%;
-  width: 100%;
-  background-color: $u-info-light;
-  box-sizing: border-box;
-  overflow-y: scroll;
-  background: linear-gradient(to bottom, #19a97c, $u-info-light, $u-info-light, $u-info-light);
-
-
-  .order-detail-container-box {
-    height: 100%;
-    width: 100%;
-    padding: $custom-page-padding;
-    box-sizing: border-box;
-
-    .order-detail-top {
-      @include card();
-
-      .order-detail-top-box {
-        .order-detail-top-box-step {
-          u-steps {
-            u-steps-item {}
-          }
-        }
-      }
-    }
-
-    .order-detail-container-box-card {
-      @include card();
-
-      .order-detail-container-header-card-title {
-        font-weight: bold;
-        line-height: 80rpx;
-        border-bottom: 3rpx solid $u-info-light;
-        margin-bottom: $custom-marin-bottom;
-        color: $u-primary;
-        display: flex;
-        align-items: center;
-
-        .order-detail-container-header-card-uicon {
-          background-color: $u-primary;
-          margin-right: 10rpx;
-          height: 35rpx;
-          width: 15rpx;
-        }
-      }
-
-      .order-detail-container-header-item {
-        display: flex;
-        margin-bottom: $custom-marin-bottom;
-
-        // font-size: 30rpx;
-        // font-weight: bold;
-        // color: $u-main-color;
-        .order-detail-container-header-title {
-          color: $u-main-color;
-          white-space: nowrap; //溢出不换行
-          color: $u-info;
-        }
-
-        .order-detail-container-header-content {
-          display: flex;
-        }
-      }
-    }
-  }
-
-
-  .space-box {
-    padding-bottom: $custom-bottom-height;
-    margin-bottom: 40rpx;
-  }
-
-
-  .order-detail-bottom {
-    position: absolute;
-    width: 100%;
-    // height: 100%;
-    bottom: 0;
-    left: 0;
-
-    .movableAreaDetail {
-      pointer-events: none;
-      position: fixed;
-      left: 0;
-      top: 0;
-      width: 100%;
-      height: calc(100% - $custom-bottom-height);
-      z-index: 999;
-
-      .movableView {
-        pointer-events: auto;
-        min-height: 60rpx;
-        min-width: 60rpx;
-
-        .order-detail-call-box-container {
-          min-height: 60rpx;
-          min-width: 60rpx;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          background-color: #19a97c;
-          border-radius: 100%;
-        }
-      }
-    }
-
-    .order-detail-bottom-box {
-      height: $custom-bottom-height;
-      padding: 50rpx;
-      box-sizing: border-box;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .order-detail-bottom-left {
-        min-width: 200rpx;
-      }
-
-      .order-detail-bottom-right {
-        min-width: 200rpx;
-      }
-    }
-  }
-}
-
-.mask-container {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 999;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
-  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>
+	$custom-marin-bottom: 20rpx;
+	$custom-page-padding: 20rpx;
+	$custom-border-radio: 20rpx;
+	$custom-bottom-height: 200rpx;
+
+	@mixin card {
+		padding: $custom-page-padding;
+		box-sizing: border-box;
+		background-color: #ffffff;
+		border-radius: $custom-border-radio;
+		margin-bottom: $custom-marin-bottom;
+	}
+
+	.order-detail-container {
+		height: 100%;
+		width: 100%;
+		background-color: $u-info-light;
+		box-sizing: border-box;
+		overflow-y: scroll;
+		background: linear-gradient(to bottom, #19a97c, $u-info-light, $u-info-light, $u-info-light);
+
+
+		.order-detail-container-box {
+			height: 100%;
+			width: 100%;
+			padding: $custom-page-padding;
+			box-sizing: border-box;
+
+			.order-detail-top {
+				@include card();
+
+				.order-detail-top-box {
+					.order-detail-top-box-step {
+						u-steps {
+							u-steps-item {}
+						}
+					}
+				}
+			}
+
+			.order-detail-container-box-card {
+				@include card();
+
+				.order-detail-container-header-card-title {
+					font-weight: bold;
+					line-height: 80rpx;
+					border-bottom: 3rpx solid $u-info-light;
+					margin-bottom: $custom-marin-bottom;
+					color: $u-primary;
+					display: flex;
+					align-items: center;
+
+					.order-detail-container-header-card-uicon {
+						background-color: $u-primary;
+						margin-right: 10rpx;
+						height: 35rpx;
+						width: 15rpx;
+					}
+				}
+
+				.order-detail-container-header-item {
+					display: flex;
+					margin-bottom: $custom-marin-bottom;
+
+					// font-size: 30rpx;
+					// font-weight: bold;
+					// color: $u-main-color;
+					.order-detail-container-header-title {
+						color: $u-main-color;
+						white-space: nowrap; //溢出不换行
+						color: $u-info;
+					}
+
+					.order-detail-container-header-content {
+						display: flex;
+					}
+				}
+			}
+		}
+
+
+		.space-box {
+			padding-bottom: $custom-bottom-height;
+			margin-bottom: 40rpx;
+		}
+
+
+		.order-detail-bottom {
+			position: absolute;
+			width: 100%;
+			// height: 100%;
+			bottom: 0;
+			left: 0;
+
+			.movableAreaDetail {
+				pointer-events: none;
+				position: fixed;
+				left: 0;
+				top: 0;
+				width: 100%;
+				height: calc(100% - $custom-bottom-height);
+				z-index: 999;
+
+				.movableView {
+					pointer-events: auto;
+					min-height: 60rpx;
+					min-width: 60rpx;
+
+					.order-detail-call-box-container {
+						min-height: 60rpx;
+						min-width: 60rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						background-color: #19a97c;
+						border-radius: 100%;
+					}
+				}
+			}
+
+			.order-detail-bottom-box {
+				height: $custom-bottom-height;
+				padding: 50rpx;
+				box-sizing: border-box;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.order-detail-bottom-left {
+					min-width: 200rpx;
+				}
+
+				.order-detail-bottom-right {
+					min-width: 200rpx;
+				}
+			}
+		}
+	}
+
+	.mask-container {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 999;
+		background-color: rgba(0, 0, 0, 0.5);
+		display: flex;
+		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>
 \ No newline at end of file
@@ -96,12 +96,12 @@ const handleScan = () =&gt; {
           })
         }
       } catch (error) {
-        uni.$u.toast("无法确认当前二维码趟次，请扫描正在进行的运输趟次");
+        uni.$u.toast("无法确认当前二维码趟次，请扫描正在进行的运输趟次123");
         console.log("===================>weixin");
       }
     },
     fail:function (res) {
-      uni.$u.toast("图片扫码失败，请检查二维码图片");
+      uni.$u.toast("图片扫码失败，请检查二维码图片123");
       console.log("===================>weixin");
     }
   });
@@ -248,4 +248,4 @@ onMounted(() =&gt; {
     }
   }
 }
 -</style>
+</style>
 \ No newline at end of file