驾驶员新增载运量

lichao
1 parent 882a21af
Showing 4 changed files with 22 additions and 10 deletions
garbage-removal/package-lock.json
garbage-removal/src/pages/order-info/order-driver/upload/index.vue
garbage-removal/src/pages/order/order-driver/swiper-list-item/index.vue
garbage-removal/yarn.lock
@@ -4668,7 +4668,7 @@
     },
     "node_modules/axios": {
       "version": "0.27.2",
-      "resolved": "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
       "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
       "dependencies": {
         "follow-redirects": "^1.14.9",
@@ -83,7 +83,14 @@
 	})
  
 	const takeLocation = () => {
-		console.log("获取定位信息");
+		// 添加定位超时处理
+		setInterval(() => {
+			if (!location.value.latitude) {
+				uni.$u.toast("定位获取超时，请检查权限");
+			}else{
+				uni.$u.toast(location.value.longitude,location.value.latitude);
+			}
+		}, 5000);
 		// 获取定位信息
 		window.JsInterface.takeLocation();
 	}
@@ -179,7 +186,6 @@
 			}
  
 			if(typeof(location.value.latitude) === 'undefined'){
-				console.log('定位获取失败');
 				uni.$u.toast("需要位置权限才能提交");
 				return;
 			}
@@ -23,8 +23,9 @@
               <view class="title u-line-2">{{ item.garOrderAddress + item.garOrderAddressDetails }}</view>
               <view class="type">垃圾类型: {{ item.garOrderTrashType }}</view>
               <view class="delivery-time">预约时间 {{ item.garOrderAgreementTime }}</view>
+              <view style="font-size: 24rpx;color: #19a97c;text-align: end;">载运量{{ item.garRealCarCount }}</view>
             </view>
-          </view>
+          </view>     
         </view>
       </view>
     </z-paging>
@@ -1417,6 +1417,16 @@
     "picocolors" "^1.0.0"
     "terser" "^5.4.0"
  
+"@esbuild/win32-x64@0.16.17":
+  "integrity" "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q=="
+  "resolved" "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz"
+  "version" "0.16.17"
+
+"@esbuild/win32-x64@0.17.19":
+  "integrity" "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA=="
+  "resolved" "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz"
+  "version" "0.17.19"
+
 "@intlify/core-base@9.1.9":
   "integrity" "sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw=="
   "resolved" "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.1.9.tgz"
@@ -2663,7 +2673,7 @@
  
 "axios@^0.27.2":
   "integrity" "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="
-  "resolved" "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz"
+  "resolved" "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"
   "version" "0.27.2"
   dependencies:
     "follow-redirects" "^1.14.9"
@@ -3677,11 +3687,6 @@
   "resolved" "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
   "version" "1.0.0"
  
-"fsevents@^2.3.2", "fsevents@~2.3.2":
-  "integrity" "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="
-  "resolved" "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz"
-  "version" "2.3.3"
-
 "function-bind@^1.1.2":
   "integrity" "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
   "resolved" "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz"