diff --git a/apis/clientDetailApi.js b/apis/clientDetailApi.js
index 7969932..61ed549 100644
--- a/apis/clientDetailApi.js
+++ b/apis/clientDetailApi.js
@@ -9,4 +9,27 @@ export function getBaseInfo(data) {
     }
   )
 }
-
+// 设备信息 
+export function getDeviceInfo(data) {
+  return http.get(
+    {
+      url: '/yyt-uec/get/customer/detail/device-info',
+      data
+    },
+    {
+      hideLoading: true
+    }
+  )
+}
+// 原纸交易 
+export function getBasePaperDeals(data) {
+  return http.get(
+    {
+      url: '/base-paper-trading/get/customer/order/list/page',
+      data
+    },
+    {
+      hideLoading: true
+    }
+  )
+}
\ No newline at end of file
diff --git a/pages/client-detail/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue
index 1088020..73e84ec 100644
--- a/pages/client-detail/base-paper-deals.vue
+++ b/pages/client-detail/base-paper-deals.vue
@@ -3,58 +3,36 @@
 		<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #FFFFFF;">
 			<view class="sum-box">
 				<view class="">
-					<view class="title">
-						交易金额
-					</view>
-					<view class="value">
-						458 682.00
-					</view>
+					<view class="title">交易金额</view>
+					<view class="value">458 682.00</view>
 				</view>
 				<view class="">
-					<view class="title">
-						总交易量(吨)
-					</view>
-					<view class="value">
-						125.7752
-					</view>
+					<view class="title">总交易量(吨)</view>
+					<view class="value">125.7752</view>
 				</view>
 			</view>
 			<uGap></uGap>
 			<view class="card-box">
 				<view class="header">
-					<view class="left-title">
-						XJ 202112235389
-					</view>
-					<view class="right-title">
-						¥ 22045.78
-					</view>
+					<view class="left-title">XJ 202112235389</view>
+					<view class="right-title">¥ 22045.78</view>
 				</view>
 				<view class="content">
 					<image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image>
 					<view class="">
-						<view class="title">
-							金蝶蓝白卡
-						</view>
-						<view class="desc">
-							白卡纸/金蝶蓝/350g/787*1092/2200张
-						</view>
+						<view class="title">金蝶蓝白卡</view>
+						<view class="desc">白卡纸/金蝶蓝/350g/787*1092/2200张</view>
 					</view>
 				</view>
 				<view class="content">
 					<image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image>
 					<view class="">
-						<view class="title">
-							丽盈白卡
-						</view>
-						<view class="desc">
-							白卡纸/丽盈/350g/787*1092/2200张
-						</view>
+						<view class="title">丽盈白卡</view>
+						<view class="desc">白卡纸/丽盈/350g/787*1092/2200张</view>
 					</view>
 				</view>
 				<view class="other">
-					<view class="time">
-						2021-12-23 12:30:45
-					</view>
+					<view class="time">2021-12-23 12:30:45</view>
 					<view class="btn">
 						更多详情
 						<image class="icon" src="/static/imgs/client-detail/arrow-right-icon.png"></image>
@@ -68,6 +46,8 @@
 
 <script>
 import uGap from '@/components/u-gap/u-gap.vue'
+import { getBasePaperDeals } from '@/apis/clientDetailApi.js'
+
 export default {
 	components: { uGap },
 	data() {
@@ -78,12 +58,64 @@ export default {
 				emptyText: '暂无数据~',
 				background: '#F7F8FA',
 				disabled: false
-			}
+			},
+			params: {
+				asc: '',
+				desc: '',
+				customerEnterpriseId: '', // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效
+				mallSupplierId: '', // 供应商id
+				status: '0', // 状态 0 全部 待发货/30106,待收货/30107,待借款/30207,已完成/30104
+				enterpriseIds: [] //企业ID集合网关获取
+			},
+			pagination: {
+				pageNum: 0, // 初始会执行一次下拉加载
+				pageSize: 10
+			},
+			list: []
 		}
 	},
 	methods: {
-		downCallback() {},
-		upCallback() {}
+		getList() {
+			return new Promise((resolve, reject) => {
+				getBasePaperDeals({ ...this.params, ...this.pagination })
+					.then(res => {
+						console.log('原纸交易', res)
+						if (res) {
+							if (this.pagination.pageNum == 1) {
+								this.list = res.records
+							} else {
+								this.list = this.list.concat(res.records)
+							}
+							// this.list = []
+							// this.list = [...this.list, ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
+							resolve({ list: this.list, total: res.total })
+						}
+					})
+					.catch(err => {
+						reject(err)
+					})
+			})
+		},
+		downCallback() {
+			this.pagination.pageNum = 1
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.list.refreshSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.list.refreshFail()
+				})
+		},
+		upCallback() {
+			this.pagination.pageNum++
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.list.loadSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.list.loadFail()
+				})
+		}
 	}
 }
 </script>
@@ -102,13 +134,13 @@ export default {
 		background-size: 100%;
 		.title {
 			font-size: 26rpx;
-			color: #FFFFFF;
+			color: #ffffff;
 			letter-spacing: 0;
 			font-weight: 500;
 		}
 		.value {
 			font-size: 56rpx;
-			color: #FFFFFF;
+			color: #ffffff;
 			letter-spacing: 0;
 			text-align: left;
 			font-weight: 500;
@@ -122,8 +154,8 @@ export default {
 			justify-content: space-between;
 			align-items: center;
 			height: 88rpx;
-			background: #FFFFFF;
-			border-bottom: 2rpx solid #DDDDDD;
+			background: #ffffff;
+			border-bottom: 2rpx solid #dddddd;
 			padding: 0rpx 32rpx;
 			.left-title {
 				font-size: 30rpx;
@@ -133,7 +165,7 @@ export default {
 			}
 			.right-title {
 				font-size: 30rpx;
-				color: #FF5368;
+				color: #ff5368;
 				letter-spacing: 0;
 				text-align: right;
 				font-weight: 500;
@@ -144,8 +176,8 @@ export default {
 			flex-direction: row;
 			align-items: center;
 			height: 148rpx;
-			background: #FFFFFF;
-			border-bottom: 2rpx solid #DDDDDD;
+			background: #ffffff;
+			border-bottom: 2rpx solid #dddddd;
 			padding: 0rpx 32rpx;
 			.image {
 				width: 100rpx;
@@ -175,7 +207,7 @@ export default {
 			justify-content: space-between;
 			align-items: center;
 			height: 80rpx;
-			background: #FFFFFF;
+			background: #ffffff;
 			padding: 0rpx 32rpx;
 			.time {
 				font-size: 26rpx;
@@ -186,7 +218,7 @@ export default {
 			}
 			.btn {
 				font-size: 28rpx;
-				color: #007AFF;
+				color: #007aff;
 				letter-spacing: 0;
 				text-align: center;
 				font-weight: 500;
diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue
index e5e9e2b..4e4335f 100644
--- a/pages/client-detail/equipment-information.vue
+++ b/pages/client-detail/equipment-information.vue
@@ -1,90 +1,90 @@
 <template>
 	<view class="warpper">
 		<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #FFFFFF;">
-			<view class="card-box">
+			<view class="card-box" v-for="(item, index) in list" :key="index">
 				<view class="header">
-					<view class="title">全自动立体糊盒机</view>
+					<view class="title">{{item.name}}</view>
 					<view class="desc">近30天</view>
 				</view>
 				<view class="content">
 					<view class="info">
 						<view class="">
-							<view class="value">8900件</view>
+							<view class="value">{{item.totalCapacity}}件</view>
 							<view class="title">
 								<image class="icon" src="/static/imgs/client-detail/address-icon.png"></image>
 								设备产能
 							</view>
 						</view>
 						<view class="">
-							<view class="value">89 h</view>
+							<view class="value">{{item.totalTime}}h</view>
 							<view class="title">
 								<image class="icon" src="/static/imgs/client-detail/address-icon.png"></image>
 								工作时长
 							</view>
 						</view>
 						<view class="">
-							<view class="value">86%</view>
+							<view class="value">{{item.totalAvgStartingUp}}%</view>
 							<view class="title">
 								<image class="icon" src="/static/imgs/client-detail/address-icon.png"></image>
 								开机率
 							</view>
 						</view>
 					</view>
-					<view class="shrink-box" v-if="!seemoreFlag">
+					<view class="shrink-box" v-if="seemoreFlag == index">
 						<view class="row">
 							<view class="left">
 								<view class="title">设备图片：</view>
-								<view class="look-over">点击查看</view>
+								<view class="look-over" @tap="previewImg(item.img, [item.img])">点击查看</view>
 							</view>
 							<view class="right">
 								<view class="title">购买年份：</view>
-								<view class="value">2019年</view>
+								<view class="value">{{item.purchasingDate}}年</view>
 							</view>
 						</view>
 						<view class="row">
 							<view class="left">
 								<view class="title">购买金额：</view>
-								<view class="value">2000万</view>
+								<view class="value">{{item.purchaseAmount}}万</view>
 							</view>
 							<view class="right">
 								<view class="title">设备产能：</view>
-								<view class="value">2000个/天</view>
+								<view class="value">{{item.capacity}}</view>
 							</view>
 						</view>
 						<view class="row">
 							<view class="left">
 								<view class="title">成色：</view>
-								<view class="value">9成新</view>
+								<view class="value">{{item.newnessDegree}}</view>
 							</view>
 							<view class="right">
 								<view class="title">设备类型：</view>
-								<view class="value">糊盒机</view>
+								<view class="value">{{item.machineTypeName}}</view>
 							</view>
 						</view>
 						<view class="row">
 							<view class="left">
 								<view class="title">最大输纸 长度：</view>
-								<view class="value">2000mm</view>
+								<view class="value">{{item.inputMaxSizeLength}}mm</view>
 							</view>
 							<view class="right">
 								<view class="title">最大输纸 宽度：</view>
-								<view class="value">2000mm</view>
+								<view class="value">{{item.inputMaxSizeWidth}}mm</view>
 							</view>
 						</view>
 						<view class="row">
 							<view class="left">
 								<view class="title">最大输纸 厚度：</view>
-								<view class="value">2000mm</view>
+								<view class="value">{{item.inputMaxThickness}}mm</view>
 							</view>
 							<view class="right">
 								<view class="title">咬口：</view>
-								<view class="value">2000mm</view>
+								<view class="value">{{item.lockSeam}}mm</view>
 							</view>
 						</view>
 					</view>
 				</view>
 				<view class="see-more">
-					<view class="" @tap="seemoreTap">
+					<view class="" @tap="seemoreTap(index)">
 						<text>设备详情</text>
 						<image class="icon" :src="!seemoreFlag ? '/static/imgs/client-detail/arrow-up-icon.png' : '/static/imgs/client-detail/arrow-down-icon.png'"></image>
 					</view>
@@ -98,6 +98,7 @@
 <script>
 import lvSelect from './lv-select.vue'
 import uGap from '@/components/u-gap/u-gap.vue'
+import { getDeviceInfo } from '@/apis/clientDetailApi.js'
 export default {
 	components: { lvSelect, uGap },
 	data() {
@@ -109,15 +110,74 @@ export default {
 				background: '#F7F8FA',
 				disabled: false
 			},
-			seemoreFlag: true
+			seemoreFlag: 0,
+			params: {
+				asc: '',
+				desc: '',
+				duration: '3',
+				enterpriseIds: [],
+			},
+			pagination: {
+				pageNum: 0, // 初始会执行一次下拉加载
+				pageSize: 10
+			},
+			list: []
 		}
 	},
+	onLoad() {
+		// this.getList()
+	},
 	methods: {
-		seemoreTap() {
-			this.seemoreFlag = !this.seemoreFlag
+		previewImg(img, list) {
+			uni.previewImage({
+				urls: list,
+				current: img
+			});
+		},
+		getList() {
+			return new Promise((resolve, reject) => {
+				getDeviceInfo({ ...this.params, ...this.pagination })
+					.then(res => {
+						console.log('设备信息', res)
+						if (res) {
+							if (this.pagination.pageNum == 1) {
+								this.list = res.records
+							} else {
+								this.list = this.list.concat(res.records)
+							}
+							// this.list = []
+							// this.list = [...this.list, ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
+							resolve({ list: this.list, total: res.total })
+						}
+					})
+					.catch(err => {
+						reject(err)
+					})
+			})
 		},
-		downCallback() {},
-		upCallback() {}
+		seemoreTap(index) {
+			this.seemoreFlag = index
+		},
+		downCallback() {
+			this.pagination.pageNum = 1
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.list.refreshSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.list.refreshFail()
+				})
+		},
+		upCallback() {
+			this.pagination.pageNum++
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.list.loadSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.list.loadFail()
+				})
+		}
 	}
 }
 </script>