市场线索查询联调

pages/breakwords-market/breakwords-market.nvue

@@ -48,24 +48,28 @@
 				</refresh>
 				<cell v-for="(item,index) in lists" :key="index">
 					<view class="scroll-item">
-						<view class="item-block item-block-code">
-							<text class="item-block-label">单号：333</text>
-						</view>
-						<view class="item-block item-block-name">
-							<text class="item-block-label item-block__label">2</text>
-						</view>
-						<view class="item-block">
-							<text class="item-block-label-des">2-3</text>
+						<view v-if="index===0" class="item-block item-block-sum">
+							<text class="item-block-label">共 1 项</text>
 						</view>
 						<view class="block-detal">
-							<view class="block-detal-item">
-								<text class="detal-item-label">存货分类</text>
-								<text class="detal-item-value">sss</text>
+							<view class="block-detal-head">
+								<text
+									class="detal-head-item-value detal-head-item-value-first">{{item.auditTime}}</text>
+								<text class="detal-head-item-value">{{item.viloationTypeName}}</text>
+								<text class="detal-head-item-value">{{item.childTypeName}}</text>
+								<text
+									class="detal-head-item-value detal-head-item-value-last status-done">{{item.statusName}}</text>
 							</view>
-
-							<view class="block-detal-item block-detal-item-last">
-								<text class="detal-item-label">已占用计划(件)</text>
-								<text class="detal-item-value">3</text>
+							<view class="block-detal-body">
+								<text class="detal-item-value">{{item.terminalName}}</text>
+								<text class="detal-item-value">{{item.terminalAddress}}</text>
+								<text class="detal-item-value">{{item.platformName}}</text>
+								<text class="detal-item-value">{{item.storeName}}</text>
+								<view class="detal-item-value" v-for="(product,index2) in item.entries" :key='index2'>
+									<text class="product-val">{{product.productName}}</text>
+									<text class="product-val">{{product.barcodeTypeName}}</text>
+									<text class="product-val"> {{product.barcode}}</text>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -166,7 +170,7 @@
 		},
 		created() {
 			this.condition.submitUserId = this.userInfo.code
-			this.reset()
+			// this.reset()
 		},
 		methods: {
 			async getClueList(isRefresh) {
@@ -204,19 +208,23 @@
 				const res = await api[this.activeTabIndex](params)
 				uni.hideLoading();
 
-				const {
-					totalNumberOfResults,
-					numberOfPages
-				} = res.data.pagination
-				this.loadParams.total = totalNumberOfResults
-				this.loadParams.totalPage = numberOfPages
-
-
-				if (isRefresh) {
-					this.lists = res.data.results
-					this.loadParams.isDone = false
+				if (res?.data?.results) {
+					const {
+						totalNumberOfResults,
+						numberOfPages
+					} = res.data.pagination
+					this.loadParams.total = totalNumberOfResults
+					this.loadParams.totalPage = numberOfPages
+
+					if (isRefresh) {
+						this.lists = res.data.results
+						this.loadParams.isDone = false
+					} else {
+						this.lists = this.lists.concat(res.data.results)
+					}
 				} else {
-					this.lists = this.lists.concat(res.data.results)
+					this.lists = [res.data]
+					this.loadParams.isDone = true
 				}
 
 				setTimeout(() => {
@@ -479,9 +487,8 @@
 		flex: 1;
 		display: flex;
 		flex-direction: column;
-		margin-bottom: 32rpx;
-		border-radius: 16rpx;
-		padding: 32rpx 64rpx 40rpx 48rpx;
+		padding: 0 64rpx 0 48rpx;
+		background-color: #fff;
 	}
 
 	.planout-block-item__last {
@@ -507,13 +514,10 @@
 		text-overflow: ellipsis;
 	}
 
-	.item-block-code {
-		padding-bottom: 16rpx;
-	}
-
-	.item-block-name {
-		padding-top: 24rpx;
-		padding-bottom: 32rpx;
+	.item-block-sum {
+		padding-bottom: 10px;
+		margin-bottom: 28rpx;
+		border-bottom: 1px solid #f4f5f6;
 	}
 
 	.item-block-label-des {
@@ -527,29 +531,51 @@
 		display: flex;
 		flex-direction: column;
 		background: #f8f8f8;
-		border-radius: 20rpx;
-		padding: 32rpx;
-		margin-top: 32rpx;
+		border-radius: 10rpx;
+		padding: 24rpx 32rpx;
+		margin-bottom: 28rpx;
 	}
 
-	.block-detal-item {
+	.block-detal-head {
 		display: flex;
-		margin-bottom: 32rpx;
 		justify-content: space-between;
+		border-bottom: 1px solid #ddd;
+		padding-bottom: 6px;
 	}
 
-	.block-detal-item-last {
-		margin-bottom: 0;
+	.detal-head-item-value {
+		flex: 1;
+		text-align: center;
 	}
 
-	.detal-item-label {
-		color: #999;
-		font-size: 24rpx;
+	.detal-head-item-value-first {
+		flex: 1.2;
+		text-align: left;
+	}
+
+	.detal-head-item-value-last {
+		flex: 0.7;
+		text-align: right;
+	}
+
+	.status-done {
+		color: #F62C29;
+	}
+
+	.product-val {
+		margin-right: 10px;
+	}
+
+	.block-detal-body {
+		display: flex;
+		flex-direction: column;
+		padding-top: 20rpx;
 	}
 
 	.detal-item-value {
 		color: #333;
-		font-size: 28rpx;
+		font-size: 24rpx;
+		margin-bottom: 8rpx;
 	}
 
 	.btn {