Merge remote-tracking branch 'origin/大连交通技师学院' into 大连交通技师学院

common/styles/global/components.scss

@@ -1,62 +1,19 @@
-/******************** 这里存放通用组件样式 ********************/
-
-/********** uni-app基础组件 待删除**********/
-/*** lli-button--primary ***/
-// lli-primary
-.lli-btn {
-    background-color: $uni-primary;
-	color:#ffffff;
-}
-// lli-primary-hover
-.button-hover.lli-btn{
-  background-color: $lli-btn-hover;
-  color: hsla(0,0%,100%,.6);
-}
-// lli-primary-disabled
-.lli-btn[disabled]:not([type]){
-	background-color: $lli-btn-disabled;
-	color: hsla(0,0%,100%,.6);
-}
-// lli-primary-loading
-.lli-btn[loading]{
-	background-color: $uni-primary;
-	color: hsla(0,0%,100%,.6);
-}
-
-/*** lli-button--plain ***/
-//lli-primary-plain
-.lli-btn[plain]{
-  border-color: $uni-primary;
-  color: $uni-primary;
-}
-// lli-primary-plain
-.button-hover.lli-btn[plain]{
-  border-color: $lli-btn-disabled;
-  color: $lli-btn-disabled;
-}
-// lli-primary-disabled
-.lli-btn[plain][disabled]:not([type]){
-	background-color: #f7f7f7;
-	color: rgba(0, 0, 0, 0.3);
-}
-.lli-btn[plain][loading]{
-	background-color: transparent;
-	border-color: $lli-btn-disabled;
-	color: $lli-btn-disabled;
-}
-	
-	
-/***** 项目中组件 *****/
-// view
+/******************** 这里放组件样式 ********************/
+/***** uni组件颜色覆盖 *****/
+// select选项面包 确定按钮
+.uni-picker-container .uni-picker-action.uni-picker-action-confirm{color: #30c190!important;}
+.uni-calendar-item__weeks-box .uni-calendar-item--checked{background-color: #30c190!important;}
+.uni-date-changed .uni-datetime-picker--btn{background-color: #30c190!important;}
+/***** view *****/
 view{box-sizing: border-box;}
 
-// 对齐方式
-.lli-tl{text-align: left;}
-.lli-tc{text-align: center;}
-.lli-tr{text-align: right;}
+/***** 对齐方式 *****/
+.ezy-tl{text-align: left;}
+.ezy-tc{text-align: center;}
+.ezy-tr{text-align: right;}
 
-/***** view *****/
-view{box-sizing: border-box;}
+/***** 状态栏 *****/
+.phone-status-bar{height: var(--status-bar-height);width: 100%;}
 
 /***** 超出省略 *****/
 // 文本超出省略号显示 (一行)
@@ -115,71 +72,50 @@ view{box-sizing: border-box;}
 
 /***** 按钮  *****/
 // 按钮
-.phone-blue-btn[type='default']{background-color: $uni-primary;color: #fff;}
-.phone-white-btn[type='default']{background-color: #fff;color: $uni-primary;border: 1rpx solid $uni-primary;}
+.phone-green-btn[type='default']{background-color: #3fd2a1;color: #fff;}
+.phone-white-btn[type='default']{background-color: #fff;color: #3fd2a1;border: 1rpx solid #3fd2a1;}
 .phone-white-btn[type='default']:after{display: none;}
-.phone-blue-btn[type='default']:hover{background-color: $lli-btn-hover;color: #fff;}
-
-
-/*****音频播放器 author: TX  date:2024-06-24*****/
-.MtaBusAudioPlayerBox{
-  position: relative;
-  .st-aplayer{
-    //position: relative;
-  }
-  .audio-mask {
-    width: 30px;
-    height: 30px;
-    background: transparent;
-    z-index: 99;
-    position: absolute;
-    top: 10px;
-    right: 20px;
-  }
-}
-
-/***** 默认头像  *****/
-.phone-default-userImg{
-	width: 120rpx;height: 120rpx;margin: 0 auto;
-	background-image: url("@/static/images/my/user-default-img.png");@include ezy-no-repeat-cover();}
-
-/***** 通用弹窗  *****/		
-.phone-common-dialog{
-	width: 660rpx;border-radius: 12rpx;background-color: #fff;padding-top: 24rpx;box-sizing: border-box;position: relative;
-	.common-title{padding-top: 24rpx;font-size: 34rpx;color: #333;text-align: center;}
-	.common-content{font-size: 32rpx;color: #666;margin:32rpx 48rpx 48rpx;line-height: 1.6;}
-	.common-input-box{
-		padding: 32rpx 0 20rpx;
-		.common-input-row{display: flex;align-items: center;margin-bottom: 24rpx;}
-		.common-label-require{color: #ff0101;margin-right: 6rpx;width:16rpx;display: inline-block;flex-shrink: 0;}
-		.common-input-label{width: 200rpx;line-height:70rpx;font-size: 28rpx;color: #333;text-align: right;}
-		.common-input,.common-input-margin{
-			height: 70rpx;min-height: 70rpx;padding: 20rpx;box-sizing: border-box;margin-right: 30rpx;
-			border: 1rpx solid #f0f0f0;border-radius: 10rpx;display: block;flex: 1;font-size: 28rpx;}
-		.common-input-margin{margin:0 46rpx 24rpx 46rpx;}
-		.common-select{margin-right: 42rpx;}
+.phone-green-btn[type='default']:hover{background-color: #34c595;color: #fff;}
+
+/***** 标题栏  *****/
+// 三个元素
+.phone-navBar-box{
+	display: flex;align-items: center;justify-content: space-between;background-color: #fff;
+	padding: calc(20rpx + var(--status-bar-height)) 20rpx 20rpx;box-sizing: border-box;position: relative;
+	.nav-bar-icon{
+		width: 24rpx;height: 38rpx;
+		background-image: url("@/static/images/common/nav-bar-jt.svg");@include ezy-no-repeat-cover();
+	}
+	.nav-bar-title{font-size: 36rpx;color: #333;}
+	// 考试数字
+	.nav-bar-other{
+		font-size: 30rpx;color: #fff;margin-right: 2%;
+		.key-note{color: #ffff01;}
+	}
+	// 文字按钮
+	.text-btn{font-size: 26rpx;color: #666;padding-top: 4rpx;box-sizing: border-box;}
+	// 图标
+	.nav-bar-icon-box{
+		.nav-bar-right-icon{font-size: 42rpx;color: #666;}
+		.nav-bar-right-icon + .nav-bar-right-icon{margin-left: 24rpx;}
 	}
-	.content-center-class{text-align: center;}
-	.content-left-class{text-align: left;}
-	.content-margin-bottom{margin-bottom: 20rpx;}
-	.common-btn-box{display: flex;flex-direction: row;border-top-color: #f5f5f5;border-top-style: solid;border-top-width: 1px;}
-	.not-confirm-btn,.confirm-btn{height: 90rpx;line-height: 90rpx;flex:1;text-align: center;font-size: 30rpx;}
-	.not-confirm-btn{color: #666;}
-	.confirm-btn{border-left-color: #f0f0f0;border-left-style: solid;border-left-width: 1px;color: $uni-primary;}
-	.code-img{width: 500rpx;height: 500rpx;display: block;margin: 0 auto;}
 }
-
-/*****分类组件 author: TX  date:2024-06-24*****/
-.lli-status-box{
-  display: flex;justify-content: space-around;background: #fff;
-  border-bottom:1px solid #f2f1f2;padding: 15px 10px;
-  .status-item{text-align: center;color: #333333;position: relative;}
-  .status-item.click:before{content: '';position: absolute;height: 2px;width: 80%;bottom: -15px;font-size: 14px;
-	background-color: $uni-primary;
-    left: 10%;border-radius: 2px;}
+// 两个元素
+.icon-title-navBar-box,.icon-title-bjcolor-navBar-box{
+	display: flex;align-items: center;justify-content: center;background-color: #fff;
+	padding: calc(20rpx + var(--status-bar-height)) 20rpx 20rpx;box-sizing: border-box;position: relative;
+	.nav-bar-title{
+		font-size: 32rpx;height: 63rpx;line-height: 63rpx;color: #333;max-width: 70%;
+	}
+	.nav-bar-icon{
+		width: 24rpx;height: 38rpx;position: absolute;left: 24rpx;top: calc(32rpx + var(--status-bar-height));
+		background-image: url("@/static/images/common/nav-bar-jt.svg");@include ezy-no-repeat-cover();
+	}
+	.bar-ml10{margin-left: 10rpx;}
+	.nav-bar-btn{font-size: 24rpx;position: absolute;right: 20rpx;
+			line-height: 50rpx;border-radius: 8rpx;padding: 0 10rpx;}
 }
-
-/*****开发中，敬请期待 author: TX  date:2024-06-25*****/
-.lli-develop-expect-page{
-	    height: 100vh;display: flex;align-items: center;justify-content: center;font-size: 36rpx;color: #666;
-}
+// 仅一个返回按钮
+.phone-nav-bar-icon{width: 24rpx;height: 38rpx;position: absolute;left: 24rpx;top: var(--status-bar-height);
+		background-image: url("@/static/images/common/nav-bar-jt.svg");@include ezy-no-repeat-cover();
+	}

common/styles/global/pages.scss

@@ -161,4 +161,21 @@
     .right-time{font-size: 24rpx;color: #333;display: block;}
   }
 }
+
+
+
+// 通知书
+.mobile-tzs-page{
+	background-color: #f8f8f8;height: 100vh;
+	.serch-box{border-top: 1rpx solid #ebedf0;background-color: #fff;padding-bottom: 2rpx;}
+	.serch-input{
+		width: 92%;height: 80rpx;background-color: #f7f8fa;margin: 32rpx auto;padding: 12px 24rpx;
+		border-radius: 40rpx;display: flex;align-items: center;box-sizing: border-box;
+	}
+	.serch-input::before{content: '';width: 30rpx;height: 30rpx;margin-right: 16rpx;flex-shrink: 0;
+	background-image: url("@/static/images/common/search-icon.svg");@include ezy-no-repeat-cover();}
+	.tzs-btn{width: 420rpx;height: 90rpx;line-height: 90rpx;text-align: center;color: #fff;
+	font-size: 28rpx;background: rgb(20, 114, 255);border-radius: 90rpx;margin: 48rpx auto;}
+	.tzs-image-box{width: calc(100% - 112rpx);height: 920rpx;margin: 56rpx;}
+}
     

pages/login.vue

@@ -1,17 +1,13 @@
 <template>
-	<view class="mobile-login-page">
+	<view class="mobile-tzs-page">
 		<view class="icon-title-navBar-box">
-	
 			<text class="nav-bar-title">录取通知书</text>
 		</view>
-		<view>
-			<input class="uni-input" v-model="name" focus placeholder="请输入姓名" />
-			<input class="uni-input" v-model="idcard" type="idcard" placeholder="请输入身份证号" />
-
-		</view>
-		<view @click="zhengshuSearch">
-			搜索
+		<view class="serch-box">
+			<input class="serch-input" v-model="name" focus placeholder="请输入姓名" />
+			<input class="serch-input" v-model="idcard" type="idcard" placeholder="请输入身份证号" />
 		</view>
+		<view class="tzs-btn" @click="zhengshuSearch">搜索</view>
 	</view>
 </template>
 

pages/showZhengshu.vue

@@ -1,13 +1,10 @@
 <template>
-
-	<view class="mobile-login-page">
+	<view class="mobile-tzs-page">
 		<view class="icon-title-navBar-box">
 			<view @click="handleBack" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">录取通知书</text>
 		</view>
-		<view class="gsl-sj-listBox custom-certBox">
-			<image @click="optenImg(data,index)" :src="base64">></image>
-		</view>
+		<image class="tzs-image-box"@click="optenImg(data,index)" :src="base64">></image>
 	</view>
 </template>
 

static/images/common/nav-bar-jt.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1739178328843" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5033" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M375.467 512l370.915-329.955c18.205-15.93 20.48-45.512 4.551-63.716-15.928-18.204-45.511-20.48-63.715-4.55l-409.6 364.088c-11.378 9.102-15.93 20.48-15.93 34.133s4.552 25.031 15.93 34.133l409.6 364.089c9.102 6.827 20.48 11.378 29.582 11.378 13.653 0 25.031-4.551 34.133-15.929 15.929-18.204 15.929-47.786-4.551-63.716L375.467 512z" p-id="5034" fill="#333333"></path></svg>

static/images/common/search-icon.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1753860468926" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4488" width="60" height="60" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M1013.9 975.4L747.3 708.8c66.3-75.3 106.9-173.7 106.9-281.7C854.2 191.6 662.6 0 427.1 0S0 191.6 0 427.1s191.6 427.1 427.1 427.1c107.1 0 204.8-39.9 279.9-105.2l266.6 266.6c5.6 5.6 12.8 8.3 20.1 8.3s14.6-2.8 20.1-8.3c11.2-11.1 11.2-29.1 0.1-40.2z m-957-548.3C56.9 223 223 56.9 427.1 56.9S797.3 223 797.3 427.1 631.2 797.3 427.1 797.3 56.9 631.2 56.9 427.1z" fill="#999999" p-id="4489" data-spm-anchor-id="a313x.search_index.0.i1.117c3a81XWeHtB" class="selected"></path></svg>