XXXX

pages/order/order.vue

@@ -12,7 +12,8 @@
 						<view class="noOrder" v-if="dataA.length < 1">
 							暂无订单～～
 						</view>
-						<view class="card" @click=" isAdmin? info(item) : ''"  v-for="(item,index) in dataA" :key="index">
+						<view class="card" @click=" isAdmin? info(item) : ''" v-for="(item,index) in dataA"
+							:key="index">
 							<view class="row">
 								<view style="width:20%;">
 									<view
@@ -103,7 +104,11 @@
 										¥{{item.real_amount}}
 									</view>
 								</view>
-								<view class="row half"></view>
+								<view class="row half make-order">
+									<view class="btn" v-if="orderStatus === '手动派单'" @click.stop="doMakeOrder(item)">
+										手动派单
+									</view>
+								</view>
 							</view>
 						</view>
 					</scroll-view>
@@ -572,18 +577,18 @@
 									</view>
 									<view class="text red">
 										¥{{item.real_amount}}
-									</view>
-								</view>
-								<view class="row half" style="justify-content: flex-end;">
-									<view class="btn" @click.stop="del(item.id)">
-										删除
-									</view>
-								</view>
-							</view>
-							<view class="row border" v-if="!isAdmin">
-								<view class="btn" @click.stop="del(item.id)">
-									删除
-								</view>
+									</view>
+								</view>
+								<view class="row half" style="justify-content: flex-end;">
+									<view class="btn" @click.stop="del(item.id)">
+										删除
+									</view>
+								</view>
+							</view>
+							<view class="row border" v-if="!isAdmin">
+								<view class="btn" @click.stop="del(item.id)">
+									删除
+								</view>
 							</view>
 						</view>
 					</scroll-view>
@@ -610,6 +615,10 @@
 			</view>
 		</u-popup>
 
+		<!-- 手动派单选择人员 -->
+		<u-select safe-area-inset-bottom="true" title="取宠人-----送宠人" v-model="checkUser" :list="all_data"
+			:label-name="'name'" :value-name="'id'" mode="mutil-column" @confirm="checkUsered">
+		</u-select>
 	</view>
 </template>
 
@@ -660,12 +669,19 @@
 				// 是否是管理员
 				isAdmin: false,
 				// 顶部高度
-				headerHeight: ''
+				headerHeight: '',
+				// 当前派单状态
+				orderStatus: "",
+				checkUser: false,
+				from_data: [],
+				to_data: [],
+				all_data: [],
+				checkId: ''
 			}
 		},
 		watch: {
 			type(e) {
-				this.getData()
+				this.getData()
 				this.getDataNum()
 			},
 			current(e) {
@@ -687,22 +703,102 @@
 			// this.getData()
 			// 获取订单数量
 			// this.getDataNum()
-			
+			// 
 		},
 		onShow() {
-			this.getData()
-			this.getDataNum()
-			let data = getApp().globalData
-			this.isAdmin = data.isAdmin
-			if (!this.isAdmin) {
-				this.getInfo()
+			let data = getApp().globalData
+			this.isAdmin = data.isAdmin
+			if (!this.isAdmin) {
+				this.getInfo()
 			}
+			this.getData()
+			this.getDataNum()
+			// 获取派单状态
+			this.getOrderStatus()
 		},
 		onPullDownRefresh() {
 			this.getDataNum()
 			this.getData()
 		},
 		methods: {
+			// 选择配送员
+			checkUsered(e) {
+				let _this = this
+				if (e[0].value !== null && e[1].value !== null) {
+					this.request('/admin_order/give', {
+						id: _this.checkId,
+						get_user_id: e[0].value,
+						send_user_id: e[1].value
+					}, 'get').then(res => {
+						if (res.code === 1) {
+							uni.showToast({
+								title: '派单成功',
+								icon: "none"
+							})
+							_this.getDataNum()
+							_this.getData()
+						} else {
+							uni.showToast({
+								title: '派单失败',
+								icon: "none"
+							})
+							_this.getDataNum()
+							_this.getData()
+						}
+					});
+				} else {
+					uni.showToast({
+						title: '请选择取宠人和送宠人',
+						icon: "none"
+					})
+				}
+			},
+			// 选择手动派单
+			doMakeOrder(data) {
+				console.log(data.from_city, data.to_city)
+				let _this = this;
+				_this.checkId = data.id;
+				// 获取可以选择的取宠人
+				this.request('/admin_user/senders', {
+					areas: data.from_city
+				}, 'get').then(res => {
+					if (res.code === 1) {
+						_this.from_data = res.data.data
+						_this.all_data[0] = res.data.data
+						_this.$forceUpdate()
+					}
+				});
+				// 获取可以选择的送宠人
+				this.request('/admin_user/senders', {
+					areas: data.to_city
+				}, 'get').then(res => {
+					if (res.code === 1) {
+						_this.to_data = res.data.data
+						_this.all_data[1] = res.data.data
+						_this.$forceUpdate()
+					}
+				});
+				uni.showModal({
+					title: "提示",
+					content: "请选择接送人员进行手动派单",
+					success(e) {
+						if (e.confirm) {
+							_this.checkUser = true
+							_this.$forceUpdate()
+						}
+					}
+				})
+			},
+			// 获取派单状态
+			getOrderStatus() {
+				this.request('/admin_config/get_config', '', 'get').then(res => {
+					if (res.data.order_way === 'manual') {
+						this.orderStatus = "手动派单"
+					} else {
+						this.orderStatus = "自动派单"
+					}
+				});
+			},
 			// 运行详情
 			transport(id) {
 				uni.navigateTo({
@@ -1006,6 +1102,10 @@
 			}
 		}
 
+		.make-order {
+			justify-content: flex-end;
+		}
+
 		.border {
 			border-top: 1px #eee solid;
 			display: flex;

unpackage/dist/dev/mp-weixin/app.json

@@ -1,35 +1,34 @@
 {
-    "pages": [
-        "pages/login/login",
-        "pages/index/index",
-        "pages/refund/refund",
-        "pages/turnover/turnover",
-        "pages/turnover/info",
-        "pages/order/order",
-        "pages/order/info",
-        "pages/Marketing/Marketing",
-        "pages/order/transport",
-        "pages/Marketing/coupon",
-        "pages/Marketing/vipers",
-        "pages/Delivery/Delivery",
-        "pages/Delivery/create",
-        "pages/order/perfect",
-        "pages/order/video",
-        "pages/Delivery/location",
-        "pages/mine/mine",
-        "pages/mine/password",
-        "pages/mine/Withdrawal",
-        "pages/order/settle",
-        "pages/webview/webview"
-    ],
-    "subPackages": [],
-    "window": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "uni-app",
-        "navigationBarBackgroundColor": "#F8F8F8",
-        "backgroundColor": "#F8F8F8"
-    },
-    "permission": {},
-    "usingComponents": {},
-    "sitemapLocation": "sitemap.json"
+  "pages": [
+    "pages/login/login",
+    "pages/index/index",
+    "pages/refund/refund",
+    "pages/turnover/turnover",
+    "pages/turnover/info",
+    "pages/order/order",
+    "pages/order/info",
+    "pages/Marketing/Marketing",
+    "pages/order/transport",
+    "pages/Marketing/coupon",
+    "pages/Marketing/vipers",
+    "pages/Delivery/Delivery",
+    "pages/Delivery/create",
+    "pages/order/perfect",
+    "pages/order/video",
+    "pages/Delivery/location",
+    "pages/mine/mine",
+    "pages/mine/password",
+    "pages/mine/Withdrawal",
+    "pages/order/settle",
+    "pages/webview/webview"
+  ],
+  "subPackages": [],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8"
+  },
+  "permission": {},
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/u-header":1,"uview-ui/components/u-input/u-input":1,"uview-ui/components/u-picker/u-picker":1,"uview-ui/components/u-icon/u-icon":1,"uview-ui/components/u-subsection/u-subsection":1,"uview-ui/components/u-tabs/u-tabs":1,"uview-ui/components/u-popup/u-popup":1,"uview-ui/components/u-search/u-search":1,"uview-ui/components/u-switch/u-switch":1,"uview-ui/components/u-checkbox-group/u-checkbox-group":1,"uview-ui/components/u-checkbox/u-checkbox":1,"uview-ui/components/u-index-anchor/u-index-anchor":1,"uview-ui/components/u-index-list/u-index-list":1,"uview-ui/components/u-form-item/u-form-item":1,"uview-ui/components/u-form/u-form":1,"uview-ui/components/u-radio-group/u-radio-group":1,"uview-ui/components/u-radio/u-radio":1,"uview-ui/components/u-badge/u-badge":1,"uview-ui/components/u-mask/u-mask":1,"uview-ui/components/u-loading/u-loading":1};
+/******/ 		var cssChunks = {"components/u-header":1,"uview-ui/components/u-input/u-input":1,"uview-ui/components/u-picker/u-picker":1,"uview-ui/components/u-icon/u-icon":1,"uview-ui/components/u-subsection/u-subsection":1,"uview-ui/components/u-tabs/u-tabs":1,"uview-ui/components/u-popup/u-popup":1,"uview-ui/components/u-select/u-select":1,"uview-ui/components/u-search/u-search":1,"uview-ui/components/u-switch/u-switch":1,"uview-ui/components/u-checkbox-group/u-checkbox-group":1,"uview-ui/components/u-checkbox/u-checkbox":1,"uview-ui/components/u-index-anchor/u-index-anchor":1,"uview-ui/components/u-index-list/u-index-list":1,"uview-ui/components/u-form-item/u-form-item":1,"uview-ui/components/u-form/u-form":1,"uview-ui/components/u-radio-group/u-radio-group":1,"uview-ui/components/u-radio/u-radio":1,"uview-ui/components/u-badge/u-badge":1,"uview-ui/components/u-mask/u-mask":1,"uview-ui/components/u-loading/u-loading":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/u-header":"components/u-header","uview-ui/components/u-input/u-input":"uview-ui/components/u-input/u-input","uview-ui/components/u-picker/u-picker":"uview-ui/components/u-picker/u-picker","uview-ui/components/u-icon/u-icon":"uview-ui/components/u-icon/u-icon","uview-ui/components/u-subsection/u-subsection":"uview-ui/components/u-subsection/u-subsection","uview-ui/components/u-tabs/u-tabs":"uview-ui/components/u-tabs/u-tabs","uview-ui/components/u-popup/u-popup":"uview-ui/components/u-popup/u-popup","uview-ui/components/u-search/u-search":"uview-ui/components/u-search/u-search","uview-ui/components/u-switch/u-switch":"uview-ui/components/u-switch/u-switch","uview-ui/components/u-checkbox-group/u-checkbox-group":"uview-ui/components/u-checkbox-group/u-checkbox-group","uview-ui/components/u-checkbox/u-checkbox":"uview-ui/components/u-checkbox/u-checkbox","uview-ui/components/u-index-anchor/u-index-anchor":"uview-ui/components/u-index-anchor/u-index-anchor","uview-ui/components/u-index-list/u-index-list":"uview-ui/components/u-index-list/u-index-list","uview-ui/components/u-form-item/u-form-item":"uview-ui/components/u-form-item/u-form-item","uview-ui/components/u-form/u-form":"uview-ui/components/u-form/u-form","uview-ui/components/u-radio-group/u-radio-group":"uview-ui/components/u-radio-group/u-radio-group","uview-ui/components/u-radio/u-radio":"uview-ui/components/u-radio/u-radio","uview-ui/components/u-badge/u-badge":"uview-ui/components/u-badge/u-badge","uview-ui/components/u-mask/u-mask":"uview-ui/components/u-mask/u-mask","uview-ui/components/u-loading/u-loading":"uview-ui/components/u-loading/u-loading"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/u-header":"components/u-header","uview-ui/components/u-input/u-input":"uview-ui/components/u-input/u-input","uview-ui/components/u-picker/u-picker":"uview-ui/components/u-picker/u-picker","uview-ui/components/u-icon/u-icon":"uview-ui/components/u-icon/u-icon","uview-ui/components/u-subsection/u-subsection":"uview-ui/components/u-subsection/u-subsection","uview-ui/components/u-tabs/u-tabs":"uview-ui/components/u-tabs/u-tabs","uview-ui/components/u-popup/u-popup":"uview-ui/components/u-popup/u-popup","uview-ui/components/u-select/u-select":"uview-ui/components/u-select/u-select","uview-ui/components/u-search/u-search":"uview-ui/components/u-search/u-search","uview-ui/components/u-switch/u-switch":"uview-ui/components/u-switch/u-switch","uview-ui/components/u-checkbox-group/u-checkbox-group":"uview-ui/components/u-checkbox-group/u-checkbox-group","uview-ui/components/u-checkbox/u-checkbox":"uview-ui/components/u-checkbox/u-checkbox","uview-ui/components/u-index-anchor/u-index-anchor":"uview-ui/components/u-index-anchor/u-index-anchor","uview-ui/components/u-index-list/u-index-list":"uview-ui/components/u-index-list/u-index-list","uview-ui/components/u-form-item/u-form-item":"uview-ui/components/u-form-item/u-form-item","uview-ui/components/u-form/u-form":"uview-ui/components/u-form/u-form","uview-ui/components/u-radio-group/u-radio-group":"uview-ui/components/u-radio-group/u-radio-group","uview-ui/components/u-radio/u-radio":"uview-ui/components/u-radio/u-radio","uview-ui/components/u-badge/u-badge":"uview-ui/components/u-badge/u-badge","uview-ui/components/u-mask/u-mask":"uview-ui/components/u-mask/u-mask","uview-ui/components/u-loading/u-loading":"uview-ui/components/u-loading/u-loading"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -10730,7 +10730,26 @@ randomArray;exports.default = _default;
 
 /***/ }),
 
-/***/ 318:
+/***/ 32:
+/*!************************************************************************!*\
+  !*** /Users/kiys/Desktop/pet_server/uview-ui/libs/function/addUnit.js ***!
+  \************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = addUnit;var _test = _interopRequireDefault(__webpack_require__(/*! ./test.js */ 22));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+
+// 添加单位，如果有rpx，%，px等单位结尾或者值为auto，直接返回，否则加上rpx单位结尾
+function addUnit() {var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'auto';var unit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'rpx';
+  value = String(value);
+  // 用uView内置验证规则中的number判断是否为数值
+  return _test.default.number(value) ? "".concat(value).concat(unit) : value;
+}
+
+/***/ }),
+
+/***/ 325:
 /*!****************************************************************************!*\
   !*** /Users/kiys/Desktop/pet_server/uview-ui/libs/util/async-validator.js ***!
   \****************************************************************************/
@@ -12093,11 +12112,11 @@ Schema.warning = warning;
 Schema.messages = messages;var _default =
 
 Schema;exports.default = _default;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/node-libs-browser/mock/process.js */ 319)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/node-libs-browser/mock/process.js */ 326)))
 
 /***/ }),
 
-/***/ 319:
+/***/ 326:
 /*!********************************************************!*\
   !*** ./node_modules/node-libs-browser/mock/process.js ***!
   \********************************************************/
@@ -12128,7 +12147,7 @@ exports.binding = function (name) {
     var path;
     exports.cwd = function () { return cwd };
     exports.chdir = function (dir) {
-        if (!path) path = __webpack_require__(/*! path */ 320);
+        if (!path) path = __webpack_require__(/*! path */ 327);
         cwd = path.resolve(dir, cwd);
     };
 })();
@@ -12142,26 +12161,7 @@ exports.features = {};
 
 /***/ }),
 
-/***/ 32:
-/*!************************************************************************!*\
-  !*** /Users/kiys/Desktop/pet_server/uview-ui/libs/function/addUnit.js ***!
-  \************************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = addUnit;var _test = _interopRequireDefault(__webpack_require__(/*! ./test.js */ 22));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
-
-// 添加单位，如果有rpx，%，px等单位结尾或者值为auto，直接返回，否则加上rpx单位结尾
-function addUnit() {var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'auto';var unit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'rpx';
-  value = String(value);
-  // 用uView内置验证规则中的number判断是否为数值
-  return _test.default.number(value) ? "".concat(value).concat(unit) : value;
-}
-
-/***/ }),
-
-/***/ 320:
+/***/ 327:
 /*!***********************************************!*\
   !*** ./node_modules/path-browserify/index.js ***!
   \***********************************************/
@@ -12471,7 +12471,7 @@ var substr = 'ab'.substr(-1) === 'b'
     }
 ;
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../node-libs-browser/mock/process.js */ 319)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../node-libs-browser/mock/process.js */ 326)))
 
 /***/ }),
 

unpackage/dist/dev/mp-weixin/components/u-header.js

@@ -83,10 +83,10 @@ try {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 257))
     },
     uRadioGroup: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 323))
+      return Promise.all(/*! import() | uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 330))
     },
     uRadio: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-radio/u-radio */ "uview-ui/components/u-radio/u-radio").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio/u-radio.vue */ 330))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-radio/u-radio */ "uview-ui/components/u-radio/u-radio").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio/u-radio.vue */ 337))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/Delivery/Delivery.js

@@ -96,10 +96,10 @@ var components
 try {
   components = {
     uSearch: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 264))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 271))
     },
     uSwitch: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-switch/u-switch */ "uview-ui/components/u-switch/u-switch").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-switch/u-switch.vue */ 271))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-switch/u-switch */ "uview-ui/components/u-switch/u-switch").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-switch/u-switch.vue */ 278))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/Delivery/create.js

@@ -96,10 +96,10 @@ var components
 try {
   components = {
     uCheckboxGroup: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 278))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 285))
     },
     uCheckbox: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-checkbox/u-checkbox */ "uview-ui/components/u-checkbox/u-checkbox").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 285))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-checkbox/u-checkbox */ "uview-ui/components/u-checkbox/u-checkbox").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 292))
     },
     uIcon: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 226))

unpackage/dist/dev/mp-weixin/pages/Delivery/location.js

@@ -96,10 +96,10 @@ var components
 try {
   components = {
     uIndexList: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-index-list/u-index-list */ "uview-ui/components/u-index-list/u-index-list").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-index-list/u-index-list.vue */ 292))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-index-list/u-index-list */ "uview-ui/components/u-index-list/u-index-list").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-index-list/u-index-list.vue */ 299))
     },
     uIndexAnchor: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-index-anchor/u-index-anchor */ "uview-ui/components/u-index-anchor/u-index-anchor").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-index-anchor/u-index-anchor.vue */ 299))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-index-anchor/u-index-anchor */ "uview-ui/components/u-index-anchor/u-index-anchor").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-index-anchor/u-index-anchor.vue */ 306))
     },
     uIcon: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 226))

unpackage/dist/dev/mp-weixin/pages/Marketing/vipers.js

@@ -96,7 +96,7 @@ var components
 try {
   components = {
     uSearch: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 264))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 271))
     },
     uPicker: function() {
       return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 233))

unpackage/dist/dev/mp-weixin/pages/mine/password.js

@@ -96,10 +96,10 @@ var components
 try {
   components = {
     uForm: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 306))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 313))
     },
     uFormItem: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 313))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 320))
     },
     uInput: function() {
       return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 218))

unpackage/dist/dev/mp-weixin/pages/order/order.js

@@ -103,6 +103,9 @@ try {
     },
     uPopup: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 257))
+    },
+    uSelect: function() {
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-select/u-select */ "uview-ui/components/u-select/u-select").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-select/u-select.vue */ 264))
     }
   }
 } catch (e) {
@@ -787,6 +790,15 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
+
+
+
+
 {
   components: {
     uHeader: uHeader },
@@ -832,7 +844,14 @@ __webpack_require__.r(__webpack_exports__);
       // 是否是管理员
       isAdmin: false,
       // 顶部高度
-      headerHeight: '' };
+      headerHeight: '',
+      // 当前派单状态
+      orderStatus: "",
+      checkUser: false,
+      from_data: [],
+      to_data: [],
+      all_data: [],
+      checkId: '' };
 
   },
   watch: {
@@ -844,14 +863,14 @@ __webpack_require__.r(__webpack_exports__);
       this.page = 1;
     } },
 
-  created: function created() {var _this = this;
+  created: function created() {var _this2 = this;
     uni.getSystemInfo({
       success: function success(res) {
         var menuButton = uni.getMenuButtonBoundingClientRect(); // 胶囊
         var navBarPadding = (menuButton.top - res.statusBarHeight) * 2;
         var statusBarHeight = res.statusBarHeight;
         var navHeight = menuButton.height + navBarPadding;
-        _this.headerHeight = navHeight + statusBarHeight;
+        _this2.headerHeight = navHeight + statusBarHeight;
       } });
 
   },
@@ -859,22 +878,102 @@ __webpack_require__.r(__webpack_exports__);
     // this.getData()
     // 获取订单数量
     // this.getDataNum()
-
+    // 
   },
   onShow: function onShow() {
-    this.getData();
-    this.getDataNum();
     var data = getApp().globalData;
     this.isAdmin = data.isAdmin;
     if (!this.isAdmin) {
       this.getInfo();
     }
+    this.getData();
+    this.getDataNum();
+    // 获取派单状态
+    this.getOrderStatus();
   },
   onPullDownRefresh: function onPullDownRefresh() {
     this.getDataNum();
     this.getData();
   },
   methods: {
+    // 选择配送员
+    checkUsered: function checkUsered(e) {
+      var _this = this;
+      if (e[0].value !== null && e[1].value !== null) {
+        this.request('/admin_order/give', {
+          id: _this.checkId,
+          get_user_id: e[0].value,
+          send_user_id: e[1].value },
+        'get').then(function (res) {
+          if (res.code === 1) {
+            uni.showToast({
+              title: '派单成功',
+              icon: "none" });
+
+            _this.getDataNum();
+            _this.getData();
+          } else {
+            uni.showToast({
+              title: '派单失败',
+              icon: "none" });
+
+            _this.getDataNum();
+            _this.getData();
+          }
+        });
+      } else {
+        uni.showToast({
+          title: '请选择取宠人和送宠人',
+          icon: "none" });
+
+      }
+    },
+    // 选择手动派单
+    doMakeOrder: function doMakeOrder(data) {
+      console.log(data.from_city, data.to_city);
+      var _this = this;
+      _this.checkId = data.id;
+      // 获取可以选择的取宠人
+      this.request('/admin_user/senders', {
+        areas: data.from_city },
+      'get').then(function (res) {
+        if (res.code === 1) {
+          _this.from_data = res.data.data;
+          _this.all_data[0] = res.data.data;
+          _this.$forceUpdate();
+        }
+      });
+      // 获取可以选择的送宠人
+      this.request('/admin_user/senders', {
+        areas: data.to_city },
+      'get').then(function (res) {
+        if (res.code === 1) {
+          _this.to_data = res.data.data;
+          _this.all_data[1] = res.data.data;
+          _this.$forceUpdate();
+        }
+      });
+      uni.showModal({
+        title: "提示",
+        content: "请选择接送人员进行手动派单",
+        success: function success(e) {
+          if (e.confirm) {
+            _this.checkUser = true;
+            _this.$forceUpdate();
+          }
+        } });
+
+    },
+    // 获取派单状态
+    getOrderStatus: function getOrderStatus() {var _this3 = this;
+      this.request('/admin_config/get_config', '', 'get').then(function (res) {
+        if (res.data.order_way === 'manual') {
+          _this3.orderStatus = "手动派单";
+        } else {
+          _this3.orderStatus = "自动派单";
+        }
+      });
+    },
     // 运行详情
     transport: function transport(id) {
       uni.navigateTo({
@@ -898,7 +997,7 @@ __webpack_require__.r(__webpack_exports__);
       }
     },
     // 删除订单
-    del: function del(id) {var _this2 = this;
+    del: function del(id) {var _this4 = this;
       var url = "";
       if (this.isAdmin) {
         url = "/admin_order/order_delete";
@@ -909,32 +1008,32 @@ __webpack_require__.r(__webpack_exports__);
         id: id },
       "GET").then(function (res) {
         if (res.code === 1) {
-          _this2.getData();
-          _this2.getDataNum();
+          _this4.getData();
+          _this4.getDataNum();
         }
       });
     },
     // 拒绝结算
-    refuse: function refuse(id) {var _this3 = this;
+    refuse: function refuse(id) {var _this5 = this;
       this.request("/admin_order/deal_settle", {
         id: id,
         status: 2 },
       "GET").then(function (res) {
         if (res.code === 1) {
-          _this3.getData();
-          _this3.getDataNum();
+          _this5.getData();
+          _this5.getDataNum();
         }
       });
     },
     // 结算
-    push: function push(id) {var _this4 = this;
+    push: function push(id) {var _this6 = this;
       this.request("/admin_order/deal_settle", {
         id: id,
         status: 1 },
       "GET").then(function (res) {
         if (res.code === 1) {
-          _this4.getData();
-          _this4.getDataNum();
+          _this6.getData();
+          _this6.getDataNum();
         }
       });
     },
@@ -950,41 +1049,41 @@ __webpack_require__.r(__webpack_exports__);
 
     },
     // 获取会员信息
-    getInfo: function getInfo() {var _this5 = this;
+    getInfo: function getInfo() {var _this7 = this;
       this.request('/user/index', {}, "GET").then(function (res) {
         if (res.code === 1) {
           if (res.data.need_verification) {
-            _this5.show = true;
+            _this7.show = true;
           }
         }
       });
     },
     // 点击立即接单
-    getOrder: function getOrder(id) {var _this6 = this;
+    getOrder: function getOrder(id) {var _this8 = this;
       this.request("/sender_order_controller/get", {
         id: id },
       "POST").then(function (res) {
         if (res.code === 1) {
-          _this6.getData();
-          _this6.getDataNum();
+          _this8.getData();
+          _this8.getDataNum();
         }
       });
     },
     // 获取订单数量
-    getDataNum: function getDataNum() {var _this7 = this;
+    getDataNum: function getDataNum() {var _this9 = this;
       this.request("/sender_order_controller/nums", {}, "GET").then(function (res) {
         console.log(res);
         if (res.code === 1) {
-          _this7.list[0].cate_count = res.data[1];
-          _this7.list[1].cate_count = res.data[2];
-          _this7.list[2].cate_count = res.data[3];
-          _this7.list[3].cate_count = res.data[4];
-          _this7.list[4].cate_count = res.data[5];
+          _this9.list[0].cate_count = res.data[1];
+          _this9.list[1].cate_count = res.data[2];
+          _this9.list[2].cate_count = res.data[3];
+          _this9.list[3].cate_count = res.data[4];
+          _this9.list[4].cate_count = res.data[5];
         }
       });
     },
     // 获取订单列表
-    getData: function getData() {var _this8 = this;
+    getData: function getData() {var _this10 = this;
       this.dataA = [];
       this.dataB = [];
       this.dataC = [];
@@ -1003,23 +1102,23 @@ __webpack_require__.r(__webpack_exports__);
       "GET").then(function (res) {
         uni.stopPullDownRefresh();
         if (res.code === 1) {
-          if (_this8.current === 0) {
-            _this8.dataA = [].concat(_toConsumableArray(_this8.dataA), _toConsumableArray(res.data.data));
+          if (_this10.current === 0) {
+            _this10.dataA = [].concat(_toConsumableArray(_this10.dataA), _toConsumableArray(res.data.data));
           }
-          if (_this8.current === 1) {
-            _this8.dataB = [].concat(_toConsumableArray(_this8.dataB), _toConsumableArray(res.data.data));
+          if (_this10.current === 1) {
+            _this10.dataB = [].concat(_toConsumableArray(_this10.dataB), _toConsumableArray(res.data.data));
           }
-          if (_this8.current === 2) {
-            _this8.dataC = [].concat(_toConsumableArray(_this8.dataC), _toConsumableArray(res.data.data));
+          if (_this10.current === 2) {
+            _this10.dataC = [].concat(_toConsumableArray(_this10.dataC), _toConsumableArray(res.data.data));
           }
-          if (_this8.current === 3) {
-            _this8.dataD = [].concat(_toConsumableArray(_this8.dataD), _toConsumableArray(res.data.data));
+          if (_this10.current === 3) {
+            _this10.dataD = [].concat(_toConsumableArray(_this10.dataD), _toConsumableArray(res.data.data));
           }
-          if (_this8.current === 4) {
-            _this8.dataE = [].concat(_toConsumableArray(_this8.dataE), _toConsumableArray(res.data.data));
+          if (_this10.current === 4) {
+            _this10.dataE = [].concat(_toConsumableArray(_this10.dataE), _toConsumableArray(res.data.data));
           }
-          _this8.last_page = res.data.last_page;
-          _this8.list[_this8.current].cate_count = res.data.total;
+          _this10.last_page = res.data.last_page;
+          _this10.list[_this10.current].cate_count = res.data.total;
         }
       });
     },

unpackage/dist/dev/mp-weixin/pages/order/order.json

@@ -6,6 +6,7 @@
     "u-tabs": "/uview-ui/components/u-tabs/u-tabs",
     "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-select": "/uview-ui/components/u-select/u-select",
     "u-header": "/components/u-header"
   }
 }

unpackage/dist/dev/mp-weixin/pages/order/order.wxss

@@ -112,6 +112,9 @@
 .card .half .text {
   width: 60%;
 }
+.card .make-order {
+  justify-content: flex-end;
+}
 .card .border {
   border-top: 1px #eee solid;
   display: flex;

unpackage/dist/dev/mp-weixin/pages/order/settle.js

@@ -96,10 +96,10 @@ var components
 try {
   components = {
     uForm: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 306))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 313))
     },
     uFormItem: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 313))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 320))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uMask: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-mask/u-mask */ "uview-ui/components/u-mask/u-mask").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-mask/u-mask.vue */ 344))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-mask/u-mask */ "uview-ui/components/u-mask/u-mask").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-mask/u-mask.vue */ 351))
     },
     uIcon: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 226))

unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabs/u-tabs.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uBadge: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-badge/u-badge */ "uview-ui/components/u-badge/u-badge").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 337))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-badge/u-badge */ "uview-ui/components/u-badge/u-badge").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 344))
     }
   }
 } catch (e) {