相关接口对接

src/pages/home/fabricList.vue

@@ -4,7 +4,7 @@
 		<view class="content background_fff u-p-30">
 			<!-- 正文内容 -->
 			<u-sticky offset-top="15">
-				<u-search class="" bg-color="#fff" border-color="#ececec" placeholder="请输入面料名称" :show-action="false" v-model="search"></u-search>
+				<u-search @search="searchCli" class="" bg-color="#fff" border-color="#ececec" placeholder="请输入面料名称" :show-action="false" v-model="search"></u-search>
 			</u-sticky>
 			<view>
 				<view class="u-m-t-30" v-for="item in fiabricList"><fabricTitle :item="item"></fabricTitle></view>
@@ -19,6 +19,7 @@ export default {
 	components: { fabricTitle },
 	data() {
 		return {
+			size: 5,
 			search: '',
 			fiabricList: []
 		};
@@ -26,18 +27,26 @@ export default {
 	onLoad() {
 		this.materialList();
 	},
+	// 上拉加载更多
+	onReachBottom() {
+		this.size = this.size + 5;
+		this.entrustmentPage();
+	},
 	methods: {
+		searchCli() {
+			this.size = 5;
+			this.materialList();
+		},
 		// 我的面料
 		materialList() {
 			this.$http('orderTicket.materialList', {
-				size: 4,
+				size: size,
 				materialCode: '',
 				materialName: this.search
 			}).then(res => {
 				let { code, data } = res;
 				if (code == 200) {
-					this.fiabricList.concat(data);
-					// this.fiabricList = [1, 2];
+					this.fiabricList = data;
 				}
 			});
 		}

src/pages/home/index.vue

@@ -18,11 +18,11 @@
 		</view>
 		<!-- 提示信息 -->
 		<view v-if="abolishIds.length > 0" class="u-m-t-20 tips background_d5aa7a u-font-28">
-			<view @click="entrustmentCli">
+			<view>
 				{{ abolishIds.length }}个委托单
 				<span class="color_fff">等待确认寄样，请尽快确认！</span>
 			</view>
-			<view class="color_fff btn" @click="sampleConfirm">寄样确认</view>
+			<view class="color_fff btn u-p-l-10 u-p-r-10" @click="sampleConfirm">寄样确认</view>
 		</view>
 		<!-- 具体内容  我的面料 -->
 		<view class="home_con u-m-t-20">
@@ -164,11 +164,8 @@ export default {
 		sampleConfirm() {
 			this.$Router.push('/pages/home/sampleConfirmation');
 		},
-		entrustmentCli() {
-			this.$Router.push('/pages/home/styleEntrustment');
-		},
 		goCli(url) {
-			this.$router.push(url);
+			this.$Router.push(url);
 		}
 	}
 };
@@ -285,7 +282,6 @@ export default {
 .btn {
 	line-height: 50rpx;
 	text-align: center;
-	width: 120rpx;
 	height: 50rpx;
 	border: 1rpx solid #fff;
 }

src/pages/home/search.vue

@@ -3,22 +3,23 @@
 	<view class="">
 		<u-navbar :is-back="true" :background="{ backgroundColor: '#F5F5F5' }" title="">
 			<view class="slot-wrap">
-				<view class="search-wrap"><u-search bg-color="#fff" border-color="#d5aa7a" placeholder="请输入面料名称" :show-action="false" v-model="value"></u-search></view>
+				<view class="search-wrap">
+					<u-search @search="searchCli" bg-color="#fff" border-color="#d5aa7a" placeholder="请输入面料名称" :show-action="false" v-model="value"></u-search>
+				</view>
 			</view>
 		</u-navbar>
 		<!-- 列表 -->
 		<view class="home_con_order">
-			<!-- <fabricTitle :tableData="[1]"></fabricTitle> -->
-			<view class="home_con_content_order u-m-t-30" v-for="item in 12">
+			<view class="home_con_content_order u-m-t-30" v-for="item in fiabricList">
 				<image style="width: 160rpx;height: 160rpx;" src="../../static/images/home/2.png" mode=""></image>
 				<view class="order_tit">
-					<view class="u-font-32">加厚荷兰绒绒布布料备份</view>
+					<view class="u-font-32">{{item.materialName}}</view>
 					<view class="u-font-24 u-m-t-20 color_6F6F72">
-						<span class="u-m-r-10">针织</span>
+						<span class="u-m-r-10">{{item.materialCategory}}</span>
 						|
-						<span class="u-m-l-10 u-m-r-10">180cm</span>
+						<span class="u-m-l-10 u-m-r-10">{{item.materialDoorWidth}}</span>
 						|
-						<span class="u-m-l-10">100%面备份面备份面备份面备份面备份面备份面备份面备份</span>
+						<span class="u-m-l-10">{{item.materialElement}}</span>
 					</view>
 				</view>
 			</view>
@@ -27,19 +28,39 @@
 </template>
 
 <script>
-import fabricTitle from './components/fabricTitle.vue';
 export default {
-	components: {
-		fabricTitle
-	},
 	data() {
 		return {
-			value: ''
+			value: '',
+			size: 5,
+			fiabricList:[]
 		};
 	},
+	// 上拉加载更多
+	onReachBottom() {
+		this.size = this.size + 5;
+		this.materialList();
+	},
 	methods: {
 		outCli() {
 			this.$router.push('/pages/home/index');
+		},
+		searchCli() {
+			this.size = 5;
+			this.materialList();
+		},
+		// 我的面料
+		materialList() {
+			this.$http('orderTicket.materialList', {
+				size: this.size,
+				materialCode: '',
+				materialName: this.value
+			}).then(res => {
+				let { code, data } = res;
+				if (code == 200) {
+					this.fiabricList = data;
+				}
+			});
 		}
 	}
 };

src/pages/home/styleEntrustment.vue

 <template>
 	<!-- 款式委托 -->
-	<!--  style="position: relative;" -->
 	<view class="">
-		<u-navbar :is-back="true" id="header" :background="{ backgroundColor: '#F5F5F5' }" title="款式委托">
+		<view id="header">
+			<u-navbar :is-back="true" :border-bottom="false" :background="{ backgroundColor: 'rgba(245,245,245,0)' }" title-color="#000" title="款式委托">
 				<template v-slot:right>
 					<view class="u-m-r-24"><u-icon name="search" size="38"></u-icon></view>
 				</template>
 			</u-navbar>
 			<view class="bg_img"></view>
-		<view class="content" :style="{ bottom: footerHeight + 'px', top: headerHeight + 'px' }">
+			<view class="" style="position: relative;">
 				<!-- 总数 -->
-			<view class="u-m-b-30 entrus_sum u-flex justify-around text-center">
+				<view class=" u-m-b-30 entrus_sum u-flex justify-around text-center">
 					<view class="" @click="change(1)">
 						<view class="color_FA5353 u-font-48 hs-weight-500">{{ exceptionNum }}</view>
 						<view class="color_AF8D66 u-font-28 hs-weight-500">异常</view>
@@ -30,10 +30,13 @@
 				<u-sticky class="bd_rad" style="background: #fff;">
 					<u-tabs :list="list" font-size="28" :show-bar="false" active-color="#AF8D66" :current="current" @change="change"></u-tabs>
 				</u-sticky>
+			</view>
+		</view>
+		<view class="content" :style="{ 'margin-bottom': footerHeight + 'px', top: headerHeight + 'px' }">
 			<!-- list -->
 			<view class="u-m-t-20 u-m-l-30 u-m-r-30 u-m-b-20">
 				<!-- v-for -->
-				<view class="u-m-b-20 posi_rela bd_rad1 u-p-30" v-for="item in entrustmentList" :key="item.id" style="background: #fff;">
+				<view class="u-m-b-20 posi_rela bd_rad1 u-p-30" v-for="item in 4" :key="item.id" style="background: #fff;">
 					<view class="u-m-b-30 u-flex justify-between">
 						<view class="entrus_list_title u-font-32">{{ item.materialName }}</view>
 						<view class="u-font-28">{{ item.status | filterStatus }}</view>
@@ -69,7 +72,7 @@
 		<view class="footer" id="footer">
 			<view class="footer-btn">
 				<view class="custom-style-round-circle custom-style-btn custom-style">
-					<view class="custom-style-right" @click="submitData"><view class="title">新增委托</view></view>
+					<view class="custom-style-right" @click="dateilEnt"><view class="title">新增委托</view></view>
 				</view>
 			</view>
 		</view>
@@ -253,6 +256,8 @@ export default {
 				this.$Router.push('/pages/designCommissioned/splitItem?id=' + item.id);
 			} else if (val == '编辑') {
 				this.$Router.push('/pages/designCommissioned/addItem?id=' + item.id);
+			} else {
+				this.$Router.push('/pages/designCommissioned/listSelectToAdd');
 			}
 		}
 	}
@@ -300,7 +305,7 @@ export default {
 	position: absolute;
 	top: 220rpx;
 	width: 100%;
-	overflow-y: auto;
+	// overflow-y: auto;
 }
 .entrus_sum {
 	height: 164rpx;