Merge remote-tracking branch 'remotes/origin/master' into master-uat

App.vue

@@ -1,7 +1,7 @@
 <style lang="scss">
 	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
 	@import "@/uni_modules/uview-ui/index.scss";
-	// @import '@/assets/font/font.css';
+	@import '@/assets/font/font.css';
 	
 </style>
 <script>
@@ -34,7 +34,7 @@
 /deep/.u-divider{
 	color: rgba(182, 189, 195, 1);
 	font-size: 12px;
-	font-weight: bold;
+	
 	font-family: 'Regular';
 }
 	.uni-icon-success-no-circle:before {

assets/font/font/font.css

@@ -0,0 +1,80 @@
+ @font-face {
+	  
+	      font-family: 'Alibaba-PuHuiTi-Regular';
+	  
+	      src: url('Alibaba-PuHuiTi-Regular.ttf');
+	  
+	      font-weight: normal;
+	  
+	      font-style: normal;
+	  
+	    }
+@font-face {  
+
+    font-family: 'PingFang Regular';
+
+    src: url('PingFang Regular.ttf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+
+@font-face {  
+
+    font-family: 'Bold';
+
+    src: url('SourceHanSerifSC-Bold.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+
+  @font-face {  
+
+    font-family: 'Medium';
+
+    src: url('SourceHanSerifSC-Medium.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+
+@font-face {  
+
+    font-family: 'SemiBold';
+
+    src: url('SourceHanSerifSC-SemiBold.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+@font-face {  
+
+    font-family: 'Regular';
+
+    src: url('SourceHanSerifSC-Regular.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+  @font-face {
+  
+      font-family: 'Light';
+  
+      src: url('SourceHanSerifSC-Light.otf');
+  
+      font-weight: normal;  
+  
+      font-style: normal;  
+  
+    }

components/canteenTabbar.vue

@@ -0,0 +1,100 @@
+<template >
+	<view>
+		<u-tabbar v-model="myCurrent" :list="tabbarList" 
+		:before-switch="beforeSwitch" active-color="#1F4A99" inactive-color="#B3BED1"  ></u-tabbar>
+		
+	</view>
+</template>
+
+<script>
+ 	var img1=require('@/components/bar-chart-box-fill 1.png')
+	var img2=require('@/components/bar-chart-box-fill 2.png')
+	var img3=require('@/components/file-list-3-fill.png')
+	var img4=require('@/components/file-list-3-fill (1).png')
+ 	export default {
+		name:"tabbarJob",
+		props:{
+			current: 0,
+			elderStatus: false
+		},
+		data() {
+			return {
+				activeColor:"#1F4A99",
+				oldindex:this.current,
+				 myCurrent:this.current,
+				 tabbarList: [
+					 {
+					 
+				 		iconPath: img2,
+				 		selectedIconPath: img1,
+				 		text: '数据统计 ',
+						pagePath2:"/pages/canteenManagement/dataStatistics/dataStatistics",
+						login:false,
+				 	},
+					{
+					 
+						iconPath: img4,
+						selectedIconPath: img3,
+						text: '消费明细 ',
+						login:true,
+						pagePath2:"/pages/canteenManagement/consumption/consumption",
+						
+					
+					},
+				 	{
+				 		iconPath: "account",
+				 		selectedIconPath: "account-fill",
+				 		text: '个人中心',
+						login:true,
+						pagePath2:"/pages/canteenManagement/mine/mine",
+				 	}
+			 ],
+			};
+			
+		},methods:{
+			setcount(c){
+				//this.myCurrent=c
+			},
+			beforeSwitch(index){
+			
+				var bl=false
+				
+				if(index==this.current){
+					
+					return false
+				}
+				//this.myCurrent=index
+				var url =this.tabbarList[index].pagePath2;
+				
+				if(this.tabbarList[index].login){
+					var userInfo=this.carhelp.getPersonInfo()
+					if(userInfo){
+						
+					}else{
+						url="/pages/login/index"
+						bl=true	
+					}
+					
+				}
+				uni.navigateTo({
+					url: url
+				})
+			
+				
+				
+			},
+			
+		},
+		mounted(){
+			
+		},destroyed(){
+			
+		}
+		
+		
+	}
+</script>
+
+<style>
+	 
+</style>

main.js

@@ -2,7 +2,7 @@ import App from './App'
 import Vue from 'vue'
 import getOpenId from './apis/utils/init.js'
 import getALIOpenId from './apis/utils/initALI.js'
-
+import './assets/font/font/font.css'
 var IS_WEIXIN = /MicroMessenger/.test(window.navigator.userAgent)
 var IS_ALI = /AlipayClient/.test(window.navigator.userAgent)
 

pages.json

@@ -338,6 +338,69 @@
             }
             
         }
+        ,{
+            "path" : "pages/canteenManagement/dataStatistics/dataStatistics",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/canteenManagement/consumption/consumption",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/canteenManagement/mine/mine",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/canteenManagement/dataStatistics/records",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/canteenManagement/consumption/consumptionDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/canteenManagement/mine/qrCode",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/staffHome/orderReport",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 
 	

pages/canteenManagement/consumption/consumption.vue

@@ -0,0 +1,198 @@
+<template>
+	<view>
+		
+		<!-- 搜索 -->
+		<view class="search">
+			<u-search :clearabled="false" placeholder="输入姓名或手机号搜索" v-model="keyword"></u-search>
+		</view>
+		<!-- 筛选 -->
+		<view class="options">
+			<view class="date-option" @click="changeDateShow">
+				2023年4月<u-icon name="arrow-down" size="24"></u-icon>
+				<view class="date-box" v-if="dateShow">
+					<view class="options-item">
+						2023年4月
+					</view>
+					
+					
+				</view>
+			</view>
+			<view class="department-option" @click="changeDepartmentShow">
+				全部部门<u-icon name="arrow-down" size="24"></u-icon>
+				<view class="department-box" v-if="departmentShow">
+					<view class="options-item">
+						全部部门
+					</view>
+					
+					
+				</view>
+			</view>
+		</view>
+		<!-- 明细 -->
+		<view class="details">
+			<view class="detail-item" v-for="item in 8">
+				<view class="head">
+					<view class="name">
+						李四
+					</view>
+					<view class="tel">
+						197****2849
+					</view>
+					<view class="money">
+						15.00
+					</view>
+				</view>
+				<view class="content">
+					<view class="department">
+						荆州地方铁路 机务段
+					</view>
+					<view class="date">
+						4月1日 12:00
+					</view>
+				</view>
+				
+			</view>
+			
+		</view>
+		
+		
+		
+		<canteenTabbar  ref="mytabbar"
+				current="1"></canteenTabbar>
+	</view>
+</template>
+
+<script>
+	import canteenTabbar from "../../../components/canteenTabbar.vue"
+	export default {
+		components: {
+			canteenTabbar
+		},
+		data() {
+			
+			return {
+				keyword: '',
+				dateShow:false,
+				departmentShow:false
+			}
+		},
+		methods: {
+			changeDateShow() {
+				this.dateShow = !this.dateShow
+			},
+			changeDepartmentShow() {
+				this.departmentShow = !this.departmentShow
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		padding-bottom: 100px;
+	}
+	// 搜索
+	.search{
+		padding: 16rpx 32rpx;
+		background-color: #fff;
+		/deep/.u-search{
+			position: relative;
+		}
+		/deep/.u-action{
+			position: absolute;
+			right: 16rpx;
+			color: rgba(31, 74, 153, 1);
+		}
+	}
+	
+// 筛选
+.options{
+		background-color: #fff;
+		padding: 0 92rpx;
+		line-height: 88rpx;
+		display: flex;
+		justify-content: space-between;
+		color: #7D7D7D;
+		border-bottom: 1px solid rgba(232, 232, 232, 1);
+		.date-option,.department-option{
+			position: relative;
+		}
+		/deep/.uicon-arrow-down{
+			margin-left: 8rpx;
+		}
+		.date-box{
+			background-color: #fff;
+			z-index: 999;
+			width: 180rpx;
+			box-shadow: 0px 0px 2px #999999;
+			position: absolute;
+			top: 70rpx;
+		    right: 0px;
+		
+			.options-item {
+				line-height: 60rpx;
+				padding-left: 8rpx;
+				background-color: #2A8EFB ;
+				color: #fff;
+			}
+		
+		}
+		.department-box{
+			background-color: #fff;
+			z-index: 999;
+			width: 180rpx;
+			box-shadow: 0px 0px 2px #999999;
+			position: absolute;
+			top: 70rpx;
+		    left: 0px;
+		
+			.options-item {
+				line-height: 60rpx;
+				padding-left: 8rpx;
+				background-color: #2A8EFB ;
+				color: #fff;
+			}
+		
+		}
+	}
+
+// 明细
+.details{
+	background-color: #fff;
+	.detail-item{
+		padding: 32rpx;
+		border-bottom: 1px solid rgba(232, 232, 232, 1);
+		.head{
+			display: flex;
+			align-items: center;
+			.name{
+				color: rgba(51, 51, 51, 1);
+				font-size: 32rpx;
+				font-family: 'PingFang Regular';
+				font-weight: bold;
+			}
+			.tel{
+				color: rgba(16, 16, 16, 1);
+				font-size: 32rpx;
+				
+				margin-left: 16rpx;
+			}
+			.money{
+				color: rgba(31, 74, 153, 1);
+				font-size: 40rpx;
+				font-weight: bold;
+				margin-left: auto;
+			}
+		}
+		
+		.content{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-family: 'Alibaba-PuHuiTi-Regular';
+			color: rgba(119, 119, 119, 1);
+			margin-top:12rpx;
+		}
+	}
+}
+</style>

pages/canteenManagement/consumption/consumptionDetail.vue

@@ -0,0 +1,194 @@
+<template>
+	<view>
+		<u-navbar title="消费详情"></u-navbar>
+		<!-- 消费详情 -->
+		<view class="details">
+			<view class="title">
+				荆州地方铁路食堂
+			</view>
+			<view class="price">
+				15.00
+			</view>
+			<view class="infos">
+				<view class="info-item">
+					<view class="info-title">
+						实付金额（元）
+					</view>
+					<view class="value">
+						15.00
+					</view>
+				</view>
+				<view class="info-item">
+					<view class="info-title">
+						饭卡余额（元）
+					</view>
+					<view class="value">
+						
+						315.00
+						
+					</view>
+				</view>
+				<view class="info-item">
+					<view class="info-title">
+						订单号
+						
+					</view>
+					<view class="value">
+						000111222333444
+						
+					</view>
+				</view>
+				<view class="info-item">
+					<view class="info-title">
+						支付时间
+					</view>
+					<view class="value">
+						2023-04-10 12:00:00
+					</view>
+				</view>
+				
+			</view>
+			
+		</view>
+		
+		<!-- 消费用户 -->
+		<view class="user">
+			<view class="user-title">
+				<view class="string">
+					
+				</view>
+				<view class="text">
+					消费用户
+				</view>
+			</view>
+			<view class="user-info">
+				<view class="info-item">
+					<view class="title">
+						用户姓名
+					</view>
+					<view class="value">
+						周斌
+					</view>
+				</view>
+				<view class="info-item">
+					<view class="title">
+						
+						手机号码
+						
+					</view>
+					<view class="value">
+						
+						135****1010
+						
+					</view>
+				</view>
+				<view class="info-item">
+					<view class="title">
+						所属部门
+					</view>
+					<view class="value">
+						机务段
+					</view>
+				</view>
+				
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	// 消费详情
+	.details{
+		background-color: #fff;
+		margin: 24rpx 32rpx;
+		padding: 40rpx;
+		border-radius: 8px;
+		text-align: center;
+		font-family: 'PingFang Regular';
+		.title{
+			color: rgba(51, 51, 51, 1);
+			font-size: 48rpx;
+			font-family: 'PingFang Regular';
+		}
+		.price{
+			margin-top: 24rpx;
+			font-size: 72rpx;
+			color: rgba(31, 74, 153, 1);
+			font-weight: bold;
+		}
+		.infos{
+			margin-top: 48rpx;
+			.info-item{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-bottom: 24rpx;
+				.info-title{
+					color: rgba(134, 137, 140, 1);
+					font-size: 32rpx;
+				}
+				.value{
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+				}
+			}
+		}
+		
+	}
+
+// 消费用户
+.user{
+	background-color: #fff;
+	padding: 32rpx;
+	margin: 32rpx;
+	border-radius: 8px;
+	.user-title{
+		display: flex;
+		align-items: center;
+		.string{
+			width: 8rpx;
+			height: 24rpx;
+			background-color: rgba(24, 90, 198, 1);
+			margin-right: 16rpx;
+		}
+		.text{
+			color: rgba(16, 16, 16, 1);
+			font-size: 32rpx;
+			font-weight: bold;
+			font-family: 'Regular';
+		}
+	}
+	.user-info{
+		margin-top: 40rpx;
+		.info-item{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 24rpx;
+			font-family: 'PingFang Regular';
+			.title{
+				color: rgba(134, 137, 140, 1);
+				font-size: 32rpx;
+			}
+			.value{
+				color: rgba(51, 51, 51, 1);
+				font-size: 32rpx;
+			}
+		}
+	}
+}
+</style>

pages/canteenManagement/dataStatistics/dataStatistics.vue

@@ -0,0 +1,334 @@
+<template>
+	<view>
+		<view class="head">
+			<view class="title">
+				<view class="name">
+					食堂管理系统
+				</view>
+				<view class="option" @click="changePlaceShow">
+					地方铁路食堂<u-icon name="arrow-down"></u-icon>
+					<view class="options-box" v-if="placeShow">
+						<view class="options-item">
+							选项1
+						</view>
+						<view class="options-item">
+							选项2
+						</view>
+						<view class="options-item">
+							选项3
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<!-- 曲线图 -->
+			<view class="chart">
+				<view class="chart-title">
+					<view class="name">
+						月度饭卡消费曲线图
+					</view>
+					<view class="time" @click="changeTimeShow">
+						2023年4月<u-icon name="arrow-down"></u-icon>.
+						<view class="time-box" v-if="timeShow">
+							<view class="options-item">
+								2023年4月
+							</view>
+
+						</view>
+					</view>
+				</view>
+				<img src="../../../assets/img/chart.png" alt="">
+			</view>
+
+		</view>
+
+		<!-- 订餐上报 -->
+		<view class="order-food">
+			<view class="title">
+				<view class="name">
+					<text><img src="../../../assets/img/riLine-calendar-2-line@1x.png" alt=""></text>订餐上报
+				</view>
+				<view class="record">
+					全部记录 <u-icon name="arrow-right" size="20"></u-icon>
+				</view>
+			</view>
+			<!-- 记录卡片 -->
+			<view class="record-card" v-for="item in 2">
+				<view class="record-title">
+					<view class="date">
+						2023年4月10日 星期一
+					</view>
+					<view class="people-number">
+						订餐人数 <text class="num1">29</text>
+					</view>
+				</view>
+				<view class="classify">
+					<view class="item">
+						<view class="type1">
+							机务段
+						</view>
+						<view class="number">
+							订餐人数 <text class="num2">10</text>
+						</view>
+					</view>
+
+					<view class="item">
+						<view class="type2">
+							荆州南
+						</view>
+						<view class="number">
+							订餐人数 <text class="num3">19</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+<canteenTabbar  ref="mytabbar"
+		current="0"></canteenTabbar> 
+	</view>
+</template>
+
+<script>
+	import canteenTabbar from "../../../components/canteenTabbar.vue"
+	export default {
+		components: {
+			canteenTabbar
+		},
+		data() {
+			return {
+				placeShow: false,
+				timeShow: false
+			}
+		},
+		methods: {
+			changePlaceShow() {
+				this.placeShow = !this.placeShow
+			},
+			changeTimeShow() {
+				this.timeShow = !this.timeShow
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		padding-bottom: 100px;
+
+	}
+
+	.head {
+		padding: 24rpx 32rpx;
+		background: linear-gradient(180deg, rgba(183, 208, 255, 1) 0%, rgba(244, 244, 246, 1) 100%);
+		height: 177px;
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.name {
+				color: rgba(31, 74, 153, 1);
+				font-size: 40rpx;
+				font-family: 'Medium';
+			}
+
+			.option {
+				color: rgba(65, 80, 88, 1);
+				font-size: 32rpx;
+				position: relative;
+
+				.options-box {
+					background-color: #fff;
+					z-index: 999;
+					width: 240rpx;
+					box-shadow: 0px 0px 2px #999999;
+					position: absolute;
+					top: 50rpx;
+					left: 0px;
+
+					.options-item {
+						line-height: 60rpx;
+						padding-left: 8rpx;
+					}
+
+				}
+			}
+		}
+
+		// 曲线图
+		.chart {
+			border-radius: 12px;
+			margin-top: 24rpx;
+			background-color: #fff;
+			height: 268px;
+
+			.chart-title {
+				padding: 38rpx 24rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: 32rpx;
+
+				.name {
+					color: rgba(51, 51, 51, 1);
+					font-weight: bold;
+					font-family: 'Medium';
+				}
+
+				.time {
+					color: rgba(119, 119, 119, 1);
+					position: relative;
+
+					.time-box {
+						background-color: #fff;
+						z-index: 999;
+						width: 200rpx;
+						box-shadow: 0px 0px 2px #999999;
+						position: absolute;
+						top: 50rpx;
+						left: 0px;
+
+						.options-item {
+							line-height: 64rpx;
+							padding-left: 8rpx;
+						}
+
+					}
+				}
+			}
+
+			img {
+				width: 100%;
+				height: 200px;
+			}
+		}
+	}
+
+	// 订餐上报
+
+	.order-food {
+		padding: 0 32rpx;
+		margin-top: 160px;
+		font-family: 'PingFang Regular';
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.name {
+				color: rgba(56, 109, 205, 1);
+				font-size: 36rpx;
+				line-height: 36rpx;
+				font-weight: bold;
+
+				text {
+					vertical-align: middle;
+					margin-right: 8rpx;
+				}
+			}
+
+			.record {
+				color: rgba(119, 119, 119, 1);
+
+			}
+		}
+	}
+
+	// 记录卡片
+	.record-card {
+		padding: 24rpx;
+		margin-top: 24rpx;
+		border-radius: 12px;
+		background-color: rgba(255, 255, 255, 1);
+
+		.record-title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 16rpx;
+
+			.date {
+				color: rgba(51, 51, 51, 1);
+				font-size: 32rpx;
+		 }
+
+			.people-number {
+				color: rgba(51, 51, 51, 1);
+				font-size: 16px;
+
+				text {
+					margin-left: 8rpx;
+				}
+			}
+		}
+
+		.classify {
+			display: flex;
+
+			align-items: center;
+
+			.item {
+				display: flex;
+				align-items: center;
+
+				.type1 {
+				 width: 112rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					border-radius: 4px;
+					border: 1px solid rgba(96, 184, 201, 1);
+					color: rgba(96, 184, 201, 1);
+					text-align: center;
+					margin-right: 8rpx;
+				}
+
+				.type2 {
+					width: 112rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					border-radius: 4px;
+				 border: 1px solid rgba(77, 140, 255, 1);
+					color: rgba(77, 140, 255, 1);
+					text-align: center;
+					margin-right: 8rpx;
+				}
+
+				.number {
+					color: rgba(51, 51, 51, 1);
+
+					text {
+						margin-left: 8rpx;
+					}
+				}
+			}
+
+			.item:nth-of-type(2) {
+				margin-left: 48rpx;
+			}
+		}
+
+		.num1 {
+			color: #FF6923;
+			font-weight: bold;
+		}
+
+		.num2 {
+			color: #85C8D5;
+			font-weight: bold;
+		}
+
+		.num3 {
+			color: #74A5FF;
+			font-weight: bold;
+		}
+	}
+
+	/deep/.uicon-arrow-down,
+	/deep/.uicon-arrow-right {
+		margin-left: 8rpx;
+
+	}
+</style>

pages/canteenManagement/dataStatistics/records.vue

@@ -0,0 +1,233 @@
+<template>
+	<view>
+		<u-navbar title="订餐上报"></u-navbar>
+		<!-- 筛选 -->
+		<view class="options">
+			<view class="date-option" @click="changeDateShow">
+				2023年4月<u-icon name="arrow-down" size="24"></u-icon>
+				<view class="date-box" v-if="dateShow">
+					<view class="options-item">
+						2023年4月
+					</view>
+					
+					
+				</view>
+			</view>
+			<view class="department-option" @click="changeDepartmentShow">
+				全部部门<u-icon name="arrow-down" size="24"></u-icon>
+				<view class="department-box" v-if="departmentShow">
+					<view class="options-item">
+						全部部门
+					</view>
+					
+					
+				</view>
+			</view>
+		</view>
+		<!-- 记录卡片 -->
+		<view class="main">
+			<view class="record-card" v-for="item in 6">
+				<view class="record-title">
+					<view class="date">
+						2023年4月10日 星期一
+					</view>
+					<view class="people-number">
+						订餐人数 <text class="num1">29</text>
+					</view>
+				</view>
+				<view class="classify">
+					<view class="item">
+						<view class="type1">
+							机务段
+						</view>
+						<view class="number">
+							订餐人数 <text class="num2">10</text>
+						</view>
+					</view>
+			
+					<view class="item">
+						<view class="type2">
+							荆州南
+						</view>
+						<view class="number">
+							订餐人数 <text class="num3">19</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	<u-divider bg-color="#F2F4F4" border-color="#CFD2D5">没有更多数据了</u-divider>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dateShow:false,
+				departmentShow:false
+			}
+		},
+		methods: {
+			changeDateShow() {
+				this.dateShow = !this.dateShow
+			},
+			changeDepartmentShow() {
+				this.departmentShow = !this.departmentShow
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		padding-bottom: 100px;
+		font-family: 'PingFang Regular';
+	}
+	// 筛选
+	.options{
+		background-color: #fff;
+		padding: 0 92rpx;
+		line-height: 88rpx;
+		display: flex;
+		justify-content: space-between;
+		color: #7D7D7D;
+		.date-option,.department-option{
+			position: relative;
+		}
+		/deep/.uicon-arrow-down{
+			margin-left: 8rpx;
+		}
+		.date-box{
+			background-color: #fff;
+			z-index: 999;
+			width: 180rpx;
+			box-shadow: 0px 0px 2px #999999;
+			position: absolute;
+			top: 70rpx;
+		    right: 0px;
+		
+			.options-item {
+				line-height: 60rpx;
+				padding-left: 8rpx;
+				background-color: #2A8EFB ;
+				color: #fff;
+			}
+		
+		}
+		.department-box{
+			background-color: #fff;
+			z-index: 999;
+			width: 180rpx;
+			box-shadow: 0px 0px 2px #999999;
+			position: absolute;
+			top: 70rpx;
+		    left: 0px;
+		
+			.options-item {
+				line-height: 60rpx;
+				padding-left: 8rpx;
+				background-color: #2A8EFB ;
+				color: #fff;
+			}
+		
+		}
+	}
+
+// 记录卡片
+.main{
+	padding: 0 32rpx;
+}
+.record-card {
+		padding: 24rpx;
+		margin-top: 24rpx;
+		border-radius: 12px;
+		
+		background-color: rgba(255, 255, 255, 1);
+
+		.record-title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 16rpx;
+
+			.date {
+				color: rgba(51, 51, 51, 1);
+				font-size: 32rpx;
+		 }
+
+			.people-number {
+				color: rgba(51, 51, 51, 1);
+				font-size: 16px;
+
+				text {
+					margin-left: 8rpx;
+				}
+			}
+		}
+
+		.classify {
+			display: flex;
+
+			align-items: center;
+
+			.item {
+				display: flex;
+				align-items: center;
+
+				.type1 {
+				 width: 112rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					border-radius: 4px;
+					border: 1px solid rgba(96, 184, 201, 1);
+					color: rgba(96, 184, 201, 1);
+					text-align: center;
+					margin-right: 8rpx;
+				}
+
+				.type2 {
+					width: 112rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					border-radius: 4px;
+				 border: 1px solid rgba(77, 140, 255, 1);
+					color: rgba(77, 140, 255, 1);
+					text-align: center;
+					margin-right: 8rpx;
+				}
+
+				.number {
+					color: rgba(51, 51, 51, 1);
+
+					text {
+						margin-left: 8rpx;
+					}
+				}
+			}
+
+			.item:nth-of-type(2) {
+				margin-left: 48rpx;
+			}
+		}
+
+		.num1 {
+			color: #FF6923;
+			font-weight: bold;
+		}
+
+		.num2 {
+			color: #85C8D5;
+			font-weight: bold;
+		}
+
+		.num3 {
+			color: #74A5FF;
+			font-weight: bold;
+		}
+	}
+	/deep/.u-divider{
+		margin-top: 40rpx !important;
+		font-family: 'PingFang Regular';
+	}
+</style>

pages/canteenManagement/login.vue

@@ -112,7 +112,7 @@
 
 		.name {
 			color: rgba(16, 16, 16, 1);
-			font-size: 40rDDpx;
+			font-size: 40rpx;
 			text-align: center;
 			font-weight: bold;
 			margin-top: 8rpx;

pages/canteenManagement/mine/mine.vue

@@ -0,0 +1,206 @@
+<template>
+	<view>
+		<view class="head">
+			<view class="photo">
+				<img src="../../../assets/img/qrLogo.png" alt="">
+			</view>
+			<view class="name">
+				地方铁路食堂
+			</view>
+			<view class="switch">
+				<view class="img"><img src="../../../assets/img/riLine-exchange-line@1x.png" alt="">
+				</view>
+				<view class="text">
+					切换帐号
+				</view>
+			</view>
+		</view>
+		
+		
+		<!-- 功能 -->
+		<view class="function-group group1"     >
+			<view class="item">
+				<view class="title">
+					<view class="icon">
+						<img src="../../../assets/img/riLine-qr-code-line@1x.png" alt="">
+					</view>
+					<view class="text">
+						收款二维码
+					</view>
+				</view>
+				<view class="right">
+					<u-icon name="arrow-right" size="32" color="#cccccc"></u-icon>
+				</view>
+			</view>
+		
+			<view class="item" >
+				<view class="title">
+					<view class="icon">
+						<img src="../../../assets/img/riLine-file-edit-line@1x.png" alt="">
+					</view>
+					<view class="text">
+						意见反馈
+					</view>
+				</view>
+				<view class="right">
+					<u-icon name="arrow-right" size="32" color="#cccccc"></u-icon>
+				</view>
+			</view>
+			
+			<view class="item" >
+				<view class="title">
+					<view class="icon">
+						<img src="../../../assets/img/riLine-customer-service-2-line@1x.png" alt="">
+					</view>
+					<view class="text">
+						联系我们
+					</view>
+					
+				</view>
+				<view class="right">
+					<text class="tel">
+						0716-8888888
+					</text>
+					<u-icon name="arrow-right" size="32" color="#cccccc"></u-icon>
+				</view>
+			</view>
+			
+			<view class="item" >
+				<view class="title">
+					<view class="icon">
+						<img src="../../../assets/img/riLine-logout-box-r-line@1x.png" alt="">
+					</view>
+					<view class="text">
+						退出账号
+					</view>
+				</view>
+				<view class="right">
+					<u-icon name="arrow-right" size="32" color="#cccccc"></u-icon>
+				</view>
+			</view>
+		
+		</view>
+		
+		
+		<canteenTabbar  ref="mytabbar"
+				current="2"></canteenTabbar>
+	</view>
+	
+</template>
+
+<script>
+	import canteenTabbar from "../../../components/canteenTabbar.vue"
+	export default {
+		components: {
+			canteenTabbar
+		},
+		data() {
+			
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		font-family: 'PingFang Regular';
+		padding-bottom: 100px;
+	}
+	.head{
+		padding: 48rpx 0 48rpx 32rpx;
+		display: flex;
+		align-items: center;
+		.photo{
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 50px;
+			background-color: rgba(255, 255, 255, 1);
+			box-shadow: 0px 2px 8px 0px rgba(35, 72, 75, 15);
+			border: 2px solid rgba(255, 255, 255, 1);
+			overflow: hidden;
+			img{
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.name{
+			color: rgba(51, 51, 51, 1);
+			font-size: 40rpx;
+			margin-left: 24rpx;
+			font-weight: bold;
+		}
+		.switch{
+			width: 216rpx;
+			height: 76rpx;
+			border-radius: 50px 0px 0px 50px;
+			background-color: rgba(255, 255, 255, 1);
+			text-align: center;
+			box-shadow: 0px 2px 4px 0px rgba(79, 125, 226, 15);
+			margin-left: auto;
+		   
+		   display: flex;
+		   justify-content: center;
+		   align-items: center;
+		   color: rgba(31, 74, 153, 1);
+		   .img{
+			   
+			   margin-right: 8rpx;
+			   img{
+				   vertical-align: middle;
+			   }
+		   }
+		   }
+			
+	}
+
+.function-group {
+		border-radius: 8px;
+		background-color: rgba(255, 255, 255, 1);
+		padding: 0 0 0 24rpx;
+		margin: 0 32rpx;
+		margin-top: 24rpx;
+
+		.item {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			height: 96rpx;
+			border-bottom: 1px solid #E6E6E6;
+
+			.title {
+				display: flex;
+				align-items: center;
+
+				.icon {
+					margin-right: 24rpx;
+
+					img {
+						width: 40rpx;
+						height: 40rpx;
+						vertical-align: middle;
+					}
+				}
+
+				.text {
+					color: rgba(119, 119, 119, 1);
+					
+				}
+			}
+
+			.right {
+				margin-right: 16rpx;
+				margin-left: 8rpx;
+				display: flex;
+			}
+		}
+		.tel{
+			margin-right: 16rpx;
+			color: rgba(119, 119, 119, 1);
+		}
+	}
+</style>

pages/canteenManagement/mine/qrCode.vue

@@ -0,0 +1,112 @@
+<template>
+	<view>
+		<u-navbar title="收款二维码"></u-navbar>
+		<!-- 二维码 -->
+		<view class="code-box">
+			<view class="qr-code">
+				<img src="../../../assets/img/qrCode.png" alt="">
+				<view class="logo">
+					<img src="../../../assets/img/qrLogo.png" alt="">
+				</view>
+			</view>
+			<view class="hint">
+				用微信扫描二维码，可以付款就餐
+			</view>
+			
+		</view>
+		<!-- 保存到相册 -->
+		<view class="save">
+			<view class="photo">
+				<img src="../../../assets/img/antFill-picture@1x.png" alt="">
+			</view>
+			<view class="text">
+				保存到相册
+			</view>
+			
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		font-family: 'PingFang Regular';
+	}
+	// 二维码
+	.code-box{
+		margin: 80rpx 56rpx;
+		padding: 92rpx 0rpx;
+		border-radius: 8px;
+		text-align: center;
+		background-color: rgba(255, 255, 255, 1);
+		.qr-code{
+			width: 400rpx;
+			height: 400rpx;
+			position: relative;
+			margin: auto;
+			img{
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.logo{
+			width: 112rpx;
+			height: 112rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			border: 4px solid #fff;
+			border-radius: 4px;
+			img{
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.hint{
+			color: rgba(51, 51, 51, 1);
+			margin-top: 16rpx;
+			font-weight: bold;
+		}
+	}
+
+ // 保存到相册
+ .save{
+	 margin-top: 80rpx;
+	 text-align: center;
+	 .photo{
+		 height: 120rpx;
+		 width: 120rpx;
+		 border-radius: 999px;
+		 background-color: rgba(255, 255, 255, 1);
+		 text-align: center;
+		 margin: auto;
+         line-height: 120rpx;
+          
+		 img{
+			 vertical-align: middle;
+		 }
+		 
+	 }
+	 .text{
+	 			 color: rgba(119, 119, 119, 1);
+	 			 font-size: 24rpx;
+	 			 margin-top: 8rpx;
+	 }
+ }
+</style>

pages/login/login.vue

@@ -110,7 +110,7 @@
 
 		.name {
 			color: rgba(16, 16, 16, 1);
-			font-size: 40rDDpx;
+			font-size: 40rpx;
 			text-align: center;
 			font-weight: bold;
 			margin-top: 8rpx;

pages/mine/mine.vue

@@ -311,7 +311,7 @@
 
 <style lang="scss" scoped>
 	page{
-		font-family: 'Regular';
+		font-family: 'PingFang Regular';
 	}
 	// 个人信息
 	.person-infos {
@@ -452,6 +452,7 @@
 					opacity: 0.7;
 					color: rgba(49, 54, 66, 1);
 					font-size: 24rpx;
+					margin-top: 8rpx;
 					.icon{
 						vertical-align: middle;
 						margin-right: 4rpx;

pages/mine/myMealCard.vue

@@ -100,13 +100,16 @@
 		.head{
 			display: flex;
 			justify-content: space-between;
+			align-items: center;
 			.balance{
 				color: rgba(51, 51, 51, 1);
+				font-family: 'Regular';
 			}
 			.time{
 				opacity: 0.7;
 				color: rgba(49, 54, 66, 1);
 				font-size: 24rpx;
+				font-family: 'PingFang Regular';
 				.icon{
 					vertical-align: middle;
 					margin-right: 4rpx;
@@ -148,6 +151,7 @@
 			  color: rgba(16, 16, 16, 1);
 			  font-size: 36rpx;
 			  border-top: 1px solid #E6E6E6;
+			  font-family: 'Alibaba-PuHuiTi-Regular';
 		  }
 		  .each{
 		  	display: flex;
@@ -160,6 +164,7 @@
 		  			color: #101010;
 		  			font-size: 32rpx;
 					font-weight: bold;
+					font-family: 'Alibaba-PuHuiTi-Regular';
 		  		}
 		  		.date{
 		  			color: rgba(119, 119, 119, 1);
@@ -169,6 +174,7 @@
 		  	.number{
 		  		color: rgba(31, 74, 153, 1);
 		  		font-size: 48rpx;
+				font-weight: bold;
 		  	}
 		  	
 		  }

pages/mine/paymentCode.vue

@@ -113,6 +113,7 @@
 <style lang="scss" scoped>
 	page {
 		background-color: #2A8EFB;
+		font-family: 'PingFang Regular';
 	}
 
 	/deep/.u-navbar {

pages/scanToPay/payResult.vue

@@ -90,6 +90,7 @@
 			color: rgba(16, 16, 16, 1);
 			font-size: 48rpx;
 			margin-top: 8rpx;
+			font-family: 'PingFang Regular';
 			
 		}
 		// 订单信息
@@ -102,10 +103,12 @@
 				.title{
 					color: rgba(134, 137, 140, 1);
 					font-size: 32rpx;
+					font-family: 'PingFang Regular';
 				}
 				.value{
 					color: rgba(51, 51, 51, 1);
 					font-size: 32rpx;
+					
 				}
 			}
 		}

pages/staffHome/orderReport.vue

@@ -0,0 +1,230 @@
+<template>
+	<view>
+		<u-navbar title="订餐上报"></u-navbar>
+		<view class="head">
+			<view class="department">
+				订餐部门：机务段
+			</view>
+			<view class="date" @click="changeDateShow">
+				2023年4月<u-icon name="arrow-down" size="24"></u-icon>
+				<view class="date-box" v-if="dateShow">
+					<view class="options-item">
+						选项1
+					</view>
+					<view class="options-item">
+						选项2
+					</view>
+					<view class="options-item">
+						选项3
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 上报记录 -->
+		<view class="records">
+			<view class="record-item">
+				<view class="date">
+					4月10日 星期一
+				</view>
+				<view class="number report" @click="maskShow">
+					{{report}} <u-icon name="arrow-right" size="20"></u-icon>
+				</view>
+			</view>
+			<view class="record-item" v-for="item in 8">
+				<view class="date">
+					4月10日 星期一
+				</view>
+				<view class="number">
+					订餐9人
+				</view>
+			</view>
+		</view>
+		<!-- 遮罩层 -->
+		<u-mask :show="show1" @click="show1 = false" :zoom='false'>
+			<view class="warp">
+				<view class="rect" @tap.stop>
+					<view class="title">
+						<u-icon name="close" color="#777777" @click="close"></u-icon>
+						订餐人数
+					</view>
+		
+					<!-- <textarea  placeholder="请填写订餐人数" name="" id="" cols="30" rows="10" v-model="name1" >
+						
+					</textarea> -->
+					<u-input v-model="name1" :clearable="false" type="number"  placeholder="请填写订餐人数"> </u-input>
+					<view class="unit">
+						人
+					</view>
+					<u-button class="btn" @click="submit" >保存</u-button>
+				</view>
+			</view>
+		</u-mask>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dateShow:false,
+				show1: false,
+				report:'点击上报',
+				name1:''
+			}
+		},
+		methods: {
+			changeDateShow() {
+				this.dateShow = !this.dateShow
+			},
+			maskShow() {
+				this.show1 = true;
+			},
+			close(){
+				this.show1 =false ;
+			},
+			submit() {
+				this.report ="订餐"+ this.name1+"人";
+				this.show1 = false;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.head{
+		background: linear-gradient(89.02deg, rgba(18,114,238,1) 1.34%,rgba(102,169,255,1) 99.5%);
+	    padding: 40rpx 32rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		color: rgba(255, 255, 255, 1);
+		.department{
+			
+			font-size: 36rpx;
+			font-family: 'Medium';
+		}
+		.date{
+			width: 218rpx;
+			height: 72rpx;
+			line-height: 72rpx;
+			text-align: center;
+			border-radius: 8px;
+			border: 1px solid rgba(255, 255, 255, 1);
+			position: relative;
+			/deep/.uicon-arrow-down{
+				margin-left: 8rpx;
+			}
+			.date-box{
+				background-color: #fff;
+				z-index: 999;
+				width: 180rpx;
+				box-shadow: 0px 0px 2px #999999;
+				position: absolute;
+				top: 70rpx;
+			    left: 0px;
+			
+				.options-item {
+					line-height: 60rpx;
+					padding-left: 16rpx;
+					background-color: #fff;
+					color: #101010;
+					text-align: left;
+				}
+			
+			}
+		}
+	}
+
+ // 上报记录
+ .records{
+	 background-color: #fff;
+	 .record-item{
+		 font-family: 'PingFang Regular';
+		 padding: 0 24rpx;
+		 line-height: 88rpx;
+		 display: flex;
+		 justify-content: space-between;
+		 align-items: center;
+		 color: rgba(16, 16, 16, 1);
+		 border-bottom: 1px solid rgba(232, 232, 232, 1);
+		 
+	 }
+	 .report{
+		 color: rgba(18, 114, 238, 1);
+		 /deep/.uicon-arrow-right{
+			 margin-left: 8rpx;
+		 }
+	 }
+ }
+ 
+ .warp {
+ 
+ 	position: fixed;
+ 	left: 0;
+ 	bottom: 0;
+ 	width: 100%;
+	/deep/.uicon-close{
+		position: absolute;
+		left: 32rpx;
+		top: 6rpx !important;
+		
+	};
+	.title {
+		color: rgba(16, 16, 16, 100);
+		line-height: 48rpx;
+		color: rgba(16, 16, 16, 1);
+		font-size: 36rpx;
+		text-align: center;
+		position: relative;
+		font-weight:bold
+	}
+ }
+ .rect {
+ 	width: 100%;
+ 	height: 100%;
+ 	background-color: #fff;
+ 	padding: 32rpx 0;
+   
+ 	
+ 
+ 	/deep/.u-input {
+ 		width: 87.2%;
+ 		border-radius: 8px;
+ 		background-color: rgba(229, 231, 234, 100);
+ 		margin: 40rpx auto 0;
+ 		height: 96rpx;
+ 		line-height: 96rpx !important;
+ 		padding: 0 16rpx;
+ 		position: relative;
+		
+ 	}
+	/deep/.u-input__input{
+		height: 96rpx !important;
+		line-height: 96rpx !important;
+		text-indent: 24rpx;
+	}
+	.unit{
+		width: 20px;
+		height: 20px;
+		position: absolute;
+		top: 140rpx;
+		right: 60rpx;
+		color: rgba(16, 16, 16, 1);
+		font-size: 36rpx;
+		
+	}
+ 
+ 	
+ 
+ 	.u-btn {
+ 		width: 89.2%;
+ 		color: rgba(255, 255, 255, 100);
+ 		font-size: 36rpx;
+ 		border-radius: 8px;
+ 		margin-top: 48rpx;
+ 		z-index: 99999;
+		background-color: rgba(31, 74, 153, 1);
+ 	}
+ }
+</style>