zmj
/
TraceabilityAPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
zmj 2023-12-17 19:34:37 +08:00
parent 2e59072b30
commit c72ae97d2d
16 changed files with 2525 additions and 2369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/plant/landInfo.vue
View File

@ -22,7 +22,7 @@
</view> </view>
</view> </view>
<view class="info-li" style="background-image: url('/static/main/index/tdfzr.png');"> <view class="info-li" style="background-image: url('/static/main/index/tdfzr.png');">
当地负责人 土地负责人
<view class=""> <view class="">
{{info.master_name}} {{info.master_name}}
</view> </view>

123
manifest.json
View File

@ -1,44 +1,44 @@
{ {
"name" : "种植溯源", "name": "种植溯源",
"appid" : "__UNI__D087881", "appid": "__UNI__D087881",
"description" : "", "description": "",
"versionName" : "1.0.1", "versionName": "1.0.2",
"versionCode" : "100", "versionCode": 102,
"transformPx" : false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus": {
"usingComponents" : true, "usingComponents": true,
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler": "uni-app",
"compilerVersion" : 3, "compilerVersion": 3,
"screenOrientation" : [ "screenOrientation": [
"portrait-primary", "portrait-primary",
"portrait-secondary", "portrait-secondary",
"landscape-primary", "landscape-primary",
"landscape-secondary" "landscape-secondary"
], ],
"splashscreen" : { "splashscreen": {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender": true,
"waiting" : true, "waiting": true,
"autoclose" : true, "autoclose": true,
"delay" : 0 "delay": 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules" : { "modules": {
"Geolocation" : {}, "Geolocation": {},
"Maps" : {}, "Maps": {},
"LivePusher" : {}, "LivePusher": {},
"VideoPlayer" : {}, "VideoPlayer": {},
"Barcode" : {}, "Barcode": {},
"Camera" : {}, "Camera": {},
"UniMP" : { "UniMP": {
"description" : "uni小程序" "description": "uni小程序"
} }
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute": {
/* android打包配置 */ /* android打包配置 */
"android" : { "android": {
"permissions" : [ "permissions": [
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
@ -52,61 +52,62 @@
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>", "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"minSdkVersion" : 21 "minSdkVersion": 21
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios": {
"dSYMs" : false "dSYMs": false
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs": {
"ad" : {}, "ad": {},
"geolocation" : { "geolocation": {
"amap" : { "amap": {
"name" : "amap_18982406440DFVLElaO", "name": "amap_18982406440DFVLElaO",
"__platform__" : [ "android" ], "__platform__": ["ios", "android"],
"appkey_ios" : "4e6789b864fe1a2d76b98e38158f20f2", "appkey_ios": "d2a3f66e130d2315fb72846db0d25197",
"appkey_android" : "a230d943475443eb29fc3871fbef8605" "appkey_android": "d2a3f66e130d2315fb72846db0d25197"
}, },
"system" : { "system": {
"__platform__" : [ "ios", "android" ] "__platform__": ["ios", "android"]
} }
}, },
"maps" : { "maps": {
"amap" : { "amap": {
"name" : "4e6789b864fe1a2d76b98e38158f20f2", "name": "4e6789b864fe1a2d76b98e38158f20f2",
"appkey_ios" : "a230d943475443eb29fc3871fbef8605", "appkey_ios": "d2a3f66e130d2315fb72846db0d25197",
"appkey_android" : "a230d943475443eb29fc3871fbef8605" "appkey_android": "d2a3f66e130d2315fb72846db0d25197"
} }
} }
} }
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp" : {}, "quickapp": {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin": {
"appid" : "", "appid": "",
"setting" : { "setting": {
"urlCheck" : false "urlCheck": false
}, },
"usingComponents" : true "usingComponents": true
}, },
"mp-alipay" : { "mp-alipay": {
"usingComponents" : true "usingComponents": true
}, },
"mp-baidu" : { "mp-baidu": {
"usingComponents" : true "usingComponents": true
}, },
"mp-toutiao" : { "mp-toutiao": {
"usingComponents" : true "usingComponents": true
}, },
"uniStatistics" : { "uniStatistics": {
"enable" : false "enable": false
}, },
"vueVersion" : "3" "vueVersion": "3"
} }

72
pages/addLand/addLand.vue
View File

@ -9,13 +9,16 @@
<view class="c-title">土地信息</view> <view class="c-title">土地信息</view>
<view class="c-box"> <view class="c-box">
<up-form-item label="土地名称" prop="title" borderBottom required> <up-form-item label="土地名称" prop="title" borderBottom required>
<up-input input-align="right" placeholder="请输入土地名称" border="none" v-model="data.formData.title"></up-input> <up-input input-align="right" placeholder="请输入土地名称" border="none"
v-model="data.formData.title"></up-input>
</up-form-item> </up-form-item>
<up-form-item label="土地面积" prop="area" borderBottom required> <up-form-item label="土地面积" prop="area" borderBottom required>
<up-input input-align="right" placeholder="请输入土地面积" border="none" v-model="data.formData.area"></up-input> <up-input input-align="right" placeholder="请输入土地面积" border="none"
v-model="data.formData.area"></up-input>
</up-form-item> </up-form-item>
<up-form-item label="土地负责人" prop="master_name" borderBottom required> <up-form-item label="土地负责人" prop="master_name" borderBottom required>
<up-input input-align="right" placeholder="请输入土地负责人名称" border="none" v-model="data.formData.master_name"></up-input> <up-input input-align="right" placeholder="请输入土地负责人名称" border="none"
v-model="data.formData.master_name"></up-input>
</up-form-item> </up-form-item>
<up-form-item label="负责人电话" prop="master_phone" borderBottom required> <up-form-item label="负责人电话" prop="master_phone" borderBottom required>
<up-input input-align="right" placeholder="请输入负责人电话" type="number" border="none" <up-input input-align="right" placeholder="请输入负责人电话" type="number" border="none"
@ -26,19 +29,23 @@
<view class="c-title">地址信息</view> <view class="c-title">地址信息</view>
<view class="c-box"> <view class="c-box">
<up-form-item label="所在省份" prop="province_code" borderBottom required @click="isshow1"> <up-form-item label="所在省份" prop="province_code" borderBottom required @click="isshow1">
<up-input input-align="right" placeholder="请选择所在省份" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" border="none" v-model="province_name" readonly <up-input input-align="right" placeholder="请选择所在省份" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" border="none" v-model="province_name" readonly
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</up-form-item> </up-form-item>
<up-form-item label="所在城市" prop="city_code" borderBottom required @click="isshow2"> <up-form-item label="所在城市" prop="city_code" borderBottom required @click="isshow2">
<up-input input-align="right" placeholder="请选择所在城市" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" border="none" v-model="city_name" readonly <up-input input-align="right" placeholder="请选择所在城市" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" border="none" v-model="city_name" readonly
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</up-form-item> </up-form-item>
<up-form-item label="所在区县" prop="county_code" borderBottom required @click="isshow3"> <up-form-item label="所在区县" prop="county_code" borderBottom required @click="isshow3">
<up-input input-align="right" placeholder="请选择所在区县" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" border="none" v-model="county_name" readonly <up-input input-align="right" placeholder="请选择所在区县" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" border="none" v-model="county_name" readonly
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</up-form-item> </up-form-item>
<up-form-item label="土地详细地址" prop="town_code" borderBottom required> <up-form-item label="土地详细地址" prop="town_code" borderBottom required @click="location">
<up-input input-align="right" placeholder="请输入土地详细地址" suffixIcon="map" suffix-icon-style="color: #b6b6b6;" border="none" v-model="data.formData.address"> <up-input input-align="right" placeholder="请输入土地详细地址" suffixIcon="map"
suffix-icon-style="color: #b6b6b6;" border="none" v-model="data.formData.address">
</up-input> </up-input>
</up-form-item> </up-form-item>
</view> </view>
@ -354,32 +361,34 @@
} }
const location = () => { const location = () => {
//#ifdef APP console.log(99)
uni.showLoading({ // uni.showLoading({
title: '获取位置中' // title: '获取位置中'
}) // })
uni.getLocation({ uni.getLocation({
type: 'gcj02', type: 'gcj02',
geocode: true, geocode: true,
isHighAccuracy: true, isHighAccuracy: true,
success: async (res) => { success: async (res) => {
// console.log(res)
data.formData.address = res.address.city + res.address.district + res.address.street + res
.address.streetNum + res.address.poiName
uni.hideLoading(); console.log(545)
console.log(res)
// data.formData.address = res.address.city + res.address.district + res.address.street + res
// .address.streetNum + res.address.poiName
// uni.hideLoading();
}, },
fail: (err) => { fail: (err) => {
uni.hideLoading(); // uni.hideLoading();
console.log(err) console.log(err)
console.log("erer")
} }
}); });
//#endif
//#ifdef H5
uni.$u.toast('暂不支持')
//#endif
} }
@ -434,22 +443,24 @@
</script> </script>
<style lang="scss"> <style lang="scss">
page{ page {
background-color: #f7fffc; background-color: #f7fffc;
} }
.card{ .card {
background-color: #f7fffc; background-color: #f7fffc;
padding: 0; padding: 0;
padding-bottom: 80rpx; padding-bottom: 80rpx;
.c-title{
.c-title {
font-weight: bold; font-weight: bold;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 30rpx; padding: 30rpx;
padding-bottom: 15rpx; padding-bottom: 15rpx;
&:before{
&:before {
content: ''; content: '';
display: inline-block; display: inline-block;
height: 0.8rem; height: 0.8rem;
@ -460,17 +471,20 @@
border-radius: 6rpx; border-radius: 6rpx;
} }
} }
.c-box{
.c-box {
background-color: #fff; background-color: #fff;
padding-left: 30rpx; padding-left: 30rpx;
padding-right: 20rpx; padding-right: 20rpx;
padding-bottom: 20rpx; padding-bottom: 20rpx;
box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.1);
} }
.c-box-p{
.c-box-p {
padding: 20rpx; padding: 20rpx;
} }
.btn{
.btn {
margin: 20rpx auto; margin: 20rpx auto;
width: 694rpx; width: 694rpx;
height: 80rpx; height: 80rpx;
@ -482,6 +496,7 @@
.card-li-tit { .card-li-tit {
position: relative; position: relative;
span { span {
position: absolute; position: absolute;
left: -9px; left: -9px;
@ -493,6 +508,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.confim-btn { .confim-btn {
margin: 0 auto; margin: 0 auto;
width: 196.26rpx; width: 196.26rpx;

34
pages/husbandryForm/Pest.vue
View File

@ -14,16 +14,16 @@
v-model="formData.breed"></up-input> v-model="formData.breed"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="除虫剂用量(升)" prop="dosage" borderBottom required> <u-form-item label="除虫剂用量(升)" prop="dosage" borderBottom required>
<up-input input-align="right" placeholder="请输入除虫剂用量" type='number' border="none" :disabled="mode=='detail'" <up-input input-align="right" placeholder="请输入除虫剂用量" type='number' border="none"
v-model="formData.dosage"></up-input> :disabled="mode=='detail'" v-model="formData.dosage"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="作业面积(亩)" prop="area" borderBottom required> <u-form-item label="作业面积(亩)" prop="area" borderBottom required>
<up-input input-align="right" placeholder="请输入作业面积" :disabled="mode=='detail'" type="number" border="none" <up-input input-align="right" placeholder="请输入作业面积" :disabled="mode=='detail'" type="number"
v-model="formData.area"></up-input> border="none" v-model="formData.area"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="参与人员" prop="user" borderBottom required> <u-form-item label="参与人员" prop="user" borderBottom required>
<up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt" border="none" <up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt"
v-model="formData.user"></up-input> border="none" v-model="formData.user"></up-input>
</u-form-item> </u-form-item>
<view class="" v-if="mode=='add'"> <view class="" v-if="mode=='add'">
<u-form-item label="开始日期" @click="openDate" prop="start_date" borderBottom required> <u-form-item label="开始日期" @click="openDate" prop="start_date" borderBottom required>
@ -85,7 +85,8 @@
<view class="c-title">备注信息</view> <view class="c-title">备注信息</view>
<view class="c-box" style="padding: 0 20rpx;"> <view class="c-box" style="padding: 0 20rpx;">
<u-form-item prop="remark" borderBottom> <u-form-item prop="remark" borderBottom>
<u--textarea v-model="formData.remark" :disabled="mode=='detail'" placeholder="请输入内容"></u--textarea> <u--textarea v-model="formData.remark" :disabled="mode=='detail'"
placeholder="请输入内容"></u--textarea>
</u-form-item> </u-form-item>
</view> </view>
@ -94,10 +95,10 @@
<!-- <uni-calendar ref="calendar" :showMonth="true" :lunar="true" :insert="false" @confirm="dateConfirmfn" /> <!-- <uni-calendar ref="calendar" :showMonth="true" :lunar="true" :insert="false" @confirm="dateConfirmfn" />
<uni-calendar ref="calendar1" :showMonth="true" :lunar="true" :insert="false" <uni-calendar ref="calendar1" :showMonth="true" :lunar="true" :insert="false"
@confirm="dateConfirmfn1" /> --> @confirm="dateConfirmfn1" /> -->
<u-datetime-picker :show="show1" v-model="value1" mode="datetime" @confirm="dateConfirmfn" <u-datetime-picker :show="show1" :max-date="getNowTime()" v-model="value1" mode="datetime"
:formatter="formatter" @cancel="show1=false"></u-datetime-picker> @confirm="dateConfirmfn" :formatter="formatter" @cancel="show1=false"></u-datetime-picker>
<u-datetime-picker :show="show2" v-model="value1" mode="datetime" @confirm="dateConfirmfn1" <u-datetime-picker :show="show2" :max-date="getNowTime()" v-model="value1" mode="datetime"
:formatter="formatter" @cancel="show2=false"></u-datetime-picker> @confirm="dateConfirmfn1" :formatter="formatter" @cancel="show2=false"></u-datetime-picker>
</view> </view>
<u-button class="btn" v-if="mode=='add'" @click="addFn">完成添加</u-button> <u-button class="btn" v-if="mode=='add'" @click="addFn">完成添加</u-button>
</view> </view>
@ -207,7 +208,7 @@
'area': { 'area': {
type: 'string', type: 'string',
required: true, required: true,
message: '请填写土地面积', message: '请填写作业面积',
trigger: ['blur', 'change'] trigger: ['blur', 'change']
}, },
'user': { 'user': {
@ -384,6 +385,15 @@
getlist() getlist()
}) })
const getNowTime = () => {
const now = new Date();
const timestamp = now.getTime();
// console.log(timestamp)
return timestamp
}
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>

52
pages/husbandryForm/fertilize.vue
View File

@ -14,33 +14,38 @@
v-model="formData.breed"></up-input> v-model="formData.breed"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="肥料用量(斤)" prop="dosage" borderBottom required> <u-form-item label="肥料用量(斤)" prop="dosage" borderBottom required>
<up-input input-align="right" placeholder="请输入肥料用量" border="none" type='number' :disabled="mode=='detail'" <up-input input-align="right" placeholder="请输入肥料用量" border="none" type='number'
v-model="formData.dosage"></up-input> :disabled="mode=='detail'" v-model="formData.dosage"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="作业面积(亩)" prop="area" borderBottom required> <u-form-item label="作业面积(亩)" prop="area" borderBottom required>
<up-input input-align="right" placeholder="请输入作业面积" :disabled="mode=='detail'" type="number" border="none" <up-input input-align="right" placeholder="请输入作业面积" :disabled="mode=='detail'" type="number"
v-model="formData.area"></up-input> border="none" v-model="formData.area"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="参与人员" prop="user" borderBottom required> <u-form-item label="参与人员" prop="user" borderBottom required>
<up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt" border="none" <up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt"
v-model="formData.user"></up-input> border="none" v-model="formData.user"></up-input>
</u-form-item><view class="" v-if="mode=='add'"> </u-form-item>
<view class="" v-if="mode=='add'">
<u-form-item label="开始日期" @click="openDate" prop="start_date" borderBottom required> <u-form-item label="开始日期" @click="openDate" prop="start_date" borderBottom required>
<up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.start_date" <up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.start_date"
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="结束日期" prop="end_date" @click="openDate1" borderBottom required> <u-form-item label="结束日期" prop="end_date" @click="openDate1" borderBottom required>
<up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.end_date" <up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.end_date"
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</u-form-item> </u-form-item>
</view> </view>
<view class="" v-else> <view class="" v-else>
<u-form-item label="开始日期" prop="start_date" borderBottom required> <u-form-item label="开始日期" prop="start_date" borderBottom required>
<up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.start_date" <up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.start_date"
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="结束日期" prop="end_date" borderBottom required> <u-form-item label="结束日期" prop="end_date" borderBottom required>
<up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.end_date" <up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.end_date"
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</u-form-item> </u-form-item>
</view> </view>
@ -57,7 +62,8 @@
<view class=""> <view class="">
<u-icon name="close" size="15" style="margin-left:120.85rpx;" @click="delimg(i)" <u-icon name="close" size="15" style="margin-left:120.85rpx;" @click="delimg(i)"
v-show="mode=='add'"></u-icon> v-show="mode=='add'"></u-icon>
<u-image :src="item" width="150.85rpx" height="150.85rpx" @click="perviewFn(item)"></u-image> <u-image :src="item" width="150.85rpx" height="150.85rpx"
@click="perviewFn(item)"></u-image>
</view> </view>
</view> </view>
</view> </view>
@ -81,7 +87,8 @@
<view class="c-title">备注信息</view> <view class="c-title">备注信息</view>
<view class="c-box" style="padding: 0 20rpx;"> <view class="c-box" style="padding: 0 20rpx;">
<u-form-item prop="remark" borderBottom> <u-form-item prop="remark" borderBottom>
<u--textarea v-model="formData.remark" :disabled="mode=='detail'" placeholder="请输入内容"></u--textarea> <u--textarea v-model="formData.remark" :disabled="mode=='detail'"
placeholder="请输入内容"></u--textarea>
</u-form-item> </u-form-item>
</view> </view>
@ -92,10 +99,10 @@
<!-- <uni-calendar ref="calendar" :showMonth="true" :lunar="true" :insert="false" @confirm="dateConfirmfn" /> <!-- <uni-calendar ref="calendar" :showMonth="true" :lunar="true" :insert="false" @confirm="dateConfirmfn" />
<uni-calendar ref="calendar1" :showMonth="true" :lunar="true" :insert="false" <uni-calendar ref="calendar1" :showMonth="true" :lunar="true" :insert="false"
@confirm="dateConfirmfn1" /> --> @confirm="dateConfirmfn1" /> -->
<u-datetime-picker :show="show1" v-model="value1" mode="datetime" @confirm="dateConfirmfn" <u-datetime-picker :show="show1" :max-date="getNowTime()" v-model="value1" mode="datetime"
:formatter="formatter" @cancel="show1=false"></u-datetime-picker> @confirm="dateConfirmfn" :formatter="formatter" @cancel="show1=false"></u-datetime-picker>
<u-datetime-picker :show="show2" v-model="value1" mode="datetime" @confirm="dateConfirmfn1" <u-datetime-picker :show="show2" :max-date="getNowTime()" v-model="value1" mode="datetime"
:formatter="formatter" @cancel="show2=false"></u-datetime-picker> @confirm="dateConfirmfn1" :formatter="formatter" @cancel="show2=false"></u-datetime-picker>
</view> </view>
@ -196,7 +203,7 @@
'area': { 'area': {
type: 'string', type: 'string',
required: true, required: true,
message: '请填写土地面积', message: '请填写作业面积',
trigger: ['blur', 'change'] trigger: ['blur', 'change']
}, },
'user': { 'user': {
@ -388,6 +395,15 @@
getlist() getlist()
}) })
const getNowTime = () => {
const now = new Date();
const timestamp = now.getTime();
// console.log(timestamp)
return timestamp
}
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>

52
pages/husbandryForm/harvest.vue
View File

@ -11,14 +11,14 @@
v-model="formData.breed"></up-input> v-model="formData.breed"></up-input>
</u-form-item> --> </u-form-item> -->
<u-form-item label="参与人员" prop="user" borderBottom required> <u-form-item label="参与人员" prop="user" borderBottom required>
<up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt" border="none" <up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt"
v-model="formData.user"></up-input> border="none" v-model="formData.user"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="作业面积" prop="formData.breed" borderBottom required> <u-form-item label="作业面积" prop="formData.breed" borderBottom required>
<up-input input-align="right" placeholder="请输入作业面积" :disabled="mode=='detail'" type="number" border="none" <up-input input-align="right" placeholder="请输入作业面积" :disabled="mode=='detail'" type="number"
v-model="formData.breed"></up-input> border="none" v-model="formData.breed"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="收获日期" prop="start_date" borderBottom required> <u-form-item label="收获日期" prop="start_date" @click="openDate" borderBottom required>
<up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down" <up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.start_date" suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.start_date"
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
@ -35,7 +35,8 @@
<view class=""> <view class="">
<u-icon name="close" size="15" style="margin-left:120.85rpx;" @click="delimg(i)" <u-icon name="close" size="15" style="margin-left:120.85rpx;" @click="delimg(i)"
v-show="mode=='add'"></u-icon> v-show="mode=='add'"></u-icon>
<u-image :src="item" width="150.85rpx" height="150.85rpx" @click="perviewFn(item)"></u-image> <u-image :src="item" width="150.85rpx" height="150.85rpx"
@click="perviewFn(item)"></u-image>
</view> </view>
</view> </view>
</view> </view>
@ -59,7 +60,8 @@
<view class="c-title">备注信息</view> <view class="c-title">备注信息</view>
<view class="c-box" style="padding: 0 20rpx;"> <view class="c-box" style="padding: 0 20rpx;">
<u-form-item prop="remark" borderBottom> <u-form-item prop="remark" borderBottom>
<u--textarea v-model="formData.remark" :disabled="mode=='detail'" placeholder="请输入内容"></u--textarea> <u--textarea v-model="formData.remark" :disabled="mode=='detail'"
placeholder="请输入内容"></u--textarea>
</u-form-item> </u-form-item>
</view> </view>
@ -67,7 +69,8 @@
</u--form> </u--form>
<u-button class="btn" v-if="mode=='add'" @click="addFn">完成添加</u-button> <u-button class="btn" v-if="mode=='add'" @click="addFn">完成添加</u-button>
</view> </view>
<u-datetime-picker :show="show1" :max-date="getNowTime()" v-model="value1" mode="datetime"
@confirm="dateConfirmfn" :formatter="formatter" @cancel="show1=false"></u-datetime-picker>
</view> </view>
@ -93,6 +96,7 @@
const form = ref(null) const form = ref(null)
const task_id = ref(''); const task_id = ref('');
const pic = reactive([]); const pic = reactive([]);
const show1 = ref(false)
const formData = reactive({ const formData = reactive({
user: "", user: "",
remark: "", remark: "",
@ -100,8 +104,21 @@
start_date: '' start_date: ''
}) })
const dateConfirmfn = (e) => { const dateConfirmfn = (e) => {
console.log(e) formData.start_date = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM ')
show1.value = false
} }
const formatter = (type, value) => {
if (type === 'year') {
return `${value}年`;
}
if (type === 'month') {
return `${value}月`;
}
if (type === 'day') {
return `${value}日`;
}
return value;
};
const rules = { const rules = {
'user': { 'user': {
type: 'string', type: 'string',
@ -125,6 +142,21 @@
url url
}) })
} }
const openDate = () => {
// calendar.value.open()
show1.value = true
// alert(455)
}
const value1 = ref(Date.now());
const getNowTime = () => {
const now = new Date();
const timestamp = now.getTime();
// console.log(timestamp)
return timestamp
}
const addFn = () => { const addFn = () => {
form.value.validate().then(res => { form.value.validate().then(res => {
console.log(res) console.log(res)
@ -161,7 +193,7 @@
// uni.$u.toast('校验成功') // uni.$u.toast('校验成功')
} }
}).catch((err)=>{ }).catch((err) => {
uni.$u.toast(err[0].message) uni.$u.toast(err[0].message)
console.log(err) console.log(err)
}) })

38
pages/husbandryForm/irrigate.vue
View File

@ -8,16 +8,16 @@
<u-form-item label="灌溉方式" prop="type" borderBottom required @click="showggai"> <u-form-item label="灌溉方式" prop="type" borderBottom required @click="showggai">
<!-- <uni-data-select v-model="formData.type" :disabled="mode=='detail'" <!-- <uni-data-select v-model="formData.type" :disabled="mode=='detail'"
:localdata="range"></uni-data-select> --> :localdata="range"></uni-data-select> -->
<up-input input-align="right" placeholder="请选择灌溉方式" readonly border="none" v-model="formDatatype" <up-input input-align="right" placeholder="请选择灌溉方式" readonly border="none"
style="pointer-events: none;"></up-input> v-model="formDatatype" style="pointer-events: none;"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="灌溉面积(亩)" prop="area" borderBottom required> <u-form-item label="灌溉面积(亩)" prop="area" borderBottom required>
<up-input input-align="right" placeholder="请输入作业面积" :disabled="mode=='detail'" type="number" border="none" <up-input input-align="right" placeholder="请输入作业面积" :disabled="mode=='detail'" type="number"
v-model="formData.area"></up-input> border="none" v-model="formData.area"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="参与人员" prop="user" borderBottom required> <u-form-item label="参与人员" prop="user" borderBottom required>
<up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt" border="none" <up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt"
v-model="formData.user"></up-input> border="none" v-model="formData.user"></up-input>
</u-form-item> </u-form-item>
<view class="" v-if="mode=='add'"> <view class="" v-if="mode=='add'">
<u-form-item label="开始日期" @click="openDate" prop="start_date" borderBottom required> <u-form-item label="开始日期" @click="openDate" prop="start_date" borderBottom required>
@ -55,7 +55,8 @@
<view class=""> <view class="">
<u-icon name="close" size="15" style="margin-left:120.85rpx;" @click="delimg(i)" <u-icon name="close" size="15" style="margin-left:120.85rpx;" @click="delimg(i)"
v-show="mode=='add'"></u-icon> v-show="mode=='add'"></u-icon>
<u-image :src="item" width="150.85rpx" height="150.85rpx" @click="perviewFn(item)"></u-image> <u-image :src="item" width="150.85rpx" height="150.85rpx"
@click="perviewFn(item)"></u-image>
</view> </view>
</view> </view>
</view> </view>
@ -79,7 +80,8 @@
<view class="c-title">备注信息</view> <view class="c-title">备注信息</view>
<view class="c-box" style="padding: 0 20rpx;"> <view class="c-box" style="padding: 0 20rpx;">
<u-form-item prop="remark" borderBottom> <u-form-item prop="remark" borderBottom>
<u--textarea v-model="formData.remark" :disabled="mode=='detail'" placeholder="请输入内容"></u--textarea> <u--textarea v-model="formData.remark" :disabled="mode=='detail'"
placeholder="请输入内容"></u--textarea>
</u-form-item> </u-form-item>
</view> </view>
@ -88,11 +90,12 @@
<!-- <uni-calendar ref="calendar" :showMonth="true" :lunar="true" :insert="false" @confirm="dateConfirmfn" /> <!-- <uni-calendar ref="calendar" :showMonth="true" :lunar="true" :insert="false" @confirm="dateConfirmfn" />
<uni-calendar ref="calendar1" :showMonth="true" :lunar="true" :insert="false" <uni-calendar ref="calendar1" :showMonth="true" :lunar="true" :insert="false"
@confirm="dateConfirmfn1" /> --> @confirm="dateConfirmfn1" /> -->
<u-datetime-picker :show="show1" v-model="value1" mode="datetime" @confirm="dateConfirmfn" <u-datetime-picker :show="show1" v-model="value1" :max-date="getNowTime()" mode="datetime"
:formatter="formatter" @cancel="show1=false"></u-datetime-picker> @confirm="dateConfirmfn" :formatter="formatter" @cancel="show1=false"></u-datetime-picker>
<u-datetime-picker :show="show2" v-model="value1" mode="datetime" @confirm="dateConfirmfn1" <u-datetime-picker :show="show2" :max-date="getNowTime()" v-model="value1" mode="datetime"
:formatter="formatter" @cancel="show2=false"></u-datetime-picker> @confirm="dateConfirmfn1" :formatter="formatter" @cancel="show2=false"></u-datetime-picker>
<u-action-sheet :show="showgg" :actions="range" title="请选择灌溉方式" @close="showgg = false" @select="ggSelect"> <u-action-sheet :show="showgg" :actions="range" title="请选择灌溉方式" @close="showgg = false"
@select="ggSelect">
</u-action-sheet> </u-action-sheet>
</view> </view>
<u-button class="btn" v-if="mode=='add'" @click="addFn">完成添加</u-button> <u-button class="btn" v-if="mode=='add'" @click="addFn">完成添加</u-button>
@ -379,6 +382,15 @@
getlist() getlist()
}) })
const getNowTime = () => {
const now = new Date();
const timestamp = now.getTime();
// console.log(timestamp)
return timestamp
}
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>

51
pages/husbandryForm/sow.vue
View File

@ -14,15 +14,16 @@
v-model="data.formData.breed"></up-input> v-model="data.formData.breed"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="种植面积(亩)" prop="area" borderBottom required> <u-form-item label="种植面积(亩)" prop="area" borderBottom required>
<up-input input-align="right" placeholder="请输入种植面积" :disabled="mode=='detail'" type="number" border="none" <up-input input-align="right" placeholder="请输入种植面积" :disabled="mode=='detail'" type="number"
v-model="data.formData.area"></up-input> border="none" v-model="data.formData.area"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="参与人员" prop="user" borderBottom required> <u-form-item label="参与人员" prop="user" borderBottom required>
<up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt" border="none" <up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt"
v-model="data.formData.user"></up-input> border="none" v-model="data.formData.user"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="种植开始日期" prop="date" borderBottom required @click="openDate"> <u-form-item label="种植开始日期" prop="date" borderBottom required @click="openDate">
<up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="data.formData.date" <up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="data.formData.date"
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</u-form-item> </u-form-item>
</view> </view>
@ -37,7 +38,8 @@
<view class=""> <view class="">
<u-icon name="close" size="15" style="margin-left:120.85rpx;" @click="delimg(i)" <u-icon name="close" size="15" style="margin-left:120.85rpx;" @click="delimg(i)"
v-show="mode=='add'"></u-icon> v-show="mode=='add'"></u-icon>
<u-image :src="item" width="150.85rpx" height="150.85rpx" @click="perviewFn(item)"></u-image> <u-image :src="item" width="150.85rpx" height="150.85rpx"
@click="perviewFn(item)"></u-image>
</view> </view>
</view> </view>
</view> </view>
@ -61,15 +63,16 @@
<view class="c-title">备注信息</view> <view class="c-title">备注信息</view>
<view class="c-box" style="padding: 0 20rpx;"> <view class="c-box" style="padding: 0 20rpx;">
<u-form-item borderBottom> <u-form-item borderBottom>
<u--textarea v-model="data.formData.remark" :disabled="mode=='detail'" placeholder="请输入内容"></u--textarea> <u--textarea v-model="data.formData.remark" :disabled="mode=='detail'"
placeholder="请输入内容"></u--textarea>
</u-form-item> </u-form-item>
</view> </view>
</u-form> </u-form>
<view> <view>
<!-- <uni-calendar ref="calendar" :showMonth="true" :lunar="true" :insert="false" @confirm="dateConfirmfn" /> --> <!-- <uni-calendar ref="calendar" :showMonth="true" :lunar="true" :insert="false" @confirm="dateConfirmfn" /> -->
<u-datetime-picker :show="show" v-model="value1" mode="date" @confirm="dateConfirmfn" :formatter="formatter" <u-datetime-picker :show="show" v-model="value1" :maxDate="getNowTime()" mode="date"
@cancel="show=false"></u-datetime-picker> @confirm="dateConfirmfn" :formatter="formatter" @cancel="show=false"></u-datetime-picker>
</view> </view>
<u-button class="btn" v-if="mode=='add'" @click="addFn">完成添加</u-button> <u-button class="btn" v-if="mode=='add'" @click="addFn">完成添加</u-button>
@ -275,6 +278,17 @@
} }
const mode = ref('add') const mode = ref('add')
const getNowTime = () => {
const now = new Date();
now.setHours(0, 0, 0, 0);
const timestamp = now.getTime();
// console.log(timestamp)
return timestamp
}
onLoad((options) => { onLoad((options) => {
task_id.value = options.id task_id.value = options.id
// if (options.task_id) { // if (options.task_id) {
@ -285,22 +299,24 @@
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>
page{ page {
background-color: #f7fffc; background-color: #f7fffc;
} }
.card{ .card {
background-color: #f7fffc; background-color: #f7fffc;
padding: 0; padding: 0;
padding-bottom: 80rpx; padding-bottom: 80rpx;
.c-title{
.c-title {
font-weight: bold; font-weight: bold;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 30rpx; padding: 30rpx;
padding-bottom: 15rpx; padding-bottom: 15rpx;
&:before{
&:before {
content: ''; content: '';
display: inline-block; display: inline-block;
height: 0.8rem; height: 0.8rem;
@ -311,17 +327,20 @@
border-radius: 6rpx; border-radius: 6rpx;
} }
} }
.c-box{
.c-box {
background-color: #fff; background-color: #fff;
padding-left: 30rpx; padding-left: 30rpx;
padding-right: 20rpx; padding-right: 20rpx;
padding-bottom: 20rpx; padding-bottom: 20rpx;
box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.1);
} }
.c-box-p{
.c-box-p {
padding: 20rpx; padding: 20rpx;
} }
.btn{
.btn {
margin: 20rpx auto; margin: 20rpx auto;
width: 694rpx; width: 694rpx;
height: 80rpx; height: 80rpx;

49
pages/husbandryForm/weeding.vue
View File

@ -14,36 +14,40 @@
v-model="formData.breed"></up-input> v-model="formData.breed"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="除草剂用量(斤)" prop="dosage" borderBottom required> <u-form-item label="除草剂用量(斤)" prop="dosage" borderBottom required>
<up-input input-align="right" placeholder="请输入除草剂用量" border="none" type='number' :disabled="mode=='detail'" <up-input input-align="right" placeholder="请输入除草剂用量" border="none" type='number'
v-model="formData.dosage"></up-input> :disabled="mode=='detail'" v-model="formData.dosage"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="作业面积(亩)" prop="area" borderBottom required> <u-form-item label="作业面积(亩)" prop="area" borderBottom required>
<up-input input-align="right" placeholder="请输入作业面积" :disabled="mode=='detail'" type="number" border="none" <up-input input-align="right" placeholder="请输入作业面积" :disabled="mode=='detail'" type="number"
v-model="formData.area"></up-input> border="none" v-model="formData.area"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="参与人员" prop="user" borderBottom required> <u-form-item label="参与人员" prop="user" borderBottom required>
<up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt" border="none" <up-input input-align="right" placeholder="请输入参与人姓名" :disabled="mode=='detail'" type="txt"
v-model="formData.user"></up-input> border="none" v-model="formData.user"></up-input>
</u-form-item> </u-form-item>
<view class="" v-if="mode=='add'"> <view class="" v-if="mode=='add'">
<u-form-item label="开始日期" @click="openDate" prop="start_date" borderBottom required> <u-form-item label="开始日期" @click="openDate" prop="start_date" borderBottom required>
<up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.start_date" <up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.start_date"
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="结束日期" prop="end_date" @click="openDate1" borderBottom required> <u-form-item label="结束日期" prop="end_date" @click="openDate1" borderBottom required>
<up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.end_date" <up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.end_date"
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</u-form-item> </u-form-item>
</view> </view>
<view class="" v-else> <view class="" v-else>
<u-form-item label="开始日期" prop="start_date" borderBottom required> <u-form-item label="开始日期" prop="start_date" borderBottom required>
<up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.start_date" <up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.start_date"
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</u-form-item> </u-form-item>
<u-form-item label="结束日期" prop="end_date" borderBottom required> <u-form-item label="结束日期" prop="end_date" borderBottom required>
<up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down" suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.end_date" <up-input input-align="right" placeholder="请选择日期" suffixIcon="arrow-down"
suffix-icon-style="color: #b6b6b6;" readonly border="none" v-model="formData.end_date"
style="pointer-events: none;"></up-input> style="pointer-events: none;"></up-input>
</u-form-item> </u-form-item>
</view> </view>
@ -59,7 +63,8 @@
<view class=""> <view class="">
<u-icon name="close" size="15" style="margin-left:120.85rpx;" @click="delimg(i)" <u-icon name="close" size="15" style="margin-left:120.85rpx;" @click="delimg(i)"
v-show="mode=='add'"></u-icon> v-show="mode=='add'"></u-icon>
<u-image :src="item" width="150.85rpx" height="150.85rpx" @click="perviewFn(item)"></u-image> <u-image :src="item" width="150.85rpx" height="150.85rpx"
@click="perviewFn(item)"></u-image>
</view> </view>
</view> </view>
</view> </view>
@ -83,7 +88,8 @@
<view class="c-title">备注信息</view> <view class="c-title">备注信息</view>
<view class="c-box" style="padding: 0 20rpx;"> <view class="c-box" style="padding: 0 20rpx;">
<u-form-item prop="remark" borderBottom> <u-form-item prop="remark" borderBottom>
<u--textarea v-model="formData.remark" :disabled="mode=='detail'" placeholder="请输入内容"></u--textarea> <u--textarea v-model="formData.remark" :disabled="mode=='detail'"
placeholder="请输入内容"></u--textarea>
</u-form-item> </u-form-item>
</view> </view>
@ -93,10 +99,10 @@
<!-- <uni-calendar ref="calendar" :showMonth="true" :lunar="true" :insert="false" @confirm="dateConfirmfn" /> <!-- <uni-calendar ref="calendar" :showMonth="true" :lunar="true" :insert="false" @confirm="dateConfirmfn" />
<uni-calendar ref="calendar1" :showMonth="true" :lunar="true" :insert="false" <uni-calendar ref="calendar1" :showMonth="true" :lunar="true" :insert="false"
@confirm="dateConfirmfn1" /> --> @confirm="dateConfirmfn1" /> -->
<u-datetime-picker :show="show1" v-model="value1" mode="datetime" @confirm="dateConfirmfn" <u-datetime-picker :show="show1" v-model="value1" :max-date="getNowTime()" mode="datetime"
:formatter="formatter" @cancel="show1=false"></u-datetime-picker> @confirm="dateConfirmfn" :formatter="formatter" @cancel="show1=false"></u-datetime-picker>
<u-datetime-picker :show="show2" v-model="value1" mode="datetime" @confirm="dateConfirmfn1" <u-datetime-picker :show="show2" v-model="value1" :max-date="getNowTime()" mode="datetime"
:formatter="formatter" @cancel="show2=false"></u-datetime-picker> @confirm="dateConfirmfn1" :formatter="formatter" @cancel="show2=false"></u-datetime-picker>
</view> </view>
<u-button class="btn" v-if="mode=='add'" @click="addFn">完成添加</u-button> <u-button class="btn" v-if="mode=='add'" @click="addFn">完成添加</u-button>
</view> </view>
@ -207,7 +213,7 @@
'area': { 'area': {
type: 'string', type: 'string',
required: true, required: true,
message: '请填写土地面积', message: '请填写作业面积',
trigger: ['blur', 'change'] trigger: ['blur', 'change']
}, },
'user': { 'user': {
@ -375,6 +381,15 @@
getlist() getlist()
}) })
const getNowTime = () => {
const now = new Date();
const timestamp = now.getTime();
// console.log(timestamp)
return timestamp
}
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>

2
pages/index/massif.vue
View File

@ -75,7 +75,7 @@
<view v-if="(dataobj.total_area-dataobj.residual_area)==0" @click="palnt(dataobj.id)"> <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');"> <view class="empty-land" style="background-image: url('static/main/index/xzzh.png');">
<text></text> <text></text>
<text @click="navto('/pages/addLand/addLand')">去新增》</text> <text>去新增》</text>
</view> </view>
</view> </view>
<view class="note" v-else> <view class="note" v-else>

5
pages/index/personal.vue
View File

@ -134,11 +134,14 @@
padding-top: 30rpx; padding-top: 30rpx;
position: relative; position: relative;
border-radius: 0 0 50rpx 50rpx; border-radius: 0 0 50rpx 50rpx;
// background-color: red;
position: relative;
.head-con { .head-con {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 150rpx; position: absolute;
bottom: 100rpx // margin-top: 150rpx;
} }
.head-li { .head-li {

57
pages/landDetail/results.vue
View File

@ -6,7 +6,7 @@
<view class="content-con-a" v-if="Object.keys(dataobj).length>0"> <view class="content-con-a" v-if="Object.keys(dataobj).length>0">
<view class="shop_detail"> <view class="shop_detail">
<view class="shop_detail-top"> <view class="tit">
品类信息 品类信息
</view> </view>
<view class="shop_detail-botm"> <view class="shop_detail-botm">
@ -69,13 +69,14 @@
<view class="shop_action"> <view class="shop_action">
<view class="" v-for="(item,i) in dataobj.actions"> <view class="" v-for="(item,i) in dataobj.actions">
<view class="shop_action-title"> <view class="tit">
{{item.type_text}} {{item.type_text}}
</view> </view>
<view class="shop_action-detail" v-if="item.type!=3&&item.type!=5"> <view class="shop_action-detail" v-if="item.type!=3&&item.type!=5">
<view class="action-detail"> <view class="action-detail">
<view class="title"> <view class="title">
{{item.type_text.slice(0, -2)}}<text class="" v-if="item.type==2||item.type==4">剂</text>品种： {{item.type_text.slice(0, -2)}}<text class=""
v-if="item.type==2||item.type==4">剂</text>品种：
</view> </view>
<view class="detail"> <view class="detail">
{{item.detail.kind}} {{item.detail.kind}}
@ -83,7 +84,8 @@
</view> </view>
<view class="action-detail" v-if="item.detail.breed"> <view class="action-detail" v-if="item.detail.breed">
<view class="title"> <view class="title">
{{item.type_text.slice(0, -2)}}<text class="" v-if="item.type==2||item.type==4">剂</text>品牌： {{item.type_text.slice(0, -2)}}<text class=""
v-if="item.type==2||item.type==4">剂</text>品牌：
</view> </view>
<view class="detail"> <view class="detail">
{{item.detail.breed}} {{item.detail.breed}}
@ -91,7 +93,8 @@
</view> </view>
<view class="action-detail"> <view class="action-detail">
<view class="title"> <view class="title">
{{item.type_text.slice(0, -2)}}<text class="" v-if="item.type==2||item.type==4">剂</text>用量： {{item.type_text.slice(0, -2)}}<text class=""
v-if="item.type==2||item.type==4">剂</text>用量：
</view> </view>
<view class="detail"> <view class="detail">
{{item.detail.dosage}}<text v-if='item.type==4'>升</text> {{item.detail.dosage}}<text v-if='item.type==4'>升</text>
@ -111,8 +114,11 @@
{{item.type_text.slice(0, -2)}}图片： {{item.type_text.slice(0, -2)}}图片：
</view> </view>
<view class="detail-img" v-if="item.detail&&item.detail.pic&&item.detail.pic.length>0"> <view class="detail-img" v-if="item.detail&&item.detail.pic&&item.detail.pic.length>0">
<image @click="perviewFn(item.detail.pic)" :src="item.detail.pic[0]" mode="aspectFit"> <!-- <image @click="perviewFn(item.detail.pic)" :src="item.detail.pic[0]" mode="aspectFit">
</image> </image> -->
<u-swiper :list="item.detail.pic" @click="hdClick" indicator indicatorMode="dot"
circular></u-swiper>
</view> </view>
</view> </view>
</view> </view>
@ -147,8 +153,10 @@
灌溉图片： 灌溉图片：
</view> </view>
<view class="detail-img" v-if="item.detail&&item.detail.pic&&item.detail.pic.length>0"> <view class="detail-img" v-if="item.detail&&item.detail.pic&&item.detail.pic.length>0">
<image @click="perviewFn(item.detail.pic)" :src="item.detail.pic[0]" mode="aspectFit"> <!-- <image @click="perviewFn(item.detail.pic)" :src="item.detail.pic[0]" mode="aspectFit">
</image> </image> -->
<u-swiper :list="item.detail.pic" @click="hdClick" indicator indicatorMode="dot"
circular></u-swiper>
</view> </view>
</view> </view>
@ -176,8 +184,10 @@
收获图片： 收获图片：
</view> </view>
<view class="detail-img" v-if="item.detail&&item.detail.pic&&item.detail.pic.length>0"> <view class="detail-img" v-if="item.detail&&item.detail.pic&&item.detail.pic.length>0">
<image @click="perviewFn(item.detail.pic)" :src="item.detail.pic[0]" mode="aspectFit"> <!-- <image @click="perviewFn(item.detail.pic)" :src="item.detail.pic[0]" mode="aspectFit">
</image> </image> -->
<u-swiper :list="item.detail.pic" @click="hdClick" indicator indicatorMode="dot"
circular></u-swiper>
</view> </view>
</view> </view>
</view> </view>
@ -277,8 +287,9 @@
.shop_detail-botm { .shop_detail-botm {
width: 694rpx; width: 694rpx;
padding: 35rpx 0; padding: 35rpx 0;
background: #FFFFFF; background: white;
border-radius: 21rpx 21rpx; border-radius: 21rpx 21rpx;
box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
.detail { .detail {
display: flex; display: flex;
@ -314,6 +325,7 @@
background: #FFFFFF; background: #FFFFFF;
border-radius: 21rpx 21rpx; border-radius: 21rpx 21rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
.action-detail { .action-detail {
display: flex; display: flex;
@ -340,7 +352,7 @@
.detail-img { .detail-img {
width: 627rpx; width: 627rpx;
height: 529rpx; // height: 529rpx;
image { image {
width: 100%; width: 100%;
@ -353,4 +365,23 @@
} }
} }
.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;
}
</style> </style>

BIN
unpackage/debug/android_debug.apk
View File

Binary file not shown.

2
unpackage/dist/build/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

13
unpackage/dist/build/app-plus/manifest.json vendored
View File

@ -7,8 +7,8 @@
"id": "__UNI__D087881", "id": "__UNI__D087881",
"name": "种植溯源", "name": "种植溯源",
"version": { "version": {
"name": "1.0.1", "name": "1.0.2",
"code": "100" "code": 102
}, },
"description": "", "description": "",
"developer": { "developer": {
@ -67,6 +67,7 @@
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>", "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
@ -84,8 +85,8 @@
"__platform__": [ "__platform__": [
"android" "android"
], ],
"appkey_ios": "4e6789b864fe1a2d76b98e38158f20f2", "appkey_ios": "a8c8821159c1781d4ea4651df856b872",
"appkey_android": "a230d943475443eb29fc3871fbef8605" "appkey_android": "a8c8821159c1781d4ea4651df856b872"
}, },
"system": { "system": {
"__platform__": [ "__platform__": [
@ -97,8 +98,8 @@
"maps": { "maps": {
"amap": { "amap": {
"name": "4e6789b864fe1a2d76b98e38158f20f2", "name": "4e6789b864fe1a2d76b98e38158f20f2",
"appkey_ios": "a230d943475443eb29fc3871fbef8605", "appkey_ios": "a8c8821159c1781d4ea4651df856b872",
"appkey_android": "a230d943475443eb29fc3871fbef8605" "appkey_android": "a8c8821159c1781d4ea4651df856b872"
} }
}, },
"audio": { "audio": {

2
unpackage/dist/dev/.nvue/app.css.js vendored
View File

File diff suppressed because one or more lines are too long