This commit is contained in:
parent
a7b393bdf1
commit
af5e75d9c1
10
api/api.js
10
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)
|
||||
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
|
||||
|
|
@ -1,47 +1,47 @@
|
|||
<template>
|
||||
|
||||
|
||||
<view class="" style="margin-top: 10rpx;">
|
||||
<view class="" style="margin-top: 15rpx;">
|
||||
<view class="" style="display: flex;align-items: center;height: 50rpx;">
|
||||
<u--image src="/static/main/index/dw.png" width="25rpx" height="30rpx"
|
||||
<u--image src="/static/main/index/dw.png" width="18.18rpx" height="24.47rpx"
|
||||
style="margin-right: 10rpx;"></u--image>
|
||||
{{info.title}}
|
||||
<text style="color: #333333;font-size: 26rpx;">{{info.title}}</text>
|
||||
</view>
|
||||
|
||||
<view class="info">
|
||||
<view class="info-li" style="background-image: url('/static/main/index/tdmj1.png');">
|
||||
当前种植
|
||||
<view class="">
|
||||
<view class="info-value">
|
||||
{{info.kindarea|| info.total_area-info.residual_area}}亩
|
||||
</view>
|
||||
</view>
|
||||
<view class="info-li" style="background-image: url('/static/main/index/tdmj1.png');">
|
||||
土地面积
|
||||
<view class="">
|
||||
<view class="info-value">
|
||||
{{info.total_area}}亩
|
||||
</view>
|
||||
</view>
|
||||
<view class="info-li" style="background-image: url('/static/main/index/tdfzr.png');">
|
||||
土地负责人
|
||||
<view class="">
|
||||
<view class="info-value">
|
||||
{{info.master_name}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="info-li" style="background-image: url('/static/main/index/fzrdh.png');">
|
||||
负责人电话
|
||||
<view class="">
|
||||
<view class="info-value">
|
||||
{{info.master_phone}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="info-li" v-if="isDetail" style="background-image: url('/static/main/index/dqzz.png');">
|
||||
种植品种
|
||||
<view class="">
|
||||
<view class="info-value">
|
||||
{{info.kind}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="info-li" v-if="isDetail" style="background-image: url('/static/main/index/pin_pai.png');">
|
||||
种植品牌
|
||||
<view class="">
|
||||
<view class="info-value">
|
||||
{{info.breed}}
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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/'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@
|
|||
"style": {
|
||||
"navigationBarTitleText": "土地详情",
|
||||
"enablePullDownRefresh": false,
|
||||
"navigationBarBackgroundColor": "#F4F4F4",
|
||||
"navigationBarTextStyle": "black"
|
||||
"navigationBarBackgroundColor": "#35D190",
|
||||
"navigationBarTextStyle": "white"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
|
||||
<view class="content">
|
||||
<view class="tit" style="margin: 0;">
|
||||
<view class="tit">
|
||||
您好！
|
||||
</view>
|
||||
<view class="tit">
|
||||
<view class="tit" style="margin-bottom: 60rpx;">
|
||||
欢迎进入吟龙土壤墒情监测溯系统!
|
||||
</view>
|
||||
|
||||
<view class="input-card">
|
||||
<view class="card-head">
|
||||
<!-- <view class="triangle top" />
|
||||
<view class="triangle top" />
|
||||
<view class="triangle bottom" />
|
||||
<view class="code-login" @click="changeLoginType(0)" :class="{act:loginType==2}">
|
||||
<span>验证码登录</span>
|
||||
|
|
@ -31,11 +31,11 @@
|
|||
</view>
|
||||
<view class="password-login" @click="changeLoginType(350)" :class="{act:loginType==1}">
|
||||
密码登录
|
||||
</view> -->
|
||||
<view class="" style="background-color: #35D190;color: white;width: 100%;height: 100rpx;
|
||||
</view>
|
||||
<!-- <view class="" style="background-color: #35D190;color: white;width: 100%;height: 100rpx;
|
||||
text-align: center;line-height: 100rpx;">
|
||||
账号登录
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="login-content">
|
||||
<view class="code">
|
||||
|
|
@ -92,10 +92,10 @@
|
|||
|
||||
|
||||
|
||||
<!-- <view class="" style="font-size: 26rpx;">
|
||||
<view class="" style="font-size: 26rpx;">
|
||||
<text>还没有账号？点击</text> <text @click="resgiter"
|
||||
style="color: #35D190;text-decoration: underline;">注册</text>
|
||||
</view> -->
|
||||
</view>
|
||||
|
||||
<view class="sub-btn">
|
||||
<u-button @click="submitFn" type="primary"
|
||||
|
|
@ -163,9 +163,9 @@
|
|||
|
||||
</view>
|
||||
</view>
|
||||
<view class="agreement">
|
||||
<!-- <view class="agreement">
|
||||
<text>登录代表您已经同意</text> <text style="color:#2D94FE ;">服务协议、隐私政策</text>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
|
|
@ -182,12 +182,17 @@
|
|||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
width: 700rpx;
|
||||
width: 750rpx;
|
||||
padding: 0 25rpx;
|
||||
box-sizing: border-box;
|
||||
margin: 0 auto;
|
||||
|
||||
.tit {
|
||||
color: white;
|
||||
font-size: 44rpx;
|
||||
margin-bottom: 30rpx;
|
||||
margin-bottom: 18rpx;
|
||||
// margin-bottom: 30rpx;
|
||||
margin-left: 23rpx;
|
||||
}
|
||||
|
||||
.input-card {
|
||||
|
|
@ -537,7 +542,7 @@
|
|||
}
|
||||
}
|
||||
const lineX = ref(0)
|
||||
const loginType = ref(1)
|
||||
const loginType = ref(2)
|
||||
const changeLoginType = (num) => {
|
||||
num ? loginType.value = 1 : loginType.value = 2
|
||||
formData.scene = loginType.value
|
||||
|
|
|
|||
|
|
@ -31,19 +31,19 @@
|
|||
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;">
|
||||
<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>
|
||||
placeholder="请输入验证码" border="surround" v-model="formData.verify_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="margin: 30rpx 0;">
|
||||
<view class="" style="display: flex;margin-top: 30rpx;margin-bottom: 10rpx;">
|
||||
|
|
@ -84,7 +84,8 @@
|
|||
<script setup>
|
||||
import Myindex from '@/components/return/index.vue';
|
||||
import {
|
||||
logregister
|
||||
logregister,
|
||||
registerCode
|
||||
} from '@/api/api.js';
|
||||
import {
|
||||
reactive,
|
||||
|
|
@ -93,7 +94,8 @@
|
|||
const pwdShow = ref(false)
|
||||
const pwdShow1 = ref(false)
|
||||
const formData = reactive({
|
||||
mobile: "",
|
||||
mobile: "19130550023",
|
||||
verify_code: "",
|
||||
password: "",
|
||||
password_confirm: "",
|
||||
|
||||
|
|
@ -104,19 +106,33 @@
|
|||
const u = (name) => {
|
||||
return `/static/main/login/${name}.png`
|
||||
}
|
||||
//倒计时
|
||||
const startCountDown = () => {
|
||||
countDown.value = 60
|
||||
const timer = setInterval(() => {
|
||||
countDown.value -= 1; // 更新倒计时秒数
|
||||
|
||||
if (countDown.value <= 0) {
|
||||
clearInterval(timer); // 倒计时结束，清除定时器
|
||||
|
||||
}
|
||||
}, 1000);
|
||||
};
|
||||
|
||||
|
||||
const getCode = () => {
|
||||
|
||||
if (countDown.value) return
|
||||
|
||||
if (!formData.account) return uni.$u.toast('账号不能为空');
|
||||
if (!formData.mobile) return uni.$u.toast('账号不能为空');
|
||||
|
||||
let data = {
|
||||
phone: formData.account,
|
||||
scene: 101
|
||||
mobile: formData.mobile,
|
||||
scene: 'YZMDL'
|
||||
}
|
||||
xinregister(data).then((res) => {
|
||||
registerCode(data).then((res) => {
|
||||
|
||||
if (res.code == 1) {
|
||||
isshow.value = true
|
||||
uni.$u.toast('验证码已发送');
|
||||
// 通知验证码组件内部开始倒计时
|
||||
startCountDown()
|
||||
|
|
|
|||
|
|
@ -4,13 +4,12 @@
|
|||
<view class="content-con-a" v-if="datalist.length>0">
|
||||
|
||||
<view class="shop_action">
|
||||
<view class="" v-for="(item,i) in datalist">
|
||||
<view class=" tit">
|
||||
<view class="" v-for="(item,i) in datalist" :key="i">
|
||||
<view class="tit">
|
||||
{{item.type_text}}
|
||||
</view>
|
||||
|
||||
<view class="shop_action-detail" v-if="item.type!=3&&item.type!=5">
|
||||
|
||||
<view class="action-detail">
|
||||
<view class="title">
|
||||
施肥面积：
|
||||
|
|
@ -81,8 +80,8 @@
|
|||
|
||||
<view class="detail-img" v-if="item.detail&&item.detail.pic&&item.detail.pic.length>0">
|
||||
|
||||
<u-swiper :list="item.detail.pic" @click="hdClick" indicator indicatorMode="dot"
|
||||
circular></u-swiper>
|
||||
<u-swiper style="height: 380rpx;" :list="item.detail.pic" @click="hdClick" indicator
|
||||
indicatorMode="dot" circular></u-swiper>
|
||||
|
||||
<!-- <image @click="perviewFn(item.detail.pic)" :src="item.detail.pic[0]" mode="aspectFit">
|
||||
</image> -->
|
||||
|
|
@ -256,7 +255,7 @@
|
|||
}
|
||||
|
||||
.content {
|
||||
padding-top: 30rpx;
|
||||
// padding-top: 30rpx;
|
||||
padding-bottom: 30rpx;
|
||||
|
||||
.banner {
|
||||
|
|
@ -286,6 +285,7 @@
|
|||
margin-bottom: 35rpx;
|
||||
margin-left: 35rpx;
|
||||
|
||||
|
||||
.detaila {
|
||||
width: 200rpx;
|
||||
}
|
||||
|
|
@ -299,7 +299,7 @@
|
|||
}
|
||||
|
||||
.shop_action {
|
||||
margin-top: 42rpx;
|
||||
// margin-top: 42rpx;
|
||||
|
||||
|
||||
.shop_action-title {
|
||||
|
|
@ -311,6 +311,7 @@
|
|||
}
|
||||
|
||||
.shop_action-detail {
|
||||
font-size: 28rpx;
|
||||
width: 694rpx;
|
||||
padding: 35rpx 0;
|
||||
background: #FFFFFF;
|
||||
|
|
@ -328,7 +329,9 @@
|
|||
}
|
||||
|
||||
.detail {
|
||||
width: 450rpx
|
||||
width: 450rpx;
|
||||
color: #7B7B7B;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -343,13 +346,15 @@
|
|||
|
||||
.detail-img {
|
||||
width: 627rpx;
|
||||
height: 380rpx;
|
||||
// background-color: red;
|
||||
// height: 529rpx;
|
||||
// background-color: red;
|
||||
|
||||
image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
// image {
|
||||
// width: 100%;
|
||||
// height: 100%;
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
<u--image v-if="item.pic" :src="item.pic[0]||''" height="150rpx" width="150rpx"
|
||||
style="margin-right: 20rpx;border-radius: 10rpx;overflow: hidden;"></u--image>
|
||||
|
||||
<view style="color:#7B7B7B ;">
|
||||
<view style="color:#7B7B7B;font-size: 26rpx;">
|
||||
<view class="card-tit">
|
||||
{{item.title}}
|
||||
</view>
|
||||
|
|
@ -131,6 +131,7 @@
|
|||
|
||||
import MyTabbar from "@/components/customTabbar/tabbar.vue"
|
||||
onLoad(() => {
|
||||
uni.hideTabBar()
|
||||
// console.log(store.state.userInfo)
|
||||
if (!store.state.userInfo) {
|
||||
uni.redirectTo({
|
||||
|
|
@ -246,7 +247,9 @@
|
|||
position: relative;
|
||||
padding-left: 20rpx;
|
||||
font-weight: bold;
|
||||
font-size: 28rpx;
|
||||
margin-bottom: 20rpx;
|
||||
color: #1A1A1A;
|
||||
}
|
||||
|
||||
.tits::before {
|
||||
|
|
@ -255,9 +258,10 @@
|
|||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
left: 0;
|
||||
width: 3px;
|
||||
width: 6rpx;
|
||||
/* 左边框的宽度 */
|
||||
height: 30rpx;
|
||||
height: 25rpx;
|
||||
border-radius: 20rpx;
|
||||
background-color: #34D08D;
|
||||
}
|
||||
|
||||
|
|
@ -416,6 +420,7 @@
|
|||
font-weight: bold;
|
||||
margin-bottom: 10rpx;
|
||||
color: black;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
|
||||
.card-address {
|
||||
|
|
|
|||
|
|
@ -6,11 +6,10 @@
|
|||
</view>
|
||||
|
||||
<view class="nav-con" style="justify-content: space-between;">
|
||||
<view class="" v-if="Object.keys(dataobj).length>0"
|
||||
style="padding-left: 20rpx;display: flex;color: white;" @click="show=true">
|
||||
<view class="title" v-if="Object.keys(dataobj).length>0" @click=" show=true">
|
||||
<u--image :src="u('qhtd')" width="38.55rpx" height="38.55rpx"
|
||||
style="margin-right: 20rpx;"></u--image>
|
||||
{{dataobj.title}}
|
||||
<text class="text">{{dataobj.title}}</text>
|
||||
|
||||
</view>
|
||||
<view class="" v-else>
|
||||
|
|
@ -19,18 +18,16 @@
|
|||
|
||||
<view class="" style="display: flex;align-items: center;">
|
||||
<view class="nav">
|
||||
<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 class="" style="margin-right: 16rpx;">
|
||||
<u--image :src="u('sbbd')" width="35.25rpx" @click="showModal=true"
|
||||
height="35.25rpx"></u--image>
|
||||
</view>
|
||||
<view class="" style="margin-left: 20rpx;">
|
||||
<!-- <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 class="" style="margin-left: 16rpx;">
|
||||
<u--image :src="u('sys')" width="35.25rpx" @click="scanFn" height="35.25rpx"></u--image>
|
||||
</view>
|
||||
|
||||
<view class="" style="margin-left: 20rpx;">
|
||||
<!-- <u-icon name="plus-circle" color="white" @click="navto('/pages/addLand/addLand')"
|
||||
:size="28"></u-icon> -->
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -46,32 +43,31 @@
|
|||
<view class="">
|
||||
<view class="" style="height:var(--status-bar-height) ;">
|
||||
</view>
|
||||
<view class="nav-con" style="margin-bottom: 80rpx;">
|
||||
<view class="nav-con" style="margin-bottom: 65rpx;">
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="content" v-if="true">
|
||||
<view class="content">
|
||||
<!-- 土地信息 -->
|
||||
<view class="">
|
||||
<view class="empty-land" v-if="Object.keys(dataobj).length<=0">
|
||||
<text>没有土地信息？</text>
|
||||
<text @click="navto('/pages/addLand/addLand')">去新增》</text>
|
||||
<text @click="navto('/pages/addLand/addLand')" style="display: flex;">去新增 <u-icon name="arrow-right"
|
||||
color="#709DE9" size="28"></u-icon></text>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="land-info">
|
||||
<view class="land-area">
|
||||
土地面积
|
||||
|
||||
|
||||
<view class="">
|
||||
<view style="color: #7B7B7B; font-size: 28rpx;">
|
||||
{{dataobj.total_area|| "--"}}亩
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="plant-area">
|
||||
种植面积
|
||||
<view class="">
|
||||
<view style="color: #7B7B7B; font-size: 28rpx;">
|
||||
{{dataobj.total_area-dataobj.residual_area||"--"}}亩
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -80,7 +76,8 @@
|
|||
<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>去新增》</text>
|
||||
<text style="display: flex;font-size: 26rpx;">新增种植 <u-icon name="arrow-right" color="#709DE9"
|
||||
size="15"></u-icon></text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="note" v-else>
|
||||
|
|
@ -92,8 +89,9 @@
|
|||
<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 class="" style="font-size: 20rpx;color: #ACACAC;display: flex;align-items: center;">
|
||||
<u-icon name="clock" style="margin-right: 5rpx;" color="#ACACAC"></u-icon>
|
||||
刷新时间：{{getNowTimeFn()}}
|
||||
</view>
|
||||
|
||||
|
||||
|
|
@ -118,12 +116,13 @@
|
|||
土壤检测信息
|
||||
</view>
|
||||
<view class="area-check">
|
||||
<view class="area-li" v-for="(item,index) in soilList" key="index"
|
||||
<view class="area-li" v-for="(item,index) in soilList" :key="index"
|
||||
:style="{backgroundImage:`url(${bgc(item.icon)})`}">
|
||||
<view class="">
|
||||
<view class="" style="color: #2E2E2E;font-size: 26rpx;">
|
||||
{{item.name}}
|
||||
</view>
|
||||
<view class="" :style=" {color: item.status==0?'#73DFB2':'red'}">
|
||||
<view class="" :style=" {color: item.status==0?'#73DFB2':'red'}"
|
||||
style="font-size: 28rpx;margin-top: 10rpx;">
|
||||
{{ item.num?item.num+item.unit:'--' }}
|
||||
</view>
|
||||
<view class="" style="display: flex;color:red" v-if="item.status>0">
|
||||
|
|
@ -143,14 +142,15 @@
|
|||
环境检测信息
|
||||
</view>
|
||||
<view class="area-check">
|
||||
<view class="area-li" v-for="(item,index) in environmentList" key="index"
|
||||
<view class="area-li" v-for="(item,index) in environmentList" :key="index"
|
||||
:style="{backgroundImage:`url(${bgc(item.icon)})`}">
|
||||
|
||||
|
||||
<view class="">
|
||||
<view class="" style="color: #2E2E2E;font-size: 26rpx;">
|
||||
{{item.name}}
|
||||
</view>
|
||||
<view class="" :style=" {color: item.status==0?'#73DFB2':'red'}">
|
||||
<view class="" :style=" {color: item.status==0?'#73DFB2':'red'}"
|
||||
style="font-size: 28rpx;margin-top: 10rpx;">
|
||||
<text v-if="item.num==0">{{item.num+item.unit}}</text>
|
||||
<text v-else>{{ item.num?item.num+item.unit:'--' }}</text>
|
||||
</view>
|
||||
|
|
@ -240,7 +240,7 @@
|
|||
@close="show = false" @select="confirm">
|
||||
</u-action-sheet>
|
||||
</view>
|
||||
<view class="empty" v-else>
|
||||
<!-- <view class="empty">
|
||||
<view class="addLand">
|
||||
<view class="">
|
||||
你还没有土地信息
|
||||
|
|
@ -250,7 +250,7 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- 组件 -->
|
||||
|
||||
<view class="Modal">
|
||||
|
|
@ -353,7 +353,7 @@
|
|||
icon: "trph",
|
||||
name: "土壤PH值",
|
||||
num: 0,
|
||||
unit: "PH",
|
||||
unit: "",
|
||||
status: 0,
|
||||
|
||||
}, {
|
||||
|
|
@ -514,7 +514,7 @@
|
|||
|
||||
if (res.code == 1) {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
video_url.value = res.data.video_url
|
||||
|
|
@ -861,7 +861,8 @@
|
|||
.content {
|
||||
// min-height: 92vh;
|
||||
padding: 0 30rpx;
|
||||
padding-top: 20rpx;
|
||||
// padding-top: 20rpx;
|
||||
// background-color: red;
|
||||
box-sizing: border-box;
|
||||
|
||||
|
||||
|
|
@ -869,28 +870,35 @@
|
|||
.land-info {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 20rpx;
|
||||
margin-bottom: 30rpx;
|
||||
|
||||
.land-area {
|
||||
width: 340rpx;
|
||||
width: 335rpx;
|
||||
height: 120rpx;
|
||||
// background-color: red;
|
||||
font-size: 30rpx;
|
||||
border-radius: 10rpx;
|
||||
color: #1A1A1A;
|
||||
box-sizing: border-box;
|
||||
background-image: url('/static/main/index/tdmj.png');
|
||||
background-size: 100% 100%;
|
||||
text-align: center;
|
||||
padding-top: 20rpx;
|
||||
box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
|
||||
padding-top: 20rpx;
|
||||
padding-left: 115rpx;
|
||||
|
||||
}
|
||||
|
||||
.plant-area {
|
||||
width: 340rpx;
|
||||
width: 335rpx;
|
||||
height: 120rpx;
|
||||
font-size: 30rpx;
|
||||
background-image: url('/static/main/index/zzmj.png');
|
||||
background-size: 100% 100%;
|
||||
text-align: center;
|
||||
padding-top: 20rpx;
|
||||
box-sizing: border-box;
|
||||
border-radius: 10rpx;
|
||||
box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
|
||||
padding-top: 20rpx;
|
||||
padding-left: 115rpx;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -907,7 +915,6 @@
|
|||
width: 100%;
|
||||
height: 447rpx;
|
||||
margin-bottom: 20rpx;
|
||||
// background-color: red;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -916,8 +923,9 @@
|
|||
.note {
|
||||
height: 168rpx;
|
||||
background-image: url('/static/main/index/JNS.png');
|
||||
// background-color: red;
|
||||
background-size: 100% 100%;
|
||||
margin-bottom: 20rpx;
|
||||
margin-bottom: 30rpx;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
|
|
@ -927,12 +935,13 @@
|
|||
flex-wrap: wrap;
|
||||
|
||||
.area-li {
|
||||
width: 335rpx;
|
||||
height: 200rpx;
|
||||
width: 330rpx;
|
||||
height: 194rpx;
|
||||
border-radius: 10rpx;
|
||||
background-size: 100% 100%;
|
||||
margin-bottom: 20rpx;
|
||||
padding: 45rpx 30rpx;
|
||||
box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -942,7 +951,9 @@
|
|||
position: relative;
|
||||
padding-left: 20rpx;
|
||||
font-weight: bold;
|
||||
font-size: 28rpx;
|
||||
margin-bottom: 20rpx;
|
||||
color: #1A1A1A;
|
||||
}
|
||||
|
||||
.tit::before {
|
||||
|
|
@ -951,23 +962,18 @@
|
|||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
left: 0;
|
||||
width: 3px;
|
||||
width: 6rpx;
|
||||
/* 左边框的宽度 */
|
||||
height: 30rpx;
|
||||
height: 25rpx;
|
||||
border-radius: 20rpx;
|
||||
background-color: #34D08D;
|
||||
}
|
||||
|
||||
|
||||
// old
|
||||
.soil-monitor {
|
||||
margin-top: 40rpx;
|
||||
|
||||
.head {
|
||||
|
||||
// .tit {
|
||||
// font-size: 33.29rpx;
|
||||
// color: black;
|
||||
// }
|
||||
|
||||
.flushed-time {
|
||||
display: flex;
|
||||
|
|
@ -1041,8 +1047,10 @@
|
|||
}
|
||||
|
||||
.empty-land {
|
||||
width: 690rpx;
|
||||
width: 715rpx;
|
||||
margin: 0 auto;
|
||||
height: 135rpx;
|
||||
transform: translateX(-20rpx);
|
||||
color: #74A0EA;
|
||||
text-align: center;
|
||||
background-image: url('../../static/main/index/xz.png');
|
||||
|
|
@ -1053,4 +1061,18 @@
|
|||
padding-left: 200rpx;
|
||||
padding-right: 10rpx;
|
||||
}
|
||||
|
||||
.title {
|
||||
padding-left: 20rpx;
|
||||
display: flex;
|
||||
color: white;
|
||||
font-size: 32rpx;
|
||||
width: 400rpx;
|
||||
}
|
||||
|
||||
.text {
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -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()
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,37 +8,33 @@
|
|||
</view>
|
||||
<view class="" style="display: flex;align-items: center;">
|
||||
<u-icon name="clock" style="margin-right: 10rpx;"></u-icon>
|
||||
<text style="color: #ACACAC;font-size: 25rpx;">刷新时间: {{getNowTimeFn()}} </text>
|
||||
<text style="color: #ACACAC;font-size: 20rpx;">刷新时间: {{getNowTimeFn()}} </text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="video" style="position: relative;">
|
||||
<u--image src="https://ceshi-worker-task.lihaink.cn/uploads/images/20231223/20231223092144475437017.png"
|
||||
width="100%" height="300rpx" @click="goLive" v-if="videoUrl"></u--image>
|
||||
<u--image src="/static/main/index/k.png" width="100%" height="300rpx" v-else></u--image>
|
||||
|
||||
<!-- <u--image src="/static/main/index/k.png" width="100%" height="510rpx" v-else></u--image> -->
|
||||
<u--image :src="u('K')" v-else width="100%" height="510rpx"></u--image>
|
||||
<view class=""
|
||||
style="width: 100%;height: 100%;background-color: rgba(0, 0, 0, .5);position: absolute;top: 1px;"
|
||||
@click="goLive" v-if="videoUrl">
|
||||
<u-icon name="play-circle" size="40" color="white" v-if="videoUrl"
|
||||
style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);"></u-icon>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
<landInfo :info='dataobj'></landInfo>
|
||||
|
||||
|
||||
|
||||
|
||||
<view class="add-thing" @click="addshowPicke">
|
||||
新增种植
|
||||
</view>
|
||||
|
||||
|
||||
<view class="">
|
||||
<view class="tit" style="font-size: 33.29rpx;margin: 20rpx 0;">
|
||||
<view class="tit">
|
||||
种植信息
|
||||
</view>
|
||||
<view class="" v-if="dataList.length>0">
|
||||
|
|
@ -77,7 +73,7 @@
|
|||
<text style="color: black;">种植面积:</text> {{item.area}}亩
|
||||
</view>
|
||||
<view class="te">
|
||||
<text style="color: black;white-space: nowrap;">参与人:</text> {{item.user}}
|
||||
<text style="color: black;white-space: nowrap;">参与人员:</text> {{item.user}}
|
||||
</view>
|
||||
<view class="">
|
||||
<text style="color: black;">种植日期:</text> {{item.plant_date}}
|
||||
|
|
@ -307,6 +303,9 @@
|
|||
|
||||
|
||||
|
||||
}
|
||||
const u = (name) => {
|
||||
return `/static/main/index/${name}.png`
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -7,17 +7,26 @@
|
|||
</view>
|
||||
<view class="" style="display: flex;align-items: center;">
|
||||
<u-icon name="clock" style="margin-right: 10rpx;"></u-icon>
|
||||
<text style="color: #ACACAC;font-size: 25rpx;">刷新时间: {{getNowTimeFn()}} </text>
|
||||
<text style="color: #ACACAC;font-size: 20rpx;">刷新时间: {{getNowTimeFn()}} </text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="video" @click="navto('/pages/live/live')">
|
||||
<u--image :src="url" width="100%" height="300rpx"></u--image>
|
||||
<!-- <u--image src="https://ceshi-worker-task.lihaink.cn/uploads/images/20231223/20231223092144475437017.png"
|
||||
width="100%" height="300rpx" @click="goLive" v-if="videoUrl"></u--image> -->
|
||||
<!-- <u--image src="/static/main/index/k.png" width="100%" height="510rpx"></u--image> -->
|
||||
<u--image :src="u('K')" width="100%" height="510rpx"></u--image>
|
||||
<!-- <view class=""
|
||||
style="width: 100%;height: 100%;background-color: rgba(0, 0, 0, .5);position: absolute;top: 1px;"
|
||||
@click="goLive" v-if="videoUrl">
|
||||
<u-icon name="play-circle" size="40" color="white" v-if="videoUrl"
|
||||
style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);"></u-icon>
|
||||
</view> -->
|
||||
</view>
|
||||
<landInfo :info='dataobj' :isDetail='true'></landInfo>
|
||||
|
||||
|
||||
<view class="">
|
||||
<view class="tit" style="font-size: 33.29rpx;margin: 20rpx 0;">
|
||||
<view class="tit">
|
||||
操作信息
|
||||
</view>
|
||||
<view class="" v-if="dataList1.length>0">
|
||||
|
|
@ -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`
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
@ -408,7 +420,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 {
|
||||
|
|
@ -476,7 +493,8 @@
|
|||
display: flex;
|
||||
justify-content: space-between;
|
||||
flex-direction: column;
|
||||
margin-left: 40rpx;
|
||||
margin-left: 20rpx;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
|
||||
.stick-img {
|
||||
|
|
@ -493,7 +511,9 @@
|
|||
position: relative;
|
||||
padding-left: 20rpx;
|
||||
font-weight: bold;
|
||||
font-size: 28rpx;
|
||||
margin-bottom: 20rpx;
|
||||
color: #1A1A1A;
|
||||
}
|
||||
|
||||
.tit::before {
|
||||
|
|
@ -502,9 +522,10 @@
|
|||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
left: 0;
|
||||
width: 3px;
|
||||
width: 6rpx;
|
||||
/* 左边框的宽度 */
|
||||
height: 30rpx;
|
||||
height: 25rpx;
|
||||
border-radius: 20rpx;
|
||||
background-color: #34D08D;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -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: {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view class="reset-password">
|
||||
<u--form ref="formRef" :rules="rules" :model="formData" labelPosition='top'>
|
||||
<u--form ref="formRef" :rules="rules" :model="formData" labelPosition='top'
|
||||
:labelStyle="{color:'#7A7A7A',fontSize:'28rpx'}">
|
||||
<u-form-item label="原密码" labelWidth="140rpx" borderBottom prop="old_password" left-icon='lock'>
|
||||
|
||||
<u-input placeholder="请输入原密码" border="surround" v-model="formData.old_password"
|
||||
:password="!pwdShow.old_password" class="ipt" customStyle='padding:20rpx 10rpx'>
|
||||
:password="!pwdShow.old_password" class="ipt" customStyle='padding:20rpx 30rpx'>
|
||||
<!-- <template #suffix>
|
||||
<u-icon :name="pwdShow.old_password?'eye-off':'eye-fill'" size="25"
|
||||
@click="pwdShow.old_password=!pwdShow.old_password"></u-icon>
|
||||
|
|
@ -25,7 +26,7 @@
|
|||
<u-form-item label="新密码" labelWidth="140rpx" borderBottom prop="password" left-icon='lock'>
|
||||
|
||||
|
||||
<u-input border="surround" class="ipt" customStyle='padding:20rpx 10rpx' v-model="formData.password"
|
||||
<u-input border="surround" class="ipt" customStyle='padding:20rpx 30rpx' v-model="formData.password"
|
||||
:password="!pwdShow.password" placeholder="请输入新密码">
|
||||
<!--
|
||||
<template #suffix>
|
||||
|
|
@ -38,7 +39,7 @@
|
|||
</u-form-item>
|
||||
<u-form-item label="确认密码" labelWidth="180rpx" borderBottom prop="password_confirm" left-icon='lock'>
|
||||
<u-input border="surround" v-model="formData.password_confirm" :password="!pwdShow.password_confirm"
|
||||
placeholder="请确认新密码" class="ipt" customStyle='padding:20rpx 10rpx'>
|
||||
placeholder="请确认新密码" class="ipt" customStyle='padding:20rpx 30rpx'>
|
||||
|
||||
<!-- <template #suffix>
|
||||
<u-icon :name="pwdShow.password_confirm?'eye-off':'eye-fill'" size="25"
|
||||
|
|
@ -47,7 +48,7 @@
|
|||
</u-input>
|
||||
|
||||
</u-form-item>
|
||||
<u-button style="margin-top: 28rpx;background-color:#34D190;color: #fff;"
|
||||
<u-button style="margin-top: 28rpx;background-color:#34D190;color: #fff;font-size: 32rpx;"
|
||||
customStyle="border-radius: 50rpx;height:100rpx" @click="submit">提交</u-button>
|
||||
</u--form>
|
||||
</view>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue