调整

assets/font/font.css

@@ -5,9 +5,9 @@
 	    font-family: 'PingFang Regular';
 	
 		font-display:swap;
-		src: url('https://xpgj.xiaoxinda.com/prod/font/PingFang-Regular.woff2') format('woff2'),
+		/* src: url('https://xpgj.xiaoxinda.com/prod/font/PingFang-Regular.woff2') format('woff2'),
 		     url('https://xpgj.xiaoxinda.com/prod/font/PingFang-Regular.woff') format('woff');
-	    font-weight: normal;
+	   */ font-weight: normal;
 	
 	    font-style: normal;  
 	
@@ -16,9 +16,9 @@
 	  @font-face {
 	  
 	      font-family: 'Alibaba-PuHuiTi-Regular';
-		  src:url('https://xpgj.xiaoxinda.com/prod/font/Alibaba-PuHuiTi-Regular.woff') format('woff'),
+		/*  src:url('https://xpgj.xiaoxinda.com/prod/font/Alibaba-PuHuiTi-Regular.woff') format('woff'),
 		  url('https://xpgj.xiaoxinda.com/prod/font/Alibaba-PuHuiTi-Regular.woff2') format('woff2');
-	    
+	    */
 		  font-display:swap;
 	      font-weight: normal;
 	  

pages/storeManagement/equipmentDelivery/deliveryDetails.vue

@@ -135,7 +135,7 @@
 					</template>
 
 					<template v-slot:content>
-						<view>
+						<view class="u-order">
 							<view class="u-order-desc">
 								<view class="level">
 									项目部
@@ -170,7 +170,7 @@
 					</template>
 
 					<template v-slot:content>
-						<view>
+						<view class="u-order">
 							<view class="u-order-desc">
 								<view class="level">
 									部门负责人
@@ -204,7 +204,7 @@
 					</template>
 
 					<template v-slot:content>
-						<view>
+						<view class="u-order">
 							<view class="u-order-desc">
 								<view class="level">
 									主管领导
@@ -239,7 +239,7 @@
 					</template>
 
 					<template v-slot:content>
-						<view>
+						<view class="u-order">
 							<view class="u-order-desc">
 								<view class="level">
 									仓库管理
@@ -439,10 +439,10 @@
 			font-size: 32rpx;
 		}
         .u-time-axis-item{
-			margin-bottom: 76rpx;
+			//margin-bottom: 76rpx;
 		}
 		.u-time-axis {
-			padding: 18rpx 40rpx;
+			//padding: 18rpx 40rpx;
 		}
 
 		.u-node {
@@ -454,7 +454,9 @@
 			align-items: center;
 			background: #d0d0d0;
 		}
-
+		.u-order{
+			margin-bottom: 32rpx;
+		}
 		.u-order-title {
 			color: #333333;
 			font-weight: bold;
@@ -520,11 +522,11 @@
       
 	}
 	
-	.u-time-axis{
-		.u-time-axis-item:last-of-type{
-			margin-bottom: 0;
-		}
-	}
+	// .u-time-axis{
+	// 	.u-time-axis-item:last-of-type{
+	// 		margin-bottom: 0;
+	// 	}
+	// }
 	// 确认出库
 	.bottom{
 		background-color: #fff;

pages/storeManagement/equipmentDelivery/equipmentDelivery.vue

@@ -8,7 +8,7 @@
 	
 		</view>
 		<view class="list1" v-if="this.current==0">
-			<view class="item" v-for="item in 3">
+			<view class="item" v-for="(item,i) in list[0].list" @click="ckInfo(item.id)" :key="i" >
 				<view class="title">
 					王五的出库申请
 				</view>
@@ -40,7 +40,7 @@
 			</view>
 		</view>
 		<view class="list2" v-if="this.current==1" > 
-			<view class="item" v-for="item in 3">
+			<view class="item"  v-for="(item,i) in list[1].list" @click="ckInfo(item.id)" :key="i">
 				<view class="title">
 					刘群的出库申请
 				</view>
@@ -80,16 +80,89 @@
 		data() {
 			return {
 				list: [{
-					name: '待出库'
+					name: '待出库',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					 typeId:"1",
+					list:[]
 				}, {
-					name: '已出库'
+					name: '已出库',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					 typeId:"2",
+					list:[]
 				}
 					
 				],
 				current: 0
 			}
 		},
+		onReachBottom() {
+			var obj=this.list[this.current]
+			if (obj.list.length < obj.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
+		onReady(){
+			this.getList()
+		},
 		methods: {
+			getList(){
+							
+							 uni.showLoading({
+							 	title: "加载中",
+							 	mask: true,
+							 })
+							 var list=this.list[this.current].list
+							 var obj=this.list[this.current]
+							 var listForm={
+								...obj
+							 }
+							 delete listForm.list
+							 
+							 API.pageList(listForm).then((res) => {
+							 	uni.hideLoading();
+								if(listForm.pageIndex==1){
+									list = res.data.data;
+								}else{
+									list = [
+										...list,
+										...res.data.data
+									];
+								}
+							 	
+							 	this.list[this.current].recordsTotal = res.data.recordsTotal;
+							 }).catch(error => {
+							 	uni.showToast({
+							 		title: error,
+							 		icon: "none"
+							 	})
+							 })
+							 
+			},
+			myLoadmore(){
+				this.list[this.current].pageIndex += 1;
+				this.getList();
+			},
+			init(){
+				this.current=0
+				this.list[0].pageIndex=1
+				this.list[1].pageIndex=1
+				this.getList()
+			},
+			ckInfo(id){
+				var url="./deliveryDetails?id="+id;
+				uni.navigateTo({
+					url:url,
+					events: {
+					  refreshData: () => {
+					    this.init()
+					  }
+					}
+				})
+			},
 			change(index) {
 				this.current = index;
 			}

pages/storeManagement/homePage/homePage.vue

@@ -1,10 +1,12 @@
 <template>
 	<view>
+		<u-navbar title="首页"  v-show="false"></u-navbar>
+		
 		<!-- 头部 -->
 		<view class="header">
 			<view class="main">
 				<view class="title">
-					<view class="name">
+					<view class="name"  @click="changeShow()">
 						<view class="text">
 							你好，孙斌！
 						</view>
@@ -12,23 +14,32 @@
 							<u-icon name='arrow-down' color="#fff" size="28"></u-icon>
 						</view>
 					</view>
+					<view class="options" v-if="this.show==true" >
+						<view @click="changeShow()">切换身份</view>
+						<view @click="changeShow()">退出账号</view>
+					</view>
+				
 					
 					<view class="qr-code">
 						<img src="../../../assets/img/riLine-qr-scan-line@1x.png" alt="">
 					</view>
 				</view>
-				<!-- 公告 -->
-				<view class="notice">
-					
-					<u-icon name="volume-up-fill" size="40" color="#fff"></u-icon>
-					<text>库存PDA设备将于2023年4月1日升级维护</text>
-				</view>
+				
 			</view>
 			
 		</view>
 		<!-- 宫格 -->
 		<view class="gird">
-			<view class="item">
+			<!-- 公告 -->
+			<view class="notice" >
+				<u-notice-bar mode="horizontal"
+				 bg-color="#6290f7" color="#fff"
+				 :list="['库存PDA设备将于2023年4月1日升级维护']"></u-notice-bar>
+			
+				<!-- <u-icon name="volume-up-fill" size="40" color="#fff"></u-icon>
+				<text></text> -->
+			</view>
+			<view class="item" @click="gotoUrl('pages/storeManagement/equipmentDelivery/equipmentDelivery')">
 				<view class="title">
 					设备出库
 				</view>
@@ -39,7 +50,7 @@
 					<img src="../../../assets/img/girdH1.png" alt="">
 				</view>
 			</view>
-			<view class="item">
+			<view class="item"  @click="gotoUrl('pages/storeManagement/equipmentEnter/equipmentEnter')">
 				<view class="title">
 					设备入库
 				</view>
@@ -50,7 +61,7 @@
 					<img src="../../../assets/img/girdH2.png" alt="">
 				</view>
 			</view>
-			<view class="item">
+			<view class="item"   @click="gotoUrl('pages/storeManagement/equipmentInspection/equipmentInspection')" >
 				<view class="title">
 					设备巡检
 				</view>
@@ -61,7 +72,7 @@
 					<img src="../../../assets/img/girdH3.png" alt="">
 				</view>
 			</view>
-			<view class="item">
+			<view class="item"   @click="gotoUrl('pages/storeManagement/equipmentRetrieval/equipmentRetrieval')" >
 				<view class="title">
 					设备检索
 				</view>
@@ -106,16 +117,35 @@
 	export default {
 		data() {
 			return {
-				
+				show:false,
 			}
 		},
 		methods: {
-			
+			changeShow(){
+				this.show=!this.show
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	
+	.options{
+		width: 260rpx;
+		
+		line-height: 60rpx;
+		//text-align: center;
+		padding:8rpx 0px 8rpx 16rpx;
+		background-color: #fff;
+		color: rgba(65, 80, 88, 1);
+		font-family: Microsoft Yahei;
+		position: absolute;
+		top: 88rpx;
+		border-radius: 1px;
+		//right: 24rpx;
+		box-shadow:5px 5px 10px gray;
+	}
+	
 	page{
 		background-color: rgba(1,122,255,1);
 		padding-bottom: 100rpx;
@@ -123,7 +153,7 @@
 	// 头部
 	.header{
 		width: 100%;
-		height: 339px;
+		height: 289px;
 		background:linear-gradient(180deg, rgba(0,45,194,1) 0%,rgba(0,59,254,1) 49%,rgba(1,122,255,1) 100%);
 		padding: 0 40rpx;
 		.main{
@@ -149,35 +179,37 @@
 				
 			}
 		}
-		// 公告
-		.notice{
-			display: flex;
-			align-items: center;
-			background-color: rgba(255, 255, 255, 0.35);
-			color: rgba(255, 255, 255, 1);
-			font-weight: bold;
-			border-radius: 8px;
-			height: 80rpx;
-			line-height: 80rpx;
-			padding: 0 24rpx;
-			position: absolute;
-			bottom: 260rpx;
-			left: 0;
-			right: 0;
-			
-			text{
-				font-size: 28rpx;
-				width: 542px;
-				margin-left: 16rpx;
-				white-space: nowrap;
-				overflow: hidden;
-				text-overflow: ellipsis;
-			}
-		}
+		
 	}
 	
  // 宫格
  .gird{
+	 // 公告
+	 .notice{
+	 	    overflow: hidden;
+	 	display: flex;
+	 	align-items: center;
+	 	background-color: #6290f7;
+	 	color: rgba(255, 255, 255, 1);
+	 	font-weight: bold;
+	 	border-radius: 8px;
+	 	height: 80rpx;
+	 	line-height: 80rpx;
+	 	padding: 0 24rpx;
+	 //	position: absolute;
+	 	bottom: 260rpx;
+	 	left: 0;
+	 	right: 0;
+	 	    margin-bottom: 40rpx;
+	 	text{
+	 		font-size: 28rpx;
+	 		width: 542px;
+	 		margin-left: 16rpx;
+	 		white-space: nowrap;
+	 		overflow: hidden;
+	 		text-overflow: ellipsis;
+	 	}
+	 }
 	 padding: 0 40rpx;
 	 display: flex;
 	 justify-content: space-between;

uni_modules/uview-ui/components/u-icon/u-icon.vue

@@ -266,7 +266,7 @@ export default {
 
 <style scoped lang="scss">
 @import "../../libs/css/style.components.scss";
-// @import '../../iconfont.css';
+@import '../../iconfont.css';
 
 .u-icon {
 	display: inline-flex;

uni_modules/uview-ui/components/u-time-line-item/u-time-line-item.vue

@@ -6,6 +6,7 @@
 				<view class="u-dot">
 				</view>
 			</slot>
+			
 		</view>
 	</view>
 </template>
@@ -54,17 +55,19 @@
 	@import "../../libs/css/style.components.scss";
 	
 	.u-time-axis-item {
+		padding-left: 40rpx;
 		@include vue-flex;
 		flex-direction: column;
 		width: 100%;
 		position: relative;
-		margin-bottom: 32rpx;
+		margin-bottom: 0px;
 	}
 
 	.u-time-axis-node {
+		padding-left: 40rpx;
 		position: absolute;
 		top: 12rpx;
-		left: -40rpx;
+		left: -20rpx;
 		transform-origin: 0;
 		transform: translateX(-50%);
 		@include vue-flex;
@@ -73,7 +76,23 @@
 		z-index: 1;
 		font-size: 24rpx;
 	}
-
+	.u-time-axis-item:last-child::before {
+		content: "" !important;
+	
+		border-left: 0px solid #ddd;
+		
+	}
+	.u-time-axis-item::before {
+		content: " ";
+		position: absolute;
+		left: 0;
+		top: 12rpx;
+		width: 1px;
+		bottom: 0;
+		border-left: 1px solid #ddd;
+		transform-origin: 0 0;
+		transform: scaleX(0.5);
+	}
 	.u-dot {
 		height: 16rpx;
 		width: 16rpx;

uni_modules/uview-ui/components/u-time-line/u-time-line.vue

@@ -29,15 +29,5 @@
 		position: relative;
 	}
 
-	.u-time-axis::before {
-		content: " ";
-		position: absolute;
-		left: 0;
-		top: 12rpx;
-		width: 1px;
-		bottom: 0;
-		border-left: 1px solid #ddd;
-		transform-origin: 0 0;
-		transform: scaleX(0.5);
-	}
+	
 </style>