From 1d5b60515b80cf400b214a5f565792c212fe6f2e Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 28 三月 2024 13:52:12 +0800
Subject: [PATCH] Merge branch 'demo' of http://47.97.1.152:5880/r/wms_app into demo

---
 components/z-data-list/z-data-list.vue |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/components/z-data-list/z-data-list.vue b/components/z-data-list/z-data-list.vue
index ac6bc1f..b01db95 100644
--- a/components/z-data-list/z-data-list.vue
+++ b/components/z-data-list/z-data-list.vue
@@ -2,11 +2,11 @@
 	<view >
 		<view class="main">
 			<view class="main-left" >
-				<view class="main-list" v-for="it in list" style="width: 100%;">
-					<view class="left-key">{{it.key}}</view>
-					<view>:</view>
+				<view class="main-list" v-for="it in lable" style="width: 100%;">
+					<view class="left-key">{{it.label}}</view>
+					<view>锛�</view>
 					<view class="left-val">
-						<text :class="it.valText">{{it.value}}</text>
+						<text :class="it.valText">{{fields[it.attribute]}}</text>
 					</view>
 				</view>
 			</view>
@@ -54,8 +54,14 @@
 			// this.dataList = this.list.detl
 		},
 		props: {
-			list: {
+			lable: {
 				type: Array,
+				default() {
+					return {}
+				}
+			},
+			fields: {
+				type: Object,
 				default() {
 					return {}
 				}
@@ -83,7 +89,7 @@
 		background-color: #f5f5f5;
 		display: flex;
 		align-items: stretch;
-		margin: 8px 8px 8px 8px;
+		margin: 8px 12px 8px 12px;
 		border-radius: 8px;
 	}
 	.main-left {

--
Gitblit v1.9.1