Merge branch 'master' into master-uat

App.vue

@@ -56,10 +56,9 @@
 		border-radius: 1px;
 	}
 	/deep/.u-title{
-		font-family: 'Alibaba-PuHuiTi-Regular';
-		font-size:36rpx !important;
-		color: rgba(51, 51, 51, 1) !important;
 		
+		font-size:36rpx !important;
+		color: rgba(51, 51, 51, 1) !important;		
 	}
 	/deep/.uicon-nav-back {
 		color: #101010 !important;

pages.json

@@ -96,6 +96,42 @@
             }
             
         }
+        ,{
+            "path" : "pages/storeManagement/equipmentInspection/equipmentInspection",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/storeManagement/equipmentInspection/planDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/storeManagement/equipmentInspection/inspectionRecord",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/storeManagement/equipmentRetrieval/equipmentRetrieval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 
 	

pages/storeManagement/equipmentEnter/enterDetails.vue

@@ -238,7 +238,7 @@
 			border-radius: 50px;
 			background-color: rgba(255, 255, 255, 1);
 			color: rgba(69, 186, 69, 1);
-			font-size: 12px;
+			font-size: 24rpx;
 			text-align: center;
 			font-family: Arial;
 			border: 1px solid rgba(69, 186, 69, 1);

pages/storeManagement/equipmentEnter/returnList.vue

@@ -2,7 +2,7 @@
 	<view>
 		<u-navbar>
 			<view class="title">
-				出库设备清单<text>(18)</text>
+				归还设备清单<text>(18)</text>
 			</view>
 		</u-navbar>
 		<view class="container">

pages/storeManagement/equipmentInspection/equipmentInspection.vue

@@ -0,0 +1,217 @@
+<template>
+	<view>
+		<view class="head">
+			<u-navbar title="设备巡检"></u-navbar>
+			<view class="tabs">
+				<u-tabs bar-width="80" inactive-color="#777777" active-color="#101010":list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+			      <view class="screen" @click="changeShow()">
+			      	  筛选<u-icon size="24" name="arrow-down" color="#777777"></u-icon>
+			      </view>
+				  <view class="options" v-if="this.show==true" @click="changeShow()">
+				  	选项3
+				  </view>
+			</view>
+	
+		</view>
+		<view class="list1" v-if="this.current==0">
+			<view class="item" >
+				<view class="title">
+					接地线220kV无杆
+				</view>
+				<view class="group">
+					<view class="name">
+						检测数量：
+					</view>
+					<view class="value">
+						7根
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						领用人：
+					</view>
+					<view class="value">
+						孙斌
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						计划日期：
+					</view>
+					<view class="value">
+						2023/03/15-2023/03/20
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		<view class="list2" v-if="this.current==1" > 
+			<view class="item" >
+				<view class="title">
+					接地线220kV无杆
+				</view>
+				<view class="group">
+					<view class="name">
+						检测数量：
+					</view>
+					<view class="value">
+						7根
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						领用人：
+					</view>
+					<view class="value">
+						孙斌
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						计划日期：
+					</view>
+					<view class="value">
+						2023/03/15-2023/03/20
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		<view class="list3" v-if="this.current==2" >
+			<view class="item" >
+				<view class="title">
+					接地线220kV无杆
+				</view>
+				<view class="group">
+					<view class="name">
+						检测数量：
+					</view>
+					<view class="value">
+						7根
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						领用人：
+					</view>
+					<view class="value">
+						孙斌
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						计划日期：
+					</view>
+					<view class="value">
+						2023/03/15-2023/03/20
+					</view>
+				</view>
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '待巡检'
+				}, {
+					name: '历史记录'
+				},{
+					name:'超期未完成'
+				}
+					
+				],
+				current: 0,
+				show:false
+			}
+		},
+		methods: {
+			change(index) {
+				this.current = index;
+			},
+			changeShow(){
+				this.show=!this.show
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		padding-bottom: 100rpx;
+		
+	}
+	.head{
+		background: linear-gradient(180deg, rgba(190,211,240,1) 0%,rgba(244,244,246,1) 100%) ;
+		height: 590rpx;
+		padding: 0 32rpx;
+		/deep/.u-navbar{
+			background: 0!important;
+		}
+		/deep/.u-border-bottom:after{
+			height: 0;
+		}
+	}
+	.tabs{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		/deep/.u-tabs{
+			background: 0 !important;
+			width: 480rpx;
+		}
+		/deep/.u-tab-bar{
+			background-color: #2A8EFB !important;
+		}
+		.screen{
+			color: #415058;
+			position: relative;
+			font-family: Microsoft Yahei;
+			/deep/.uicon-arrow-down{
+				margin-left: 4rpx;
+			}
+		}
+		.options{
+			width: 120rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			background-color: #fff;
+			color: rgba(65, 80, 88, 1);
+			font-family: Microsoft Yahei;
+			position: absolute;
+			top: 160rpx;
+			right: 24rpx;
+			box-shadow:5px 5px 10px gray;
+		}
+		
+	}
+
+
+ .list1,.list2,.list3{
+	 padding: 0 32rpx;
+	 margin-top: -400rpx;
+	 .item{
+		 border-radius: 8px;
+		 background-color: rgba(255, 255, 255, 1);
+		 padding: 32rpx;
+		 margin-bottom: 24rpx;
+		 .title{
+			 color: rgba(51, 51, 51, 1);
+			 font-size: 36rpx;
+			 margin-bottom: 16rpx;
+		 }
+		 .group{
+			 display: flex;
+			 color: rgba(119, 119, 119, 1);
+			 margin-top: 16rpx;
+			 font-weight: bold;
+		 }
+	 }
+	 
+ }
+</style>

pages/storeManagement/equipmentInspection/inspectionRecord.vue

@@ -0,0 +1,302 @@
+<template>
+	<view>
+		<u-navbar title="巡检记录"></u-navbar>
+		<view class="head">
+			<view class="title">
+				接地线
+			</view>
+			<view class="item">
+				<view class="name">
+					数量：
+				</view>
+				<view class="value">
+					7根
+				</view>
+			</view>
+			<view class="item">
+				<view class="name">
+					领用人：
+				</view>
+				<view class="value">
+					孙斌
+				</view>
+			</view>
+			<view class="item">
+				<view class="name">
+					计划日期：
+				</view>
+				<view class="value">
+					2023/03/15-2023/03/20
+				</view>
+				<view class="unfold" @click="changeShow()">
+					展开<u-icon size="28" name="arrow-down"></u-icon>
+				</view>
+				<view class="options" v-if="this.show==true" @click="changeShow()">
+					选项3
+				</view>
+			</view>
+		</view>
+		<view class="container">
+			<view class="main">
+				<view class="list-item">
+					<!--信息 -->
+					<view class="list-infos">
+						<view class="infos-head">
+							<view class="name">
+								50KV直流高压电缆
+							</view>
+
+						</view>
+						<view class="infos">
+							<view class="infos-1">
+								<view class="infos-item">
+									<view class="item-name">
+										型号：
+									</view>
+									<view class="item-value">
+										GZYV GYVZ-50
+									</view>
+								</view>
+
+							</view>
+							<view class="infos-2">
+								<view class="infos-item">
+									<view class="item-name">
+										设备编号：
+									</view>
+									<view class="item-value">
+										ND920182001511
+									</view>
+								</view>
+
+							</view>
+
+						</view>
+
+					</view>
+                <!-- 巡检结果 -->
+					<view class="result">
+						<view class="title">
+							巡检结果
+						</view>
+						<view class="value">
+							合格
+						</view>
+					</view>
+                <!-- 备注 -->
+                    <view class="remark">
+                    	<view class="title">
+                    		备注说明：
+                    	</view>
+						<view class="value">
+						   设备各项数据一切正常
+						</view>
+                    </view>
+        <!-- 图片 -->
+		<view class="image">
+			<view class="img-box" >
+				<img src="../../../assets/img/image.png" alt="">
+			</view>
+		</view>
+
+				</view>
+
+
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false
+			};
+		},
+		methods: {
+			changeShow() {
+				this.show = !this.show
+			}
+
+		},
+
+	};
+</script>
+
+<style scoped lang="scss">
+	.head {
+		background-color: #fff;
+		padding: 32rpx;
+
+		.title {
+			color: rgba(51, 51, 51, 1);
+			font-size: 36rpx;
+			margin-bottom: 16rpx;
+		}
+
+		.item {
+			display: flex;
+			color: #777777;
+			margin-top: 16rpx;
+
+			.name,
+			.value {
+				font-weight: bold;
+			}
+
+			.unfold {
+				margin-left: auto;
+				position: relative;
+				color: #929EA5;
+				font-family: Microsoft Yahei;
+
+				/deep/.uicon-arrow-down {
+					margin-left: 8rpx;
+				}
+			}
+
+			.options {
+				width: 120rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				background-color: #fff;
+				color: rgba(65, 80, 88, 1);
+				font-family: Microsoft Yahei;
+				position: absolute;
+				top: 320rpx;
+				right: 24rpx;
+				box-shadow: 5px 5px 10px gray;
+			}
+		}
+	}
+
+	.container {
+		.main {
+			padding: 0 24rpx;
+
+			.list-item {
+				border-radius: 8px;
+				padding: 24rpx;
+				background-color: #fff;
+				margin-top: 24rpx;
+			}
+
+			// 信息
+			.list-infos {
+				padding-bottom: 24rpx;
+				border-bottom: 1px solid rgba(232, 232, 232, 1);
+
+				.infos-head {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 24rpx;
+
+					.name {
+						color: rgba(51, 51, 51, 1);
+						font-size: 32rpx;
+					}
+
+					.state {
+						border: 1px solid rgba(69, 186, 69, 1);
+						border-radius: 4px;
+						color: rgba(69, 186, 69, 1);
+						font-size: 24rpx;
+						line-height: 48rpx;
+						width: 160rpx;
+						text-align: center;
+
+						text {
+							img {
+								vertical-align: middle;
+								margin-right: 4rpx;
+							}
+						}
+					}
+
+
+				}
+
+				.infos {
+					margin-top: 16rpx;
+					display: flex;
+					justify-content: space-between;
+					color: #777777;
+					font-size: 24rpx;
+
+
+
+					.infos-item {
+						display: flex;
+						margin-bottom: 8rpx;
+
+						.item-value {
+							width: 200rpx;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+					}
+				}
+			}
+   // 结果
+     .result{
+		 display: flex;
+		 justify-content: space-between;
+		 margin-top: 24rpx;
+		 .title{
+			 color:#333333;
+			 font-weight: bold;
+		 }
+		 .value{
+			 color: #0EB01D;
+		 }
+	 }
+  // 备注
+  .remark{
+	  display: flex;
+	  color:#777777;
+	  margin-top: 24rpx;
+  }
+
+// 图片
+.image{
+	margin-top: 24rpx;
+	display: flex;
+	flex-wrap: wrap;
+	.img-box{
+		
+		border-radius: 4px;
+		overflow: hidden;
+		margin-bottom: 16rpx;
+		
+		img{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	@media screen and(max-width:375px) {
+		.img-box{
+			width: 154rpx;
+			height: 154rpx;
+			margin-left: 12rpx;
+		}
+	}
+	@media screen and(min-width:375px) {
+		.img-box{
+			width: 154rpx;
+			height: 154rpx;
+			margin-left:8rpx;
+		}
+	}
+}
+
+
+		}
+
+
+
+	}
+</style>

pages/storeManagement/equipmentInspection/planDetail.vue

@@ -0,0 +1,322 @@
+<template>
+	<view>
+		<u-navbar title="计划详情"></u-navbar>
+		<view class="head">
+			<view class="title">
+				接地线
+			</view>
+			<view class="item">
+				<view class="name">
+					数量：
+				</view>
+				<view class="value">
+					7根
+				</view>
+			</view>
+			<view class="item">
+				<view class="name">
+					领用人：
+				</view>
+				<view class="value">
+					孙斌
+				</view>
+			</view>
+			<view class="item">
+				<view class="name">
+					计划日期：
+				</view>
+				<view class="value">
+					2023/03/15-2023/03/20
+				</view>
+				<view class="unfold" @click="changeShow()">
+					展开<u-icon size="28" name="arrow-down"></u-icon>
+				</view>
+				<view class="options" v-if="this.show==true" @click="changeShow()">
+					选项3
+				</view>
+			</view>
+		</view>
+		<view class="container">
+			<view class="main">
+				<view class="list-item" v-for="item in 2">
+					<!--信息 -->
+					<view class="list-infos">
+						<view class="infos-head">
+							<view class="name">
+								50KV直流高压电缆
+							</view>
+							
+						</view>
+						<view class="infos">
+							<view class="infos-1">
+								<view class="infos-item">
+									<view class="item-name">
+										型号：
+									</view>
+									<view class="item-value">
+										GZYV GYVZ-50
+									</view>
+								</view>
+		
+							</view>
+							<view class="infos-2">
+								<view class="infos-item">
+									<view class="item-name">
+										设备编号：
+									</view>
+									<view class="item-value">
+										ND920182001511
+									</view>
+								</view>
+		
+							</view>
+		
+						</view>
+		
+					</view>
+					<view class="receive-options">
+						<view class="title">
+							巡检结果
+						</view>
+						<view class="receive-radio">
+							<u-radio-group v-model="value" @change="radioGroupChange">
+								<u-radio @change="radioChange" v-for="(item, index) in list" :key="index"
+									:name="item.name" :disabled="item.disabled">
+									{{item.name}}
+								</u-radio>
+							</u-radio-group>
+						</view>
+					</view>
+					<!-- 备注 -->
+					<textarea placeholder="备注" name="" id="" cols="30" rows="10"></textarea>
+				
+				<!-- 上传图片 -->
+					<view class="upload-img">
+						<u-upload width="144" height="144"  upload-text="" del-bg-color="#0051FF"   :before-upload="beforeUpload"></u-upload>
+					</view>
+				</view>
+		
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+						name: '合格',
+						disabled: false
+					},
+					{
+						name: '不合格',
+						disabled: false
+					},
+
+				],
+				// u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
+				value: '合格',
+				show:false
+			};
+		},
+		methods: {
+			// 选中某个单选框时，由radio时触发
+			radioChange(e) {
+				// console.log(e);
+			},
+			// 选中任一radio时，由radio-group触发
+			radioGroupChange(e) {
+				// console.log(e);
+			},
+			beforeUpload(index, list) {
+							// 只上传偶数索引的文件
+							if(index % 2 == 0) return true;
+							else return false;
+						},
+						changeShow(){
+							this.show=!this.show
+						}
+						
+		},
+		
+	};
+</script>
+
+<style scoped lang="scss">
+	.head{
+		background-color: #fff;
+		padding: 32rpx;
+		.title{
+			color: rgba(51, 51, 51, 1);
+			font-size: 36rpx;
+			margin-bottom: 16rpx;
+		}
+		.item{
+			display: flex;
+			color: #777777 ;
+			margin-top: 16rpx;
+			
+			.name,.value{
+				font-weight: bold;
+			}
+			.unfold{
+				margin-left: auto;
+				position: relative;
+			color:#929EA5;
+			font-family: Microsoft Yahei;
+			/deep/.uicon-arrow-down{
+				margin-left: 8rpx;
+			}
+			}
+			.options{
+				width: 120rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				background-color: #fff;
+				color: rgba(65, 80, 88, 1);
+				font-family: Microsoft Yahei;
+				position: absolute;
+				top: 320rpx;
+				right: 24rpx;
+				box-shadow:5px 5px 10px gray;
+			}
+		}
+	}
+.container {
+		.main {
+			padding: 0 24rpx;
+
+			.list-item {
+				border-radius: 8px;
+				padding: 24rpx;
+				background-color: #fff;
+				margin-top: 24rpx;
+			}
+
+			// 信息
+			.list-infos {
+				padding-bottom: 24rpx;
+				border-bottom: 1px solid rgba(232, 232, 232, 1);
+
+				.infos-head {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 24rpx;
+
+					.name {
+						color: rgba(51, 51, 51, 1);
+						font-size: 32rpx;
+					}
+
+					.state {
+						border: 1px solid rgba(69, 186, 69, 1);
+						border-radius: 4px;
+						color: rgba(69, 186, 69, 1);
+						font-size: 24rpx;
+						line-height: 48rpx;
+						width: 160rpx;
+						text-align: center;
+
+						text {
+							img {
+								vertical-align: middle;
+								margin-right: 4rpx;
+							}
+						}
+					}
+
+					
+				}
+
+				.infos {
+					margin-top: 16rpx;
+					display: flex;
+					justify-content: space-between;
+					color: #777777;
+					font-size: 24rpx;
+
+					
+
+					.infos-item {
+						display: flex;
+						margin-bottom: 8rpx;
+						.item-value{
+							width: 200rpx;
+							overflow: hidden;
+							 white-space: nowrap;
+							 text-overflow: ellipsis;
+						}
+					}
+				}
+			}
+
+			// 接收选项
+			.receive-options {
+			 display: flex;
+				align-items: center;
+				padding: 24rpx 0;
+
+				.title {
+					color: #333333;
+					margin-right: 24rpx;
+					font-weight: bold;
+				}
+
+				.receive-radio {
+					flex: 1;
+
+					/deep/.u-radio-group {
+						width: 100%;
+
+					}
+
+					/deep/.u-radio {
+						margin-right: 48rpx;
+					}
+				}
+
+			}
+
+			// 备注
+			uni-textarea {
+				width: 100%;
+				height: 80rpx;
+				line-height: 80rpx;
+				text-indent: 24rpx;
+				background-color: rgba(241, 242, 245, 1);
+				color: rgba(136, 136, 136, 1);
+				border-radius: 8px;
+				font-family: Microsoft Yahei;
+				font-size: 28rpx;
+			}
+			// 上传图片
+			.upload-img{
+				margin-top: 24rpx;
+				/deep/.u-add-tips{
+					margin-top: 0;
+				}
+				// 右上角删除图标
+				/deep/.u-delete-icon{
+					top: -8rpx;
+					right: -8rpx;
+					width: 36rpx;
+					height: 36rpx;
+				}
+				/deep/.u-list-item{
+					overflow: inherit;
+				}
+				/deep/.u-list-item{
+					margin-right: 8rpx;
+				}
+			}
+
+		}
+
+
+
+	}
+</style>

pages/storeManagement/equipmentRetrieval/equipmentRetrieval.vue

@@ -0,0 +1,251 @@
+<template>
+	<view>
+		<!-- 搜索 -->
+		<view class="search">
+			<u-icon name="arrow-left" size="36"></u-icon>
+			<view class="search-box">
+				<u-search placeholder="搜索设备名称或型号" :show-action="false">
+
+				</u-search>
+				<view class="search-btn">
+					<view class="text">
+						搜索
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="main">
+			<!-- 分类 -->
+			<view class="classify">
+				<view class="item " v-for="(item,index) in menuList" @click="toggle(index)"
+					:class="{'checked':index ==checkindex }">
+					{{item.name}}
+				</view>
+				
+			</view>
+			<!-- 类型 -->
+			<view class="type" >
+			<view class="type-item" v-for="item in 2">
+				<view class="title">
+					设备类型一
+				</view>
+				<view class="content">
+					<view class="item" v-for="item in 2">
+						<view class="picture">
+							<img src="../../../assets/img/typePic.png" alt="">
+						</view>
+						<view class="infos" >
+							<view class="name">
+								安防摄像头
+							</view>
+							<view class="model">
+								<view class="infos-title">
+									型号：
+								</view>
+								<view class="value">
+									DAH08410512
+								</view>
+							</view>
+							<view class="inventory">
+								<view class="infos-title">
+									库存：
+								</view>
+								<view class="value">
+									10
+								</view>
+							</view>
+	
+						</view>
+					</view>
+				</view>
+    </view>
+			</view>
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				checkindex: 0,
+				menuList: [{
+						name: '安全工器具'
+					},
+					{
+						name: '测量工器具'
+					},
+					{
+						name: '放线工器具'
+					},
+					{
+						name: '加工设备'
+					},
+					{
+						name: '起重设备'
+					},
+					{
+						name: '共用设备	'
+					},
+					{
+						name: '高压试验设备'
+					},
+					{
+						name: '继电保护设备'
+					},
+					{
+						name: '生活设备'
+					},
+					{
+						name: '工程技术科'
+					},
+					{
+						name: '菜单1'
+					},
+					{
+						name: '菜单2'
+					},
+					{
+						name: '菜单3'
+					},
+					{
+						name: '菜单4'
+					},
+				]
+
+			}
+		},
+		methods: {
+			toggle(index) {
+				this.checkindex = index
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	// 搜索
+	.search {
+		padding: 12rpx 24rpx;
+		display: flex;
+		border-radius: 8px;
+		overflow: hidden;
+
+		.search-box {
+			display: flex;
+			border-radius: 8px;
+			overflow: hidden;
+		}
+
+		/deep/.u-search {
+			width: 530rpx;
+			margin: auto !important;
+			position: relative;
+			flex: 0;
+			margin: 0 !important;
+			height: 64rpx !important;
+		}
+
+		/deep/.u-content {
+			width: 430px;
+			border-radius: 0px !important;
+			height: 64rpx !important;
+		}
+
+		/deep/.u-icon--right {
+			margin-right: 16rpx;
+		}
+
+		.search-btn {
+			width: 100rpx;
+			height: 64rpx;
+			background-color: #f2f2f2;
+
+			.text {
+				height: 40rpx;
+				margin: 12rpx 0;
+				border-left: 1px solid #999999;
+				font-family: Microsoft Yahei;
+				text-align: center;
+				color: rgba(16, 98, 213, 1);
+				font-size: 28rpx;
+			}
+		}
+	}
+
+	.main {
+		display: flex;
+
+		// 分类
+		.classify {
+			width: 200rpx;
+			height: calc(100vh - 88rpx);
+			background-color: #F0F0F0;
+			overflow-y: scroll;
+			font-size: 28rpx;
+
+			.item {
+				height: 120rpx;
+				line-height: 120rpx;
+				text-align: center;
+			}
+
+			.checked {
+				background-color: #fff;
+				color: #1062D5
+			}
+		}
+	// 类型
+	.type{
+		padding: 24rpx 32rpx;
+		height: calc(100vh - 88rpx);
+		overflow-y: scroll;
+		.type-item{
+			margin-bottom: 80rpx;
+		}
+		.title{
+			color: rgba(51, 51, 51, 1);
+			font-size: 32rpx;
+			margin-bottom: 24rpx;
+		}
+		.content{
+			.item{
+				display: flex;
+				margin-bottom: 64rpx;
+				.picture{
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 8rpx;
+					overflow: hidden;
+					img{
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.infos{
+					margin-left: 16rpx;
+					.name{
+						color: rgba(51, 51, 51, 1);
+						font-size: 32rpx;
+						margin-bottom: 16rpx;
+					}
+					.model,.inventory{
+						color: rgba(153, 153, 153, 1);
+						font-size: 24rpx;
+						display: flex;
+						margin-bottom: 8rpx;
+					}
+				}
+			}
+		}
+	}
+	
+	
+	}
+</style>

pages/storeManagement/homePage/homePage.vue

@@ -195,6 +195,7 @@
 			 color: rgba(16, 16, 16, 1);
 			 font-size: 36rpx;
 			 margin-bottom: 8rpx;
+			 font-family: 'Alibaba-PuHuiTi-Regular';
 		 }
 		 .hint{
 			 color: rgba(106, 121, 142, 1);