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 @@
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
- 土地名称
-
-
- 已种植
-
-
- 未种植
-
+
+
+
-
-
- 面积: 20亩
-
+
+
-
-
- 农作物: 洋芋
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 土地名称: 土地信息1
+
+
+ 农作物: 洋芋
+
+
+ 面积: 20亩
+
+
+
+ 切换土地
+
+
+
+
+
+
+
+
+
+ 苗情监测数据
+
+
+
+ 刷新时间: {{getNowTimeFn()}}
+
+
+
+
+
+
+
+
+
+
+
+ 土壤监测数据
+
+
+
+ 刷新时间: {{getNowTimeFn()}}
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+ {{item.num}}
+ {{item.unit}}
+
+
+
+
+
+
+
+
+ 环境监测数据
+
+
+
+ 刷新时间: {{getNowTimeFn()}}
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+ {{item.num}}
+ {{item.unit}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 你还没有土地信息
+
+
+ 去添加
+
+
+
+
+
+
+
+
+
+
+ 设备编号:
+
+
+
+
+
\ 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 @@
-
+
- 姓名: 咋还归纳
+ 姓名: {{userinfo.nickname}}
- 电话: 15884967541
+ 电话: {{userinfo.mobile}}
-
+
@@ -44,18 +45,24 @@
reactive,
ref
} from 'vue';
- const url = ref('https://ceshi-worker-task.lihaink.cn//uploads//images//20231121//202311211336582b7920656.jpg')
+ import { logout } from '@/api/file.js'
+
+ const userinfo = uni.getStorageSync("SY_USER")
+
+
+
+
const previewImageFn = () => {
uni.previewImage({
urls: [
- "https://ceshi-worker-task.lihaink.cn//uploads//images//20231121//202311211336582b7920656.jpg"
+ userinfo.avatar
]
});
}
const cardLiList = reactive([{
- text: "片区经s理"
+ text: "片区经理"
},
{
text: "安全设置",
@@ -65,9 +72,18 @@
])
const loginOutFn = () => {
- uni.navigateTo({
- url: "/pages/Login/login"
+
+ logout().then((res)=>{
+
+ if(res.code==1){
+ uni.$u.toast('退出登录');
+ uni.navigateTo({
+ url: "/pages/Login/login"
+ })
+ uni.clearStorageSync()
+ }
})
+
}
const navto = (url) => {
uni.navigateTo({
diff --git a/pages/landDetail/index.vue b/pages/landDetail/index.vue
index fc6f1e3..ac63859 100644
--- a/pages/landDetail/index.vue
+++ b/pages/landDetail/index.vue
@@ -2,7 +2,9 @@
-
+
+
+
@@ -67,6 +69,36 @@
ref,
reactive
} from "vue"
+
+ const list = reactive([{
+
+ id: 1,
+ url: 'https://ceshi-worker-task.lihaink.cn//uploads//images//20231121//202311211336582b7920656.jpg',
+
+
+ },
+ {
+
+ id: 1,
+ url: 'https://ceshi-worker-task.lihaink.cn//uploads//images//20231121//202311211336582b7920656.jpg',
+
+
+ },
+ {
+
+ id: 1,
+ url: 'https://ceshi-worker-task.lihaink.cn//uploads//images//20231121//202311211336582b7920656.jpg',
+
+
+ },
+ {
+
+ id: 1,
+ url: 'https://ceshi-worker-task.lihaink.cn//uploads//images//20231121//202311211336582b7920656.jpg',
+
+
+ }
+ ])
const dataList = reactive([{
type: '0'
}, {
@@ -174,6 +206,7 @@
.content {
width: 693.93rpx;
margin: auto;
+ padding-top: 20rpx;
}
// padding: 20rpx;
diff --git a/pages/live/live.nvue b/pages/live/live.nvue
index f72cf05..d8f7ec4 100644
--- a/pages/live/live.nvue
+++ b/pages/live/live.nvue
@@ -1,15 +1,102 @@
-
- 监控页面
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
\ 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 @@