diff --git a/components/customTabbar/tabbar.vue b/components/customTabbar/tabbar.vue
index e8a7e60..829a9a9 100644
--- a/components/customTabbar/tabbar.vue
+++ b/components/customTabbar/tabbar.vue
@@ -54,12 +54,12 @@
 		// console.log(, 454)
 		if (e == 0) {
 			uni.switchTab({
-				url: '/pages/index/massif'
+				url: '/pages/index/index'
 			})
 		}
 		if (e == 1) {
 			uni.switchTab({
-				url: '/pages/index/index'
+				url: '/pages/index/massif'
 			})
 		}
 		if (e == 2) {
diff --git a/manifest.json b/manifest.json
index 504b7df..e346546 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "种植溯源",
     "appid" : "__UNI__D087881",
     "description" : "",
-    "versionName" : "1.1.1",
-    "versionCode" : 111,
+    "versionName" : "1.1.2",
+    "versionCode" : 112,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/node_modules/.vite/deps/_metadata.json b/node_modules/.vite/deps/_metadata.json
index 7e3d83a..db0e803 100644
--- a/node_modules/.vite/deps/_metadata.json
+++ b/node_modules/.vite/deps/_metadata.json
@@ -1,11 +1,11 @@
 {
-  "hash": "f979aabd",
-  "browserHash": "06d2b6c4",
+  "hash": "ba8e1249",
+  "browserHash": "740bcf73",
   "optimized": {
     "uview-plus": {
       "src": "../../uview-plus/index.js",
       "file": "uview-plus.js",
-      "fileHash": "e7195992",
+      "fileHash": "96859172",
       "needsInterop": false
     }
   },
diff --git a/node_modules/.vite/deps/package.json b/node_modules/.vite/deps/package.json
index 7c34deb..3dbc1ca 100644
--- a/node_modules/.vite/deps/package.json
+++ b/node_modules/.vite/deps/package.json
@@ -1 +1,3 @@
-{"type":"module"}
\ No newline at end of file
+{
+  "type": "module"
+}
diff --git a/node_modules/.vite/deps/uview-plus.js b/node_modules/.vite/deps/uview-plus.js
index de488a2..e10baf7 100644
--- a/node_modules/.vite/deps/uview-plus.js
+++ b/node_modules/.vite/deps/uview-plus.js
@@ -1,4 +1,4 @@
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mixin.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mixin.js
 var mixin_default = {
   // 定义每个组件都可能需要用到的外部样式以及类名
   props: {
@@ -129,10 +129,10 @@ var mixin_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mpMixin.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mpMixin.js
 var mpMixin_default = {};
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils.js
 var { toString } = Object.prototype;
 function isArray(val) {
   return toString.call(val) === "[object Array]";
@@ -188,7 +188,7 @@ function isUndefined(val) {
   return typeof val === "undefined";
 }
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/buildURL.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/buildURL.js
 function encode(val) {
   return encodeURIComponent(val).replace(/%40/gi, "@").replace(/%3A/gi, ":").replace(/%24/g, "$").replace(/%2C/gi, ",").replace(/%20/g, "+").replace(/%5B/gi, "[").replace(/%5D/gi, "]");
 }
@@ -231,17 +231,17 @@ function buildURL(url2, params) {
   return url2;
 }
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js
 function isAbsoluteURL(url2) {
   return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url2);
 }
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/combineURLs.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/combineURLs.js
 function combineURLs(baseURL, relativeURL) {
   return relativeURL ? `${baseURL.replace(/\/+$/, "")}/${relativeURL.replace(/^\/+/, "")}` : baseURL;
 }
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/buildFullPath.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/buildFullPath.js
 function buildFullPath(baseURL, requestedURL) {
   if (baseURL && !isAbsoluteURL(requestedURL)) {
     return combineURLs(baseURL, requestedURL);
@@ -249,7 +249,7 @@ function buildFullPath(baseURL, requestedURL) {
   return requestedURL;
 }
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/settle.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/settle.js
 function settle(resolve, reject, response) {
   const { validateStatus: validateStatus2 } = response.config;
   const status = response.statusCode;
@@ -260,7 +260,7 @@ function settle(resolve, reject, response) {
   }
 }
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/adapters/index.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/adapters/index.js
 var mergeKeys = (keys, config2) => {
   const config = {};
   keys.forEach((prop) => {
@@ -323,10 +323,10 @@ var adapters_default = (config) => new Promise((resolve, reject) => {
   }
 });
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/dispatchRequest.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/dispatchRequest.js
 var dispatchRequest_default = (config) => adapters_default(config);
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/InterceptorManager.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/InterceptorManager.js
 function InterceptorManager() {
   this.handlers = [];
 }
@@ -351,7 +351,7 @@ InterceptorManager.prototype.forEach = function forEach2(fn) {
 };
 var InterceptorManager_default = InterceptorManager;
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/mergeConfig.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/mergeConfig.js
 var mergeKeys2 = (keys, globalsConfig, config2) => {
   const config = {};
   keys.forEach((prop) => {
@@ -413,7 +413,7 @@ var mergeConfig_default = (globalsConfig, config2 = {}) => {
   return config;
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/defaults.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/defaults.js
 var defaults_default = {
   baseURL: "",
   header: {},
@@ -428,7 +428,7 @@ var defaults_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils/clone.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils/clone.js
 var clone = function() {
   "use strict";
   function _instanceof(obj, type) {
@@ -625,7 +625,7 @@ var clone = function() {
 }();
 var clone_default = clone;
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/Request.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/Request.js
 var Request = class {
   /**
   * @param {Object} arg - 全局配置
@@ -763,10 +763,10 @@ var Request = class {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/index.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/index.js
 var luch_request_default = Request;
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/util/route.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/util/route.js
 var Router = class {
   constructor() {
     this.config = {
@@ -866,7 +866,7 @@ var Router = class {
 };
 var route_default = new Router().route;
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/colorGradient.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/function/colorGradient.js
 function colorGradient(startColor = "rgb(0, 0, 0)", endColor = "rgb(255, 255, 255)", step = 10) {
   const startRGB = hexToRgb(startColor, false);
   const startR = startRGB[0];
@@ -978,7 +978,7 @@ var colorGradient_default = {
   colorToRgba
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/test.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/function/test.js
 function email(value) {
   return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value);
 }
@@ -1152,7 +1152,7 @@ var test_default = {
   string
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/debounce.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/function/debounce.js
 var timeout = null;
 function debounce(func2, wait = 500, immediate = false) {
   if (timeout !== null)
@@ -1172,7 +1172,7 @@ function debounce(func2, wait = 500, immediate = false) {
 }
 var debounce_default = debounce;
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/throttle.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/function/throttle.js
 var timer;
 var flag;
 function throttle(func2, wait = 500, immediate = true) {
@@ -1194,7 +1194,7 @@ function throttle(func2, wait = 500, immediate = true) {
 }
 var throttle_default = throttle;
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/digit.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/function/digit.js
 var _boundaryCheckingState = true;
 function strip(num, precision = 15) {
   return +parseFloat(Number(num).toPrecision(precision));
@@ -1258,7 +1258,7 @@ function round(num, ratio) {
   return result;
 }
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/index.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/function/index.js
 function range2(min = 0, max = 0, value = 0) {
   return Math.max(min, Math.min(max, Number(value)));
 }
@@ -1732,7 +1732,7 @@ var function_default = {
   setConfig
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/config.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/config.js
 var version = "3";
 if (true) {
   console.log(`
@@ -1767,7 +1767,7 @@ var config_default = {
   unit: "px"
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/actionSheet.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/actionSheet.js
 var actionSheet_default = {
   // action-sheet组件
   actionSheet: {
@@ -1785,7 +1785,7 @@ var actionSheet_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/album.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/album.js
 var album_default = {
   // album 组件
   album: {
@@ -1803,7 +1803,7 @@ var album_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/alert.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/alert.js
 var alert_default = {
   // alert警告组件
   alert: {
@@ -1818,7 +1818,7 @@ var alert_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatar.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatar.js
 var avatar_default = {
   // avatar 组件
   avatar: {
@@ -1839,7 +1839,7 @@ var avatar_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatarGroup.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatarGroup.js
 var avatarGroup_default = {
   // avatarGroup 组件
   avatarGroup: {
@@ -1855,7 +1855,7 @@ var avatarGroup_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/backtop.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/backtop.js
 var backtop_default = {
   // backtop组件
   backtop: {
@@ -1875,7 +1875,7 @@ var backtop_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/badge.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/badge.js
 var badge_default = {
   // 徽标数组件
   badge: {
@@ -1895,7 +1895,7 @@ var badge_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/button.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/button.js
 var button_default = {
   // button组件
   button: {
@@ -1930,7 +1930,7 @@ var button_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/calendar.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/calendar.js
 var calendar_default = {
   // calendar 组件
   calendar: {
@@ -1967,7 +1967,7 @@ var calendar_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/carKeyboard.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/carKeyboard.js
 var carKeyboard_default = {
   // 车牌号键盘
   carKeyboard: {
@@ -1975,7 +1975,7 @@ var carKeyboard_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cell.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cell.js
 var cell_default = {
   // cell组件的props
   cell: {
@@ -2003,7 +2003,7 @@ var cell_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cellGroup.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cellGroup.js
 var cellGroup_default = {
   // cell-group组件的props
   cellGroup: {
@@ -2013,7 +2013,7 @@ var cellGroup_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkbox.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkbox.js
 var checkbox_default = {
   // checkbox组件
   checkbox: {
@@ -2033,7 +2033,7 @@ var checkbox_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkboxGroup.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkboxGroup.js
 var checkboxGroup_default = {
   // checkbox-group组件
   checkboxGroup: {
@@ -2055,7 +2055,7 @@ var checkboxGroup_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/circleProgress.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/circleProgress.js
 var circleProgress_default = {
   // circleProgress 组件
   circleProgress: {
@@ -2063,7 +2063,7 @@ var circleProgress_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/code.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/code.js
 var code_default = {
   // code 组件
   code: {
@@ -2076,7 +2076,7 @@ var code_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/codeInput.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/codeInput.js
 var codeInput_default = {
   // codeInput 组件
   codeInput: {
@@ -2098,7 +2098,7 @@ var codeInput_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/col.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/col.js
 var col_default = {
   // col 组件
   col: {
@@ -2110,7 +2110,7 @@ var col_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapse.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapse.js
 var collapse_default = {
   // collapse 组件
   collapse: {
@@ -2120,7 +2120,7 @@ var collapse_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapseItem.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapseItem.js
 var collapseItem_default = {
   // collapseItem 组件
   collapseItem: {
@@ -2138,7 +2138,7 @@ var collapseItem_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/columnNotice.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/columnNotice.js
 var columnNotice_default = {
   // columnNotice 组件
   columnNotice: {
@@ -2155,7 +2155,7 @@ var columnNotice_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countDown.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countDown.js
 var countDown_default = {
   // u-count-down 计时器组件
   countDown: {
@@ -2166,7 +2166,7 @@ var countDown_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countTo.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countTo.js
 var countTo_default = {
   // countTo 组件
   countTo: {
@@ -2184,7 +2184,7 @@ var countTo_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/datetimePicker.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/datetimePicker.js
 var datetimePicker_default = {
   // datetimePicker 组件
   datetimePicker: {
@@ -2213,7 +2213,7 @@ var datetimePicker_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/divider.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/divider.js
 var divider_default = {
   // divider组件
   divider: {
@@ -2228,7 +2228,7 @@ var divider_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/empty.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/empty.js
 var empty_default = {
   // empty组件
   empty: {
@@ -2246,7 +2246,7 @@ var empty_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/form.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/form.js
 var form_default = {
   // form 组件
   form: {
@@ -2261,7 +2261,7 @@ var form_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/formItem.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/formItem.js
 var formItem_default = {
   // formItem 组件
   formItem: {
@@ -2276,7 +2276,7 @@ var formItem_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gap.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gap.js
 var gap_default = {
   // gap组件
   gap: {
@@ -2288,7 +2288,7 @@ var gap_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/grid.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/grid.js
 var grid_default = {
   // grid组件
   grid: {
@@ -2298,7 +2298,7 @@ var grid_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gridItem.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gridItem.js
 var gridItem_default = {
   // grid-item组件
   gridItem: {
@@ -2307,7 +2307,7 @@ var gridItem_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/icon.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/icon.js
 var {
   color
 } = config_default;
@@ -2334,7 +2334,7 @@ var icon_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/image.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/image.js
 var image_default = {
   // image组件
   image: {
@@ -2357,7 +2357,7 @@ var image_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexAnchor.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexAnchor.js
 var indexAnchor_default = {
   // indexAnchor 组件
   indexAnchor: {
@@ -2369,7 +2369,7 @@ var indexAnchor_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexList.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexList.js
 var indexList_default = {
   // indexList 组件
   indexList: {
@@ -2381,7 +2381,7 @@ var indexList_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/input.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/input.js
 var input_default = {
   // index 组件
   input: {
@@ -2422,7 +2422,7 @@ var input_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/keyboard.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/keyboard.js
 var keyboard_default = {
   // 键盘组件
   keyboard: {
@@ -2445,7 +2445,7 @@ var keyboard_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/line.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/line.js
 var line_default = {
   // line组件
   line: {
@@ -2458,7 +2458,7 @@ var line_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/lineProgress.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/lineProgress.js
 var lineProgress_default = {
   // lineProgress 组件
   lineProgress: {
@@ -2470,7 +2470,7 @@ var lineProgress_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/link.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/link.js
 var {
   color: color2
 } = config_default;
@@ -2487,7 +2487,7 @@ var link_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/list.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/list.js
 var list_default = {
   // list 组件
   list: {
@@ -2508,7 +2508,7 @@ var list_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/listItem.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/listItem.js
 var listItem_default = {
   // listItem 组件
   listItem: {
@@ -2516,7 +2516,7 @@ var listItem_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingIcon.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingIcon.js
 var {
   color: color3
 } = config_default;
@@ -2537,7 +2537,7 @@ var loadingIcon_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingPage.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingPage.js
 var loadingPage_default = {
   // loading-page组件
   loadingPage: {
@@ -2553,7 +2553,7 @@ var loadingPage_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadmore.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadmore.js
 var loadmore_default = {
   // loadmore 组件
   loadmore: {
@@ -2578,7 +2578,7 @@ var loadmore_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/modal.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/modal.js
 var modal_default = {
   // modal 组件
   modal: {
@@ -2601,7 +2601,7 @@ var modal_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/color.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/color.js
 var color4 = {
   primary: "#3c9cff",
   info: "#909399",
@@ -2617,7 +2617,7 @@ var color4 = {
 };
 var color_default = color4;
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/navbar.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/navbar.js
 var navbar_default = {
   // navbar 组件
   navbar: {
@@ -2640,7 +2640,7 @@ var navbar_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noNetwork.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noNetwork.js
 var noNetwork_default = {
   // noNetwork
   noNetwork: {
@@ -2650,7 +2650,7 @@ var noNetwork_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noticeBar.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noticeBar.js
 var noticeBar_default = {
   // noticeBar
   noticeBar: {
@@ -2670,7 +2670,7 @@ var noticeBar_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/notify.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/notify.js
 var notify_default = {
   // notify组件
   notify: {
@@ -2685,7 +2685,7 @@ var notify_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberBox.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberBox.js
 var numberBox_default = {
   // 步进器组件
   numberBox: {
@@ -2713,7 +2713,7 @@ var numberBox_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberKeyboard.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberKeyboard.js
 var numberKeyboard_default = {
   // 数字键盘
   numberKeyboard: {
@@ -2723,7 +2723,7 @@ var numberKeyboard_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/overlay.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/overlay.js
 var overlay_default = {
   // overlay组件
   overlay: {
@@ -2734,7 +2734,7 @@ var overlay_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/parse.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/parse.js
 var parse_default = {
   // parse
   parse: {
@@ -2749,7 +2749,7 @@ var parse_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/picker.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/picker.js
 var picker_default = {
   // picker
   picker: {
@@ -2771,7 +2771,7 @@ var picker_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/popup.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/popup.js
 var popup_default = {
   // popup组件
   popup: {
@@ -2794,7 +2794,7 @@ var popup_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radio.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radio.js
 var radio_default = {
   // radio组件
   radio: {
@@ -2814,7 +2814,7 @@ var radio_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radioGroup.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radioGroup.js
 var radioGroup_default = {
   // radio-group组件
   radioGroup: {
@@ -2837,7 +2837,7 @@ var radioGroup_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rate.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rate.js
 var rate_default = {
   // rate组件
   rate: {
@@ -2856,7 +2856,7 @@ var rate_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/readMore.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/readMore.js
 var readMore_default = {
   // readMore
   readMore: {
@@ -2871,7 +2871,7 @@ var readMore_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/row.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/row.js
 var row_default = {
   // row
   row: {
@@ -2881,7 +2881,7 @@ var row_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rowNotice.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rowNotice.js
 var rowNotice_default = {
   // rowNotice
   rowNotice: {
@@ -2895,7 +2895,7 @@ var rowNotice_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/scrollList.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/scrollList.js
 var scrollList_default = {
   // scrollList
   scrollList: {
@@ -2908,7 +2908,7 @@ var scrollList_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/search.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/search.js
 var search_default = {
   // search
   search: {
@@ -2938,7 +2938,7 @@ var search_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/section.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/section.js
 var section_default = {
   // u-section组件
   section: {
@@ -2955,7 +2955,7 @@ var section_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/skeleton.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/skeleton.js
 var skeleton_default = {
   // skeleton
   skeleton: {
@@ -2973,7 +2973,7 @@ var skeleton_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/slider.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/slider.js
 var slider_default = {
   // slider组件
   slider: {
@@ -2992,7 +2992,7 @@ var slider_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/statusBar.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/statusBar.js
 var statusBar_default = {
   // statusBar
   statusBar: {
@@ -3000,7 +3000,7 @@ var statusBar_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/steps.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/steps.js
 var steps_default = {
   // steps组件
   steps: {
@@ -3014,7 +3014,7 @@ var steps_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/stepsItem.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/stepsItem.js
 var stepsItem_default = {
   // steps-item组件
   stepsItem: {
@@ -3025,7 +3025,7 @@ var stepsItem_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/sticky.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/sticky.js
 var sticky_default = {
   // sticky组件
   sticky: {
@@ -3038,7 +3038,7 @@ var sticky_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/subsection.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/subsection.js
 var subsection_default = {
   // subsection组件
   subsection: {
@@ -3054,7 +3054,7 @@ var subsection_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeAction.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeAction.js
 var swipeAction_default = {
   // swipe-action组件
   swipeAction: {
@@ -3062,7 +3062,7 @@ var swipeAction_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeActionItem.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeActionItem.js
 var swipeActionItem_default = {
   // swipeActionItem 组件
   swipeActionItem: {
@@ -3076,7 +3076,7 @@ var swipeActionItem_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swiper.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swiper.js
 var swiper_default = {
   // swiper 组件
   swiper: {
@@ -3107,7 +3107,7 @@ var swiper_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipterIndicator.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipterIndicator.js
 var swipterIndicator_default = {
   // swiperIndicator 组件
   swiperIndicator: {
@@ -3119,7 +3119,7 @@ var swipterIndicator_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/switch.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/switch.js
 var switch_default = {
   // switch
   switch: {
@@ -3136,7 +3136,7 @@ var switch_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbar.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbar.js
 var tabbar_default = {
   // tabbar
   tabbar: {
@@ -3151,7 +3151,7 @@ var tabbar_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbarItem.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbarItem.js
 var tabbarItem_default = {
   //
   tabbarItem: {
@@ -3164,7 +3164,7 @@ var tabbarItem_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabs.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabs.js
 var tabs_default = {
   //
   tabs: {
@@ -3189,7 +3189,7 @@ var tabs_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tag.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tag.js
 var tag_default = {
   // tag 组件
   tag: {
@@ -3211,7 +3211,7 @@ var tag_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/text.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/text.js
 var text_default = {
   // text 组件
   text: {
@@ -3241,7 +3241,7 @@ var text_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/textarea.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/textarea.js
 var textarea_default = {
   // textarea 组件
   textarea: {
@@ -3270,7 +3270,7 @@ var textarea_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toast.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toast.js
 var toast_default = {
   // toast组件
   toast: {
@@ -3293,7 +3293,7 @@ var toast_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toolbar.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toolbar.js
 var toolbar_default = {
   // toolbar 组件
   toolbar: {
@@ -3306,7 +3306,7 @@ var toolbar_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tooltip.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tooltip.js
 var tooltip_default = {
   // tooltip 组件
   tooltip: {
@@ -3324,7 +3324,7 @@ var tooltip_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/transition.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/transition.js
 var transition_default = {
   // transition动画组件的props
   transition: {
@@ -3335,7 +3335,7 @@ var transition_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/upload.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props/upload.js
 var upload_default = {
   // upload组件
   upload: {
@@ -3364,7 +3364,7 @@ var upload_default = {
   }
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/props.js
 var {
   color: color5
 } = config_default;
@@ -3459,7 +3459,7 @@ var props_default = {
   ...upload_default
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/zIndex.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/config/zIndex.js
 var zIndex_default = {
   toast: 10090,
   noNetwork: 10080,
@@ -3472,13 +3472,13 @@ var zIndex_default = {
   indexListSticky: 965
 };
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/platform.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/libs/function/platform.js
 var platform = "none";
 platform = "vue3";
 platform = "h5";
 var platform_default = platform;
 
-// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/index.js
+// ../../../../里海数字乡村/TraceabilityAPP/node_modules/uview-plus/index.js
 var pleaseSetTranspileDependencies = {};
 var babelTest = pleaseSetTranspileDependencies == null ? void 0 : pleaseSetTranspileDependencies.test;
 var $u = {
diff --git a/pages.json b/pages.json
index f82e0b8..defcc15 100644
--- a/pages.json
+++ b/pages.json
@@ -9,7 +9,7 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/index/massif",
+			"path": "pages/index/index",
 
 			"style": {
 				"navigationBarTitleText": "地块",
@@ -18,8 +18,9 @@
 				"navigationBarBackgroundColor": "#35D190",
 				"navigationBarTextStyle": "black"
 			}
-		}, {
-			"path": "pages/index/index",
+		}, 
+    {
+			"path": "pages/index/massif",
 			"style": {
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
@@ -238,13 +239,12 @@
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"list": [{
-				"pagePath": "pages/index/massif",
+				"pagePath": "pages/index/index",
 				"iconPath": "static/tabs-icon/sy.png",
 				"selectedIconPath": "static/tabs-icon/sydj.png"
 			},
 			{
-				"pagePath": "pages/index/index",
-
+				"pagePath": "pages/index/massif",
 				"iconPath": "static/tabs-icon/dk.png",
 				"selectedIconPath": "static/tabs-icon/dkdj.png"
 			},
diff --git a/pages/Login/login.vue b/pages/Login/login.vue
index 56794cf..a3742d2 100644
--- a/pages/Login/login.vue
+++ b/pages/Login/login.vue
@@ -564,7 +564,7 @@
 					uni.hideLoading()
 					store.dispatch('changeTabbar', 0)
 					uni.switchTab({
-						url: '/pages/index/massif'
+						url: '/pages/index/index'
 					})
 					console.log(store.state.tabbrIndex, "tabbar")
 					uni.$u.toast('登录成功');
diff --git a/pages/addLand/addLand1.vue b/pages/addLand/addLand1.vue
index 7b9b471..41b472b 100644
--- a/pages/addLand/addLand1.vue
+++ b/pages/addLand/addLand1.vue
@@ -413,7 +413,7 @@
 		// }).catch(errors => {
 		// 	uni.$u.toast('校验失败')
 		// })
-		// navgo('/pages/index/index')
+		// navgo('/pages/index/massif')
 	}
 
 	const updateImgFn = async () => {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c22aac3..abb8b69 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,101 +1,166 @@
 <template>
-	<view class="">
-		<view class="" style="height: var(--status-bar-height);background-color: #35D190;">
+	<view class="" style="position: relative;">
+		<view class="top">
+			<!-- 17828474084 -->
+			<view class="" style="height:var(--status-bar-height) ;">
+			</view>
+
+			<view class="nav-con" style="justify-content: space-between;">
+				<view class="title" v-if="Object.keys(dataobj).length>0" @click=" show=true">
+					<u--image :src="u('qhtd')" width="38.55rpx" height="38.55rpx"
+						style="margin-right: 20rpx;"></u--image>
+					<text class="text">{{dataobj.title}}</text>
+
+				</view>
+				<view class="" v-else>
+
+				</view>
+
+				<view class="" style="display: flex;align-items: center;">
+					<view class="nav">
+						<view class="" style="margin-right: 16rpx;">
+							<u--image :src="u('sbbd')" width="35.25rpx" @click="showModal=true"
+								height="35.25rpx"></u--image>
+						</view>
+						<view class="" style="margin-left: 16rpx;">
+							<u--image :src="u('sys')" width="35.25rpx" @click="scanFn" height="35.25rpx"></u--image>
+						</view>
+
+						<view class="" style="margin-left: 20rpx;">
+
+						</view>
+					</view>
+
+					<view class="" style="margin-top: -5rpx;">
+						<Myindex url='/pages/index/index' />
+					</view>
+				</view>
+			</view>
+
+
 
 		</view>
-		<view class="header">
-			<u-icon name="plus-circle" color="white" @click="navto('/pages/addLand/addLand')" :size="28"></u-icon>
-
-			<Myindex url='/pages/index/index' />
+		<view class="">
+			<view class="" style="height:var(--status-bar-height) ;">
+			</view>
+			<view class="nav-con" style="margin-bottom: 65rpx;">
+			</view>
 		</view>
 		<view class="content">
-			<view class="serch">
-				<u-search bgColor="white" :show-action="false" placeholder="搜索你的土地信息" v-model="fomData.keyword"
-					shape="round" :clearabled='false' @change="inputval"></u-search>
-				<view class="ser-text" @click="search">
-					搜索
+			<!-- 土地信息 -->
+			<view class="">
+				<view class="empty-land" v-if="Object.keys(dataobj).length<=0">
+					<text>没有土地信息？</text>
+					<text @click="navto('/pages/addLand/addLand')" style="display: flex;">去新增 <u-icon name="arrow-right"
+							color="#709DE9" size="28"></u-icon></text>
 				</view>
-			</view>
-			<view class="tits">
-				土地信息
-			</view>
-			<view class="card" v-for="(item,index) in datalist" :key="index" @click="navgo(item)">
-				<view class="plant-status" v-if="item.residual_area!=item.total_area"
-					:style="{backgroundImage:`url(${bgc('yzz')})`}">
-					已种植
-				</view>
-				<view class="plant-status" v-if="item.residual_area==item.total_area"
-					:style="{backgroundImage:`url(${bgc('wzz')})`}">
-					未种植
-				</view>
-				<view class="card-content">
-					<u--image v-if="item.pic" :src="item.pic[0]||''" height="150rpx" width="150rpx"
-						style="margin-right: 20rpx;border-radius: 10rpx;overflow: hidden;"></u--image>
 
-					<view style="color:#7B7B7B;font-size: 26rpx;">
-						<view class="card-tit">
-							{{item.title}}
+
+				<view class="land-info">
+					<view class="land-area">
+						土地面积
+						<view style="color: #7B7B7B; font-size: 28rpx;">
+							{{dataobj.total_area|| "--"}}亩
 						</view>
-						<view class="">
-							<text style="color: black;">种植面积</text> : {{item.total_area-item.residual_area}}亩
-						</view>
-						<view class="">
-							<text style="color: black;">土地面积</text>: {{item.total_area}}亩
-						</view>
-						<view class="card-address">
-							<text style="color: black;white-space: nowrap;">地址</text>: {{item.address}}
+
+					</view>
+					<view class="plant-area">
+						种植面积
+						<view style="color: #7B7B7B; font-size: 28rpx;">
+							{{dataobj.total_area-dataobj.residual_area||"--"}}亩
 						</view>
 					</view>
+				</view>
+
+				<view v-if="(dataobj.total_area-dataobj.residual_area)==0" @click="palnt(dataobj.id)">
+					<view class="empty-land" style="background-image: url('static/main/index/xzzh.png');">
+						<text></text>
+						<text style="display: flex;font-size: 26rpx;">新增种植 <u-icon name="arrow-right" color="#709DE9"
+								size="15"></u-icon></text>
+					</view>
+				</view>
+				<view class="note" v-else>
+					<u--image v-if="columns2[0]&&columns2[0].length>0" @click="showPicker1=true" :src="u('qtj')"
+						click="showPicker1=true" width="170rpx" height="40rpx"
+						style="position: absolute;right: 80rpx;top: 80rpx;"></u--image>
+				</view>
+				<view class="live-tit" style="color: #1A1A1A;">
+					<view class="tit" style="">
+						苗情检测视频
+					</view>
+					<view class="" style="font-size: 20rpx;color: #ACACAC;display: flex;align-items: center;">
+						<!-- <u-icon name="clock" style="margin-right: 5rpx;" color="#ACACAC"></u-icon> -->
+						<u--image :src="u('sj')" width='18rpx' height="18rpx" style="margin-right:5rpx"></u--image>
+						刷新时间：{{getNowTimeFn()}}
+					</view>
+
+
+				</view>
+				<view class="live">
+					<u--image :src="videoCover" v-if="video_url" width="100%" height="450rpx"></u--image>
+					<u--image :src="u('K')" v-else width="100%"></u--image>
+
+					<view class=""
+						style="width: 100%;height: 100%;background-color: rgba(0, 0, 0, .5);position: absolute;top: 1px;"
+						@click="goLive" v-if="video_url">
+						<u-icon name="play-circle" size="40" color="white" v-if="video_url"
+							style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);"></u-icon>
+					</view>
 
 				</view>
 
-
-
-				<!-- old -->
-
-				<!-- <view class="tit card-li" style="margin-top: 50rpx;">
-					<view class="">
-						{{item.title}}
-					</view>
-					<view class="" style="color: #00A15E;" v-if="item.residual_area!=item.total_area">
-						已种植
-					</view>
-					<view class="" style="color: #00A15E;" v-if="item.residual_area==item.total_area">
-						未种植
-					</view>
-				</view>
-				<view class="card-li" v-if="item.residual_area!=item.total_area">
-					<view class="">
-						种植面积:{{item.total_area-item.residual_area}}亩
-					</view>
-					<view class="">
-						土地面积:{{item.total_area}}亩
-					</view>
-				</view>
-				<view class="card-li" v-if="item.residual_area==item.total_area">
-					<view class="">
-						未种植面积:{{item.total_area}}亩
-					</view>
-				</view>
-				<view class="card-li tit">
-					<view class="" style="font-weight: normal;">
-						地址: {{item.address}}
-					</view>
-				</view>
-
-			 -->
-
-
-			</view>
-			<!-- <view class="land" @click="navgo('/pages/addLand/addLand')">
-				土地
-			</view> -->
-
-			<view class="coneng-detail" v-if="datalist.length==0">
 				<view class="">
-					<image src="@/static/img/zw.png" mode="aspectFit"></image>
-					<view class="">
-						暂无数据
+					<view class="tit">
+						土壤检测信息
+					</view>
+					<view class="area-check">
+						<view class="area-li" v-for="(item,index) in soilList" :key="index"
+							:style="{backgroundImage:`url(${bgc(item.icon)})`}">
+							<view class="" style="color: #2E2E2E;font-size: 26rpx;">
+								{{item.name}}
+							</view>
+							<view class="" :style=" {color: item.status==0?'#73DFB2':'#EE6969'}"
+								style="font-size: 28rpx;margin-top: 10rpx;font-weight: bold;">
+								{{ item.num?item.num+item.unit:'--' }}
+							</view>
+							<view class="" style="display: flex;color:#EE6969" v-if="item.status>0">
+								<u-icon name="arrow-upward" color="#EE6969"></u-icon>{{item.status}}
+							</view>
+							<view class="" v-if="item.status<0" style="color: #A3E1F5;display: flex;">
+								<u-icon name="arrow-downward" color="#A3E1F5"></u-icon>{{item.status}}
+							</view>
+						</view>
+
+					</view>
+				</view>
+
+
+				<view class="">
+					<view class="tit">
+						环境检测信息
+					</view>
+					<view class="area-check">
+						<view class="area-li" v-for="(item,index) in environmentList" :key="index"
+							:style="{backgroundImage:`url(${bgc(item.icon)})`}">
+
+
+							<view class="" style="color: #2E2E2E;font-size: 26rpx;">
+								{{item.name}}
+							</view>
+							<view class="" :style=" {color: item.status==0?'#73DFB2':'#EE6969'}"
+								style="font-size: 28rpx;margin-top: 10rpx;font-weight: bold;">
+								<text v-if="item.num==0">{{item.num+item.unit}}</text>
+								<text v-else>{{ item.num?item.num+item.unit:'--' }}</text>
+							</view>
+
+
+							<view class="" style="display: flex;color:#EE6969" v-if="item.status>0">
+								<u-icon name="arrow-upward" color="#EE6969"></u-icon>{{item.status}}
+							</view>
+							<view class="" v-if="item.status<0" style="color: #A3E1F5;display: flex;">
+								<u-icon name="arrow-downward" color="#A3E1F5"></u-icon>{{item.status}}
+							</view>
+						</view>
 					</view>
 				</view>
 
@@ -103,36 +168,157 @@
 
 
 
+
+
+
+
 			</view>
+
+			<u-loading-page :loading="showLoading"></u-loading-page>
+
+
+			<u-action-sheet :show="show" keyName="name" closeOnClickOverlay :actions="columns" title="请选择"
+				@close="show = false" @select="confirm">
+			</u-action-sheet>
 		</view>
 
 
+		<view class="Modal">
+			<u-popup :show="showModal" mode="center" @close="closeModal" :round="10">
+				<view class="Modal">
+					<text> 产品编号:</text>
+					<uni-data-select v-model="equipmentId" style="width: 300rpx;margin-left: 30rpx;"
+						:localdata="range"></uni-data-select>
+				</view>
+
+				<view class="Modal-btn">
+					<view class="Modal-btna" @click="closeModal">
+						取消
+					</view>
+					<view class="Modal-btnb" @click="bindFn">
+						确定
+					</view>
+				</view>
+			</u-popup>
+
+		</view>
+		<u-picker keyName="name" :show="showPicker1" @cancel="showPicker1=false" @confirm="confirm1"
+			:columns="columns2"></u-picker>
+
+		<u-picker keyName="label" :show="showPicker" @cancel="showPicker=false" @confirm="confirm2"
+			:columns="columns1"></u-picker>
 	</view>
-	<MyTabbar></MyTabbar>
+	<MyTabbar />
 </template>
 
 <script setup>
+	import {
+		reactive,
+		ref,
+	} from 'vue';
 	import {
 		onLoad,
 		onShow,
-		onReachBottom,
+		onHide,
 		onPullDownRefresh
-	} from "@dcloudio/uni-app"
-	import {
-		ref,
-		reactive,
-		onMounted
-	} from "vue"
-	import Myindex from '@/components/return/index.vue';
-	import store from "@/store/index.js"
-	import {
-		landlist
-	} from '@/api/api.js'
 
+	} from "@dcloudio/uni-app"
+	import Myindex from '@/components/return/index.vue';
 	import MyTabbar from "@/components/customTabbar/tabbar.vue"
+	import {
+		bindproduct,
+		lindexist,
+		landlist,
+		plantlist,
+		landproduct
+	} from '@/api/api.js'
+	import store from "@/store/index.js"
+	const showPicker = ref(false)
+	const showPicker1 = ref(false)
+	const showModal = ref(false)
+	const columns1 = reactive([
+		[{
+			label: '施肥',
+			route: "/pages/husbandryForm/fertilize"
+		}, {
+			label: '除草',
+			route: "/pages/husbandryForm/weeding"
+		}, {
+			label: '灌溉',
+			route: "/pages/husbandryForm/irrigate"
+		}, {
+			label: '除虫',
+			route: "/pages/husbandryForm/Pest"
+		}, {
+			label: '收获',
+			route: "/pages/husbandryForm/harvest"
+		}]
+	]);
+
+	const columns2 = reactive([])
+	const range = reactive([])
+	// 土壤监测数据
+	const url = ref('https://ceshi-worker-task.lihaink.cn//uploads//images//20231121//202311211336582b7920656.jpg')
+	const soilList = reactive([{
+			icon: "trwd",
+			name: "土壤温度",
+			num: 0,
+			unit: "℃",
+			status: 0,
+
+		}, {
+			icon: "trsd",
+			name: "土壤湿度",
+			num: 0,
+			unit: "%RH",
+			status: 0,
+
+		}, {
+			icon: "trddl",
+			name: "土壤导电率",
+			num: 0,
+			unit: "μS/cm",
+			status: 0,
+
+		}, {
+			icon: "trph",
+			name: "土壤PH值",
+			num: 0,
+			unit: "",
+			status: 0,
+
+		}, {
+			icon: "trhdl",
+			name: "土壤含氮量",
+			num: 0,
+			unit: "mg/kg",
+			status: 0,
+
+		}, {
+			icon: "trhll",
+			name: "土壤含磷量",
+			num: 0,
+			unit: "mg/kg",
+			status: 0,
+
+		}, {
+			icon: "trhjl",
+			name: "土壤含钾量",
+			num: 0,
+			unit: "mg/kg",
+			status: 0,
+
+		},
+
+	])
+	const userInfo = ref({
+		master_phone: "",
+		device_id: ""
+	})
 	onLoad(() => {
+
+
 		uni.hideTabBar()
-		// console.log(store.state.userInfo)
 		if (!store.state.userInfo) {
 			uni.redirectTo({
 				url: '/pages/Login/login'
@@ -140,110 +326,559 @@
 
 		}
 	})
-	onShow(() => {
-		list()
-	})
-	onPullDownRefresh(() => {
-		list()
-		uni.stopPullDownRefresh()
-	})
-	onReachBottom(() => {
-
-		getlist()
-	})
-	const datalist = reactive([])
-	const fomData = reactive({
-		page_no: 1,
-		page_size: 15,
-		keyword: ''
-	})
 
 
-	// 获取位置
-	const getPositionFn = () => {
-		uni.getLocation({
-			type: 'gcj02',
-			geocode: true,
-			isHighAccuracy: true,
+	const videoCover = ref('')
+
+	const dataobj = reactive({})
+	const tdId = ref('')
+	const palntId = ref('')
+	// 绑定设备
+	const equipmentId = ref("")
+	const bindFn = () => {
+		biproduct()
+		showModal.value = false
+	}
+	// 扫码
+	const scanFn = () => {
+		uni.scanCode({
 			success: function(res) {
-				uni.request({
-					url: `https://restapi.amap.com/v3/geocode/regeo?output=JSON&location=${res.longitude},${res.latitude}&key=b0c21bc6b220aa882bad8ffb6bce8829&radius=1000&extensions=all`,
-					success: (res) => {
-						console.log(res)
-					}
+				console.log('条码类型：' ,res);
+				console.log('条码内容：' + res.result.split('='));
+				uni.navigateTo({
+					url: '/pages/landDetail/results?id=' + res.result.split('=')[1]
 				})
 			}
 		});
 	}
-	const list = () => {
-		datalist.splice(0)
-		fomData.page_no = 1
-		getlist()
-	}
-	const getlist = () => {
-		landlist(fomData).then((res) => {
-			if (res.code == 1) {
-				datalist.push(...res.data)
-				fomData.page_no = fomData.page_no + 1
-			}
+	const goLive = () => {
 
+		let system = uni.getSystemInfoSync().platform
+
+		uni.navigateTo({
+			url: `/pages/live/${system == 'ios'?'liveIos':'live'}?url=${video_url.value }&user=${userInfo.value.master_phone}&device=${userInfo.value.device_id} `
+		})
+	}
+	const show = ref(false)
+	const showLoading = ref(false)
+	const columns = reactive([]);
+
+	// 环境基准
+	let threshold = []
+	const thresholdFn = (item, min, max) => {
+		if (item.num < min) {
+			item.status = (item.num - min).toFixed(1)
+		}
+		if (item.num > max) {
+			item.status = (item.num - max).toFixed(1)
+		}
+	}
+	// 环境监测数据
+	const environmentList = reactive([{
+			icon: "FS",
+			name: "风速",
+			num: 0,
+			unit: "m/s",
+			status: 0,
+
+		}, {
+			icon: "FX",
+			name: "风向",
+			num: 0,
+			unit: "",
+			status: 0,
+
+		}, {
+			icon: "WD1",
+			name: "环境温度",
+			num: 0,
+			unit: "℃",
+			status: 0,
+
+		}, {
+			icon: "SD",
+			name: "环境湿度",
+			num: 0,
+			unit: "%RH",
+			status: 0,
+
+		}, {
+			icon: 'eyht',
+			name: "二氧化碳",
+			num: 0,
+			unit: "ppm",
+			status: 0,
+		}, {
+			icon: "QY",
+			name: "气压",
+			num: 0,
+			unit: "KPa",
+			status: 0,
+
+		}, {
+			icon: "YL",
+			name: "雨量",
+			num: 0,
+			unit: "mm",
+			status: 0,
+
+		}, {
+			icon: "GZ",
+			name: "光照量",
+			num: 0,
+			unit: "Lux",
+			status: 0,
+
+		},
+
+	])
+	onShow(() => {
+
+		// getlist()
+		getlist1()
+		getlist2()
+
+	})
+	const bgc = (icon) => {
+		return `/static/main/index/${icon}.png`
+	}
+	const video_url = ref()
+
+
+	const testUser = () => {
+		if (uni.getStorageSync("SY_USER").mobile == '19130550023' || uni.getStorageSync("SY_USER").mobile ==
+			'19330904744') {
+			video_url.value =
+				"http://rtsp.lihaink.cn/live/lihai_lot_walnutpi_dev_6.live.mp4"
+			userInfo.value.master_phone = "lihai_lot_land_1"
+			userInfo.value.device_id = "6"
+			// console.log("19130550023")
+		}
+	}
+	//列表获取
+	const getlist = () => {
+		lindexist({
+			land_id: tdId.value
+		}).then((res) => {
+			if (res.code == 1) {
+				userInfo.value = res.data
+				video_url.value = res.data.video_url
+				testUser()
+				videoCover.value = userInfo.value.video_cover || "/static/main/index/videoCover.png"
+				// uni.getStorageSync('SY_VIDEO_POSTS') || "/static/main/index/videoCover.png"
+				threshold = res.data?.monitor?.threshold || ""
+				if (Object.keys(res.data).length > 0) {
+					getlist3(res.data.id)
+					Object.assign(dataobj, res.data);
+					if (res.data && res.data.monitor && res.data.monitor.soil_monitor_data) {
+						soilList[0].num = res.data.monitor.soil_monitor_data.soil_temperature
+						soilList[1].num = res.data.monitor.soil_monitor_data.soil_moisture
+						soilList[2].num = res.data.monitor.soil_monitor_data.conductivity
+						soilList[3].num = res.data.monitor.soil_monitor_data.ph
+						soilList[4].num = res.data.monitor.soil_monitor_data.n_content
+						soilList[5].num = res.data.monitor.soil_monitor_data.p_content
+						soilList[6].num = res.data.monitor.soil_monitor_data.k_content
+						thresholdFn(soilList[0], threshold.soil_temp_min, threshold.soil_temp_max)
+						thresholdFn(soilList[1], threshold.soil_mois_min, threshold.soil_mois_max)
+						thresholdFn(soilList[3], threshold.soil_ph_min, threshold.soil_ph_max)
+						thresholdFn(soilList[4], threshold.soil_n_content_min, threshold.soil_n_content_max)
+						thresholdFn(soilList[5], threshold.soil_p_content_min, threshold.soil_p_content_max)
+						thresholdFn(soilList[6], threshold.soil_k_content_min, threshold.soil_k_content_max)
+
+					}
+					if (res.data && res.data.monitor && res.data.monitor.air_monitor_data) {
+						environmentList[0].num = res.data.monitor.air_monitor_data.wind_speed
+						environmentList[1].num = res.data.monitor.air_monitor_data.wind_direction
+						environmentList[2].num = res.data.monitor.air_monitor_data.air_temperature
+						environmentList[3].num = res.data.monitor.air_monitor_data.air_moisture
+						environmentList[4].num = res.data.monitor.air_monitor_data.co2_content
+						environmentList[5].num = res.data.monitor.air_monitor_data.pressure
+						environmentList[6].num = res.data.monitor.air_monitor_data.rainfall
+						environmentList[7].num = res.data.monitor.air_monitor_data.light_intensity
+						thresholdFn(environmentList[0], threshold.wind_speed_min, threshold.wind_speed_max)
+						// thresholdFn(environmentList[1], threshold.wind_speed_min, threshold.wind_speed_max)
+						thresholdFn(environmentList[2], threshold.air_temp_min, threshold.air_temp_max)
+						thresholdFn(environmentList[3], threshold.air_mois_min, threshold.air_mois_max)
+						thresholdFn(environmentList[4], threshold.air_co2_content_min, threshold
+							.air_co2_content_max)
+						thresholdFn(environmentList[5], threshold.ambient_air_pressure_min, threshold
+							.ambient_air_pressure_max)
+						// thresholdFn(environmentList[6], threshold.ambient_air_pressure_min, threshold.ambient_air_pressure_max)
+						// thresholdFn(environmentList[6], threshold.ambient_air_pressure_min, threshold.ambient_air_pressure_max)
+					}
+				}
+			}
 		})
 
 	}
 
-	//输入监听
-	const inputval = (e) => {
-		// console.log(e)
-		if (e.length == 0) {
-			list()
-		}
+	const getlist1 = () => {
+		landlist({
+			page_no: 1,
+			page_size: 99995,
+			keyword: ''
+		}).then((res) => {
+			if (res.code == 1) {
+				tdId.value = res.data[0]?.id || ''
+				getlist()
+				if (res.data.length > 0) {
+					columns.splice(0, columns.length, ...res.data.map((step, index) => {
+						return {
+							name: step.title,
+							id: step.id,
+						};
+					}));
+				}
+			}
+		})
+
 	}
 
-	//搜索
-	const search = () => {
-		list()
+	const getlist2 = () => {
+		landproduct().then((res) => {
+			if (res.code == 1) {
+				range.splice(0, range.length, ...res.data.map((step, index) => {
+					return {
+						text: step.name,
+						value: step.product_id,
+					};
+				}));
+
+				// console.log(res)
+			}
+		})
+
+
+	}
+	const getlist3 = (id) => {
+		plantlist({
+			land_id: id
+		}).then((res) => {
+
+			if (res.code == 1) {
+				columns2.splice(0)
+				let arr1 = []
+				arr1.splice(0, arr1.length, ...res.data.map((step, index) => {
+					return {
+						name: step.kind + '-' + step.id,
+						id: step.id,
+						status: step.status
+					};
+				}));
+				columns2.push(arr1)
+
+
+
+			}
+		})
+
+
+	}
+
+	//关闭弹窗
+	const closeModal = () => {
+		showModal.value = false
+		equipmentId.value = ''
+	}
+	//绑定产品
+	const biproduct = () => {
+		if (equipmentId.value) {
+			bindproduct({
+				land_id: dataobj.id,
+				product_id: equipmentId.value
+			}).then((res) => {
+				if (res.code == 1) {
+					uni.$u.toast(res.msg);
+					// this.dataobj=res.data
+					equipmentId.value = ''
+				}
+				console.log(res)
+			})
+		} else {
+			uni.$u.toast('请选择产品编号');
+		}
+
+	}
+	const confirm2 = (e) => {
+		showPicker.value = false
+
+		uni.navigateTo({
+			url: e.value[0].route + '?id=' + palntId.value
+		})
+	}
+	const confirm1 = (e) => {
+
+		palntId.value = e.value[0].id
+		showPicker1.value = false
+		if (e.value[0].status == 2) {
+			uni.$u.toast('该土地已经收获，不能进行操作');
+		} else {
+			showPicker.value = true
+		}
+
+	}
+	const confirm = (e) => {
+		// console.log(e)
+		tdId.value = e.id
+
+		getlist()
+
+		show.value = false
+		showLoading.value = true
+		setTimeout(() => {
+			showLoading.value = false
+		}, 1000)
+	}
+	const getNowTimeFn = () => {
+		const now = new Date();
+		const hour = now.getHours();
+		const minute = now.getMinutes();
+		const formattedHour = hour < 10 ? '0' + hour : hour;
+		const formattedMinute = minute < 10 ? '0' + minute : minute;
+		const currentTime = formattedHour + ':' + formattedMinute;
+		return currentTime
+	}
+
+	const navgo = () => {
+		uni.navigateTo({
+			url: '/pages/landDetail/index?id=' + dataobj.id
+		})
+	}
+	const palnt = (id) => {
+
+		uni.navigateTo({
+			url: '/pages/husbandryForm/sow?id=' + id
+		})
 	}
 	const navto = (url) => {
 		uni.navigateTo({
 			url
 		})
 	}
-
-	const navgo = (item) => {
-		uni.navigateTo({
-			url: '/pages/landDetail/index?id=' + item.id
-		})
-	}
-
-	onMounted(() => {
-		// console.log('22222222')
-	})
+	getNowTimeFn()
 	const u = (name) => {
 		return `/static/main/index/${name}.png`
 	}
-	const bgc = (icon) => {
-		return `/static/main/index/${icon}.png`
-	}
-</script>
 
+
+
+
+	onPullDownRefresh(() => {
+		getlist1()
+		getlist2()
+		uni.stopPullDownRefresh()
+	})
+</script>
 <style lang="scss">
 	page {
-		// background-color: $theme-bg-color;
-		background-color: #F5FDFA;
+		background-color: $theme-bg-color;
+	}
+
+	.top {
+		background-color: #34D190;
+		position: fixed;
+		z-index: 999999;
+		width: 750rpx;
 
 	}
 
-	.header {
-		background-color: #34D190;
+	.coneng-detail {
+		width: 478rpx;
+		height: 341rpx;
+		background: #FFFFFF;
+		border-radius: 6px 6px 6px 6px;
+		opacity: 1;
+		font-size: 25rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		color: #737373;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+		margin: 70rpx auto;
+
+		image {
+			width: 280rpx;
+			height: 142rpx;
+			margin-bottom: 20rpx;
+
+
+		}
+	}
+
+	.add-thing {
+		width: 266.36rpx;
+		height: 66.59rpx;
+		border-radius: 42.06rpx 42.06rpx 42.06rpx 42.06rpx;
+		border: 1px solid $theme-main-color;
+		margin: 20rpx auto;
+		line-height: 66rpx;
+		text-align: center;
+		color: $theme-main-color;
+	}
+
+	.Modal {
+		padding: 60rpx 40rpx;
+		display: flex;
+
+		text {
+			margin-top: 5rpx;
+		}
+
+		.Modal-btn {
+			display: flex;
+			justify-content: space-around;
+			padding-bottom: 20rpx;
+
+			.Modal-btna {
+				width: 120rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				font-size: 25rpx;
+				background-color: #e5e0d8;
+				text-align: center;
+				border-radius: 30rpx;
+				color: #fff;
+			}
+
+			.Modal-btnb {
+				width: 120rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				font-size: 25rpx;
+				background-color: #34D190;
+				text-align: center;
+				border-radius: 30rpx;
+				color: #fff;
+
+			}
+		}
+	}
+
+	.uni-select__selector {
+		z-index: 9999 !important;
+	}
+
+	.nav-con {
+		display: flex;
+
+		padding-top: 20rpx;
+		padding-bottom: 10rpx;
+	}
+
+	.nav {
+		display: flex;
+		padding-right: 20rpx;
+		padding-left: 10rpx;
+
+	}
+
+	.card {
 		display: flex;
 		justify-content: space-between;
-		padding: 10rpx 0 10rpx 20rpx;
-		// padding-top: 10rpx;
-		// padding-left: 20rpx;
-		// padding-bottom: 20rpx;
+
+		.changeLand {
+			width: 200rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			text-align: center;
+			border-radius: 30rpx;
+			background-color: $theme-main-color;
+			color: white;
+		}
 	}
 
-	.tits {
+	.content {
+		// min-height: 92vh;	
+		padding: 0 30rpx;
+		// padding-top: 20rpx;
+		// background-color: red;
+		box-sizing: border-box;
+
+
+		// .land.land-info
+		.land-info {
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 30rpx;
+
+			.land-area {
+				width: 335rpx;
+				height: 120rpx;
+				font-size: 30rpx;
+				border-radius: 10rpx;
+				color: #1A1A1A;
+				box-sizing: border-box;
+				background-image: url('/static/main/index/tdmj.png');
+				background-size: 100% 100%;
+				box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
+				padding-top: 20rpx;
+				padding-left: 115rpx;
+
+			}
+
+			.plant-area {
+				width: 335rpx;
+				height: 120rpx;
+				font-size: 30rpx;
+				background-image: url('/static/main/index/zzmj.png');
+				background-size: 100% 100%;
+				box-sizing: border-box;
+				border-radius: 10rpx;
+				box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
+				padding-top: 20rpx;
+				padding-left: 115rpx;
+
+
+			}
+		}
+
+		.live-tit {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+
+		.live {
+
+			position: relative;
+			width: 100%;
+			height: 447rpx;
+			margin-bottom: 20rpx;
+		}
+
+
+	}
+
+	.note {
+		height: 168rpx;
+		background-image: url('/static/main/index/JNS.png');
+		// background-color: red;
+		background-size: 100% 100%;
+		margin-bottom: 30rpx;
+		position: relative;
+	}
+
+	.area-check {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+
+		.area-li {
+			width: 330rpx;
+			height: 194rpx;
+			border-radius: 10rpx;
+			background-size: 100% 100%;
+			margin-bottom: 20rpx;
+			padding: 45rpx 30rpx;
+			box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
+		}
+	}
+
+
+
+	.tit {
 		position: relative;
 		padding-left: 20rpx;
 		font-weight: bold;
@@ -252,7 +887,7 @@
 		color: #1A1A1A;
 	}
 
-	.tits::before {
+	.tit::before {
 		content: "";
 		position: absolute;
 		top: 50%;
@@ -265,190 +900,110 @@
 		background-color: #34D08D;
 	}
 
-	// old
-	.content {
+	.soil-monitor {
+		margin-top: 40rpx;
 
-		position: relative;
-		padding: 0 20rpx;
+		.head {
 
 
-		// padding-top: 100rpx;
-
-		.head-img {
-			// position: absolute;
-			// display: flex;
-			// top: 0;
-			// right: 10rpx;
-			// margin-top: 20rpx;
-
-		}
-
-		.land {
-			width: 100rpx;
-			height: 100rpx;
-			line-height: 100rpx;
-			text-align: center;
-			background-color: #fff;
-			border-radius: 50%;
-			position: absolute;
-			right: 60rpx;
-			bottom: 130rpx;
-			position: fixed;
-		}
-
-
-		.serch {
-
-			// padding-bottom: 20rpx;
-			box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
-			border-radius: 200rpx;
-			position: relative;
-			color: #35D190;
-			font-size: 28rpx;
-			margin-top: 20rpx;
-
-			margin-bottom: 20rpx;
-
-			.ser-text {
-				position: absolute;
-				padding-left: 20rpx;
-				top: 50%;
-				transform: translateY(-50%);
-				right: 40rpx;
-
-			}
-
-			.ser-text::before {
-				content: "";
-				position: absolute;
-				top: 50%;
-				transform: translateY(-50%);
-				left: 0;
-				width: 2px;
-				/* 左边框的宽度 */
-				height: 20rpx;
-				background-color: #34D08D;
-			}
-
-			// width: 100%;
-			// height: 100rpx;
-			// background-color: #EAF2EF;
-			// position: absolute;
-			// position: fixed;
-			// display: flex;
-			// top: 0;
-			// // padding-top: calc(70rpx + var(--status-bar-height) + 20rpx);
-			// padding-right: 20rpx;
-
-
-			// .custom-style {
-			// 	color: #606266;
-			// 	width: 140rpx;
-			// 	border-radius: 30rpx;
-			// 	margin-top: 10rpx;
-			// 	margin-right: 20rpx;
-			// }
-
-			// z-index: 8888 !important;
-
-		}
-
-		.border-bgc {
-			height: 200rpx;
-			background-color: #34D190;
-			border-radius: 0 0 40rpx 40rpx;
-			position: absolute;
-			width: 750rpx;
-
-		}
-
-		.coneng-detail {
-			width: 478rpx;
-			height: 341rpx;
-			background: #FFFFFF;
-			border-radius: 6px 6px 6px 6px;
-			opacity: 1;
-			font-size: 25rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 400;
-			color: #737373;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			text-align: center;
-
-			margin: 300rpx auto;
-
-			image {
-				width: 280rpx;
-				height: 142rpx;
-				margin-bottom: 20rpx;
-
-
-			}
-		}
-
-		.card {
-			position: relative;
-
-			margin: auto;
-			background-color: #FFFFFF;
-			box-sizing: border-box;
-			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
-			margin-bottom: 40rpx;
-
-
-			.plant-status {
-				position: absolute;
-				width: 109rpx;
-				height: 99rpx;
-				background-image: url('/static/main/index/wzz.png');
-				background-size: 100% 100%;
-				top: -10rpx;
-				right: 50rpx;
-				color: white;
-				text-align: center;
-				padding-top: 20rpx;
-				font-size: 26rpx;
-
-			}
-
-			.card-content {
+			.flushed-time {
 				display: flex;
+				font-size: 26.29rpx;
+				color: #737373;
+				margin-top: 10rpx;
+			}
+		}
 
-				.card-tit {
-					font-weight: bold;
-					margin-bottom: 10rpx;
-					color: black;
-					font-size: 28rpx;
+		.monitor-content {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.monitor-card {
+				margin-top: 20rpx;
+				background-color: white;
+				padding: 30rpx 20rpx;
+				border-radius: 30rpx;
+				width: 332.94rpx;
+				box-sizing: border-box;
+				height: 212.03rpx;
+
+				.name {
+					font-size: 29.79rpx;
+					display: flex;
+					align-items: center;
 				}
 
-				.card-address {
-					// width: 60vw;
-					width: 500rpx;
-					white-space: nowrap;
-					/* 文字不换行 */
-					overflow: hidden;
-					/* 超出部分隐藏 */
-					text-overflow: ellipsis;
-					/* 超出部分显示省略号 */
-				}
-
-				.value {
-
-
-					/* 超出部分显示省略号 */
+				.num {
+					margin-top: 30rpx;
+					color: $theme-main-color;
 
 				}
 			}
 
-			// .tit {
-			// 	display: flex;
-			// 	font-size: 33.29rpx;
-			// 	font-weight: bold;
-
-			// 	justify-content: space-between;
-			// }
 		}
 	}
+
+	.video {
+		margin-top: 20rpx;
+		width: 100%;
+		height: 300rpx;
+	}
+
+	.empty {
+		height: 100vh;
+		background-color: $theme-bg-color;
+		position: relative;
+
+		.addLand {
+			width: auto;
+			height: 100rpx;
+			color: grey;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+
+			.addBtn {
+				margin-top: 20rpx;
+				width: 250rpx;
+				height: 70rpx;
+				border: 1px solid $theme-main-color;
+				line-height: 70rpx;
+				border-radius: 50rpx;
+				text-align: center;
+			}
+
+		}
+	}
+
+	.empty-land {
+		width: 715rpx;
+		margin: 0 auto;
+		height: 135rpx;
+		transform: translateX(-20rpx);
+		color: #74A0EA;
+		text-align: center;
+		background-image: url('../../static/main/index/xz.png');
+		background-size: 100% 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding-left: 200rpx;
+		padding-right: 10rpx;
+	}
+
+	.title {
+		padding-left: 20rpx;
+		display: flex;
+		color: white;
+		font-size: 32rpx;
+		width: 400rpx;
+	}
+
+	.text {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/massif.vue b/pages/index/massif.vue
index 4253ad5..9b07343 100644
--- a/pages/index/massif.vue
+++ b/pages/index/massif.vue
@@ -1,324 +1,138 @@
 <template>
-	<view class="" style="position: relative;">
-		<view class="top">
-			<!-- 17828474084 -->
-			<view class="" style="height:var(--status-bar-height) ;">
-			</view>
-
-			<view class="nav-con" style="justify-content: space-between;">
-				<view class="title" v-if="Object.keys(dataobj).length>0" @click=" show=true">
-					<u--image :src="u('qhtd')" width="38.55rpx" height="38.55rpx"
-						style="margin-right: 20rpx;"></u--image>
-					<text class="text">{{dataobj.title}}</text>
-
-				</view>
-				<view class="" v-else>
-
-				</view>
-
-				<view class="" style="display: flex;align-items: center;">
-					<view class="nav">
-						<view class="" style="margin-right: 16rpx;">
-							<u--image :src="u('sbbd')" width="35.25rpx" @click="showModal=true"
-								height="35.25rpx"></u--image>
-						</view>
-						<view class="" style="margin-left: 16rpx;">
-							<u--image :src="u('sys')" width="35.25rpx" @click="scanFn" height="35.25rpx"></u--image>
-						</view>
-
-						<view class="" style="margin-left: 20rpx;">
-
-						</view>
-					</view>
-
-					<view class="" style="margin-top: -5rpx;">
-						<Myindex url='/pages/index/massif' />
-					</view>
-				</view>
-			</view>
-
-
+	<view class="">
+		<view class="" style="height: var(--status-bar-height);background-color: #35D190;">
 
 		</view>
-		<view class="">
-			<view class="" style="height:var(--status-bar-height) ;">
-			</view>
-			<view class="nav-con" style="margin-bottom: 65rpx;">
-			</view>
+		<view class="header">
+			<u-icon name="plus-circle" color="white" @click="navto('/pages/addLand/addLand')" :size="28"></u-icon>
+
+			<Myindex url='/pages/index/massif' />
 		</view>
 		<view class="content">
-			<!-- 土地信息 -->
-			<view class="">
-				<view class="empty-land" v-if="Object.keys(dataobj).length<=0">
-					<text>没有土地信息？</text>
-					<text @click="navto('/pages/addLand/addLand')" style="display: flex;">去新增 <u-icon name="arrow-right"
-							color="#709DE9" size="28"></u-icon></text>
+			<view class="serch">
+				<u-search bgColor="white" :show-action="false" placeholder="搜索你的土地信息" v-model="fomData.keyword"
+					shape="round" :clearabled='false' @change="inputval"></u-search>
+				<view class="ser-text" @click="search">
+					搜索
 				</view>
+			</view>
+			<view class="tits">
+				土地信息
+			</view>
+			<view class="card" v-for="(item,index) in datalist" :key="index" @click="navgo(item)">
+				<view class="plant-status" v-if="item.residual_area!=item.total_area"
+					:style="{backgroundImage:`url(${bgc('yzz')})`}">
+					已种植
+				</view>
+				<view class="plant-status" v-if="item.residual_area==item.total_area"
+					:style="{backgroundImage:`url(${bgc('wzz')})`}">
+					未种植
+				</view>
+				<view class="card-content">
+					<u--image v-if="item.pic" :src="item.pic[0]||''" height="150rpx" width="150rpx"
+						style="margin-right: 20rpx;border-radius: 10rpx;overflow: hidden;"></u--image>
 
-
-				<view class="land-info">
-					<view class="land-area">
-						土地面积
-						<view style="color: #7B7B7B; font-size: 28rpx;">
-							{{dataobj.total_area|| "--"}}亩
+					<view style="color:#7B7B7B;font-size: 26rpx;">
+						<view class="card-tit">
+							{{item.title}}
 						</view>
-
-					</view>
-					<view class="plant-area">
-						种植面积
-						<view style="color: #7B7B7B; font-size: 28rpx;">
-							{{dataobj.total_area-dataobj.residual_area||"--"}}亩
+						<view class="">
+							<text style="color: black;">种植面积</text> : {{item.total_area-item.residual_area}}亩
+						</view>
+						<view class="">
+							<text style="color: black;">土地面积</text>: {{item.total_area}}亩
+						</view>
+						<view class="card-address">
+							<text style="color: black;white-space: nowrap;">地址</text>: {{item.address}}
 						</view>
 					</view>
+
 				</view>
 
-				<view v-if="(dataobj.total_area-dataobj.residual_area)==0" @click="palnt(dataobj.id)">
-					<view class="empty-land" style="background-image: url('static/main/index/xzzh.png');">
-						<text></text>
-						<text style="display: flex;font-size: 26rpx;">新增种植 <u-icon name="arrow-right" color="#709DE9"
-								size="15"></u-icon></text>
+
+
+				<!-- old -->
+
+				<!-- <view class="tit card-li" style="margin-top: 50rpx;">
+					<view class="">
+						{{item.title}}
+					</view>
+					<view class="" style="color: #00A15E;" v-if="item.residual_area!=item.total_area">
+						已种植
+					</view>
+					<view class="" style="color: #00A15E;" v-if="item.residual_area==item.total_area">
+						未种植
 					</view>
 				</view>
-				<view class="note" v-else>
-					<u--image v-if="columns2[0]&&columns2[0].length>0" @click="showPicker1=true" :src="u('qtj')"
-						click="showPicker1=true" width="170rpx" height="40rpx"
-						style="position: absolute;right: 80rpx;top: 80rpx;"></u--image>
+				<view class="card-li" v-if="item.residual_area!=item.total_area">
+					<view class="">
+						种植面积:{{item.total_area-item.residual_area}}亩
+					</view>
+					<view class="">
+						土地面积:{{item.total_area}}亩
+					</view>
 				</view>
-				<view class="live-tit" style="color: #1A1A1A;">
-					<view class="tit" style="">
-						苗情检测视频
+				<view class="card-li" v-if="item.residual_area==item.total_area">
+					<view class="">
+						未种植面积:{{item.total_area}}亩
 					</view>
-					<view class="" style="font-size: 20rpx;color: #ACACAC;display: flex;align-items: center;">
-						<!-- <u-icon name="clock" style="margin-right: 5rpx;" color="#ACACAC"></u-icon> -->
-						<u--image :src="u('sj')" width='18rpx' height="18rpx" style="margin-right:5rpx"></u--image>
-						刷新时间：{{getNowTimeFn()}}
-					</view>
-
-
 				</view>
-				<view class="live">
-					<u--image :src="videoCover" v-if="video_url" width="100%" height="450rpx"></u--image>
-					<u--image :src="u('K')" v-else width="100%"></u--image>
-
-					<view class=""
-						style="width: 100%;height: 100%;background-color: rgba(0, 0, 0, .5);position: absolute;top: 1px;"
-						@click="goLive" v-if="video_url">
-						<u-icon name="play-circle" size="40" color="white" v-if="video_url"
-							style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);"></u-icon>
+				<view class="card-li tit">
+					<view class="" style="font-weight: normal;">
+						地址: {{item.address}}
 					</view>
-
 				</view>
 
+			 -->
+
+
+			</view>
+			<!-- <view class="land" @click="navgo('/pages/addLand/addLand')">
+				土地
+			</view> -->
+
+			<view class="coneng-detail" v-if="datalist.length==0">
 				<view class="">
-					<view class="tit">
-						土壤检测信息
-					</view>
-					<view class="area-check">
-						<view class="area-li" v-for="(item,index) in soilList" :key="index"
-							:style="{backgroundImage:`url(${bgc(item.icon)})`}">
-							<view class="" style="color: #2E2E2E;font-size: 26rpx;">
-								{{item.name}}
-							</view>
-							<view class="" :style=" {color: item.status==0?'#73DFB2':'#EE6969'}"
-								style="font-size: 28rpx;margin-top: 10rpx;font-weight: bold;">
-								{{ item.num?item.num+item.unit:'--' }}
-							</view>
-							<view class="" style="display: flex;color:#EE6969" v-if="item.status>0">
-								<u-icon name="arrow-upward" color="#EE6969"></u-icon>{{item.status}}
-							</view>
-							<view class="" v-if="item.status<0" style="color: #A3E1F5;display: flex;">
-								<u-icon name="arrow-downward" color="#A3E1F5"></u-icon>{{item.status}}
-							</view>
-						</view>
-
+					<image src="@/static/img/zw.png" mode="aspectFit"></image>
+					<view class="">
+						暂无数据
 					</view>
 				</view>
 
 
-				<view class="">
-					<view class="tit">
-						环境检测信息
-					</view>
-					<view class="area-check">
-						<view class="area-li" v-for="(item,index) in environmentList" :key="index"
-							:style="{backgroundImage:`url(${bgc(item.icon)})`}">
-
-
-							<view class="" style="color: #2E2E2E;font-size: 26rpx;">
-								{{item.name}}
-							</view>
-							<view class="" :style=" {color: item.status==0?'#73DFB2':'#EE6969'}"
-								style="font-size: 28rpx;margin-top: 10rpx;font-weight: bold;">
-								<text v-if="item.num==0">{{item.num+item.unit}}</text>
-								<text v-else>{{ item.num?item.num+item.unit:'--' }}</text>
-							</view>
-
-
-							<view class="" style="display: flex;color:#EE6969" v-if="item.status>0">
-								<u-icon name="arrow-upward" color="#EE6969"></u-icon>{{item.status}}
-							</view>
-							<view class="" v-if="item.status<0" style="color: #A3E1F5;display: flex;">
-								<u-icon name="arrow-downward" color="#A3E1F5"></u-icon>{{item.status}}
-							</view>
-						</view>
-					</view>
-				</view>
-
-
-
-
-
-
 
 
 
 			</view>
-
-			<u-loading-page :loading="showLoading"></u-loading-page>
-
-
-			<u-action-sheet :show="show" keyName="name" closeOnClickOverlay :actions="columns" title="请选择"
-				@close="show = false" @select="confirm">
-			</u-action-sheet>
 		</view>
 
 
-		<view class="Modal">
-			<u-popup :show="showModal" mode="center" @close="closeModal" :round="10">
-				<view class="Modal">
-					<text> 产品编号:</text>
-					<uni-data-select v-model="equipmentId" style="width: 300rpx;margin-left: 30rpx;"
-						:localdata="range"></uni-data-select>
-				</view>
-
-				<view class="Modal-btn">
-					<view class="Modal-btna" @click="closeModal">
-						取消
-					</view>
-					<view class="Modal-btnb" @click="bindFn">
-						确定
-					</view>
-				</view>
-			</u-popup>
-
-		</view>
-		<u-picker keyName="name" :show="showPicker1" @cancel="showPicker1=false" @confirm="confirm1"
-			:columns="columns2"></u-picker>
-
-		<u-picker keyName="label" :show="showPicker" @cancel="showPicker=false" @confirm="confirm2"
-			:columns="columns1"></u-picker>
 	</view>
-	<MyTabbar />
+	<MyTabbar></MyTabbar>
 </template>
 
 <script setup>
-	import {
-		reactive,
-		ref,
-	} from 'vue';
 	import {
 		onLoad,
 		onShow,
-		onHide,
+		onReachBottom,
 		onPullDownRefresh
-
 	} from "@dcloudio/uni-app"
-	import Myindex from '@/components/return/index.vue';
-	import MyTabbar from "@/components/customTabbar/tabbar.vue"
 	import {
-		bindproduct,
-		lindexist,
-		landlist,
-		plantlist,
-		landproduct
-	} from '@/api/api.js'
+		ref,
+		reactive,
+		onMounted
+	} from "vue"
+	import Myindex from '@/components/return/index.vue';
 	import store from "@/store/index.js"
-	const showPicker = ref(false)
-	const showPicker1 = ref(false)
-	const showModal = ref(false)
-	const columns1 = reactive([
-		[{
-			label: '施肥',
-			route: "/pages/husbandryForm/fertilize"
-		}, {
-			label: '除草',
-			route: "/pages/husbandryForm/weeding"
-		}, {
-			label: '灌溉',
-			route: "/pages/husbandryForm/irrigate"
-		}, {
-			label: '除虫',
-			route: "/pages/husbandryForm/Pest"
-		}, {
-			label: '收获',
-			route: "/pages/husbandryForm/harvest"
-		}]
-	]);
+	import {
+		landlist
+	} from '@/api/api.js'
 
-	const columns2 = reactive([])
-	const range = reactive([])
-	// 土壤监测数据
-	const url = ref('https://ceshi-worker-task.lihaink.cn//uploads//images//20231121//202311211336582b7920656.jpg')
-	const soilList = reactive([{
-			icon: "trwd",
-			name: "土壤温度",
-			num: 0,
-			unit: "℃",
-			status: 0,
-
-		}, {
-			icon: "trsd",
-			name: "土壤湿度",
-			num: 0,
-			unit: "%RH",
-			status: 0,
-
-		}, {
-			icon: "trddl",
-			name: "土壤导电率",
-			num: 0,
-			unit: "μS/cm",
-			status: 0,
-
-		}, {
-			icon: "trph",
-			name: "土壤PH值",
-			num: 0,
-			unit: "",
-			status: 0,
-
-		}, {
-			icon: "trhdl",
-			name: "土壤含氮量",
-			num: 0,
-			unit: "mg/kg",
-			status: 0,
-
-		}, {
-			icon: "trhll",
-			name: "土壤含磷量",
-			num: 0,
-			unit: "mg/kg",
-			status: 0,
-
-		}, {
-			icon: "trhjl",
-			name: "土壤含钾量",
-			num: 0,
-			unit: "mg/kg",
-			status: 0,
-
-		},
-
-	])
-	const userInfo = ref({
-		master_phone: "",
-		device_id: ""
-	})
+	import MyTabbar from "@/components/customTabbar/tabbar.vue"
 	onLoad(() => {
-
-
 		uni.hideTabBar()
+		// console.log(store.state.userInfo)
 		if (!store.state.userInfo) {
 			uni.redirectTo({
 				url: '/pages/Login/login'
@@ -326,559 +140,110 @@
 
 		}
 	})
+	onShow(() => {
+		list()
+	})
+	onPullDownRefresh(() => {
+		list()
+		uni.stopPullDownRefresh()
+	})
+	onReachBottom(() => {
+
+		getlist()
+	})
+	const datalist = reactive([])
+	const fomData = reactive({
+		page_no: 1,
+		page_size: 15,
+		keyword: ''
+	})
 
 
-	const videoCover = ref('')
-
-	const dataobj = reactive({})
-	const tdId = ref('')
-	const palntId = ref('')
-	// 绑定设备
-	const equipmentId = ref("")
-	const bindFn = () => {
-		biproduct()
-		showModal.value = false
-	}
-	// 扫码
-	const scanFn = () => {
-		uni.scanCode({
+	// 获取位置
+	const getPositionFn = () => {
+		uni.getLocation({
+			type: 'gcj02',
+			geocode: true,
+			isHighAccuracy: true,
 			success: function(res) {
-				console.log('条码类型：' ,res);
-				console.log('条码内容：' + res.result.split('='));
-				uni.navigateTo({
-					url: '/pages/landDetail/results?id=' + res.result.split('=')[1]
+				uni.request({
+					url: `https://restapi.amap.com/v3/geocode/regeo?output=JSON&location=${res.longitude},${res.latitude}&key=b0c21bc6b220aa882bad8ffb6bce8829&radius=1000&extensions=all`,
+					success: (res) => {
+						console.log(res)
+					}
 				})
 			}
 		});
 	}
-	const goLive = () => {
-
-		let system = uni.getSystemInfoSync().platform
-
-		uni.navigateTo({
-			url: `/pages/live/${system == 'ios'?'liveIos':'live'}?url=${video_url.value }&user=${userInfo.value.master_phone}&device=${userInfo.value.device_id} `
-		})
-	}
-	const show = ref(false)
-	const showLoading = ref(false)
-	const columns = reactive([]);
-
-	// 环境基准
-	let threshold = []
-	const thresholdFn = (item, min, max) => {
-		if (item.num < min) {
-			item.status = (item.num - min).toFixed(1)
-		}
-		if (item.num > max) {
-			item.status = (item.num - max).toFixed(1)
-		}
-	}
-	// 环境监测数据
-	const environmentList = reactive([{
-			icon: "FS",
-			name: "风速",
-			num: 0,
-			unit: "m/s",
-			status: 0,
-
-		}, {
-			icon: "FX",
-			name: "风向",
-			num: 0,
-			unit: "",
-			status: 0,
-
-		}, {
-			icon: "WD1",
-			name: "环境温度",
-			num: 0,
-			unit: "℃",
-			status: 0,
-
-		}, {
-			icon: "SD",
-			name: "环境湿度",
-			num: 0,
-			unit: "%RH",
-			status: 0,
-
-		}, {
-			icon: 'eyht',
-			name: "二氧化碳",
-			num: 0,
-			unit: "ppm",
-			status: 0,
-		}, {
-			icon: "QY",
-			name: "气压",
-			num: 0,
-			unit: "KPa",
-			status: 0,
-
-		}, {
-			icon: "YL",
-			name: "雨量",
-			num: 0,
-			unit: "mm",
-			status: 0,
-
-		}, {
-			icon: "GZ",
-			name: "光照量",
-			num: 0,
-			unit: "Lux",
-			status: 0,
-
-		},
-
-	])
-	onShow(() => {
-
-		// getlist()
-		getlist1()
-		getlist2()
-
-	})
-	const bgc = (icon) => {
-		return `/static/main/index/${icon}.png`
-	}
-	const video_url = ref()
-
-
-	const testUser = () => {
-		if (uni.getStorageSync("SY_USER").mobile == '19130550023' || uni.getStorageSync("SY_USER").mobile ==
-			'19330904744') {
-			video_url.value =
-				"http://rtsp.lihaink.cn/live/lihai_lot_walnutpi_dev_6.live.mp4"
-			userInfo.value.master_phone = "lihai_lot_land_1"
-			userInfo.value.device_id = "6"
-			// console.log("19130550023")
-		}
-	}
-	//列表获取
-	const getlist = () => {
-		lindexist({
-			land_id: tdId.value
-		}).then((res) => {
-			if (res.code == 1) {
-				userInfo.value = res.data
-				video_url.value = res.data.video_url
-				testUser()
-				videoCover.value = userInfo.value.video_cover || "/static/main/index/videoCover.png"
-				// uni.getStorageSync('SY_VIDEO_POSTS') || "/static/main/index/videoCover.png"
-				threshold = res.data?.monitor?.threshold || ""
-				if (Object.keys(res.data).length > 0) {
-					getlist3(res.data.id)
-					Object.assign(dataobj, res.data);
-					if (res.data && res.data.monitor && res.data.monitor.soil_monitor_data) {
-						soilList[0].num = res.data.monitor.soil_monitor_data.soil_temperature
-						soilList[1].num = res.data.monitor.soil_monitor_data.soil_moisture
-						soilList[2].num = res.data.monitor.soil_monitor_data.conductivity
-						soilList[3].num = res.data.monitor.soil_monitor_data.ph
-						soilList[4].num = res.data.monitor.soil_monitor_data.n_content
-						soilList[5].num = res.data.monitor.soil_monitor_data.p_content
-						soilList[6].num = res.data.monitor.soil_monitor_data.k_content
-						thresholdFn(soilList[0], threshold.soil_temp_min, threshold.soil_temp_max)
-						thresholdFn(soilList[1], threshold.soil_mois_min, threshold.soil_mois_max)
-						thresholdFn(soilList[3], threshold.soil_ph_min, threshold.soil_ph_max)
-						thresholdFn(soilList[4], threshold.soil_n_content_min, threshold.soil_n_content_max)
-						thresholdFn(soilList[5], threshold.soil_p_content_min, threshold.soil_p_content_max)
-						thresholdFn(soilList[6], threshold.soil_k_content_min, threshold.soil_k_content_max)
-
-					}
-					if (res.data && res.data.monitor && res.data.monitor.air_monitor_data) {
-						environmentList[0].num = res.data.monitor.air_monitor_data.wind_speed
-						environmentList[1].num = res.data.monitor.air_monitor_data.wind_direction
-						environmentList[2].num = res.data.monitor.air_monitor_data.air_temperature
-						environmentList[3].num = res.data.monitor.air_monitor_data.air_moisture
-						environmentList[4].num = res.data.monitor.air_monitor_data.co2_content
-						environmentList[5].num = res.data.monitor.air_monitor_data.pressure
-						environmentList[6].num = res.data.monitor.air_monitor_data.rainfall
-						environmentList[7].num = res.data.monitor.air_monitor_data.light_intensity
-						thresholdFn(environmentList[0], threshold.wind_speed_min, threshold.wind_speed_max)
-						// thresholdFn(environmentList[1], threshold.wind_speed_min, threshold.wind_speed_max)
-						thresholdFn(environmentList[2], threshold.air_temp_min, threshold.air_temp_max)
-						thresholdFn(environmentList[3], threshold.air_mois_min, threshold.air_mois_max)
-						thresholdFn(environmentList[4], threshold.air_co2_content_min, threshold
-							.air_co2_content_max)
-						thresholdFn(environmentList[5], threshold.ambient_air_pressure_min, threshold
-							.ambient_air_pressure_max)
-						// thresholdFn(environmentList[6], threshold.ambient_air_pressure_min, threshold.ambient_air_pressure_max)
-						// thresholdFn(environmentList[6], threshold.ambient_air_pressure_min, threshold.ambient_air_pressure_max)
-					}
-				}
-			}
-		})
-
-	}
-
-	const getlist1 = () => {
-		landlist({
-			page_no: 1,
-			page_size: 99995,
-			keyword: ''
-		}).then((res) => {
-			if (res.code == 1) {
-				tdId.value = res.data[0]?.id || ''
-				getlist()
-				if (res.data.length > 0) {
-					columns.splice(0, columns.length, ...res.data.map((step, index) => {
-						return {
-							name: step.title,
-							id: step.id,
-						};
-					}));
-				}
-			}
-		})
-
-	}
-
-	const getlist2 = () => {
-		landproduct().then((res) => {
-			if (res.code == 1) {
-				range.splice(0, range.length, ...res.data.map((step, index) => {
-					return {
-						text: step.name,
-						value: step.product_id,
-					};
-				}));
-
-				// console.log(res)
-			}
-		})
-
-
-	}
-	const getlist3 = (id) => {
-		plantlist({
-			land_id: id
-		}).then((res) => {
-
-			if (res.code == 1) {
-				columns2.splice(0)
-				let arr1 = []
-				arr1.splice(0, arr1.length, ...res.data.map((step, index) => {
-					return {
-						name: step.kind + '-' + step.id,
-						id: step.id,
-						status: step.status
-					};
-				}));
-				columns2.push(arr1)
-
-
-
-			}
-		})
-
-
-	}
-
-	//关闭弹窗
-	const closeModal = () => {
-		showModal.value = false
-		equipmentId.value = ''
-	}
-	//绑定产品
-	const biproduct = () => {
-		if (equipmentId.value) {
-			bindproduct({
-				land_id: dataobj.id,
-				product_id: equipmentId.value
-			}).then((res) => {
-				if (res.code == 1) {
-					uni.$u.toast(res.msg);
-					// this.dataobj=res.data
-					equipmentId.value = ''
-				}
-				console.log(res)
-			})
-		} else {
-			uni.$u.toast('请选择产品编号');
-		}
-
-	}
-	const confirm2 = (e) => {
-		showPicker.value = false
-
-		uni.navigateTo({
-			url: e.value[0].route + '?id=' + palntId.value
-		})
-	}
-	const confirm1 = (e) => {
-
-		palntId.value = e.value[0].id
-		showPicker1.value = false
-		if (e.value[0].status == 2) {
-			uni.$u.toast('该土地已经收获，不能进行操作');
-		} else {
-			showPicker.value = true
-		}
-
-	}
-	const confirm = (e) => {
-		// console.log(e)
-		tdId.value = e.id
-
+	const list = () => {
+		datalist.splice(0)
+		fomData.page_no = 1
 		getlist()
-
-		show.value = false
-		showLoading.value = true
-		setTimeout(() => {
-			showLoading.value = false
-		}, 1000)
-	}
-	const getNowTimeFn = () => {
-		const now = new Date();
-		const hour = now.getHours();
-		const minute = now.getMinutes();
-		const formattedHour = hour < 10 ? '0' + hour : hour;
-		const formattedMinute = minute < 10 ? '0' + minute : minute;
-		const currentTime = formattedHour + ':' + formattedMinute;
-		return currentTime
 	}
+	const getlist = () => {
+		landlist(fomData).then((res) => {
+			if (res.code == 1) {
+				datalist.push(...res.data)
+				fomData.page_no = fomData.page_no + 1
+			}
 
-	const navgo = () => {
-		uni.navigateTo({
-			url: '/pages/landDetail/index?id=' + dataobj.id
 		})
-	}
-	const palnt = (id) => {
 
-		uni.navigateTo({
-			url: '/pages/husbandryForm/sow?id=' + id
-		})
+	}
+
+	//输入监听
+	const inputval = (e) => {
+		// console.log(e)
+		if (e.length == 0) {
+			list()
+		}
+	}
+
+	//搜索
+	const search = () => {
+		list()
 	}
 	const navto = (url) => {
 		uni.navigateTo({
 			url
 		})
 	}
-	getNowTimeFn()
+
+	const navgo = (item) => {
+		uni.navigateTo({
+			url: '/pages/landDetail/index?id=' + item.id
+		})
+	}
+
+	onMounted(() => {
+		// console.log('22222222')
+	})
 	const u = (name) => {
 		return `/static/main/index/${name}.png`
 	}
-
-
-
-
-	onPullDownRefresh(() => {
-		getlist1()
-		getlist2()
-		uni.stopPullDownRefresh()
-	})
+	const bgc = (icon) => {
+		return `/static/main/index/${icon}.png`
+	}
 </script>
+
 <style lang="scss">
 	page {
-		background-color: $theme-bg-color;
+		// background-color: $theme-bg-color;
+		background-color: #F5FDFA;
+
 	}
 
-	.top {
+	.header {
 		background-color: #34D190;
-		position: fixed;
-		z-index: 999999;
-		width: 750rpx;
-
-	}
-
-	.coneng-detail {
-		width: 478rpx;
-		height: 341rpx;
-		background: #FFFFFF;
-		border-radius: 6px 6px 6px 6px;
-		opacity: 1;
-		font-size: 25rpx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 400;
-		color: #737373;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		text-align: center;
-		margin: 70rpx auto;
-
-		image {
-			width: 280rpx;
-			height: 142rpx;
-			margin-bottom: 20rpx;
-
-
-		}
-	}
-
-	.add-thing {
-		width: 266.36rpx;
-		height: 66.59rpx;
-		border-radius: 42.06rpx 42.06rpx 42.06rpx 42.06rpx;
-		border: 1px solid $theme-main-color;
-		margin: 20rpx auto;
-		line-height: 66rpx;
-		text-align: center;
-		color: $theme-main-color;
-	}
-
-	.Modal {
-		padding: 60rpx 40rpx;
-		display: flex;
-
-		text {
-			margin-top: 5rpx;
-		}
-
-		.Modal-btn {
-			display: flex;
-			justify-content: space-around;
-			padding-bottom: 20rpx;
-
-			.Modal-btna {
-				width: 120rpx;
-				height: 60rpx;
-				line-height: 60rpx;
-				font-size: 25rpx;
-				background-color: #e5e0d8;
-				text-align: center;
-				border-radius: 30rpx;
-				color: #fff;
-			}
-
-			.Modal-btnb {
-				width: 120rpx;
-				height: 60rpx;
-				line-height: 60rpx;
-				font-size: 25rpx;
-				background-color: #34D190;
-				text-align: center;
-				border-radius: 30rpx;
-				color: #fff;
-
-			}
-		}
-	}
-
-	.uni-select__selector {
-		z-index: 9999 !important;
-	}
-
-	.nav-con {
-		display: flex;
-
-		padding-top: 20rpx;
-		padding-bottom: 10rpx;
-	}
-
-	.nav {
-		display: flex;
-		padding-right: 20rpx;
-		padding-left: 10rpx;
-
-	}
-
-	.card {
 		display: flex;
 		justify-content: space-between;
-
-		.changeLand {
-			width: 200rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			text-align: center;
-			border-radius: 30rpx;
-			background-color: $theme-main-color;
-			color: white;
-		}
+		padding: 10rpx 0 10rpx 20rpx;
+		// padding-top: 10rpx;
+		// padding-left: 20rpx;
+		// padding-bottom: 20rpx;
 	}
 
-	.content {
-		// min-height: 92vh;	
-		padding: 0 30rpx;
-		// padding-top: 20rpx;
-		// background-color: red;
-		box-sizing: border-box;
-
-
-		// .land.land-info
-		.land-info {
-			display: flex;
-			justify-content: space-between;
-			margin-bottom: 30rpx;
-
-			.land-area {
-				width: 335rpx;
-				height: 120rpx;
-				font-size: 30rpx;
-				border-radius: 10rpx;
-				color: #1A1A1A;
-				box-sizing: border-box;
-				background-image: url('/static/main/index/tdmj.png');
-				background-size: 100% 100%;
-				box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
-				padding-top: 20rpx;
-				padding-left: 115rpx;
-
-			}
-
-			.plant-area {
-				width: 335rpx;
-				height: 120rpx;
-				font-size: 30rpx;
-				background-image: url('/static/main/index/zzmj.png');
-				background-size: 100% 100%;
-				box-sizing: border-box;
-				border-radius: 10rpx;
-				box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
-				padding-top: 20rpx;
-				padding-left: 115rpx;
-
-
-			}
-		}
-
-		.live-tit {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-		}
-
-		.live {
-
-			position: relative;
-			width: 100%;
-			height: 447rpx;
-			margin-bottom: 20rpx;
-		}
-
-
-	}
-
-	.note {
-		height: 168rpx;
-		background-image: url('/static/main/index/JNS.png');
-		// background-color: red;
-		background-size: 100% 100%;
-		margin-bottom: 30rpx;
-		position: relative;
-	}
-
-	.area-check {
-		display: flex;
-		justify-content: space-between;
-		flex-wrap: wrap;
-
-		.area-li {
-			width: 330rpx;
-			height: 194rpx;
-			border-radius: 10rpx;
-			background-size: 100% 100%;
-			margin-bottom: 20rpx;
-			padding: 45rpx 30rpx;
-			box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
-		}
-	}
-
-
-
-	.tit {
+	.tits {
 		position: relative;
 		padding-left: 20rpx;
 		font-weight: bold;
@@ -887,7 +252,7 @@
 		color: #1A1A1A;
 	}
 
-	.tit::before {
+	.tits::before {
 		content: "";
 		position: absolute;
 		top: 50%;
@@ -900,110 +265,190 @@
 		background-color: #34D08D;
 	}
 
-	.soil-monitor {
-		margin-top: 40rpx;
+	// old
+	.content {
 
-		.head {
-
-
-			.flushed-time {
-				display: flex;
-				font-size: 26.29rpx;
-				color: #737373;
-				margin-top: 10rpx;
-			}
-		}
-
-		.monitor-content {
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-
-			.monitor-card {
-				margin-top: 20rpx;
-				background-color: white;
-				padding: 30rpx 20rpx;
-				border-radius: 30rpx;
-				width: 332.94rpx;
-				box-sizing: border-box;
-				height: 212.03rpx;
-
-				.name {
-					font-size: 29.79rpx;
-					display: flex;
-					align-items: center;
-				}
-
-				.num {
-					margin-top: 30rpx;
-					color: $theme-main-color;
-
-				}
-			}
-
-		}
-	}
-
-	.video {
-		margin-top: 20rpx;
-		width: 100%;
-		height: 300rpx;
-	}
-
-	.empty {
-		height: 100vh;
-		background-color: $theme-bg-color;
 		position: relative;
+		padding: 0 20rpx;
 
-		.addLand {
-			width: auto;
-			height: 100rpx;
-			color: grey;
-			position: absolute;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%);
 
-			.addBtn {
-				margin-top: 20rpx;
-				width: 250rpx;
-				height: 70rpx;
-				border: 1px solid $theme-main-color;
-				line-height: 70rpx;
-				border-radius: 50rpx;
-				text-align: center;
-			}
+		// padding-top: 100rpx;
+
+		.head-img {
+			// position: absolute;
+			// display: flex;
+			// top: 0;
+			// right: 10rpx;
+			// margin-top: 20rpx;
 
 		}
-	}
 
-	.empty-land {
-		width: 715rpx;
-		margin: 0 auto;
-		height: 135rpx;
-		transform: translateX(-20rpx);
-		color: #74A0EA;
-		text-align: center;
-		background-image: url('../../static/main/index/xz.png');
-		background-size: 100% 100%;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding-left: 200rpx;
-		padding-right: 10rpx;
-	}
+		.land {
+			width: 100rpx;
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: center;
+			background-color: #fff;
+			border-radius: 50%;
+			position: absolute;
+			right: 60rpx;
+			bottom: 130rpx;
+			position: fixed;
+		}
 
-	.title {
-		padding-left: 20rpx;
-		display: flex;
-		color: white;
-		font-size: 32rpx;
-		width: 400rpx;
-	}
 
-	.text {
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
+		.serch {
+
+			// padding-bottom: 20rpx;
+			box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
+			border-radius: 200rpx;
+			position: relative;
+			color: #35D190;
+			font-size: 28rpx;
+			margin-top: 20rpx;
+
+			margin-bottom: 20rpx;
+
+			.ser-text {
+				position: absolute;
+				padding-left: 20rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				right: 40rpx;
+
+			}
+
+			.ser-text::before {
+				content: "";
+				position: absolute;
+				top: 50%;
+				transform: translateY(-50%);
+				left: 0;
+				width: 2px;
+				/* 左边框的宽度 */
+				height: 20rpx;
+				background-color: #34D08D;
+			}
+
+			// width: 100%;
+			// height: 100rpx;
+			// background-color: #EAF2EF;
+			// position: absolute;
+			// position: fixed;
+			// display: flex;
+			// top: 0;
+			// // padding-top: calc(70rpx + var(--status-bar-height) + 20rpx);
+			// padding-right: 20rpx;
+
+
+			// .custom-style {
+			// 	color: #606266;
+			// 	width: 140rpx;
+			// 	border-radius: 30rpx;
+			// 	margin-top: 10rpx;
+			// 	margin-right: 20rpx;
+			// }
+
+			// z-index: 8888 !important;
+
+		}
+
+		.border-bgc {
+			height: 200rpx;
+			background-color: #34D190;
+			border-radius: 0 0 40rpx 40rpx;
+			position: absolute;
+			width: 750rpx;
+
+		}
+
+		.coneng-detail {
+			width: 478rpx;
+			height: 341rpx;
+			background: #FFFFFF;
+			border-radius: 6px 6px 6px 6px;
+			opacity: 1;
+			font-size: 25rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			color: #737373;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			text-align: center;
+
+			margin: 300rpx auto;
+
+			image {
+				width: 280rpx;
+				height: 142rpx;
+				margin-bottom: 20rpx;
+
+
+			}
+		}
+
+		.card {
+			position: relative;
+
+			margin: auto;
+			background-color: #FFFFFF;
+			box-sizing: border-box;
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			margin-bottom: 40rpx;
+
+
+			.plant-status {
+				position: absolute;
+				width: 109rpx;
+				height: 99rpx;
+				background-image: url('/static/main/index/wzz.png');
+				background-size: 100% 100%;
+				top: -10rpx;
+				right: 50rpx;
+				color: white;
+				text-align: center;
+				padding-top: 20rpx;
+				font-size: 26rpx;
+
+			}
+
+			.card-content {
+				display: flex;
+
+				.card-tit {
+					font-weight: bold;
+					margin-bottom: 10rpx;
+					color: black;
+					font-size: 28rpx;
+				}
+
+				.card-address {
+					// width: 60vw;
+					width: 500rpx;
+					white-space: nowrap;
+					/* 文字不换行 */
+					overflow: hidden;
+					/* 超出部分隐藏 */
+					text-overflow: ellipsis;
+					/* 超出部分显示省略号 */
+				}
+
+				.value {
+
+
+					/* 超出部分显示省略号 */
+
+				}
+			}
+
+			// .tit {
+			// 	display: flex;
+			// 	font-size: 33.29rpx;
+			// 	font-weight: bold;
+
+			// 	justify-content: space-between;
+			// }
+		}
 	}
 </style>
\ No newline at end of file