|  |  | 
 |  |  |       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) { |