1

src/api/index.js

@@ -797,6 +797,14 @@ export const getCustomerPhoneSetting = (params) => {
 export const saveCustomerPhoneSetting = (params) => {
     return postBodyRequest('/mall/admin/seckillGroup/customerPhone/save', params)
 }
+// 查询区域基础配送费
+export const getBaseDeliveryFeeSetting = (params) => {
+    return getRequest('/mall/admin/seckillGroup/baseDeliveryFee/get', params)
+}
+// 保存区域基础配送费
+export const saveBaseDeliveryFeeSetting = (params) => {
+    return postBodyRequest('/mall/admin/seckillGroup/baseDeliveryFee/save', params)
+}
 // 查询i/e审核管理配置
 export const getIeAuditSetting = (params) => {
     return getRequest('/app/ie/admin/audit-setting', params)

src/views/app/business/deliverytruck/deliveryTruck.vue

@@ -290,8 +290,7 @@ export default {
         { title: '状态', key: 'status', width: 90, render: (h, p) => h('Tag', { props: { color: p.row.status === 1 ? 'green' : 'default' } }, p.row.status === 1 ? '启用' : '停用') },
         { title: '操作', width: 220, fixed: 'right', render: (h, p) => h('div', [
           h('Button', { props: { size: 'small' }, on: { click: () => this.openCategory(p.row) } }, '编辑'),
-          h('Button', { props: { size: 'small', type: p.row.status === 1 ? 'warning' : 'success' }, style: { marginLeft: '6px' }, on: { click: () => this.updateCategoryStatus(p.row) } }, p.row.status === 1 ? '停用' : '启用'),
+          h('Button', { props: { size: 'small', type: p.row.status === 1 ? 'warning' : 'success' }, style: { marginLeft: '6px' }, on: { click: () => this.updateCategoryStatus(p.row) } }, p.row.status === 1 ? '停用' : '启用')
-          h('Button', { props: { size: 'small', type: 'error' }, style: { marginLeft: '6px' }, on: { click: () => this.deleteCategory(p.row) } }, '删除')
         ]) }
       ],
       postColumns: [

src/views/app/business/logistics/logistics.vue

@@ -78,6 +78,7 @@
 				<TabPane :label="'配送中订单(' + deliveryTotalCount + ')'" name="delivery"></TabPane>
 				<TabPane label="配送时长设置" name="setting"></TabPane>
 				<TabPane label="客服设置" name="service"></TabPane>
+				<TabPane label="基础配送费" name="baseDeliveryFee"></TabPane>
 			</Tabs>
 			<div v-if="isOrderTab">
 				<Tabs v-if="tabName === 'hall'" v-model="hallTab" :animated="false" @on-click="changeHallTab">
@@ -112,6 +113,18 @@
 					</FormItem>
 				</Form>
 			</div>
+			<div v-else-if="tabName === 'baseDeliveryFee'" style="padding: 20px 0;">
+				<Form ref="baseDeliveryFeeForm" :model="baseDeliveryFeeForm" :label-width="130" style="width: 460px;">
+					<FormItem label="基础配送费">
+						<InputNumber v-model="baseDeliveryFeeForm.baseDeliveryFee" :min="0" :precision="2" style="width: 220px" />
+						<span style="margin-left: 8px;">元</span>
+						<div style="color: #999; font-size: 12px; line-height: 22px;">可设置为0，最多保留2位小数</div>
+					</FormItem>
+					<FormItem>
+						<Button type="primary" :loading="baseDeliveryFeeLoading" @click="saveBaseDeliveryFeeSetting">保存</Button>
+					</FormItem>
+				</Form>
+			</div>
 			<Row v-if="isOrderTab" v-show="openSearch" @keydown.enter.native="handleSearch">
 				<Form ref="searchForm" :model="activeSearchForm" inline :label-width="90">
 					<FormItem label="配送类型" v-if="tabName === 'delivery'">
@@ -233,6 +246,8 @@
 		saveDeliveryTimeSetting,
 		getCustomerPhoneSetting,
 		saveCustomerPhoneSetting,
+		getBaseDeliveryFeeSetting as getBaseDeliveryFeeSettingApi,
+		saveBaseDeliveryFeeSetting as saveBaseDeliveryFeeSettingApi,
 	} from "@/api/index";
 	import addEdit from "./addEdit.vue";
 	import logisticsAddress from "@/views/app/business/logistics/logisticsAddress";
@@ -272,6 +287,7 @@
 				autoRefreshing: false,
 				settingLoading: false,
 				customerServiceLoading: false,
+				baseDeliveryFeeLoading: false,
 				transferOrder: false,
 				workerOrderVisible: false,
 				workerOrderTab: "daiqu",
@@ -323,6 +339,10 @@
 					regionId: regionId,
 					customerPhone: ""
 				},
+				baseDeliveryFeeForm: {
+					regionId: regionId,
+					baseDeliveryFee: 0
+				},
 				workerOrderForm: {
 					pageNum: 1,
 					pageSize: 10
@@ -393,6 +413,7 @@
 				this.startCountRefreshTimer();
 				this.getSetting();
 				this.getCustomerServiceSetting();
+				this.getBaseDeliveryFeeSetting();
 			},
 			buildWorkerColumns() {
 				return [ {
@@ -530,6 +551,10 @@
 					this.getCustomerServiceSetting();
 					return;
 				}
+				if (v === "baseDeliveryFee") {
+					this.getBaseDeliveryFeeSetting();
+					return;
+				}
 				this.total = 0;
 				this.data = [];
 				const form = v === "hall" ? this.hallSearchForm : this.deliverySearchForm;
@@ -945,6 +970,41 @@
 					this.customerServiceLoading = false;
 				});
 			},
+			getBaseDeliveryFeeSetting() {
+				getBaseDeliveryFeeSettingApi({
+					regionId: this.baseDeliveryFeeForm.regionId
+				}).then((res) => {
+					if (res.success) {
+						this.baseDeliveryFeeForm.baseDeliveryFee = res.result == null ? 0 : Number(res.result);
+					}
+				});
+			},
+			saveBaseDeliveryFeeSetting() {
+				const fee = this.baseDeliveryFeeForm.baseDeliveryFee;
+				if (fee === null || fee === undefined || fee === "") {
+					this.$Message.warning("请输入基础配送费");
+					return;
+				}
+				if (Number(fee) < 0) {
+					this.$Message.warning("基础配送费不能小于0");
+					return;
+				}
+				if (!/^\d+(\.\d{1,2})?$/.test(String(fee))) {
+					this.$Message.warning("基础配送费最多保留2位小数");
+					return;
+				}
+				this.baseDeliveryFeeLoading = true;
+				saveBaseDeliveryFeeSettingApi({
+					regionId: this.baseDeliveryFeeForm.regionId,
+					baseDeliveryFee: Number(fee)
+				}).then((res) => {
+					if (res.success) {
+						this.$Message.success("保存成功");
+					}
+				}).finally(() => {
+					this.baseDeliveryFeeLoading = false;
+				});
+			},
 			goTransferOrder(item) {
 				if (!item || !item.workerId) {
 					this.$Message.warning("请选择配送员");

src/views/sys/order-manage/orderManage.vue

@@ -529,7 +529,11 @@
 								re = "待支付";
 							} else if (params.row.status == 2) {
 								re = "待接单";
-							} else if (params.row.status == 3 && params.row.deliveryType == 1) {
+							} else if (params.row.otherOrder == null && params.row.status == 3 && params.row.deliveryType == 1 && params.row.shopMakeTime != null) {
+								re = "待取货";
+							} else if (params.row.otherOrder == null && params.row.status == 3 && params.row.deliveryType == 1 && params.row.shopMakeTime == null) {
+								re = "待出餐";
+							}  else if (params.row.otherOrder != null && params.row.status == 3 && params.row.deliveryType == 1) {
 								re = "待取货";
 							} else if (params.row.status == 3 && params.row.deliveryType == 2) {
 								re = "待消费";