Merge remote-tracking branch 'origin/master'

src/projects/business/components/GreenCode.vue

@@ -15,14 +15,17 @@
 							<label>身份证号</label>
 							<input type="text" v-model="idCard" placeholder="请输入身份证号">
 						</div>
-						<div class="mui-input-row">
-							<div style="text-align: center;"><a class="jp-faq mui-icon mui-icon-help" style="color:#999;font-size: 14px;">用于获取健康码及实名认证服务</a></div>
-						</div>
-						<div class="mui-button-row">
-							<button type="button" class="mui-btn" @click="editIdcardVisible=false">取消</button>
-							<button type="button" class="mui-btn red" @click="updateIdCard">确认</button>
-						</div>
+						
 					</form>
+					<a herf=""><span class="mui-icon mui-icon-help"></span>用于获取健康码及实名认证服务</a>					
+				</div>
+				<div class="fyy-popup-button">
+					<div class="mui-col-xs-6">
+						<button type="button" class="mui-btn" @click="editIdcardVisible=false">取消</button>
+					</div>
+					<div class="mui-col-xs-6">
+						<button type="button" class="mui-btn mui-btn-primary" @click="updateIdCard">确认</button>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -30,7 +33,7 @@
 
 		<div class="fyy-popup-1" style="z-index: 999" v-show="qrcodeVisible">
 			<div class="fyy-popup-bg" @click="qrcodeVisible=false"></div>
-			<div class="fyy-popup-ceter fyy-popup-center">
+			<div class="fyy-popup-ceter fyy-popup-f">
 				<div class="fyy-popup-inner">
 					<div class="fyy-popup-title">
 						<div class="mui-col-xs-4">
@@ -46,10 +49,10 @@
 						<img :src="qrCodeImg" id="qrcode">
 						<h6>更新于 {{qrcodeDetail.date}}</h6>
 					</div>
-					<form class="mui-input-group">
+					<form class="mui-input-group fyy-popup-data">
 						<div class="mui-input-row">
 							<label>数据来源</label>
-							<span v-text="qrcodeDetail.sjly" style="line-height: 28px;padding-top:10px;"></span>
+							<span v-text="qrcodeDetail.sjly"></span>
 						</div>
 						<div class="mui-input-row" v-show="qrcodeDetail.healthyCode!='00'">
 							<label>原因</label>
@@ -268,38 +271,75 @@
 <style scoped src="$project/assets/css/sczpfyy.css"></style>
 <style scoped src="$project/assets/css/iconfont.css"></style>
 <style scoped>
-	.fyy-scon-center .mui-checkbox input[type=checkbox],
-	.fyy-scon-center .mui-radio input[type=radio] {
-		left: 0
+	.fyy-popup-bg{
+		position: fixed;
+		z-index: 998;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		background-color: rgba(0, 0, 0, .3);
 	}
-
-	.fyy-scon-center.mui-card .mui-checkbox input[type=checkbox]:checked:before,
-	.fyy-scon-center.mui-card .mui-radio input[type=radio]:checked:before {
-		color: #096DD9
+	.fyy-popup-ceter{
+		position: fixed;
+		z-index: 999;
+		top: 20%;
+		left:0;
+		right:0;
+		margin: 30px;
+		background: #ffffff;
+		border-radius: 4px;
 	}
-
-	.fyy-scon-center .mui-input-row label {
-		padding-left: 40px;
+	.fyy-popup-inner .mui-input-row{
+		border-bottom:1px #eee solid
 	}
-
-	.fyy-scon-center.mui-card {
-		background: #ffffff;
-		padding: 15px 15px 5px;
-		border-radius: 5px;
+	
+	.fyy-popup-inner h4{
+		font-size:18px;
+		text-align: center;
+		padding: 20px 15px;
+		border-bottom: 1px #ddd solid;
+		margin: 0;
+		font-weight: bold;
 	}
-
-	.fyy-popup-1 {
-		margin-left: auto;
-		margin-top: auto;
-		text-align: left;
+	.fyy-popup-inner a{
+		padding:10px 15px;
+		font-size:12px;
+		color:#999;
+		display: flex;
 	}
-
-	.fyy-popup-1 .iconfont {
-		font-size: 16px;
-		color: #999
+	.fyy-popup-inner a .mui-icon{
+		font-size:14px
 	}
-
-	.mui-popup {
-		width: 300px;
+	.fyy-popup-button{
+		display: flex;
+		padding:10px
+	}
+	.fyy-popup-button .mui-col-xs-6{
+		padding:0 5px
+	}
+	.fyy-popup-button button{
+		width:100%
+	}
+	.fyy-popup-title{
+		display: flex;
+		padding:10px 15px
+	}
+	.fyy-popup-ma{
+		margin:0 auto;
+		padding:0 15px;
+		text-align: center;
+	}
+	.fyy-popup-ma img{
+		width:100%
+	}
+	.fyy-popup-data span{
+		line-height: 50px;
+	}
+	.fyy-popup-f label{
+		color:#666
+	}
+	.fyy-popup-f{
+		top:15%
 	}
 </style>