From 2ada220ed30569d8ae39aac210a1976724dcbe66 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 18 七月 2025 08:54:00 +0800
Subject: [PATCH] 用工运货接口对接
---
small-program/unpackage/dist/dev/mp-weixin/pages/packaging-worker/packaging-worker.js | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/packaging-worker/packaging-worker.js b/small-program/unpackage/dist/dev/mp-weixin/pages/packaging-worker/packaging-worker.js
index fc2208a..952c4ee 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/packaging-worker/packaging-worker.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/packaging-worker/packaging-worker.js
@@ -109,7 +109,11 @@
return Promise.all(/*! import() | node-modules/uview-ui/components/u-calendar/u-calendar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-calendar/u-calendar")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-calendar/u-calendar.vue */ 396))
},
uPicker: function () {
+<<<<<<< HEAD
return Promise.all(/*! import() | node-modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-picker/u-picker.vue */ 423))
+=======
+ return Promise.all(/*! import() | node-modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-picker/u-picker.vue */ 553))
+>>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
},
}
} catch (e) {
--
Gitblit v1.9.3