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

pages.json

@@ -301,6 +301,43 @@
             }
             
         }
+        ,{
+            "path" : "pages/mine/myMealCard",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/mine/paymentCode",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        
+        ,{
+            "path" : "pages/scanToPay/payResult",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/canteenManagement/login",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 
 	

pages/mine/myMealCard.vue

@@ -0,0 +1,178 @@
+<template>
+	<view>
+		<u-navbar title="我的饭卡"></u-navbar>
+		<view class="background">
+			<view class="head">
+				<view class="balance">
+					饭卡余额（元）
+				</view>
+				<view class="time">
+					<text class="icon"><img src="../../assets/img/riLine-information-line@1x.png" alt=""></text>
+					<text>下次清零 2023月6月1日 0点</text>
+				</view>
+			</view>
+			<view class="main">
+				<view class="number">
+					330
+				</view>
+				<view class="img">
+					<img src="../../assets/img/ze-card@1x.png" alt="">
+				</view>
+			</view>
+			
+		</view>
+		
+		<view class="content">
+			<view class="tabs">
+				<u-tabs bar-width="100" inactive-color="#bbbbbb" active-color="#101010"  :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+			</view>
+			<!-- 消费 -->
+			<view class="consumption" v-if="this.current==0">
+				<view class="total">
+					6月消费105元
+				</view>
+				<view class="each" v-for="item in 7">
+					<view class="place-date">
+						<view class="place">
+							地方铁路食堂
+						</view>
+						<view class="date">
+							2023-04-07 12:00
+						</view>
+					</view>
+					<view class="number">
+						-15
+					</view>
+				</view>
+			</view>
+			<!-- 餐费存入 -->
+			<view class="deposit" v-if="this.current==1">
+				<view class="each" v-for="item in 5">
+					<view class="place-date">
+						<view class="place">
+							2023年4月餐费存入
+						</view>
+						<view class="date">
+							2023-04-07 12:00
+						</view>
+					</view>
+					<view class="number">
+						+330
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		
+		<u-divider   bg-color="#F2F4F4" border-color="#CFD2D5">已经到底了</u-divider>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+									name: '余额消费'
+								}, {
+									name: '餐费存入'
+								}],
+								current: 0
+			}
+		},
+		methods: {
+			change(index) {
+							this.current = index;
+						}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page{
+		padding-bottom: 100px;
+	}
+	.background{
+		background: linear-gradient(-0.06deg, rgba(246,248,248,1) -0.15%,rgba(240,225,198,1) 48.47%,rgba(236,193,148,1) 101.15%);
+		padding: 32rpx;
+		color: #fff;
+		height: 231px;
+		.head{
+			display: flex;
+			justify-content: space-between;
+			.balance{
+				color: rgba(51, 51, 51, 1);
+			}
+			.time{
+				opacity: 0.7;
+				color: rgba(49, 54, 66, 1);
+				font-size: 24rpx;
+				.icon{
+					vertical-align: middle;
+					margin-right: 4rpx;
+				}
+			}
+		}
+		.main{
+			
+				display: flex;
+				justify-content: space-between;
+			.number{
+				color: rgba(16, 16, 16, 1);
+				font-size: 80rpx;
+				font-weight: bold;
+			}
+			.img{
+				margin-top:-20rpx
+			}
+		}
+		
+		
+		
+}
+
+  .content{
+	  margin: -260rpx 32rpx 24rpx;
+	  background-color: #fff;
+	  border-radius: 8px 8px 0px 0px;
+	  overflow: hidden;
+	  min-height: 800rpx;
+	  /deep/.u-tab-bar{
+	  			 background-color: #0076FF !important ;
+	  }
+	  // 消费
+	  .consumption,.deposit{
+		  padding: 0 36rpx;
+		  .total{
+			  line-height: 88rpx;
+			  color: rgba(16, 16, 16, 1);
+			  font-size: 36rpx;
+			  border-top: 1px solid #E6E6E6;
+		  }
+		  .each{
+		  	display: flex;
+		  	justify-content: space-between;
+		  	align-items: center;
+		  	padding: 28rpx 0;
+		  	border-top: 1px solid #E6E6E6;
+		  	.place-date{
+		  		.place{
+		  			color: #101010;
+		  			font-size: 32rpx;
+					font-weight: bold;
+		  		}
+		  		.date{
+		  			color: rgba(119, 119, 119, 1);
+		  			margin-top: 16rpx;
+		  		}
+		  	}
+		  	.number{
+		  		color: rgba(31, 74, 153, 1);
+		  		font-size: 48rpx;
+		  	}
+		  	
+		  }
+	  }
+  }
+
+</style>

pages/mine/paymentCode.vue

@@ -0,0 +1,219 @@
+<template>
+	<view>
+		<u-navbar title="付款码">	
+		</u-navbar>
+		<view class="content">
+			<!-- 饭卡信息 -->
+			<view class="head">
+				<view class="person">
+					<view class="photo">
+						<img src="../../assets/img/shareP.png" alt="">
+					</view>
+					<view class="name">
+						王泽
+					</view>
+				</view>
+				<view class="balance">
+					<view class="title">
+						饭卡余额：
+					</view>
+					<view class="value">
+						330 元
+					</view>
+				</view>
+			</view>
+			<!-- 二维码 -->
+			<view class="qr-code ">
+				<view class="img">
+					<img src="../../assets/img/qrCode.png" alt="">
+					<view class="qr-logo">
+						<img src="../../assets/img/qrLogo.png" alt="">
+					</view>
+					
+					
+				</view>
+				<view class="hint">
+					将二维码对准摄像头，即可付款就餐
+				</view>
+			</view>
+			<!-- 付款中 -->
+			<!-- <view class="paying">
+				<img src="../../assets/img/if-spinner@1x.png" alt="">
+			     <view class="">
+			     	付款中...
+			     </view>
+			</view> -->
+			<!-- 我的消费记录 -->
+			<view class="consumption-record">
+				<view class="icon">
+					<img src="../../assets/img/riLine-file-list-3-line@1x.png" alt="">
+				</view>
+				<view class="text">
+					我的消费记录
+				</view>
+				<view class="right">
+					<u-icon name="arrow-right" color="#999999"></u-icon>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background-color: #2A8EFB;
+	}
+	/deep/.u-navbar{
+		background-color: #2A8EFB !important;
+		
+	}
+	/deep/.u-title{
+		color: #fff !important;
+		font-weight: bold !important;
+	}
+	/deep/.uicon-nav-back{
+		color: #fff !important
+	}
+	/deep/.u-border-bottom:after {
+       border-bottom-width: 0px;
+}
+
+    .content{
+		border-radius: 24rpx;
+		background-color: rgba(255, 255, 255, 1);
+		margin:48rpx 32rpx;
+		// 饭卡信息
+		.head{
+			padding: 32rpx 0;
+			margin: 0 32rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			border-bottom: 1px solid rgba(232, 232, 232, 1);
+			.person{
+				display: flex;
+				align-items: center;
+				.photo{
+					width: 48rpx;
+					height: 48rpx;
+					border-radius: 100rpx;
+					overflow: hidden;
+					img{
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.name{
+					color: rgba(51, 51, 51, 1);
+					font-size: 36rpx;
+					margin-left: 16rpx;
+				}
+			}
+			.balance{
+				display: flex;
+				align-items: center;
+				color: rgba(16, 16, 16, 1);
+				font-size: 32rpx;
+				font-weight: bold;
+			}
+		}
+		// 二维码
+		.qr-code{
+			padding: 80rpx 0;
+			
+			.img{
+				width: 400rpx;
+				height: 400rpx;
+				position: relative;
+				margin: 0 144rpx;
+				img{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.qr-logo{
+				width: 112rpx;
+				height: 112rpx;
+				position:absolute;
+				top: 0;left:0;right:0;bottom:0;
+				margin: auto;
+				
+				img{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			// 付款中
+			
+		}
+		.hint{
+			margin-top: 16rpx;
+			color: rgba(51, 51, 51, 1);
+			text-align: center;
+		}
+		//我的消费记录
+		.consumption-record{
+			display: flex;
+			align-items: center;
+			padding: 32rpx 0;
+			margin: 0 32rpx;
+			border-top: 1px solid rgba(232, 232, 232, 1);
+			.icon{
+				width: 40rpx;
+				height: 40rpx;
+				
+				img{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.text{
+				color: rgba(51, 51, 51, 1);
+				font-size: 32rpx;
+				margin-left: 8rpx;
+			}
+			.right{
+				margin-left: auto;
+			}
+		}
+	}
+	// 付款中
+	.paying{
+		width: 160rpx;
+		height: 160rpx;
+		border-radius: 8px;
+		background-color: rgba(0, 0, 0, 1);
+		color: #fff;
+		padding: 22rpx 0;
+		text-align: center;
+		position:absolute;
+		top: 440rpx;
+		left:0;
+		right:0;
+		
+		margin: auto;
+		
+		img{
+			width: 72rpx;
+			height: 72rpx;
+		}
+	}
+	// 透明
+	.opacity{
+		opacity: 0.3;
+	}
+</style>

pages/scanToPay/payResult.vue

@@ -0,0 +1,146 @@
+<template>
+	<view>
+		<u-navbar title="付款结果"></u-navbar>
+		<view class="main">
+			<view class="icon">
+				<img src="../../assets/img/success.png" alt="">
+			</view>
+			<!-- 金额 -->
+			<view class="money">
+				15.00
+			</view>
+			<view class="text">
+				付款成功
+			</view>
+			<!-- 订单信息 -->
+			<view class="infos">
+				<view class="item">
+					<view class="title">
+						饭卡余额（元）
+					</view>
+					<view class="value">
+						315.00
+					</view>
+				</view>
+				<view class="item">
+					<view class="title">
+						订单号
+					</view>
+					<view class="value">
+						000111222333444
+					</view>
+				</view>
+				<view class="item">
+					<view class="title">
+						支付时间
+					</view>
+					<view class="value">
+			        2023-04-10 12:00:00
+					</view>
+				</view>
+			</view>
+			<!-- 按钮 -->
+			 <view class="button">
+			 	 <view class="close">
+			 	 	<button>关闭页面</button>
+			 	 </view>
+				 <view class="check">
+				 	<button>查看消费记录</button>
+				 </view>
+			 </view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background-color: #fff;
+	}
+	/deep/.u-border-bottom:after {
+	       border-bottom-width: 0px;
+	}
+	.main{
+		text-align: center;
+		.icon{
+			margin: 100rpx auto 40rpx;
+			
+		}
+		// 金额
+		.money{
+			color: rgba(51, 51, 51, 1);
+			font-size: 96rpx;
+			font-weight: bold;
+			font-family: Roboto-medium;
+		}
+		.text{
+			color: rgba(16, 16, 16, 1);
+			font-size: 48rpx;
+			margin-top: 8rpx;
+			
+		}
+		// 订单信息
+		.infos{
+			margin: 48rpx 72rpx;
+			.item{
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 32rpx;
+				.title{
+					color: rgba(134, 137, 140, 1);
+					font-size: 32rpx;
+				}
+				.value{
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+				}
+			}
+		}
+		// 按钮
+		.button{
+			margin: 0 72rpx;
+			display: flex;
+			justify-content: space-between;
+			font-size: 32rpx;
+			text-align: center;
+			.close{
+				uni-button{
+					width: 280rpx;
+					height: 80rpx;
+					line-height: 80rpx;
+					border-radius: 16rpx;
+					font-size: 32rpx;
+					background-color: rgba(255, 255, 255, 1);
+					color: rgba(51, 51, 51, 1);
+					border: 1px solid rgba(153, 153, 153, 1);
+				}
+			}
+			.check{
+				uni-button{
+					width: 280rpx;
+					height: 80rpx;
+					line-height: 80rpx;
+					border-radius: 16rpx;
+					font-size: 32rpx;
+					background-color: rgba(255, 255, 255, 1);
+					color: rgba(31, 74, 153, 1);
+					border: 1px solid rgba(31, 74, 153, 1);
+				}
+			}
+		}
+	}
+
+</style>