diff --git a/admin/src/config/index.ts b/admin/src/config/index.ts
index 10bbb3da..4bf4e940 100644
--- a/admin/src/config/index.ts
+++ b/admin/src/config/index.ts
@@ -2,8 +2,8 @@ const config = {
terminal: 1, //终端
title: '后台管理系统', //网站默认标题
version: '1.6.0', //版本号
- baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}/`, //请求接口域名
- // baseUrl: 'http://127.0.0.1:30005/',
+ // baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}/`, //请求接口域名
+ baseUrl: 'http://127.0.0.1:30005/',
urlPrefix: 'adminapi', //请求默认前缀
timeout: 10 * 1000 //请求超时时长
}
diff --git a/admin/src/views/land_plant/index.vue b/admin/src/views/land_plant/index.vue
index 4002324b..6828d0da 100644
--- a/admin/src/views/land_plant/index.vue
+++ b/admin/src/views/land_plant/index.vue
@@ -73,7 +73,15 @@
-
+
@@ -81,7 +89,7 @@
{{ row.plant_date ? timeFormat(row.plant_date, 'yyyy-mm-dd hh:MM:ss') : '' }}
-
+
编辑
+
+ 溯源信息
+
种植图片
diff --git a/app/adminapi/logic/land/LandPlantLogic.php b/app/adminapi/logic/land/LandPlantLogic.php
index ed54f981..f8bc62e6 100644
--- a/app/adminapi/logic/land/LandPlantLogic.php
+++ b/app/adminapi/logic/land/LandPlantLogic.php
@@ -150,7 +150,9 @@ class LandPlantLogic extends BaseLogic
return false;
}
$plantInfo['pic'] = json_decode($plantInfo['pic'],true);
+ $plantInfo['group_day'] = floor(($plantInfo['harvest_date'] - $plantInfo['plant_date']) / 86400);
$plantInfo['plant_date'] = date('Y-m-d',$plantInfo['plant_date']);
+ $plantInfo['harvest_date'] = date('Y-m-d',$plantInfo['harvest_date']);
$plantInfo['land_name'] = $landInfo['title'];
$plantInfo['land_area'] = $landInfo['total_area'];
$plantInfo['land_address'] = $landInfo['province_name'].$landInfo['city_name'].$landInfo['county_name'].$landInfo['town_name'].$landInfo['village_name'].$landInfo['group_name'];