From 0e324729a41812dc6dfee2af3e545042d3d3425b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 06 十月 2023 11:14:12 +0800
Subject: [PATCH] #

---
 /dev/null                              |   20 ----------
 pages/component/demo.vue               |   40 +++++++++++++++++++-
 components/z-data-list/z-data-list.vue |   47 ++++++++++++++++++-----
 3 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/components/z-data-list-detail/z-data-list-detail.vue b/components/z-data-list-detail/z-data-list-detail.vue
deleted file mode 100644
index 1803a6f..0000000
--- a/components/z-data-list-detail/z-data-list-detail.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
-	<view>
-		data-list-detail
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"z-data-list-detail",
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file
diff --git a/components/z-data-list/z-data-list.vue b/components/z-data-list/z-data-list.vue
index 7689e4a..4099787 100644
--- a/components/z-data-list/z-data-list.vue
+++ b/components/z-data-list/z-data-list.vue
@@ -3,14 +3,14 @@
 		<view class="main">
 			<view class="main-left" >
 				<view class="main-list" v-for="it in dataList" >
-					<view>key</view>
-					<view style="margin-left: 8px;">value</view>
+					<view>{{it.key}}</view>
+					<view style="margin-left: 8px;">{{it.value}}</view>
 				</view>
 			</view>
-			<view class="main-right">
+			<view class="main-right" @click="goDetail">
 				<view class="list-options">
 					<view class="list-number">1</view>
-					<view class="abdb" @click="goDetail()"> > </view>
+					<view class="abdb"> > </view>
 				</view>
 			</view>
 		</view>
@@ -23,15 +23,38 @@
 		data() {
 			return {
 				dataList: [
-					{},
-					{},
-					{},
-					{},
-				]
+					{key: '鍟嗗搧缂栫爜',value: 'fbr3242'},
+					{key: '鎵瑰彿',value: '20231006'},
+					{key: '鏁伴噺',value: '200'},
+					{key: '鍟嗗搧缂栫爜',value: 'fbr3242'},
+					{key: '鎵瑰彿',value: '20231006'},
+					{key: '鏁伴噺',value: '200'}
+				],
+				detailList: [],
+				dataKey: {}
 			};
 		},
 		methods: {
 			goDetail() {
+				this.$emit('goDetail');
+			}
+		},
+		created() {
+			console.log(this.list);
+			this.dataList = this.list.detl
+		},
+		props: {
+			list: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			keyName: {
+				type: Object,
+				default() {
+					return {}
+				}
 			}
 		}
 	}
@@ -43,18 +66,20 @@
 	.main {
 		position: relative;
 		min-height: 70rpx;
-		background-color: #fdadfc;
+		background-color: #ebe7e6;
 		display: flex;
 		align-items: stretch;
 		margin: 8px 8px 8px 8px;
+		border-radius: 16rpx;
 	}
 	.main-left {
 		flex: 4;
 		display: flex;
 		flex-direction: column;
+		padding-top: 8rpx;
+		padding-bottom: 8rpx;
 	}
 	.main-right {
-		background-color: #cccccc;
 		flex: 1;
 		display: flex;
 		align-items: center;
diff --git a/pages/component/demo.vue b/pages/component/demo.vue
index cc34170..81b4618 100644
--- a/pages/component/demo.vue
+++ b/pages/component/demo.vue
@@ -17,7 +17,10 @@
 		
 		<hr>
 		
-		<z-data-list></z-data-list>
+		<z-data-list class="data-list" v-for="it in zDataList"  @goDetail='goDetail' :list="it" :keyName="zDataKey"></z-data-list>
+		
+		<!-- 鍨珮 -->
+		<view style="height: 100rpx;"></view>
 	</view>
 </template>
 
@@ -31,7 +34,29 @@
 					{name: 'aaa',desc: '鐗╂枡鐮�',btn: true,btnName: '鎻愬彇',placeholder: '',val: '1',focus: false}
 				],
 				zDataList: [
-					{name: 'asd',orderNo: 'CK123',barcode: 'bar321'}
+					{
+						detl: [
+							{key: '鍟嗗搧鐮�',value: '3CPPJ.B.GMB.LZ.QBY4-10/15P316LL'},
+							{key: '鍟嗗搧鍚嶇О',value: '涓嶉攬閽㈢珛鏌�'},
+							{key: '瑙勬牸',value: 'QBY4-10/15P316LLZ'},
+							{key: '鏁伴噺',value: 10},
+						],
+					},
+					{
+						detl: [
+							{key: '鍟嗗搧鐮�',value: '3CPPJ.B.GMB.LZ.'},
+							{key: '鍟嗗搧鍚嶇О',value: '绔嬫煴'},
+							{key: '瑙勬牸',value: '15P316LLZ'},
+							{key: '鏁伴噺',value: 8},
+						],
+					}
+				],
+				zDataKey: {str1: '鐗╂枡缂栫爜',str2: '璁㈠崟鍙�', str3: '鎵樼洏鐮�'},
+				pData: [
+					{key: '鍟嗗搧鐮�',value: '3CPPJ.B.GMB.LZ.QBY4-10/15P316LL'},
+					{key: '鍟嗗搧鍚嶇О',value: '涓嶉攬閽㈢珛鏌�'},
+					{key: '瑙勬牸',value: 'QBY4-10/15P316LLZ'},
+					{key: '鏁伴噺',value: 10},
 				]
 				
 			}
@@ -59,6 +84,11 @@
 					this.zInputList[2].focus = false
 				}
 				
+			},
+			goDetail() {
+				uni.navigateTo({
+					url: '/pages/common/data-list/dataDetail'
+				})
 			}
 		}
 		
@@ -66,4 +96,10 @@
 </script>
 
 <style>
+	.data-list {
+		
+	}
+	.data-list:last-child {
+		margin-bottom: 100px;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1