相关接口提交

src/config/request/apiList/orderTicket.js

@@ -57,5 +57,10 @@ export default {
 		    url: `${base}/materialList`,
 		    method: 'get'
 		},
+		// 面料详情
+		materialDetail:{
+		    url: `${base}/materialDetail`,
+		    method: 'get'
+		},
     }
 }

src/pages/home/fabricDetails.vue

@@ -6,33 +6,33 @@
 		<view class="content u-p-30">
 			<!-- 面料基本信息 -->
 			<view class="fabric_tit u-p-30">
-				<view class="color_DDA973 u-font-32">加厚荷兰绒绒布布料</view>
+				<view class="color_DDA973 u-font-32">{{fabricObj.materialName}}</view>
 				<view class="u-font-24 u-m-t-20 color_fff08">
-					<span class="u-m-r-10">针织</span>
+					<span class="u-m-r-10">{{fabricObj.materialCategory}}</span>
 					|
-					<span class="u-m-l-10 u-m-r-10">180cm</span>
+					<span class="u-m-l-10 u-m-r-10">{{fabricObj.materialDoorWidth}}</span>
 					|
-					<span class="u-m-l-10">100%面备份面备份</span>
+					<span class="u-m-l-10">{{fabricObj.materialElement}}</span>
 				</view>
-				<view class="u-m-t-20"><image v-for="item in 3" class="img_120 u-m-r-30" src="../../static/images/home/1.png" mode=""></image></view>
+				<view class="u-m-t-20"><image v-for="item in fabricObj.materialPictureList" class="img_120 u-m-r-30" :src="item.fileCode" mode=""></image></view>
 			</view>
 			<!-- 建模信息 -->
 			<view class="modeling_tit u-p-30">
 				<view class="tit_date u-font-32">
 					<span class="u-font-28 ft-wt-700">建模委托信息</span>
 					<span class="u-font-24">
-						2021年12月12日
+						{{fabricObj.completionDate}}
 						<u-icon size="28" class="u-m-l-5" color="#ccc" name="arrow-right"></u-icon>
 					</span>
 				</view>
 				<view class="ds_flex jt_con_center fx_dir_column ht_136">
 					<view class="ds_flex">
 						<span class="width_30 color_00004">检测服务商</span>
-						<span class="flex-sub">上海天飞智慧科技有限公司</span>
+						<span class="flex-sub">{{fabricObj.supplierId}}</span>
 					</view>
 					<view class="ds_flex u-m-t-8">
 						<span class="width_30 color_00004">项目价格</span>
-						<span class="flex-sub">1200.32元</span>
+						<span class="flex-sub">{{fabricObj.price}}元</span>
 					</view>
 				</view>
 			</view>
@@ -76,12 +76,24 @@ export default {
 	data() {
 		return {
 			searchFabric: '',
+			fabricObj:{},
 			tableList: [1, 2, 3, 4, 5]
 		};
 	},
+	onLoad() {
+		this.materialDetail();
+	},
 	methods: {
 		seeStyleDetails(item) {
 			this.$Router.push('/pages/home/styleDetails');
+		},
+		materialDetail() {
+			this.$http('orderTicket.materialDetail', 1).then(res => {
+				let { code, data } = res;
+				if (code === 200) {
+					this.fabricObj = data
+				}
+			});
 		}
 	}
 };

src/pages/home/fabricList.vue

@@ -40,7 +40,7 @@ export default {
 		// 我的面料
 		materialList() {
 			this.$http('orderTicket.materialList', {
-				size: size,
+				size: this.size,
 				materialCode: '',
 				materialName: this.search
 			}).then(res => {

src/pages/home/index.vue

@@ -34,7 +34,7 @@
 				<view class="u-font-24 color_d5aa7a" @click="seeFabric">查看更多</view>
 			</view>
 			<view class="home_con_fabric">
-				<view class="home_con_content u-m-t-24" @click="detailFabric(item)" v-for="item in fiabricList">
+				<view class="home_con_content u-m-t-24" @click="detailFabric(item)" v-for="item in 2">
 					<image class="hs-img" :src="item.fileCode" mode=""></image>
 					<view class="home_con_content_font ov_hiden">{{ item.materialName }}</view>
 				</view>
@@ -89,7 +89,8 @@ export default {
 				{
 					name: '款式委托',
 					img: '../../static/images/home/styleEntrustment@2x.png',
-					url: '/pages/home/styleEntrustment'
+					// url: '/pages/home/styleEntrustment'
+					url: '/pages/home/demo'
 				},
 				{
 					name: '检测委托',

src/pages/home/sampleConfirmation.vue

@@ -36,7 +36,7 @@
 							<span class="u-font-28">所选面料</span>
 							<span class="u-font-24 color_DDA973">（新建面料，已同步面料建模）</span>
 						</view>
-						<fabricTitle :item="tableData"></fabricTitle>
+						<view class="u-m-t-30"><fabricTitle :item="tableData"></fabricTitle></view>
 					</view>
 				</view>
 			</view>
@@ -51,21 +51,23 @@ export default {
 	data() {
 		return {
 			// 总数
-			total: 12,
+			total: 1,
 			// 当前数
-			sum: 12,
+			sum: 1,
 			tableData: {}
 		};
 	},
-	onLoad(){
-		this.detail()
+	onLoad() {
+		this.detail();
 	},
 	methods: {
-		detail(){
-			// this.$http('orderTicket.detail',1).then(res => {
-			// 	let { code,data } = res
-			// 	this.a = data
-			// })
+		detail() {
+			this.$http('orderTicket.detail', 1).then(res => {
+				let { code, data } = res;
+				if (code === 200) {
+					this.tableData = data;
+				}
+			});
 		},
 		previousCli() {
 			if (this.sum == 1) return;

src/pages/home/styleEntrustment.vue

@@ -2,7 +2,7 @@
 	<!-- 款式委托 -->
 	<view class="">
 		<view id="header">
-			<u-navbar :is-back="true" :border-bottom="false" :background="{ backgroundColor: 'rgba(245,245,245,0)' }" title-color="#000" title="款式委托">
+			<u-navbar :is-back="true" :border-bottom="false" :background="background" title-color="#000" title="款式委托">
 				<template v-slot:right>
 					<view class="u-m-r-24"><u-icon name="search" size="38"></u-icon></view>
 				</template>
@@ -16,7 +16,7 @@
 						<view class="color_AF8D66 u-font-28 hs-weight-500">异常</view>
 					</view>
 					<view class="split_line"></view>
-					<view class="" @click="change(5)">
+					<view class="" @click="change(4)">
 						<view class="u-font-48 hs-weight-500">{{ abolishIds }}</view>
 						<view class="color_AF8D66 u-font-28 hs-weight-500">待寄样</view>
 					</view>
@@ -87,6 +87,7 @@ export default {
 	mixins: [dom],
 	data() {
 		return {
+			background: { backgroundColor: 'rgba(245,245,245,0)' },
 			modal: {
 				show: false,
 				title: ''
@@ -101,6 +102,7 @@ export default {
 			entrustmentId: '',
 			current: 0,
 			entrustmentList: [],
+			total: 0,
 			list: [
 				{
 					name: '全部'
@@ -137,8 +139,10 @@ export default {
 	},
 	// 上拉加载更多
 	onReachBottom() {
-		this.pages.size = this.pages.size + 5;
-		this.entrustmentPage();
+		if (this.total > this.entrustmentList.length) {
+			this.pages.size = this.pages.size + 5;
+			this.entrustmentPage();
+		}
 	},
 	filters: {
 		filterStatus(v) {
@@ -205,7 +209,8 @@ export default {
 			}).then(res => {
 				let { code, data } = res;
 				if (code === 200) {
-					this.entrustmentList = data;
+					this.entrustmentList = data.data;
+					this.total = data.total;
 				}
 			});
 		},