页面样式修改

2023-12-13 15:57:20 +08:00 · 2023-12-13 15:57:20 +08:00 · 339d96f174
parent 4a4986d35e
commit 339d96f174
52 changed files with 1351 additions and 626 deletions
--- a/App.vue
+++ b/App.vue
@ -21,7 +21,6 @@

 	.card {
 		position: relative;
-		width: 693.93rpx;

 		background-color: #fff;
 		box-sizing: border-box;
@ -54,5 +53,14 @@
 		max-height: 30vh !important;
 	}

+	view {
+		box-sizing: border-box;
+	}
+
+	// .uni-tabbar .uni-tabbar__icon {
+	// 	width: 80rpx !important;
+	// 	height: 80rpx !important;
+	// }
+
 	/*每个页面公共css */
 </style>
--- a/components/plant/landInfo.vue
+++ b/components/plant/landInfo.vue
@ -1,17 +1,18 @@
 <template>
+
+
+	<view class="">
+		{{info.title}}
+
+
+	</view>
+
+
 	<view class="card">
 		<view class="tit">
 			<view class="">
 				{{info.title}}
-				号土地
 			</view>
-
-			<!-- <view class="" style="display:flex;">
-				<view class="" style="margin-right: 10rpx;">溯源码: </view>
-				
-				<u--image @click="perviewFn('http://ceshi-suyuan.lihaink.cn/uploads/images/20231127/2023112716443447deb3539.png')" radius='10' src="http://ceshi-suyuan.lihaink.cn/uploads/images/20231127/2023112716443447deb3539.png" width="30rpx"
-					height="30rpx" style="margin-top: 10rpx;"></u--image>
-			</view> -->
 		</view>
 		<view class="card-li">

@ -21,9 +22,7 @@
 			<view class="" v-else>
 				当前种植: {{info.total_area-info.residual_area}}亩
 			</view>
-			<!-- <view class="">
-				种植品牌: {{info.kind}}
-			</view> -->
+
 		</view>
 		<view class="card-li" v-if="info.kind">

@ -35,17 +34,13 @@
 			<view class="">
 				种植品牌: {{info.breed}}
 			</view>
-			<!-- <view class="">
-				种子品牌: {{}}
-			</view> -->
+
 		</view>
 		<view class="card-li">
 			<view class="">
 				土地面积: {{info.total_area}}亩
 			</view>
-			<!-- <view class="">
-				种子品牌: {{}}
-			</view> -->
+
 		</view>


@ -63,6 +58,9 @@
 		</view>

 	</view>
+
+
+
 </template>

 <script setup>
--- a/node_modules/.vite/deps/_metadata.json
+++ b/node_modules/.vite/deps/_metadata.json
@ -1,11 +1,11 @@
 {
-  "hash": "ff711c6a",
-  "browserHash": "fa669d50",
+  "hash": "8ba23d55",
+  "browserHash": "9b7bcd37",
  "optimized": {
    "uview-plus": {
      "src": "../../uview-plus/index.js",
      "file": "uview-plus.js",
-      "fileHash": "31730495",
+      "fileHash": "5cac3687",
      "needsInterop": false
    }
  },
--- a/node_modules/.vite/deps/uview-plus.js
+++ b/node_modules/.vite/deps/uview-plus.js
@ -1,4 +1,4 @@
-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mixin.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mixin.js
 var mixin_default = {
  // 定义每个组件都可能需要用到的外部样式以及类名
  props: {
@ -129,10 +129,10 @@ var mixin_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mpMixin.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mpMixin.js
 var mpMixin_default = {};

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils.js
+// ../../../../../books/apps/LiHai/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";
 }

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/buildURL.js
+// ../../../../../books/apps/LiHai/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;
 }

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js
 function isAbsoluteURL(url2) {
  return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url2);
 }

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/combineURLs.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/combineURLs.js
 function combineURLs(baseURL, relativeURL) {
  return relativeURL ? `${baseURL.replace(/\/+$/, "")}/${relativeURL.replace(/^\/+/, "")}` : baseURL;
 }

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/buildFullPath.js
+// ../../../../../books/apps/LiHai/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;
 }

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/settle.js
+// ../../../../../books/apps/LiHai/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) {
  }
 }

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/adapters/index.js
+// ../../../../../books/apps/LiHai/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) => {
  }
 });

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/dispatchRequest.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/dispatchRequest.js
 var dispatchRequest_default = (config) => adapters_default(config);

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/InterceptorManager.js
+// ../../../../../books/apps/LiHai/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;

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/mergeConfig.js
+// ../../../../../books/apps/LiHai/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;
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/defaults.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/defaults.js
 var defaults_default = {
  baseURL: "",
  header: {},
@ -428,7 +428,7 @@ var defaults_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils/clone.js
+// ../../../../../books/apps/LiHai/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;

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/Request.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/Request.js
 var Request = class {
  /**
  * @param {Object} arg - 全局配置
@ -763,10 +763,10 @@ var Request = class {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/index.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/index.js
 var luch_request_default = Request;

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/util/route.js
+// ../../../../../books/apps/LiHai/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;

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/function/colorGradient.js
+// ../../../../../books/apps/LiHai/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
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/function/test.js
+// ../../../../../books/apps/LiHai/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
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/function/debounce.js
+// ../../../../../books/apps/LiHai/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;

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/function/throttle.js
+// ../../../../../books/apps/LiHai/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;

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/function/digit.js
+// ../../../../../books/apps/LiHai/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;
 }

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/function/index.js
+// ../../../../../books/apps/LiHai/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
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/config.js
+// ../../../../../books/apps/LiHai/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"
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/actionSheet.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/actionSheet.js
 var actionSheet_default = {
  // action-sheet组件
  actionSheet: {
@ -1785,7 +1785,7 @@ var actionSheet_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/album.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/album.js
 var album_default = {
  // album 组件
  album: {
@ -1803,7 +1803,7 @@ var album_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/alert.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/alert.js
 var alert_default = {
  // alert警告组件
  alert: {
@ -1818,7 +1818,7 @@ var alert_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatar.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatar.js
 var avatar_default = {
  // avatar 组件
  avatar: {
@ -1839,7 +1839,7 @@ var avatar_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatarGroup.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatarGroup.js
 var avatarGroup_default = {
  // avatarGroup 组件
  avatarGroup: {
@ -1855,7 +1855,7 @@ var avatarGroup_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/backtop.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/backtop.js
 var backtop_default = {
  // backtop组件
  backtop: {
@ -1875,7 +1875,7 @@ var backtop_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/badge.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/badge.js
 var badge_default = {
  // 徽标数组件
  badge: {
@ -1895,7 +1895,7 @@ var badge_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/button.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/button.js
 var button_default = {
  // button组件
  button: {
@ -1930,7 +1930,7 @@ var button_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/calendar.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/calendar.js
 var calendar_default = {
  // calendar 组件
  calendar: {
@ -1967,7 +1967,7 @@ var calendar_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/carKeyboard.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/carKeyboard.js
 var carKeyboard_default = {
  // 车牌号键盘
  carKeyboard: {
@ -1975,7 +1975,7 @@ var carKeyboard_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cell.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cell.js
 var cell_default = {
  // cell组件的props
  cell: {
@ -2003,7 +2003,7 @@ var cell_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cellGroup.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cellGroup.js
 var cellGroup_default = {
  // cell-group组件的props
  cellGroup: {
@ -2013,7 +2013,7 @@ var cellGroup_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkbox.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkbox.js
 var checkbox_default = {
  // checkbox组件
  checkbox: {
@ -2033,7 +2033,7 @@ var checkbox_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkboxGroup.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkboxGroup.js
 var checkboxGroup_default = {
  // checkbox-group组件
  checkboxGroup: {
@ -2055,7 +2055,7 @@ var checkboxGroup_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/circleProgress.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/circleProgress.js
 var circleProgress_default = {
  // circleProgress 组件
  circleProgress: {
@ -2063,7 +2063,7 @@ var circleProgress_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/code.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/code.js
 var code_default = {
  // code 组件
  code: {
@ -2076,7 +2076,7 @@ var code_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/codeInput.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/codeInput.js
 var codeInput_default = {
  // codeInput 组件
  codeInput: {
@ -2098,7 +2098,7 @@ var codeInput_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/col.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/col.js
 var col_default = {
  // col 组件
  col: {
@ -2110,7 +2110,7 @@ var col_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapse.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapse.js
 var collapse_default = {
  // collapse 组件
  collapse: {
@ -2120,7 +2120,7 @@ var collapse_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapseItem.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapseItem.js
 var collapseItem_default = {
  // collapseItem 组件
  collapseItem: {
@ -2138,7 +2138,7 @@ var collapseItem_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/columnNotice.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/columnNotice.js
 var columnNotice_default = {
  // columnNotice 组件
  columnNotice: {
@ -2155,7 +2155,7 @@ var columnNotice_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countDown.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countDown.js
 var countDown_default = {
  // u-count-down 计时器组件
  countDown: {
@ -2166,7 +2166,7 @@ var countDown_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countTo.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countTo.js
 var countTo_default = {
  // countTo 组件
  countTo: {
@ -2184,7 +2184,7 @@ var countTo_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/datetimePicker.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/datetimePicker.js
 var datetimePicker_default = {
  // datetimePicker 组件
  datetimePicker: {
@ -2213,7 +2213,7 @@ var datetimePicker_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/divider.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/divider.js
 var divider_default = {
  // divider组件
  divider: {
@ -2228,7 +2228,7 @@ var divider_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/empty.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/empty.js
 var empty_default = {
  // empty组件
  empty: {
@ -2246,7 +2246,7 @@ var empty_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/form.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/form.js
 var form_default = {
  // form 组件
  form: {
@ -2261,7 +2261,7 @@ var form_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/formItem.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/formItem.js
 var formItem_default = {
  // formItem 组件
  formItem: {
@ -2276,7 +2276,7 @@ var formItem_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gap.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gap.js
 var gap_default = {
  // gap组件
  gap: {
@ -2288,7 +2288,7 @@ var gap_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/grid.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/grid.js
 var grid_default = {
  // grid组件
  grid: {
@ -2298,7 +2298,7 @@ var grid_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gridItem.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gridItem.js
 var gridItem_default = {
  // grid-item组件
  gridItem: {
@ -2307,7 +2307,7 @@ var gridItem_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/icon.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/icon.js
 var {
  color
 } = config_default;
@ -2334,7 +2334,7 @@ var icon_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/image.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/image.js
 var image_default = {
  // image组件
  image: {
@ -2357,7 +2357,7 @@ var image_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexAnchor.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexAnchor.js
 var indexAnchor_default = {
  // indexAnchor 组件
  indexAnchor: {
@ -2369,7 +2369,7 @@ var indexAnchor_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexList.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexList.js
 var indexList_default = {
  // indexList 组件
  indexList: {
@ -2381,7 +2381,7 @@ var indexList_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/input.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/input.js
 var input_default = {
  // index 组件
  input: {
@ -2422,7 +2422,7 @@ var input_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/keyboard.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/keyboard.js
 var keyboard_default = {
  // 键盘组件
  keyboard: {
@ -2445,7 +2445,7 @@ var keyboard_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/line.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/line.js
 var line_default = {
  // line组件
  line: {
@ -2458,7 +2458,7 @@ var line_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/lineProgress.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/lineProgress.js
 var lineProgress_default = {
  // lineProgress 组件
  lineProgress: {
@ -2470,7 +2470,7 @@ var lineProgress_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/link.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/link.js
 var {
  color: color2
 } = config_default;
@ -2487,7 +2487,7 @@ var link_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/list.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/list.js
 var list_default = {
  // list 组件
  list: {
@ -2508,7 +2508,7 @@ var list_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/listItem.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/listItem.js
 var listItem_default = {
  // listItem 组件
  listItem: {
@ -2516,7 +2516,7 @@ var listItem_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingIcon.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingIcon.js
 var {
  color: color3
 } = config_default;
@ -2537,7 +2537,7 @@ var loadingIcon_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingPage.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingPage.js
 var loadingPage_default = {
  // loading-page组件
  loadingPage: {
@ -2553,7 +2553,7 @@ var loadingPage_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadmore.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadmore.js
 var loadmore_default = {
  // loadmore 组件
  loadmore: {
@ -2578,7 +2578,7 @@ var loadmore_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/modal.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/modal.js
 var modal_default = {
  // modal 组件
  modal: {
@ -2601,7 +2601,7 @@ var modal_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/color.js
+// ../../../../../books/apps/LiHai/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;

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/navbar.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/navbar.js
 var navbar_default = {
  // navbar 组件
  navbar: {
@ -2640,7 +2640,7 @@ var navbar_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noNetwork.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noNetwork.js
 var noNetwork_default = {
  // noNetwork
  noNetwork: {
@ -2650,7 +2650,7 @@ var noNetwork_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noticeBar.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noticeBar.js
 var noticeBar_default = {
  // noticeBar
  noticeBar: {
@ -2670,7 +2670,7 @@ var noticeBar_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/notify.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/notify.js
 var notify_default = {
  // notify组件
  notify: {
@ -2685,7 +2685,7 @@ var notify_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberBox.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberBox.js
 var numberBox_default = {
  // 步进器组件
  numberBox: {
@ -2713,7 +2713,7 @@ var numberBox_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberKeyboard.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberKeyboard.js
 var numberKeyboard_default = {
  // 数字键盘
  numberKeyboard: {
@ -2723,7 +2723,7 @@ var numberKeyboard_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/overlay.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/overlay.js
 var overlay_default = {
  // overlay组件
  overlay: {
@ -2734,7 +2734,7 @@ var overlay_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/parse.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/parse.js
 var parse_default = {
  // parse
  parse: {
@ -2749,7 +2749,7 @@ var parse_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/picker.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/picker.js
 var picker_default = {
  // picker
  picker: {
@ -2771,7 +2771,7 @@ var picker_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/popup.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/popup.js
 var popup_default = {
  // popup组件
  popup: {
@ -2794,7 +2794,7 @@ var popup_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radio.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radio.js
 var radio_default = {
  // radio组件
  radio: {
@ -2814,7 +2814,7 @@ var radio_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radioGroup.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radioGroup.js
 var radioGroup_default = {
  // radio-group组件
  radioGroup: {
@ -2837,7 +2837,7 @@ var radioGroup_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rate.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rate.js
 var rate_default = {
  // rate组件
  rate: {
@ -2856,7 +2856,7 @@ var rate_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/readMore.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/readMore.js
 var readMore_default = {
  // readMore
  readMore: {
@ -2871,7 +2871,7 @@ var readMore_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/row.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/row.js
 var row_default = {
  // row
  row: {
@ -2881,7 +2881,7 @@ var row_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rowNotice.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rowNotice.js
 var rowNotice_default = {
  // rowNotice
  rowNotice: {
@ -2895,7 +2895,7 @@ var rowNotice_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/scrollList.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/scrollList.js
 var scrollList_default = {
  // scrollList
  scrollList: {
@ -2908,7 +2908,7 @@ var scrollList_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/search.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/search.js
 var search_default = {
  // search
  search: {
@ -2938,7 +2938,7 @@ var search_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/section.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/section.js
 var section_default = {
  // u-section组件
  section: {
@ -2955,7 +2955,7 @@ var section_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/skeleton.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/skeleton.js
 var skeleton_default = {
  // skeleton
  skeleton: {
@ -2973,7 +2973,7 @@ var skeleton_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/slider.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/slider.js
 var slider_default = {
  // slider组件
  slider: {
@ -2992,7 +2992,7 @@ var slider_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/statusBar.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/statusBar.js
 var statusBar_default = {
  // statusBar
  statusBar: {
@ -3000,7 +3000,7 @@ var statusBar_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/steps.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/steps.js
 var steps_default = {
  // steps组件
  steps: {
@ -3014,7 +3014,7 @@ var steps_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/stepsItem.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/stepsItem.js
 var stepsItem_default = {
  // steps-item组件
  stepsItem: {
@ -3025,7 +3025,7 @@ var stepsItem_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/sticky.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/sticky.js
 var sticky_default = {
  // sticky组件
  sticky: {
@ -3038,7 +3038,7 @@ var sticky_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/subsection.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/subsection.js
 var subsection_default = {
  // subsection组件
  subsection: {
@ -3054,7 +3054,7 @@ var subsection_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeAction.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeAction.js
 var swipeAction_default = {
  // swipe-action组件
  swipeAction: {
@ -3062,7 +3062,7 @@ var swipeAction_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeActionItem.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeActionItem.js
 var swipeActionItem_default = {
  // swipeActionItem 组件
  swipeActionItem: {
@ -3076,7 +3076,7 @@ var swipeActionItem_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swiper.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swiper.js
 var swiper_default = {
  // swiper 组件
  swiper: {
@ -3107,7 +3107,7 @@ var swiper_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipterIndicator.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipterIndicator.js
 var swipterIndicator_default = {
  // swiperIndicator 组件
  swiperIndicator: {
@ -3119,7 +3119,7 @@ var swipterIndicator_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/switch.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/switch.js
 var switch_default = {
  // switch
  switch: {
@ -3136,7 +3136,7 @@ var switch_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbar.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbar.js
 var tabbar_default = {
  // tabbar
  tabbar: {
@ -3151,7 +3151,7 @@ var tabbar_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbarItem.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbarItem.js
 var tabbarItem_default = {
  //
  tabbarItem: {
@ -3164,7 +3164,7 @@ var tabbarItem_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabs.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabs.js
 var tabs_default = {
  //
  tabs: {
@ -3189,7 +3189,7 @@ var tabs_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tag.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tag.js
 var tag_default = {
  // tag 组件
  tag: {
@ -3211,7 +3211,7 @@ var tag_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/text.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/text.js
 var text_default = {
  // text 组件
  text: {
@ -3241,7 +3241,7 @@ var text_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/textarea.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/textarea.js
 var textarea_default = {
  // textarea 组件
  textarea: {
@ -3270,7 +3270,7 @@ var textarea_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toast.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toast.js
 var toast_default = {
  // toast组件
  toast: {
@ -3293,7 +3293,7 @@ var toast_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toolbar.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toolbar.js
 var toolbar_default = {
  // toolbar 组件
  toolbar: {
@ -3306,7 +3306,7 @@ var toolbar_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tooltip.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tooltip.js
 var tooltip_default = {
  // tooltip 组件
  tooltip: {
@ -3324,7 +3324,7 @@ var tooltip_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/transition.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/transition.js
 var transition_default = {
  // transition动画组件的props
  transition: {
@ -3335,7 +3335,7 @@ var transition_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props/upload.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props/upload.js
 var upload_default = {
  // upload组件
  upload: {
@ -3364,7 +3364,7 @@ var upload_default = {
  }
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/props.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/config/props.js
 var {
  color: color5
 } = config_default;
@ -3459,7 +3459,7 @@ var props_default = {
  ...upload_default
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/config/zIndex.js
+// ../../../../../books/apps/LiHai/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
 };

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/libs/function/platform.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/libs/function/platform.js
 var platform = "none";
 platform = "vue3";
 platform = "h5";
 var platform_default = platform;

-// E:/新建文件夹/TraceabilityAPP/node_modules/uview-plus/index.js
+// ../../../../../books/apps/LiHai/TraceabilityAPP/node_modules/uview-plus/index.js
 var pleaseSetTranspileDependencies = {};
 var babelTest = pleaseSetTranspileDependencies == null ? void 0 : pleaseSetTranspileDependencies.test;
 var $u = {
--- a/pages.json
+++ b/pages.json
@ -18,7 +18,7 @@
 				"navigationBarBackgroundColor": "#F4F4F4",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		}, {
 			"path": "pages/index/index",
 			"style": {
 				"navigationStyle": "custom",
@ -116,6 +116,15 @@
 				"navigationBarTextStyle": "black"
 			}
 		},
+		{
+			"path": "pages/equipment/index",
+			"style": {
+				"navigationBarTitleText": "我的设备",
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#35D190",
+				"navigationBarTextStyle": "white"
+			}
+		},
 		{
 			"path": "pages/landDetail/results",
 			"style": {
@ -124,7 +133,7 @@
 				"navigationBarBackgroundColor": "#F4F4F4",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		}, {
 			"path": "pages/husbandryForm/detail",
 			"style": {
 				"navigationBarTitleText": "操作详情",
@ -173,24 +182,25 @@
 		"selectedColor": "#34D190",
 		"borderStyle": "white",
 		"backgroundColor": "#EBF1EF",
+		"iconWidth": "40px",
 		"list": [{
 				"pagePath": "pages/index/massif",
-				"text": "首页",
-				"iconPath": "static/tabber/a-a.png",
-				"selectedIconPath": "static/tabber/a.png"
+				"text": "",
+				"iconPath": "static/main/index/sy.png",
+				"selectedIconPath": "static/main/index/sydj.png"
 			},
 			{
 				"pagePath": "pages/index/index",
-				"text": "地块",
-				"iconPath": "static/tabber/b-b.png",
-				"selectedIconPath": "static/tabber/b.png"
+				"text": "",
+				"iconPath": "static/main/index/dk.png",
+				"selectedIconPath": "static/main/index/dkdj.png"
 			},

 			{
 				"pagePath": "pages/index/personal",
-				"text": "我的",
-				"iconPath": "static/tabber/c-a.png",
-				"selectedIconPath": "static/tabber/c.png"
+				"text": "",
+				"iconPath": "static/main/index/wd.png",
+				"selectedIconPath": "static/main/index/wddj.png"
 			}

 		]
--- a/pages/Login/login.vue
+++ b/pages/Login/login.vue
@ -1,11 +1,115 @@
 <template>
 	<view class="box">
 		<view class="content">
+			<view class="tit" style="margin: 0;">
+				您好！
+			</view>
 			<view class="tit">
 				欢迎进入吟龙土壤墒情监测溯系统!
 			</view>
+
 			<view class="input-card">
-				<view class="login-type" v-for="(item,i) in arr1.list" :key="i" @click="aclick(i)">
+				<view class="card-head">
+					<view class="triangle top" />
+					<view class="triangle bottom" />
+					<view class="code-login" @click="changeLoginType(0)" :class="{act:loginType==2}">
+						<span>验证码登录</span>
+						<view class="line" :style="{transform: 'translateX('+lineX+'rpx)'}" />
+
+					</view>
+					<view class="password-login" @click="changeLoginType(350)" :class="{act:loginType==1}">
+						密码登录
+					</view>
+				</view>
+				<view class="login-content">
+					<view class="code">
+
+						<view class="" v-if="loginType==1" style="margin-bottom: 20rpx;">
+							<view class="" style="display: flex;margin-bottom: 10rpx;">
+								<up-image :src="u('sj')" width="30rpx" height="44rpx"
+									style="margin-right: 20rpx;"></up-image>账号
+							</view>
+							<u-input placeholder="请输入用户账号"
+								customStyle="background:#F5F5F5;height:80rpx;padding-left:40rpx;border:none"
+								shape='circle' border="surround" v-model="formData.account"></u-input>
+
+							<view class="" style="display: flex;margin-top: 30rpx;margin-bottom: 10rpx;">
+								<up-image :src="u('mm')" width="30rpx" height="44rpx"
+									style="margin-right: 20rpx;"></up-image>密码
+							</view>
+							<u-input :password="!pwdShow" shape='circle'
+								customStyle="background:#F5F5F5;height:80rpx;padding-left:40rpx;border:none"
+								placeholder="请输入密码" border="surround" v-model="formData.password">
+							</u-input>
+						</view>
+
+
+
+						<view class="" v-else>
+
+							<view class="" style="display: flex;margin-bottom: 10rpx;">
+								<up-image :src="u('sj')" width="30rpx" height="44rpx"
+									style="margin-right: 20rpx;"></up-image>手机号
+							</view>
+
+							<u-input placeholder="请输入账号"
+								customStyle="background:#F5F5F5;height:80rpx;padding-left:40rpx;border:none"
+								shape='circle' border="surround" v-model="formData.account"></u-input>
+
+							<view class="" style="display: flex;margin-top: 30rpx;margin-bottom: 10rpx;">
+								<up-image :src="u('yzm')" width="30rpx" height="44rpx"
+									style="margin-right: 20rpx;"></up-image>验证码
+							</view>
+							<view class="" style="position: relative;">
+								<u-input type="number" shape='circle'
+									customStyle="background:#F5F5F5;height:80rpx;padding-left:40rpx;border:none;margin-bottom:15rpx"
+									placeholder="请输入验证码" border="surround" v-model="formData.code"></u-input>
+
+
+								<view class="get-code" :style="{color: countDown?'grey':''}" @click="getCode"><text
+										class="lineY"></text>
+									获取验证码 <text v-if='countDown'>{{countDown}}s</text> </view>
+							</view>
+						</view>
+
+
+
+
+
+						<view class="" style="font-size: 26rpx;">
+							<text>还没有账号？点击</text> <text @click="resgiter"
+								style="color: #35D190;text-decoration: underline;">注册</text>
+						</view>
+
+						<view class="sub-btn">
+							<u-button @click="submitFn" type="primary"
+								customStyle="border:none;height:90rpx;border-radius: 50rpx;" color="#34D190"
+								text="登录"></u-button>
+						</view>
+
+
+					</view>
+
+
+
+				</view>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+				<!-- <>old -->
+
+				<!-- 	<view class="login-type" v-for="(item,i) in arr1.list" :key="i" @click="aclick(i)">
 					{{item.name}}
 					<view class="line" v-if="i==num" />
 				</view>
@ -27,10 +131,9 @@
 				<view class="" v-if="num==1">
 					<u-input :password="!pwdShow" shape='circle'
 						customStyle="background:#F5F5F5;height:80rpx;;padding-left:40rpx;border:none"
-						placeholder="请输入密码" border="surround" v-model="formData.password" >
+						placeholder="请输入密码" border="surround" v-model="formData.password">
 						<template #suffix>
-							<u-icon :name="pwdShow?'eye-off':'eye-fill'"
-								@click="pwdShow=!pwdShow"  size="25"></u-icon>
+							<u-icon :name="pwdShow?'eye-off':'eye-fill'" @click="pwdShow=!pwdShow" size="25"></u-icon>
 						</template>
 					</u-input>
 				</view>
@ -40,15 +143,223 @@
 				<view class="sub-btn">
 					<u-button @click="submitFn" type="primary" customStyle="border:none;height:90rpx" color="#34D190"
 						text="登录"></u-button>
-				</view>
+				</view> -->

 			</view>

-		</view>

+
+		</view>
+		<view class="agreement">
+			<text>登录代表您已经同意</text> <text style="color:#2D94FE ;">服务协议、隐私政策</text>
+		</view>
 	</view>
 </template>
+<style lang="scss" scoped>
+	.box {
+		width: 100vw;
+		height: 100vh;
+		background-image: url('/static/main/login/bg.png');
+		background-size: 100% 100%;
+		position: relative;
+	}

+	.content {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 700rpx;
+
+		.tit {
+			color: white;
+			font-size: 44rpx;
+			margin-bottom: 30rpx;
+		}
+
+		.input-card {
+			width: 700rpx;
+			box-sizing: border-box;
+
+			.card-head {
+				background-color: #fff;
+				display: flex;
+				position: relative;
+
+
+				.triangle {
+					position: absolute;
+					width: 0;
+					height: 0;
+					border-left: 12rpx solid transparent;
+					border-right: 12rpx solid transparent;
+					left: 50%;
+				}
+
+				.top {
+					border-top: 50rpx solid #31BE89;
+					top: -1rpx;
+					transform: translateX(-50%);
+				}
+
+				.bottom {
+					border-bottom: 50rpx solid white;
+					bottom: -1rpx;
+					transform: translateX(-50%);
+				}
+
+				.code-login {
+					width: 50%;
+					height: 50px;
+					background-color: #35D190;
+					box-sizing: border-box;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					align-items: center;
+					padding: 20rpx;
+					transition: 500ms;
+					color: white;
+
+					.line {
+						width: 100rpx;
+						background-color: #35D190;
+						height: 3px;
+						border-radius: 100rpx;
+						transition: 500ms;
+
+					}
+				}
+
+				.password-login {
+					width: 50%;
+					height: 50px;
+					background-color: #35D190;
+					box-sizing: border-box;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					align-items: center;
+					padding: 20rpx;
+					transition: 500ms;
+					color: white;
+				}
+
+				.act {
+					background-color: white;
+					color: black;
+					font-weight: bold;
+				}
+
+
+
+			}
+
+			.login-content {
+				background-color: #fff;
+				padding: 10rpx 40rpx;
+				transform: translateY(-1rpx);
+				color: #7A7A7A;
+
+				.code {
+
+					.get-code {
+						color: $theme-main-color;
+						font-size: 28rpx;
+						position: absolute;
+						right: 30rpx;
+						top: 20rpx;
+
+						.lineY {
+							width: 1px;
+							height: 20rpx;
+							background-color: $theme-main-color;
+							display: inline-block;
+							margin-right: 10rpx;
+						}
+					}
+
+
+				}
+
+				.password {}
+
+
+				.sub-btn {
+					margin-top: 80rpx;
+					margin-bottom: 30rpx;
+				}
+
+				// box-sizing: b;
+			}
+
+			// .login-type {
+			// 	display: flex;
+			// 	display: inline-block;
+			// 	margin-right: 50rpx;
+			// 	flex-direction: column;
+			// 	// align-items: center;
+			// 	justify-content: flex-start;
+
+			// 	.line {
+			// 		border-top: 3px solid #34D190;
+			// 		margin: 0 auto;
+			// 		margin-top: 10rpx;
+			// 		width: 60rpx;
+			// 	}
+			// }
+
+			// .yanzm {
+			// 	display: flex;
+			// 	justify-content: space-between;
+
+			// 	.u-input {
+
+			// 		margin-right: 60rpx;
+			// 	}
+
+
+			// }
+
+			// .code {
+			// 	width: 120rpx;
+			// 	height: 80rpx;
+			// 	background-color: #34D190;
+			// 	line-height: 80rpx;
+			// 	text-align: center;
+			// 	border-radius: 20rpx 20rpx;
+			// 	font-size: 20rpx;
+			// 	padding: 0rpx 20rpx;
+			// 	color: #fff;
+			// 	margin-top: 10rpx;
+
+			// }
+
+
+
+			// .resgiter {
+			// 	font-size: 30rpx;
+			// 	margin-top: 40rpx;
+
+			// }
+
+		}
+	}
+
+	.agreement {
+		position: absolute;
+		bottom: 100rpx;
+		margin: 0 auto;
+		font-size: 24rpx;
+		color: white;
+		width: auto;
+		left: 50%;
+		transform: translateX(-50%);
+		width: 700rpx;
+		text-align: center;
+		white-space: nowrap;
+	}
+</style>
 <script setup>
 	import {
 		login,
@ -65,17 +376,16 @@
 	} from 'vue';

 	const store = useStore()
-
 	const num = ref(0)
 	const isshow = ref(false)
 	const pwdShow = ref(false)
 	const tips = ref('获取验证码')
-	const countDown = ref(60); // 倒计时秒数
+	const countDown = ref(0); // 倒计时秒数
 	const formData = reactive({
 		account: "",
 		password: "",
 		code: '',
-		scene: "",
+		scene: "2",
 		terminal: ''

 	})
@ -121,13 +431,13 @@
 	};
 	//倒计时
 	const startCountDown = () => {
+		countDown.value = 60
 		const timer = setInterval(() => {
 			countDown.value -= 1; // 更新倒计时秒数

-			if (countDown.value === 0) {
+			if (countDown.value <= 0) {
 				clearInterval(timer); // 倒计时结束，清除定时器
 				isshow.value = false
-				countDown.value = 60

 			}
 		}, 1000);
@ -135,6 +445,9 @@

 	const getCode = () => {

+		if (countDown.value) return
+
+		if (!formData.account) return uni.$u.toast('账号不能为空');
 		let data = {
 			phone: formData.account,
 			scene: 101
@ -204,94 +517,21 @@
 			formData.scene = 2
 		}
 	}
+	const lineX = ref(0)
+	const loginType = ref(2)
+	const changeLoginType = (num) => {
+		num ? loginType.value = 1 : loginType.value = 2
+		formData.scene = loginType.value

+		console.log(formData.scene)
+		lineX.value = num
+	}
+	const u = (name) => {
+		return `/static/main/login/${name}.png`
+	}
 	onMounted(() => {
 		checkUserAgent()
-		formData.scene = 2
+

 	})
 </script>
-
-<style lang="scss" scoped>
-	.box {
-		width: 100vw;
-		height: 100vh;
-		background-color: $theme-main-color;
-		position: relative;
-	}
-
-	.content {
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		width: 700rpx;
-
-		.tit {
-			color: white;
-			font-size: 45rpx;
-			margin-bottom: 30rpx;
-		}
-
-		.input-card {
-			width: 620rpx;
-			background-color: #fff;
-			height: auto;
-			padding: 40rpx;
-			border-radius: 30rpx;
-
-			.login-type {
-				display: flex;
-				display: inline-block;
-				margin-right: 50rpx;
-				flex-direction: column;
-				// align-items: center;
-				justify-content: flex-start;
-
-				.line {
-					border-top: 3px solid #34D190;
-					margin: 0 auto;
-					margin-top: 10rpx;
-					width: 60rpx;
-				}
-			}
-
-			.yanzm {
-				display: flex;
-				justify-content: space-between;
-
-				.u-input {
-
-					margin-right: 60rpx;
-				}
-
-
-			}
-
-			.code {
-				width: 120rpx;
-				height: 80rpx;
-				background-color: #34D190;
-				line-height: 80rpx;
-				text-align: center;
-				border-radius: 20rpx 20rpx;
-				font-size: 20rpx;
-				padding: 0rpx 20rpx;
-				color: #fff;
-				margin-top: 10rpx;
-
-			}
-
-			.sub-btn {
-				margin-top: 30rpx;
-			}
-
-			.resgiter {
-				font-size: 30rpx;
-				margin-top: 40rpx;
-
-			}
-
-		}
-	}
-</style>
--- a/pages/Login/resgier.vue
+++ b/pages/Login/resgier.vue
@ -3,31 +3,52 @@

 	<view class="box">
 		<view class="content">
+
+			<view class="tit" style="margin-bottom: 10rpx;">
+				您好！
+			</view>
 			<view class="tit">
 				欢迎进入吟龙土壤墒情监测溯系统!
 			</view>
-			<view class="input-card">
-				<view class="login-type">
-					账号注册
+			<view class="input-card" style="color: #7A7A7A;">
+				<view class="login-type" style="color: black;font-weight: bold;">
+					注册
 					<view class="line" />
 				</view>
 				<view class="" style="margin: 30rpx 0;">
+					<view class="" style="display: flex;margin-bottom: 10rpx;">
+						<up-image :src="u('sj')" width="30rpx" height="44rpx"
+							style="margin-right: 20rpx;"></up-image>手机号
+					</view>
 					<u-input placeholder="请输入账号"
 						customStyle="background:#F5F5F5;height:80rpx;padding-left:40rpx;border:none" shape='circle'
 						border="surround" v-model="formData.mobile"></u-input>
 				</view>
+				<view class="" style="display: flex;margin-top: 30rpx;margin-bottom: 10rpx;">
+					<up-image :src="u('yzm')" width="30rpx" height="44rpx" style="margin-right: 20rpx;"></up-image>验证码
+				</view>
+				<view class="" style="position: relative;">
+					<u-input type="number" shape='circle'
+						customStyle="background:#F5F5F5;height:80rpx;padding-left:40rpx;border:none;margin-bottom:15rpx"
+						placeholder="请输入验证码" border="surround" v-model="formData.code"></u-input>


+					<view class="get-code" :style="{color: countDown?'grey':''}" @click="getCode"><text
+							class="lineY"></text>
+						获取验证码 <text v-if='countDown'>{{countDown}}s</text> </view>
+				</view>
+
 				<view class="" style="margin: 30rpx 0;">
+					<view class="" style="display: flex;margin-top: 30rpx;margin-bottom: 10rpx;">
+						<up-image :src="u('mm')" width="30rpx" height="44rpx" style="margin-right: 20rpx;"></up-image>密码
+					</view>
 					<u-input :password="!pwdShow" shape='circle'
 						customStyle="background:#F5F5F5;height:80rpx;;padding-left:40rpx;border:none"
 						placeholder="请输入密码" border="surround" v-model="formData.password">
-						<template #suffix>
-							<u-icon :name="pwdShow?'eye-off':'eye-fill'" size="25" @click="pwdShow=!pwdShow"></u-icon>
-						</template>
+
 					</u-input>
 				</view>
-				<view class="">
+				<!-- <view class="">
 					<u-input :password="!pwdShow1" shape='circle'
 						customStyle="background:#F5F5F5;height:80rpx;;padding-left:40rpx;border:none"
 						placeholder="请确认密码" border="surround" v-model="formData.password_confirm">
@ -38,11 +59,12 @@
 					</u-input>


-				</view>
+				</view> -->

 				<view class="sub-btn">
-					<u-button @click="submitFn" type="primary" customStyle="border:none;height:90rpx" color="#34D190"
-						text="注册登录"></u-button>
+					<u-button @click="submitFn" type="primary"
+						customStyle="border:none;height:90rpx;border-radius: 100rpx;" color="#34D190"
+						text="注册"></u-button>
 				</view>

 			</view>
@ -70,11 +92,32 @@

 	})

+	const countDown = ref(0)
+	const u = (name) => {
+		return `/static/main/login/${name}.png`
+	}
+	const getCode = () => {

+		if (countDown.value) return

+		if (!formData.account) return uni.$u.toast('账号不能为空');
+		let data = {
+			phone: formData.account,
+			scene: 101
+		}
+		xinregister(data).then((res) => {

+			if (res.code == 1) {
+				isshow.value = true
+				uni.$u.toast('验证码已发送');
+				// 通知验证码组件内部开始倒计时
+				startCountDown()
+			}
+		})
+	}

 	const submitFn = () => {
+		var pattern = /^(?=.*[a-zA-Z])(?=.*\d).+$/;

 		if (!formData.mobile) return uni.$u.toast('账号不能为空');
 		if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.mobile)) return uni.$u.toast(
@ -82,9 +125,10 @@
 		);
 		if (!formData.password)
 			return uni.$u.toast('密码不能为空')
-
-		if (formData.password !== formData.password_confirm) return uni.$u.toast('密码与确认密码不一致');
-
+		if (formData.password.length < 6)
+			return uni.$u.toast('密码长度至少在6-25位之间')
+		if (!pattern.test(formData.password)) return uni.$u.toast('密码要包含数字与英文')
+		formData.password_confirm = formData.password
 		logregister(formData).then((res) => {

 			if (res.code == 1) {
@ -92,10 +136,10 @@
 					delta: 1
 				})
 				uni.$u.toast('注册成功');
-			}else{
-				if(res.data&&res.data.has_register==1){
+			} else {
+				if (res.data && res.data.has_register == 1) {
 					uni.redirectTo({
-						url:'/pages/Login/login'
+						url: '/pages/Login/login'
 					})
 				}
 			}
@ -118,6 +162,7 @@
 		top: 50%;
 		left: 50%;
 		transform: translate(-50%, -50%);
+		// border-radius: 100rpx;
 		width: 700rpx;

 		.tit {
@ -127,7 +172,7 @@
 		}

 		.input-card {
-			width: 620rpx;
+			width: 700rpx;
 			background-color: #fff;
 			height: auto;
 			padding: 40rpx;
@ -136,14 +181,15 @@
 			.login-type {
 				display: flex;

-				margin-right: 50rpx;
+				// margin-right: 50rpx;
 				flex-direction: column;
-				// align-items: center;
-				justify-content: flex-start;
+				align-items: center;
+				// justify-content: flex-start;
+				margin: 0 auto;
+				text-align: center;

 				.line {
 					border-top: 3px solid #34D190;
-					margin-left: 30rpx;
 					margin-top: 10rpx;
 					width: 60rpx;
 				}
@ -186,4 +232,20 @@

 		}
 	}
+
+	.get-code {
+		color: $theme-main-color;
+		font-size: 28rpx;
+		position: absolute;
+		right: 30rpx;
+		top: 20rpx;
+
+		.lineY {
+			width: 1px;
+			height: 20rpx;
+			background-color: $theme-main-color;
+			display: inline-block;
+			margin-right: 10rpx;
+		}
+	}
 </style>
--- a/pages/equipment/index.vue
+++ b/pages/equipment/index.vue
@ -0,0 +1,12 @@
+<template>
+
+	<view class="">
+		设备列表
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -1,26 +1,59 @@
 <template>
 	<view class="">
+		<view class="" style="height: var(--status-bar-height);background-color: #35D190;">

+		</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>
 		<view class="content">
-
 			<view class="serch">
-				<!-- #ifdef APP-PLUS -->
-				<view class="head-img" style="top: var(--status-bar-height);">
-					<Myindex url='/pages/index/index'/>
+				<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>

-				<!-- #endif -->
-				<u-search bgColor="white" :show-action="false" margin='0 30rpx' placeholder="搜索你的土地信息"
-					v-model="fomData.keyword" shape="round"  :clearabled='false' @change="inputval"></u-search>
-					
-				<u-button class="custom-style" @click="search">搜索</u-button>
+					<view style="color:#7B7B7B ;">
+						<view class="card-tit">
+							{{item.title}}
+						</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>

 				</view>


-			<view class="card" v-for="(item,index) in datalist" :key="index" @click="navgo(item)"
-				style="margin-top: calc(var(--status-bar-height) + 40rpx);">
-				<view class="tit card-li">
+
+				<!-- old -->
+
+				<!-- <view class="tit card-li" style="margin-top: 50rpx;">
 					<view class="">
 						{{item.title}}
 					</view>
@ -50,6 +83,9 @@
 					</view>
 				</view>

+			 -->
+
+
 			</view>
 			<!-- <view class="land" @click="navgo('/pages/addLand/addLand')">
 				土地
@ -87,11 +123,11 @@
 	import {
 		landlist
 	} from '@/api/api.js'
-	onLoad(()=>{
+	onLoad(() => {
 		// console.log(store.state.userInfo)
 		if (!store.state.userInfo) {
 			uni.redirectTo({
-				url:'/pages/Login/login'
+				url: '/pages/Login/login'
 			})

 		}
@ -150,18 +186,22 @@
 	}

 	//输入监听
-	const inputval= (e) => {
+	const inputval = (e) => {
 		// console.log(e)
-		if(e.length==0){
+		if (e.length == 0) {
 			list()
 		}
 	}

-//搜索
+	//搜索
 	const search = () => {
 		list()
 	}
-
+	const navto = (url) => {
+		uni.navigateTo({
+			url
+		})
+	}

 	const navgo = (item) => {
 		uni.navigateTo({
@ -172,6 +212,12 @@
 	onMounted(() => {
 		// console.log('22222222')
 	})
+	const u = (name) => {
+		return `/static/main/index/${name}.png`
+	}
+	const bgc = (icon) => {
+		return `/static/main/index/${icon}.png`
+	}
 </script>

 <style lang="scss">
@ -180,21 +226,50 @@

 	}

+	.header {
+		background-color: #34D190;
+		display: flex;
+		justify-content: space-between;
+		padding: 10rpx 0 10rpx 20rpx;
+		// padding-top: 10rpx;
+		// padding-left: 20rpx;
+		// padding-bottom: 20rpx;
+	}
+
+	.tits {
+		position: relative;
+		padding-left: 20rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+	}
+
+	.tits::before {
+		content: "";
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		left: 0;
+		width: 3px;
+		/* 左边框的宽度 */
+		height: 30rpx;
+		background-color: #34D08D;
+	}
+
+	// old
 	.content {

 		position: relative;
+		padding: 0 20rpx;


-		padding-top: 180rpx;
+		// padding-top: 100rpx;

 		.head-img {
-			position: absolute;
-			display: flex;
-			top: 0;
-			right: 10rpx;
-			margin-top: 20rpx;
-
-
+			// position: absolute;
+			// display: flex;
+			// top: 0;
+			// right: 10rpx;
+			// margin-top: 20rpx;

 		}

@ -213,26 +288,55 @@


 		.serch {
-			width: 100%;
-			height: 100rpx;
-			background-color: #EAF2EF;
+
+			// padding-bottom: 20rpx;
+			position: relative;
+			color: #35D190;
+			font-size: 28rpx;
+			margin-top: 20rpx;
+			margin-bottom: 20rpx;
+
+			.ser-text {
 				position: absolute;
-			position: fixed;
-			display: flex;
-			top: 0;
-			padding-top: calc(70rpx + var(--status-bar-height) + 20rpx);
-			padding-right: 20rpx;
+				padding-left: 20rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				right: 40rpx;

-
-			.custom-style {
-				color: #606266;
-				width: 140rpx;
-				border-radius: 30rpx;
-				margin-top: 10rpx;
-				margin-right: 20rpx;
 			}

-			z-index: 8888 !important;
+			.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;

 		}

@ -273,7 +377,7 @@

 		.card {
 			position: relative;
-			width: 693.93rpx;
+
 			margin: auto;
 			background-color: #fff;
 			box-sizing: border-box;
@ -281,15 +385,56 @@
 			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;

-
-			.tit {
-				display: flex;
-				font-size: 33.29rpx;
-				font-weight: bold;
-
-				justify-content: space-between;
 			}
+
+			.card-content {
+				display: flex;
+
+				.card-tit {
+					font-weight: bold;
+					margin-bottom: 10rpx;
+					color: black;
+				}
+
+				.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>
--- a/pages/index/massif.vue
+++ b/pages/index/massif.vue
@ -1,39 +1,45 @@
 <template>
 	<view class="" style="position: relative;">
 		<view class="top">
-
+			<!-- 17828474084 -->
 			<view class="" style="height:var(--status-bar-height) ;">
 			</view>
-			<!-- #ifdef APP-PLUS -->
+
 			<view class="nav-con" style="justify-content: space-between;">
-			<!-- #endif -->
-				<!-- #ifdef H5 -->
-				<view class="nav-con" style="justify-content: flex-end;">
-				<!-- #endif -->
+				<view class="" v-if="Object.keys(dataobj).length>0"
+					style="padding-left: 20rpx;display: flex;color: white;" @click="show=true">
+					<u--image :src="u('qhtd')" width="38.55rpx" @click="scanFn" height="38.55rpx"
+						style="margin-right: 20rpx;"></u--image>
+					{{dataobj.title}}

+				</view>

+				<view class="" style="display: flex;align-items: center;">
 					<view class="nav">
-
-
-						<view class="">
-							<u-icon name="scan" @click="scanFn" color="white" :size="30"></u-icon>
+						<view class="" style="margin-right: 20rpx;">
+							<!-- <u-icon name="scan" @click="scanFn" color="white" :size="30"></u-icon> -->
+							<u--image :src="u('sys')" width="38.55rpx" @click="scanFn" height="38.55rpx"></u--image>
 						</view>
 						<view class="" style="margin-left: 20rpx;">
-							<u-icon name="coupon-fill" color="white" @click="showModal=true" :size="28"></u-icon>
+							<!-- <u-icon name="coupon-fill" color="white" @click="showModal=true" :size="28"></u-icon> -->
+							<u--image :src="u('sbbd')" width="38.55rpx" @click="showModal=true"
+								height="38.55rpx"></u--image>
 						</view>
 						<view class="" style="margin-left: 20rpx;">
-							<u-icon name="plus-circle" color="white" @click="navto('/pages/addLand/addLand')"
-								:size="28"></u-icon>
+							<!-- <u-icon name="plus-circle" color="white" @click="navto('/pages/addLand/addLand')"
+								:size="28"></u-icon> -->
 						</view>
 					</view>
-					<!-- #ifdef APP-PLUS -->
+
 					<view class="" style="margin-top: -5rpx;">
-
 						<Myindex url='/pages/index/massif' />
 					</view>
-					<!-- #endif -->
 				</view>
 			</view>
+
+
+
+		</view>
 		<view class="">
 			<view class="" style="height:var(--status-bar-height) ;">
 			</view>
@ -44,14 +50,107 @@
 		<view class="content" v-if="true">
 			<!-- 土地信息 -->
 			<view class="">
+				<view class="empty-land" v-if="Object.keys(dataobj).length<=0">
+					<text>没有土地信息？</text>
+					<text @click="navto('/pages/addLand/addLand')">去新增》</text>
+				</view>
+
+
+				<view class="land-info">
+					<view class="land-area">
+						土地面积
+						<view class="">
+							{{dataobj.total_area|| "--"}}亩
+						</view>
+
+					</view>
+					<view class="plant-area">
+						种植面积
+						<view class="">
+							{{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 @click="navto('/pages/addLand/addLand')">去新增》</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: 24rpx;color: #ACACAC;display: flex;align-items: center;">
+						<u-icon name="clock" style="margin-right: 5rpx;"></u-icon> 刷新时间：{{getNowTimeFn()}}
+					</view>
+
+
+				</view>
+				<view class="live">
+					<u--image :src="u('K')" width="100%"></u--image>
+				</view>
+
+				<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="">
+								{{item.name}}
+							</view>
+							<view class="" style="color:#73DFB2">
+								{{ item.num?item.num+item.unit:'--' }}
+							</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="">
+								{{item.name}}
+							</view>
+							<view class="" style="color:#73DFB2">
+
+								{{ item.num?item.num+item.unit:'--' }}
+							</view>
+						</view>
+					</view>
+				</view>
+
+
+
+
+
+
+
+
+				<!-- old -->
 				<view class="card" v-if="Object.keys(dataobj).length>0">
 					<view class="" @click="navgo">
 						<view class="" style="margin: 10rpx 0;">
 							土地名称: {{dataobj.title}}
 						</view>
-							<!-- <view class="" style="margin: 10rpx 0;">
-							农作物: 洋芋
-						</view> -->
+
 						<view class="" style="margin: 10rpx 0;">
 							土地面积: {{dataobj.total_area}}亩
 						</view>
@ -65,15 +164,11 @@

 				</view>
 				<view class="card" v-else>
-
 					<view class="">
 						<view class="">
 							暂无信息
 						</view>
-
 					</view>
-
-
 				</view>

 			</view>
@ -82,7 +177,6 @@
 			</view>
 			<view class="" v-else>
 				<view class="add-thing" @click="showPicker1=true" v-if="columns2[0]&&columns2[0].length>0">
-
 					记农事
 				</view>
 			</view>
@ -99,7 +193,7 @@
 						</view>
 					</view>
 				</view>
-					<view class="video" @click="navto('/pages/live/live')">
+				<view class="video" @click="navto(' /pages/live/live')">
 					<!-- <u--image :src="url" width="100%" height="300rpx"></u--image> -->
 					<u-swiper :list="dataobj.pic" width="100%" height="300rpx"></u-swiper>
 				</view>
@ -167,7 +261,6 @@
 								<view class="" style="margin-left: 10rpx;">
 									{{item.name}}
 								</view>
-
 							</view>
 							<view class="num">
 								<text style="font-size: 70rpx;">{{item.num}}</text>
@ -175,10 +268,7 @@
 							</view>
 						</view>
 					</view>
-
-
 					<view class="coneng-detail" v-else>
-
 						<view class="">
 							<image src="@/static/img/zw.png" mode="aspectFit"></image>
 							<view class="">
@ -187,8 +277,6 @@
 						</view>
 					</view>
 				</view>
-
-
 			</view>

 			<!-- 组件 -->
@ -285,45 +373,45 @@
 	// 土壤监测数据
 	const url = ref('https://ceshi-worker-task.lihaink.cn//uploads//images//20231121//202311211336582b7920656.jpg')
 	const soilList = reactive([{
-			icon: "/static/img/CTWD.png",
+			icon: "trwd",
 			name: "土壤温度",
-			num: 20,
+			num: 0,
 			unit: "℃",

 		}, {
-			icon: "/static/img/SD.png",
+			icon: "trsd",
 			name: "土壤湿度",
-			num: 20,
+			num: 0,
 			unit: "%RH",

 		}, {
-			icon: "/static/img/DD.png",
+			icon: "trddl",
 			name: "土壤导电率",
-			num: 20,
+			num: 0,
 			unit: "μS/cm",

 		}, {
-			icon: "/static/img/PH.png",
+			icon: "trph",
 			name: "土壤PH值",
-			num: 20,
+			num: 0,
 			unit: "PH",

 		}, {
-			icon: "/static/img/AHL.png",
+			icon: "trhdl",
 			name: "土壤含氮量",
-			num: 20,
+			num: 0,
 			unit: "mg/kg",

 		}, {
-			icon: "/static/img/Hl.png",
+			icon: "trhll",
 			name: "土壤含磷量",
-			num: 20,
+			num: 0,
 			unit: "mg/kg",

 		}, {
-			icon: "/static/img/HJ.png",
+			icon: "trhjl",
 			name: "土壤含钾量",
-			num: 20,
+			num: 0,
 			unit: "mg/kg",

 		},
@ -365,51 +453,51 @@
 	const columns = reactive([]);
 	// 环境监测数据
 	const environmentList = reactive([{
-			icon: "/static/img/FS.png",
+			icon: "FS",
 			name: "风速",
-			num: 20,
+			num: 0,
 			unit: "%",

 		}, {
-			icon: "/static/img/FX.png",
+			icon: "FX",
 			name: "风向",
-			num: 20,
+			num: 0,
 			unit: "%",

 		}, {
-			icon: "/static/img/CTWD.png",
+			icon: "WD1",
 			name: "温度",
-			num: 20,
+			num: 0,
 			unit: "℃",

 		}, {
-			icon: "/static/img/SD.png",
+			icon: "SD",
 			name: "湿度",
-			num: 20,
+			num: 0,
 			unit: "%RH",

 		}, {
-			icon: '/static/img/CO2.png',
+			icon: 'eyht',
 			name: "二氧化碳",
-			num: 20,
+			num: 0,
 			unit: "ppm",

 		}, {
-			icon: "/static/img/QY.png",
+			icon: "QY",
 			name: "气压",
-			num: 20,
+			num: 0,
 			unit: "KPa",

 		}, {
-			icon: "/static/img/JY.png",
+			icon: "YL",
 			name: "雨量",
-			num: 20,
+			num: 0,
 			unit: "mm",

 		}, {
-			icon: "/static/img/GZ.png",
+			icon: "GZ",
 			name: "光照量",
-			num: 20,
+			num: 0,
 			unit: "Lux",

 		},
@ -421,7 +509,9 @@
 		getlist2()

 	})
-
+	const bgc = (icon) => {
+		return `/static/main/index/${icon}.png`
+	}

 	//列表获取
 	const getlist = () => {
@ -608,6 +698,9 @@
 		})
 	}
 	getNowTimeFn()
+	const u = (name) => {
+		return `/static/main/index/${name}.png`
+	}
 </script>
 <style lang="scss">
 	page {
@ -734,17 +827,109 @@
 		padding: 0 30rpx;
 		padding-top: 20rpx;
 		box-sizing: border-box;
+
+
+		// .land.land-info
+		.land-info {
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 20rpx;
+
+			.land-area {
+				width: 340rpx;
+				height: 120rpx;
+				// background-color: red;
+				background-image: url('/static/main/index/tdmj.png');
+				background-size: 100% 100%;
+				text-align: center;
+				padding-top: 20rpx;
+
 			}

+			.plant-area {
+				width: 340rpx;
+				height: 120rpx;
+				background-image: url('/static/main/index/zzmj.png');
+				background-size: 100% 100%;
+				text-align: center;
+				padding-top: 20rpx;
+
+			}
+		}
+
+		.live-tit {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+
+		.live {
+
+
+			width: 100%;
+			height: 447rpx;
+			margin-bottom: 20rpx;
+			// background-color: red;
+		}
+
+
+	}
+
+	.note {
+		height: 168rpx;
+		background-image: url('/static/main/index/JNS.png');
+		background-size: 100% 100%;
+		margin-bottom: 20rpx;
+		position: relative;
+	}
+
+	.area-check {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+
+		.area-li {
+			width: 335rpx;
+			height: 200rpx;
+			border-radius: 10rpx;
+			background-size: 100% 100%;
+			margin-bottom: 20rpx;
+			padding: 45rpx 30rpx;
+		}
+	}
+
+
+
+	.tit {
+		position: relative;
+		padding-left: 20rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+	}
+
+	.tit::before {
+		content: "";
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		left: 0;
+		width: 3px;
+		/* 左边框的宽度 */
+		height: 30rpx;
+		background-color: #34D08D;
+	}
+
+
+	// old
 	.soil-monitor {
 		margin-top: 40rpx;

 		.head {

-			.tit {
-				font-size: 33.29rpx;
-				color: black;
-			}
+			// .tit {
+			// 	font-size: 33.29rpx;
+			// 	color: black;
+			// }

 			.flushed-time {
 				display: flex;
@ -816,4 +1001,18 @@

 		}
 	}
+
+	.empty-land {
+		width: 690rpx;
+		height: 135rpx;
+		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;
+	}
 </style>
--- a/pages/landDetail/index.vue
+++ b/pages/landDetail/index.vue
@ -2,20 +2,23 @@
 	<view class="box">
 		<view class="content">

-			<view class="video" @click="navto('/pages/live/live')">
-
-				<!-- <u--image :src="url" width="100%" height="300rpx"></u--image> -->
-				<u-swiper :list="dataobj.pic" width="100%" height="300rpx"></u-swiper>
-
+			<view class="" style="display: flex;justify-content: space-between;">
+				<view class="tit">
+					苗情监测数据
 				</view>
-			<view class="time">
-				<u-icon name="clock"></u-icon>
+				<view class="" style="display: flex;">
+					<u-icon name="clock" style="margin-right: 10rpx;"></u-icon>
 					<text>刷新时间: {{getNowTimeFn()}} </text>
 				</view>
+			</view>
+			<view class="video" @click="navto('/pages/live/live')">
+				<u--image :src="url" width="100%" height="300rpx"></u--image>
+			</view>
+
+			<landInfo :info='dataobj'></landInfo>
 			<view class="add-thing" @click="addshowPicke">
 				新增种植
 			</view>
-			<landInfo :info='dataobj'></landInfo>


 			<view class="">
@ -23,43 +26,48 @@
 					种植信息
 				</view>
 				<view class="" v-if="dataList.length>0">
-					<view class="thing-card" v-for="(item,index) in dataList" :key="index">
-						<view class="head">
+
+					<view class="thing-card" v-for="(item,index) in dataList" :key="index" @click="navtoForm(item,i)">
+						<!-- <view class="head">
 							<view class="">
 								种植
 							</view>
 							<view class="" @click="navtoForm(item,i)">
 								农事查看
 							</view>
-						</view>
+						</view> -->

 						<view class="card_body">
 							<view class="left" v-if='item.pic.length>0'>
 								<u--image @click="perviewFn(item.pic)" radius='10' :src="item.pic[0]" width="200rpx"
 									height="200rpx"></u--image>
 							</view>
-							<view class="right">
+
+							<u--image src="/static/main/index/xyj.png" class="next" width="38rpx"
+								height="38rpx"></u--image>
+
+							<view class="right" style="color: #7B7B7B;">
 								<view class="">
-									种植种类: {{item.kind}}
+									<text style="color: black;">种植种类:</text> {{item.kind}}
 								</view>
-								<view class="">
+								<!-- <view class="">
 									种植品牌: {{item.breed}}
+								</view> -->
+								<view class="">
+									<text style="color: black;">种植面积:</text> {{item.area}}亩
 								</view>
 								<view class="">
-									种植面积: {{item.area}}亩
+									<text style="color: black;">参与人:</text> {{item.user}}
 								</view>
 								<view class="">
-									参与人: {{item.user}}
+									<text style="color: black;">种植日期:</text> {{item.plant_date}}
 								</view>
-								<view class="">
-									种植日期: {{item.plant_date}}
-								</view>
-								<view class="" v-if="item.remark">
-									备注: {{item.remark}}
+								<view class="te" v-if="item.remark">
+									<text style="color: black; white-space: nowrap; margin-top: 10rpx;">备注:</text>
+									{{item.remark}}
 								</view>
 								<view class="" style="display:flex;" v-if="item.status==2">
 									<view class="" style="margin-right: 10rpx;">溯源码: </view>
-
 									<u--image @click="perviewFn1(item.qr_code)" radius='10' :src="item.qr_code"
 										width="200rpx" height="200rpx" style="margin-top: 10rpx;"></u--image>
 								</view>
@ -275,14 +283,14 @@
 		}

 		.add-thing {
-			width: 266.36rpx;
-			height: 66.59rpx;
+
+			height: 90rpx;
 			border-radius: 42.06rpx 42.06rpx 42.06rpx 42.06rpx;
-			border: 1px solid $theme-main-color;
 			margin: 20rpx auto;
-			line-height: 66.59rpx;
+			line-height: 90rpx;
 			text-align: center;
-			color: $theme-main-color;
+			color: white;
+			background-color: $theme-main-color;
 		}
 	}

@ -333,6 +341,15 @@
 		.card_body {
 			padding: 20rpx;
 			display: flex;
+			position: relative;
+
+			.next {
+				position: absolute;
+				top: 50%;
+				transform: translateY(-50%);
+				right: 20rpx;
+			}
+
 			// justify-content: space-between;

 			.right {
@ -343,4 +360,35 @@
 			}
 		}
 	}
+
+	.tit {
+		position: relative;
+		padding-left: 20rpx;
+		font-weight: bold;
+		margin-bottom: 20rpx;
+	}
+
+	.tit::before {
+		content: "";
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		left: 0;
+		width: 3px;
+		/* 左边框的宽度 */
+		height: 30rpx;
+		background-color: #34D08D;
+	}
+
+	.te {
+
+		width: 40vw;
+		/* 容器宽度 */
+		white-space: nowrap;
+		/* 文字不换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
+		/* 超出部分显示省略号 */
+	}
 </style>
--- a/pages/live/live.nvue
+++ b/pages/live/live.nvue
@ -3,7 +3,9 @@
 		<view :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;z-inde:-1;'">

 			<view class="root">
-				<video ref="videoPlayer" :src="currentSrc" controls  :object-fit="object_fit" autoplay="true"
+				<video ref="videoPlayer"
+					src="http://192.168.1.27/live/test.live.flv?secret=gqig2yFKkDpIMic1uWZY1L5MsIo0eflm" controls
+					:object-fit="object_fit" autoplay="true"
 					:style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'"></video>
 			</view>

--- a/static/main/index/FS.png
+++ b/static/main/index/FS.png
--- a/static/main/index/FX.png
+++ b/static/main/index/FX.png
--- a/static/main/index/GZ.png
+++ b/static/main/index/GZ.png
--- a/static/main/index/JNS.png
+++ b/static/main/index/JNS.png
--- a/static/main/index/K.png
+++ b/static/main/index/K.png
--- a/static/main/index/QY.png
+++ b/static/main/index/QY.png
--- a/static/main/index/SD.png
+++ b/static/main/index/SD.png
--- a/static/main/index/WD1.png
+++ b/static/main/index/WD1.png
--- a/static/main/index/YL.png
+++ b/static/main/index/YL.png
--- a/static/main/index/dk.png
+++ b/static/main/index/dk.png
--- a/static/main/index/dkdj.png
+++ b/static/main/index/dkdj.png
--- a/static/main/index/eyht.png
+++ b/static/main/index/eyht.png
--- a/static/main/index/qhtd.png
+++ b/static/main/index/qhtd.png
--- a/static/main/index/qtj.png
+++ b/static/main/index/qtj.png
--- a/static/main/index/sbbd.png
+++ b/static/main/index/sbbd.png
--- a/static/main/index/sy.png
+++ b/static/main/index/sy.png
--- a/static/main/index/sydj.png
+++ b/static/main/index/sydj.png
--- a/static/main/index/sys.png
+++ b/static/main/index/sys.png
--- a/static/main/index/tdmj.png
+++ b/static/main/index/tdmj.png
--- a/static/main/index/trddl.png
+++ b/static/main/index/trddl.png
--- a/static/main/index/trhdl.png
+++ b/static/main/index/trhdl.png
--- a/static/main/index/trhjl.png
+++ b/static/main/index/trhjl.png
--- a/static/main/index/trhll.png
+++ b/static/main/index/trhll.png
--- a/static/main/index/trph.png
+++ b/static/main/index/trph.png
--- a/static/main/index/trsd.png
+++ b/static/main/index/trsd.png
--- a/static/main/index/trwd.png
+++ b/static/main/index/trwd.png
--- a/static/main/index/wd.png
+++ b/static/main/index/wd.png
--- a/static/main/index/wddj.png
+++ b/static/main/index/wddj.png
--- a/static/main/index/wzz.png
+++ b/static/main/index/wzz.png
--- a/static/main/index/xyj.png
+++ b/static/main/index/xyj.png
--- a/static/main/index/xz.png
+++ b/static/main/index/xz.png
--- a/static/main/index/xzzh.png
+++ b/static/main/index/xzzh.png
--- a/static/main/index/yzz.png
+++ b/static/main/index/yzz.png
--- a/static/main/index/zzmj.png
+++ b/static/main/index/zzmj.png
--- a/static/main/login/bg.png
+++ b/static/main/login/bg.png
--- a/static/main/login/mm.png
+++ b/static/main/login/mm.png
--- a/static/main/login/sj.png
+++ b/static/main/login/sj.png
--- a/static/main/login/yzm.png
+++ b/static/main/login/yzm.png
--- a/uni.scss
+++ b/uni.scss
@ -17,6 +17,7 @@
 /* 行为相关颜色 */
@import 'uview-plus/theme.scss';
 $theme-main-color: #34D190;
+
 $theme-bg-color: #EAF2EF;
 $uni-color-primary: #007aff;
 $uni-color-success: #4cd964;
--- a/yarn.lock
+++ b/yarn.lock
@ -3,68 +3,68 @@


 "@vue/devtools-api@^6.5.0":
-  "integrity" "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA=="
-  "resolved" "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.1.tgz"
-  "version" "6.5.1"
+  version "6.5.1"
+  resolved "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.1.tgz"
+  integrity sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==

-"clipboard@^2.0.11":
-  "integrity" "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw=="
-  "resolved" "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz"
-  "version" "2.0.11"
+clipboard@^2.0.11:
+  version "2.0.11"
+  resolved "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz"
+  integrity sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==
  dependencies:
-    "good-listener" "^1.2.2"
-    "select" "^1.1.2"
-    "tiny-emitter" "^2.0.0"
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.0.0"

-"dayjs@^1.11.3":
-  "integrity" "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
-  "resolved" "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz"
-  "version" "1.11.10"
+dayjs@^1.11.3:
+  version "1.11.10"
+  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz"
+  integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==

-"delegate@^3.1.2":
-  "integrity" "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
-  "resolved" "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz"
-  "version" "3.2.0"
+delegate@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz"
+  integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==

-"good-listener@^1.2.2":
-  "integrity" "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw=="
-  "resolved" "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz"
-  "version" "1.2.2"
+good-listener@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz"
+  integrity sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==
  dependencies:
-    "delegate" "^3.1.2"
+    delegate "^3.1.2"

-"pinia@^2.0.33":
-  "integrity" "sha512-HOj1yVV2itw6rNIrR2f7+MirGNxhORjrULL8GWgRwXsGSvEqIQ+SE0MYt6cwtpegzCda3i+rVTZM+AM7CG+kRg=="
-  "resolved" "https://registry.npmmirror.com/pinia/-/pinia-2.0.33.tgz"
-  "version" "2.0.33"
+pinia@^2.0.33:
+  version "2.0.33"
+  resolved "https://registry.npmmirror.com/pinia/-/pinia-2.0.33.tgz"
+  integrity sha512-HOj1yVV2itw6rNIrR2f7+MirGNxhORjrULL8GWgRwXsGSvEqIQ+SE0MYt6cwtpegzCda3i+rVTZM+AM7CG+kRg==
  dependencies:
    "@vue/devtools-api" "^6.5.0"
-    "vue-demi" "*"
+    vue-demi "*"

-"select@^1.1.2":
-  "integrity" "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
-  "resolved" "https://registry.npmjs.org/select/-/select-1.1.2.tgz"
-  "version" "1.1.2"
+select@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/select/-/select-1.1.2.tgz"
+  integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==

-"tiny-emitter@^2.0.0":
-  "integrity" "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-  "resolved" "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz"
-  "version" "2.1.0"
+tiny-emitter@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz"
+  integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==

-"uview-plus@^3.1.38":
-  "integrity" "sha512-sdEkDBdqhBuzJVDXR4ApzchtdZjaen2jK23h0Mp5VSLngWEPiOmWDwSBu66ZHbnM9n4xTzfip6t6cGRFhvIGRA=="
-  "resolved" "https://registry.npmjs.org/uview-plus/-/uview-plus-3.1.38.tgz"
-  "version" "3.1.38"
+uview-plus@^3.1.38:
+  version "3.1.38"
+  resolved "https://registry.npmjs.org/uview-plus/-/uview-plus-3.1.38.tgz"
+  integrity sha512-sdEkDBdqhBuzJVDXR4ApzchtdZjaen2jK23h0Mp5VSLngWEPiOmWDwSBu66ZHbnM9n4xTzfip6t6cGRFhvIGRA==
  dependencies:
-    "clipboard" "^2.0.11"
-    "dayjs" "^1.11.3"
+    clipboard "^2.0.11"
+    dayjs "^1.11.3"

-"vue-demi@*":
-  "integrity" "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w=="
-  "resolved" "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.6.tgz"
-  "version" "0.14.6"
+vue-demi@*:
+  version "0.14.6"
+  resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.6.tgz"
+  integrity sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==

 "vue@^2.6.14 || ^3.2.0", "vue@^3.0.0-0 || ^2.6.0":
-  "integrity" "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
-  "resolved" "https://registry.npmmirror.com/vue/-/vue-2.6.14.tgz"
-  "version" "2.6.14"
+  version "2.6.14"
+  resolved "https://registry.npmmirror.com/vue/-/vue-2.6.14.tgz"
+  integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==