From f300ea8a5691d3b904f216b9e4a19b92fe2f8f30 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 2 Jan 2024 13:59:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/detail/comDetailCard.vue                 | 11 ++++++-----
 mycomponents/recommend/recommend.vue                  |  2 +-
 pages/putaway/job/putawayDetail.vue                   |  5 ++---
 .../uni-collapse-item/uni-collapse-item.vue           |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mycomponents/detail/comDetailCard.vue b/mycomponents/detail/comDetailCard.vue
index bfabce80..9afaf97d 100644
--- a/mycomponents/detail/comDetailCard.vue
+++ b/mycomponents/detail/comDetailCard.vue
@@ -9,7 +9,8 @@
 				<view class="" v-for="(item,index) in dataContent.subList">
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item)"
-							:right-options="item.scaned?scanOptions:detailOptions">
+							:right-options="item.scaned?scanOptions:detailOptions"
+							style='padding:0px 0px  5px 0px;align-items: center;'>
 							<recommend :detail="item" :isShowToLocation="false">
 							</recommend>
 						</uni-swipe-action-item>
@@ -36,7 +37,7 @@
 	} from '@/common/array.js';
 
 	export default {
-		emits: ['openDetail',"updateData"],
+		emits: ['openDetail', "updateData"],
 		components: {
 			itemCompareQty,
 			recommend,
@@ -78,7 +79,7 @@
 			return {
 				option: [],
 				showItem: {},
-				locatonItem:{},
+				locatonItem: {},
 				editItem: {},
 				detailOptions: [],
 				scanOptions: []
@@ -101,7 +102,7 @@
 					this.detail(item)
 				} else if (e.content.text == "编辑") {
 					this.edit(item)
-				}  else if (e.content.text == "库位") {
+				} else if (e.content.text == "库位") {
 					this.showLocation(item)
 				} else if (e.content.text == "移除") {
 					this.remove(item)
@@ -139,7 +140,7 @@
 			},
 			//扫描源库位
 			getLocation(location, code) {
-				this.locatonItem.toLocationCode =code;
+				this.locatonItem.toLocationCode = code;
 				this.$emit('updateData')
 			},
 		}
diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue
index c2057ba2..37fc81cc 100644
--- a/mycomponents/recommend/recommend.vue
+++ b/mycomponents/recommend/recommend.vue
@@ -1,5 +1,5 @@
 <template>
-	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; margin-bottom: 1px;">
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; border-bottom: 1upx solid #EEEEEE;">
 		<view class="uni-flex uni-row space-between"  style="align-items: center">
 			<!-- uni-inline-item 暂时拿掉-->
 			<view>
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index 805485c9..42b5e660 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -7,9 +7,9 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" ></u-line>
+			<u-line color="#D8D8D8"></u-line>
 		</view>
-		
+
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -19,7 +19,6 @@
 							:locationTypeList='tolocationTypeList'>
 						</com-detail-card>
 					</view>
-					<u-line />
 				</view>
 			</scroll-view>
 		</view>
diff --git a/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
index 90f85c36..50a72a55 100644
--- a/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
+++ b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
@@ -210,7 +210,7 @@
 						this.height = data.height + 1
 						// #endif
 						// #ifndef APP-NVUE
-						this.height = data.height+3
+						this.height = data.height
 						// #endif
 						this.isheight = true
 						if (type) return