diff --git a/api/api.js b/api/api.js
index 8194131..4034d32 100644
--- a/api/api.js
+++ b/api/api.js
@@ -9,6 +9,8 @@ export const login = (data) => syhttp.post('/login/account', data)
export const xinregister = (data) => syhttp.post('/index/code', data)
//用户注册
export const logregister = (data) => syhttp.post('/login/register', data)
+//用户注册验证码
+export const registerCode = (data) => syhttp.post('/sms/sendCode', data)
//修改密码
export const changePassword = (data) => syhttp.post('/user/changePassword', data)
//退出登录
@@ -63,4 +65,10 @@ export const towns = (data) => http.get('/common/geo/towns', data)
//乡村
export const villages = (data) => http.get('/common/geo/villages', data)
//小组
-export const groups = (data) => http.get('/common/geo/groups', data)
\ No newline at end of file
+export const groups = (data) => http.get('/common/geo/groups', data)
+//视频推流
+export const videoPush = (data) => http.get('/video', data)
+
+
+
+// http: //127.0.0.1:8001/video/17378971117/lihai_lot_walnutpi_dev_1
\ No newline at end of file
diff --git a/components/plant/landInfo.vue b/components/plant/landInfo.vue
index e52ea69..a99c31d 100644
--- a/components/plant/landInfo.vue
+++ b/components/plant/landInfo.vue
@@ -1,47 +1,47 @@
-
+
-
- {{info.title}}
+ {{info.title}}
当前种植
-
+
{{info.kindarea|| info.total_area-info.residual_area}}亩
土地面积
-
+
{{info.total_area}}亩
土地负责人
-
+
{{info.master_name}}
负责人电话
-
+
{{info.master_phone}}
种植品种
-
+
{{info.kind}}
种植品牌
-
+
{{info.breed}}
@@ -130,15 +130,26 @@
display: flex;
flex-wrap: wrap;
justify-content: space-between;
+ margin-top: 10rpx;
.info-li {
+
width: 223rpx;
- height: 129rpx;
+ height: 105rpx;
border-radius: 10rpx;
background-size: 100% 100%;
- padding: 20rpx;
+ // padding: 20rpx;
+ padding: 18rpx;
margin-bottom: 20rpx;
box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
+ font-size: 26rpx;
+ color: #333333;
+ }
+
+ .info-value {
+ color: #7B7B7B;
+ font-size: 26rpx;
+ margin-top: 4rpx;
}
}
diff --git a/config/app.js b/config/app.js
index 4ec7ee8..64a1015 100644
--- a/config/app.js
+++ b/config/app.js
@@ -8,7 +8,7 @@ let env = "dev"
let HTTP_REQUEST_URL
let HEADER
if (env == 'dev') {
- BASE_URL = 'http://ceshi-suyuan.lihaink.cn/'
+ BASE_URL = 'http://192.168.1.15:8082/'
} else if (env = 'prod') {
BASE_URL = 'https://suyuan.lihaink.cn/'
}
diff --git a/pages.json b/pages.json
index 49bba8f..c448225 100644
--- a/pages.json
+++ b/pages.json
@@ -31,8 +31,8 @@
"style": {
"navigationBarTitleText": "土地详情",
"enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#F4F4F4",
- "navigationBarTextStyle": "black"
+ "navigationBarBackgroundColor": "#35D190",
+ "navigationBarTextStyle": "white"
}
},
{
diff --git a/pages/Login/login.vue b/pages/Login/login.vue
index a4be73b..0cc7d33 100644
--- a/pages/Login/login.vue
+++ b/pages/Login/login.vue
@@ -13,16 +13,16 @@
-
+
您好！
-
+
欢迎进入吟龙土壤墒情监测溯系统!
-
-
账号登录
-
+ -->
@@ -92,10 +92,10 @@
-
+
-
+
\ No newline at end of file
diff --git a/pages/index/personal.vue b/pages/index/personal.vue
index 169bc35..c8aea7d 100644
--- a/pages/index/personal.vue
+++ b/pages/index/personal.vue
@@ -61,6 +61,10 @@
ref
} from 'vue';
import { logout } from '@/api/api.js'
+ import {
+ onLoad
+
+ } from "@dcloudio/uni-app"
import store from "@/store/index.js"
const userinfo = reactive({})
@@ -78,7 +82,9 @@
}
-
+ onLoad(() => {
+ uni.hideTabBar()
+ })
diff --git a/pages/landDetail/index.vue b/pages/landDetail/index.vue
index d21eedd..89283e7 100644
--- a/pages/landDetail/index.vue
+++ b/pages/landDetail/index.vue
@@ -8,37 +8,33 @@
- 刷新时间: {{getNowTimeFn()}}
+ 刷新时间: {{getNowTimeFn()}}
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
新增种植
-
+
种植信息
@@ -77,7 +73,7 @@
种植面积: {{item.area}}亩
- 参与人: {{item.user}}
+ 参与人员: {{item.user}}
种植日期: {{item.plant_date}}
@@ -307,6 +303,9 @@
+ }
+ const u = (name) => {
+ return `/static/main/index/${name}.png`
}
@@ -332,7 +331,12 @@
}
.video {
- // margin-top: 10rpx;
+ width: 690rpx;
+ height: 510rpx;
+ box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
+ border-radius: 10rpx;
+ overflow: hidden;
+
}
.add-thing {
@@ -410,7 +414,8 @@
display: flex;
justify-content: space-between;
flex-direction: column;
- margin-left: 40rpx;
+ margin-left: 20rpx;
+ font-size: 26rpx;
}
}
}
@@ -419,7 +424,9 @@
position: relative;
padding-left: 20rpx;
font-weight: bold;
+ font-size: 28rpx;
margin-bottom: 20rpx;
+ color: #1A1A1A;
}
.tit::before {
@@ -428,12 +435,14 @@
top: 50%;
transform: translateY(-50%);
left: 0;
- width: 3px;
+ width: 6rpx;
/* 左边框的宽度 */
- height: 30rpx;
+ height: 25rpx;
+ border-radius: 20rpx;
background-color: #34D08D;
}
+
.code-btn {
border: 1px solid $theme-main-color;
border-radius: 30rpx;
diff --git a/pages/landDetail/tudi.vue b/pages/landDetail/tudi.vue
index 8cc80c3..4073beb 100644
--- a/pages/landDetail/tudi.vue
+++ b/pages/landDetail/tudi.vue
@@ -7,17 +7,26 @@
- 刷新时间: {{getNowTimeFn()}}
+ 刷新时间: {{getNowTimeFn()}}
-
+
+
+
+
-
+
操作信息
@@ -384,6 +393,9 @@
if (type == 1) return "/static/main/index/shi_fei.png"
if (type == 5) return "/static/main/index/shou_huo.png"
}
+ const u = (name) => {
+ return `/static/main/index/${name}.png`
+ }
\ No newline at end of file
diff --git a/pages/live/live.nvue b/pages/live/live.nvue
index d7c4b2f..3e38e05 100644
--- a/pages/live/live.nvue
+++ b/pages/live/live.nvue
@@ -37,6 +37,15 @@
uni.$emit('push', {
msg: '页面更新'
})
+
+ uni.request({
+ url: 'http://192.168.1.27:8001/video/13433212473/lihai_lot_walnutpi_dev_3', //仅为示例，并非真实接口地址。
+
+ success: (res) => {
+ console.log(54545);
+ // this.text = 'request success';
+ }
+ });
// uni.request({
// url: 'https://iot.lihaink.cn/push_stream',
// data: {
diff --git a/pages/updatePassword/updatePassword.vue b/pages/updatePassword/updatePassword.vue
index a2493c8..8c9fa96 100644
--- a/pages/updatePassword/updatePassword.vue
+++ b/pages/updatePassword/updatePassword.vue
@@ -1,11 +1,12 @@
-
+
+ :password="!pwdShow.old_password" class="ipt" customStyle='padding:20rpx 30rpx'>