From 11272f615833d154372e410e32c54b08818ea18b Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Wed, 31 Jul 2024 17:13:16 +0800
Subject: [PATCH] =?UTF-8?q?1;=20=E7=BB=91=E5=AE=9A=E5=BA=97=E9=93=BA=20?=
 =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E8=87=AA=E9=85=8D=E9=80=81=E6=97=B6?=
 =?UTF-8?q?=E9=95=BF60=E5=88=86=E9=92=9F=202=EF=BC=9B=E8=87=AA=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E9=A1=B5=E9=9D=A2=E6=8C=89=E9=92=AE=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/business/service/impl/MeituanServiceImpl.java   | 1 +
 ruoyi-ui/src/views/market/self/index.vue                      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
index 927a204..c6b42dd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
@@ -152,6 +152,7 @@ public class MeituanServiceImpl implements IMeituanService {
             busStoreConfigInfo.setEndTime("23:59:59");
             busStoreConfigInfo.setMinOrderNum(1);
             busStoreConfigInfo.setMaxOrderNum(1);
+            busStoreConfigInfo.setSelfDeliveryDuration(60);
             busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo);
 
         } else if (list.size() == 1) {
diff --git a/ruoyi-ui/src/views/market/self/index.vue b/ruoyi-ui/src/views/market/self/index.vue
index d2990da..5a865d1 100644
--- a/ruoyi-ui/src/views/market/self/index.vue
+++ b/ruoyi-ui/src/views/market/self/index.vue
@@ -223,7 +223,7 @@
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width =120>
         <template slot-scope="scope">
-          <el-button  v-if="userAccount !='admin' && scope.row.returnVisitStatus !== '1'"
+          <el-button  v-if="userAccount !='admin' "
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -235,7 +235,7 @@
             icon="el-icon-bicycle"
             @click="handleSelfDelivery(scope.row)"
           >退出自配送</el-button>
-          <el-button  v-if="userAccount !='admin' && scope.row.returnVisitStatus !== '1'"
+          <el-button  v-if="userAccount !='admin' "
             size="mini"
             type="text"
             icon="el-icon-delete"