From f0f7c6987aaf0ef3fc1e5dbaa97d20e1ca1725f1 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Thu, 23 Nov 2023 10:58:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=20=20=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 24 +- api/file.js | 21 +- config/app.js | 1 - manifest.json | 5 +- node_modules/.vite/deps/_metadata.json | 6 +- node_modules/.vite/deps/uview-plus.js | 234 +++++----- node_modules/.vite/deps/uview-plus.js.map | 2 +- node_modules/uview-plus/index.scss | 5 +- package.json | 1 + pages.json | 14 +- pages/Login/login.vue | 200 ++++++++- pages/addLand/addLand.vue | 4 +- pages/husbandryForm/weeding.vue | 1 + pages/index/index.vue | 492 +++++----------------- pages/index/massif.vue | 480 +++++++++++++++++---- pages/index/personal.vue | 36 +- pages/landDetail/index.vue | 35 +- pages/live/live.nvue | 99 ++++- pages/updatePassword/updatePassword.vue | 39 +- store/userInfo.js | 3 + utils/syhttp.js | 2 +- utils/uplodeImg.js | 1 + 22 files changed, 1015 insertions(+), 690 deletions(-) diff --git a/App.vue b/App.vue index b6a64d6..e67f279 100644 --- a/App.vue +++ b/App.vue @@ -1,23 +1,14 @@ @@ -80,22 +211,55 @@ .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-left: 30rpx; + 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; + + } + .sub-btn { margin-top: 30rpx; } + .resgiter { + font-size: 20rpx; + margin-top: 40rpx; + + } + } } \ No newline at end of file diff --git a/pages/addLand/addLand.vue b/pages/addLand/addLand.vue index a39501e..0c5a40a 100644 --- a/pages/addLand/addLand.vue +++ b/pages/addLand/addLand.vue @@ -62,9 +62,7 @@ - \ No newline at end of file + diff --git a/pages/index/massif.vue b/pages/index/massif.vue index f26cc06..f663626 100644 --- a/pages/index/massif.vue +++ b/pages/index/massif.vue @@ -1,120 +1,438 @@ + + + \ No newline at end of file diff --git a/pages/index/personal.vue b/pages/index/personal.vue index c01462e..702c407 100644 --- a/pages/index/personal.vue +++ b/pages/index/personal.vue @@ -1,18 +1,19 @@ - - \ No newline at end of file diff --git a/pages/updatePassword/updatePassword.vue b/pages/updatePassword/updatePassword.vue index d700a38..934c7f4 100644 --- a/pages/updatePassword/updatePassword.vue +++ b/pages/updatePassword/updatePassword.vue @@ -43,6 +43,9 @@