From 4cba8eb7532bca4f189ce2fe0d88861a962e0947 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Tue, 7 Feb 2023 15:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E4=BB=93=E5=BA=93=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue     |  8 ++++++++
 pages/warehouse/info.vue | 13 ++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index 949a660..fdaa7e5 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -196,7 +196,10 @@
 					margin:20rpx 0;
 					padding-bottom:20rpx;
 					border-bottom:2rpx solid #D8D8D8;
+					display:flex;
+					align-items: center;
 					text{
+						flex-shrink: 0;
 						display: inline-flex;
 						align-items: center;
 						&:before{
@@ -207,6 +210,10 @@
 						&.active{
 							color:rgba(var(--c),1);
 						}
+						&.more{
+							color:#999;
+							margin-left:auto;
+						}
 					}
 				}
 				.item{
@@ -321,6 +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>
 			</view>
 
 			<template v-if="!baseIndex || baseIndex=='record'">
diff --git a/pages/warehouse/info.vue b/pages/warehouse/info.vue
index 43b4f65..6452a57 100644
--- a/pages/warehouse/info.vue
+++ b/pages/warehouse/info.vue
@@ -87,7 +87,7 @@ import request from '@/common/request.js'
 			submit(){
 				this.$refs.form.validate().then(async valid=>{
 					if(valid){
-						var res=await request("/api/AddWarehouseApi/add",{
+						var res=await request("/api/WarehouseManageApi/addOrUpdate",{
 							method:"post",
 							body:{
 								...this.formData,
@@ -107,12 +107,15 @@ import request from '@/common/request.js'
 					}
 				})
 			},
-			async getDetail(warehouseId){
-				var res=await request("/api/WarehouseManageApi/addOrUpdate",{
-					params:{warehouseId}
+			async getDetail(id){
+				var res=await request("/api/WarehouseManageApi/queryById",{
+					params:{id}
 				})
 				if(res.statu){
-					this.formData=res.data.upper
+					this.formData=res.data
+					this.fields.warehousePic.value=res.data.warehousePic
+					this.formData.warehousePic=res.data.warehousePic?.split?.(",")?.filter?.(v=>v)||[]
+					this.fields.warehouseType.value=[res.data.warehouseType]
 				}else{
 					uni.showModal({
 						title:"提示",