From 2082687bcb2519294ac0fe4732fc97ba2dd9a1e5 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Tue, 7 Feb 2023 17:05:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E5=BA=93=E5=AD=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/baseMana/formReacord.vue | 80 ++++++++++++++++++++++++++++++++++
 pages/home/index.vue           |  2 +-
 pages/stock/mana.vue           |  5 ++-
 router/home.js                 | 11 +++++
 4 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 pages/baseMana/formReacord.vue

diff --git a/pages/baseMana/formReacord.vue b/pages/baseMana/formReacord.vue
new file mode 100644
index 0000000..2dba01d
--- /dev/null
+++ b/pages/baseMana/formReacord.vue
@@ -0,0 +1,80 @@
+<style lang="scss">
+	.container{
+		height:100%;
+		background:#f6f6f6;
+
+		.data-range{
+			flex-shrink: 0;
+		}
+
+		scroll-view{
+			flex-grow: 1;
+			height:1rpx;
+
+			.card{
+				.info{
+					display:flex;
+					align-items: center;
+					text{
+						&:first-child{
+							flex-shrink: 0;
+							background:#10C176;
+							border-radius:4rpx 40rpx 4rpx 40rpx;
+							padding:0 10rpx;
+							box-sizing: border-box;
+							color:#fff;
+							height:40rpx;
+							line-height: 40rpx;
+							min-width:80rpx;
+							text-align: center;
+							font-size:20rpx;
+							margin-right:12rpx;
+						}
+						&:nth-child(3){
+							flex-shrink: 0;
+							color:#10C176;
+							font-size:24rpx;
+							font-weight: bold;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
+<template>
+	<view class="container flex">
+		<d-search />
+
+		<view class="date-range">
+			<text>请选择开始时间</text> ~ <text>请选择结束时间</text>
+		</view>
+
+		<scroll-view scroll-y @scrolltolower="search">
+			<view class="card">
+				<view class="info">
+					<text>施肥</text> <text class="over">中量元素水溶肥</text> <text>10kg</text>
+				</view>
+				<view class="people">
+					<text>负责人：张召忠</text> <text>记录时间：2022-12-12</text>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+<script>
+import request from '@/common/request.js'
+	export default {
+		data(){
+			return{
+				
+			}
+		},
+		onLoad(){},
+		methods:{
+			async search(){
+				var res=await request()
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/home/index.vue b/pages/home/index.vue
index fdaa7e5..814d751 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -328,7 +328,7 @@
 			<view class="matter">
 				<text class="plant-jilu" :class="{active:baseIndex=='record'}" style="--c:16, 193, 118;margin-right:40px;" @click="baseIndex=='record'?baseIndex='':baseIndex='record'">农事记录</text>
 				<text class="plant-tourupin" :class="{active:baseIndex=='input'}" style="--c:255, 195, 83;" @click="baseIndex=='input'?baseIndex='':baseIndex='input'">投入品</text>
-				<text class="more">更多>></text>
+				<text class="more" @click="$u.route({url:'/pages/baseMana/formReacord'})">更多>></text>
 			</view>
 
 			<template v-if="!baseIndex || baseIndex=='record'">
diff --git a/pages/stock/mana.vue b/pages/stock/mana.vue
index dc67710..e77faa1 100644
--- a/pages/stock/mana.vue
+++ b/pages/stock/mana.vue
@@ -137,7 +137,7 @@
 			<button class="cu-btn bg-white" :class="{active:searchVal.substanceType=='ncp'}" @click="searchVal.substanceType='ncp';clean();search()">农产品</button>
 		</view>
 
-		<scroll-view scroll-y @scrolltowoer="search">
+		<scroll-view scroll-y @scrolltolower="search">
 			<view class="card item" v-for="(v,k) in list" :key="k">
 				<view class="info">
 					<text>{{v.agriculturalGoods}}</text>
@@ -171,13 +171,14 @@ export default {
 				substanceType:"nz",
 				pageNo:1,
 				pageSize:5,
+				warehouseId:"",
 			},
 			total:0,
 			list:[],
 		}
 	},
 	onLoad(options){
-		// this.searchVal
+		this.searchVal.warehouseId=options.id
 		this.search()
 	},
 	methods:{
diff --git a/router/home.js b/router/home.js
index 0d57663..40ec315 100644
--- a/router/home.js
+++ b/router/home.js
@@ -55,4 +55,15 @@ module.exports=[
 			}
 		}
 	},
+	{
+		path:"pages/baseMana/formReacord",
+		style:{
+			navigationBarTitleText:"农事记录",
+			navigationBarBackgroundColor:"#10C176",
+			navigationBarTextStyle:"white",
+			"app-plus":{
+				titleNView:true
+			}
+		}
+	},
 ]
\ No newline at end of file