相关页面修改

src/pages/home/fabricDetails.vue

@@ -6,13 +6,13 @@
 		<view class="content u-p-30">
 			<!-- 面料基本信息 -->
 			<view class="fabric_tit u-p-30">
-				<view class="color_DDA973 u-font-32">{{materialInfo.materialName}}</view>
+				<view class="color_DDA973 u-font-32">{{ materialInfo.materialName }}</view>
 				<view class="u-font-24 u-m-t-20 color_fff08">
-					<span class="u-m-r-10">{{materialInfo.category}}</span>
+					<span class="u-m-r-10">{{ materialInfo.category }}</span>
 					|
-					<span class="u-m-l-10 u-m-r-10">{{materialInfo.clothWidth}} cm</span>
+					<span class="u-m-l-10 u-m-r-10">{{ materialInfo.clothWidth }} cm</span>
 					|
-					<span class="u-m-l-10">{{materialInfo.component}}</span>
+					<span class="u-m-l-10">{{ materialInfo.component }}</span>
 				</view>
 				<view class="u-m-t-20"><image v-for="item in materialInfo.materialPictureList" class="img_120 u-m-r-30" :src="item.fileCode" mode=""></image></view>
 			</view>
@@ -21,7 +21,7 @@
 				<view class="tit_date u-font-32">
 					<span class="u-font-28 ft-wt-700">建模委托信息</span>
 					<span class="u-font-24">
-						{{fabricObj.completionDate}}
+						{{ fabricObj.completionDate }}
 						<u-icon size="28" class="u-m-l-5" color="#ccc" name="arrow-right"></u-icon>
 					</span>
 				</view>
@@ -29,11 +29,11 @@
 					<view class="ds_flex">
 						<span class="width_30 color_00004">检测服务商</span>
 						<!-- TODO  后期修改 -->
-						<span class="flex-sub">{{fabricObj.supplierId}}</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">{{fabricObj.price}}元</span>
+						<span class="flex-sub">{{ fabricObj.price }}元</span>
 					</view>
 				</view>
 			</view>
@@ -77,18 +77,18 @@ export default {
 	data() {
 		return {
 			searchFabric: '',
-			fabricObj:{},
-			id:'',
+			fabricObj: {},
+			id: '',
 			tableList: [1, 2, 3, 4, 5]
 		};
 	},
 	onLoad(option) {
-		this.id = option.id
+		this.id = option.id;
 		this.materialDetail();
 	},
-	computed:{
-		materialInfo(){
-			return this.fabricObj.materialInfo
+	computed: {
+		materialInfo() {
+			return this.fabricObj.materialInfo || {};
 		}
 	},
 	methods: {
@@ -99,7 +99,7 @@ export default {
 			this.$http('orderTicket.materialDetail', this.id).then(res => {
 				let { code, data } = res;
 				if (code === 200) {
-					this.fabricObj = data
+					this.fabricObj = data;
 				}
 			});
 		}

src/pages/home/fabricList.vue

@@ -9,7 +9,7 @@
 			<view>
 				<view class="u-m-t-30" v-for="item in fiabricList">
 					<!-- 后期用公共组件 fabricTitle -->
-					<hs-material-thumbnail :item="filterFiabric(item)"></hs-material-thumbnail>
+					<hs-material-thumbnail @click="detailFabric(item)" :item="filterFiabric(item)"></hs-material-thumbnail>
 				</view>
 			</view>
 		</view>
@@ -17,9 +17,9 @@
 </template>
 
 <script>
-import fabricTitle from '@/components/hs-material-thumbnail/hs-material-thumbnail.vue';
+import home from './mixin/index.js'
 export default {
-	components: { fabricTitle },
+	mixins:[home],
 	data() {
 		return {
 			size: 5,
@@ -39,15 +39,6 @@ export default {
 		}
 	},
 	methods: {
-		filterFiabric(item) {
-			return {
-				...item,
-				name: item.materialName,
-				mdmMaterialComponent: item.materialElement,
-				mdmMaterialClothWidth: item.materialDoorWidth,
-				mdmMaterialCategory: item.materialCategory,
-			};
-		},
 		searchCli() {
 			this.size = 5;
 			this.materialList();

src/pages/home/index.vue

@@ -35,7 +35,6 @@
 			</view>
 			<view class="home_con_fabric">
 				<view class="home_con_content u-m-t-24" @click="detailFabric(item)" v-for="item in fiabricList">
-					<!-- <image class="hs-img" :src="item.fileCode" mode=""></image> -->
 					<image class="hs-img" src="../../static/images/home/1@2x.png" mode=""></image>
 					<view class="home_con_content_font ov_hiden">{{ item.materialName }}</view>
 				</view>

src/pages/home/mixin/index.js

+export default {
+	methods: {
+		filterFiabric(item) {
+			return {
+				...item,
+				// name: item.materialName,
+				// mdmMaterialComponent: item.materialElement,
+				// mdmMaterialClothWidth: item.materialDoorWidth,
+				// mdmMaterialCategory: item.materialCategory
+			};
+		},
+		detailFabric(data) {
+			this.$Router.push('/pages/home/fabricDetails?id=' + data.id);
+		},
+	}
+}

src/pages/home/sampleConfirmation.vue

@@ -37,22 +37,6 @@
 						</view>
 						<view class="u-m-t-30">
 							<hs-material-thumbnail :item="mdmMaterial"></hs-material-thumbnail>
-							<!-- <view class="home_con_content_order" @click="click">
-								<image style="width: 100%;height: 160rpx;" src="@/static/images/home/1@2x.png" mode=""></image>
-								<view class="order_tit">
-									<view class="u-flex justify-between u-font-32">
-										<span class="color_DDA973 u-line-1">{{ tableData.mdmMaterialName }}</span>
-										<span><u-icon size="24" color="#fff" name="arrow-right"></u-icon></span>
-									</view>
-									<view class="u-font-24 u-m-t-20 color_6F6F72">
-										<span class="u-m-r-10">{{ tableData.mdmMaterialCategory }}</span>
-										|
-										<span class="u-m-l-10 u-m-r-10">{{ tableData.mdmMaterialClothWidth }}cm</span>
-										|
-										<span class="u-m-l-10">{{ tableData.mdmMaterialComponent }}</span>
-									</view>
-								</view>
-							</view> -->
 						</view>
 					</view>
 				</view>
@@ -78,7 +62,7 @@ export default {
 	computed: {
 		mdmMaterial() {
 			return {
-				name: this.tableData.mdmMaterialName,
+				// name: this.tableData.mdmMaterialName,
 				...this.tableData
 			};
 		}

src/pages/home/search.vue

@@ -9,30 +9,21 @@
 			</view>
 		</u-navbar>
 		<!-- 列表 -->
-		<view class="home_con_order">
-			<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">{{ item.materialName }}</view>
-					<view class="u-font-24 u-m-t-20 color_6F6F72">
-						<span class="u-m-r-10">{{ item.materialCategory }}</span>
-						|
-						<span class="u-m-l-10 u-m-r-10">{{ item.materialDoorWidth }}</span>
-						|
-						<span class="u-m-l-10">{{ item.materialElement }}</span>
-					</view>
-				</view>
-			</view>
+		<view class="home_con_order u-p-l-30 u-p-r-30">
+			<view class="u-m-t-30" v-for="item in fiabricList"><hs-material-thumbnail @click="detailFabric(item)" :item="filterFiabric(item)"></hs-material-thumbnail></view>
 		</view>
 	</view>
 </template>
 
 <script>
+import home from './mixin/index.js';
 export default {
+	mixins: [home],
 	data() {
 		return {
 			value: '',
 			size: 5,
+			total: 0,
 			fiabricList: []
 		};
 	},
@@ -64,7 +55,7 @@ export default {
 					this.total = data.total;
 				}
 			});
-		}
+		},
 	}
 };
 </script>
@@ -78,24 +69,4 @@ export default {
 	margin: 0 20rpx;
 	flex: 1;
 }
-.home_con_order {
-	padding: 0 30rpx;
-}
-.home_con_content_order {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	height: 160rpx;
-	border-radius: 8rpx;
-	overflow: hidden;
-	.order_tit {
-		flex-direction: column;
-		display: flex;
-		justify-content: center;
-		padding: 20rpx;
-		flex: 1;
-		height: 100%;
-		background: rgba(172, 166, 166, 0.5);
-	}
-}
 </style>

src/pages/home/styleEntrustment.vue

@@ -284,6 +284,8 @@ export default {
 			if (val == '拆单') {
 				this.$Router.push('/pages/designCommissioned/splitItem?id=' + item.id);
 			} else if (val == '编辑') {
+				// &id=${item.id}
+				uni.setStorageSync('_item', item);
 				this.$Router.push(`/pages/designCommissioned/addItem?id=${item.id}&status=1`);
 			} else if (val == '选款') {
 				// this.$Router.push(`/pages/designCommissioned/addItem?id=${item.id}&status=2`);