Merge branch 'main' of https://git.tsl3060.com/jgl/photo_uniapp

pagesA/photo/face.vue

@@ -57,6 +57,90 @@
 		</view>
 
 		
+		<u-popup :show="show_1" mode="center" bgColor="transparent"  :round="12">
+		        <view class="show_readme_div">
+		            <view class="show_readme_div_1">
+						服务说明
+					</view>
+					<view class="show_readme_div_2">
+						<view>1.AI生成写真实际效果与您上传的照片有关，请认真上传。</view>
+						<view>2.生成高峰期，可能会有排队情况，请耐心等候。</view>
+						<view>3.如需更换写真人物, 请前往【我的】增加人物的面部档案。</view>
+					</view>
+					<view class="show_readme_div_3">
+						确认
+					</view>
+		        </view>
+		</u-popup>
+		
+		<u-popup :show="show_2" mode="center" bgColor="transparent"  :round="12">
+		        <view class="show_readme_div" style="height: 380rpx;">
+		            <view class="show_readme_div_1">
+						提醒
+					</view>
+					<view class="show_readme_div_2">
+						<view>目前系统还未存入您的面部档案信息，请先前往创建需要生成写真的面部档案</view>
+						
+					</view>
+					<view class="show_readme_div_line">						
+						<view class="show_readme_div_4" style="width: 220rpx;">
+							暂不生成
+						</view>
+						<view class="show_readme_div_3" style="width: 220rpx;">
+							前往创建
+						</view>
+					</view>
+					
+		        </view>
+		</u-popup>	
+		
+		<u-popup :show="show_3" mode="center" bgColor="transparent"  :round="12">
+		        <view class="show_readme_div" style="height: 440rpx;">
+		            <view class="show_readme_div_1">
+						请选择需要生成写真的面部档案
+					</view>
+					<view class="show_readme_div_2" style="width: 520rpx;margin-left: 40rpx;">
+						<view class="show_readme_div_2_1">
+							<view class="show_readme_div_2_1_one">
+								<view class="show_readme_div_2_1_one_1">
+									<image  src="../../static/img/index/banner.png"/>
+								</view>
+								<view class="show_readme_div_2_1_one_2">
+									<image src="/static/img/common/photo_common_21.png"/>
+								</view>
+							</view>
+							
+							<view class="show_readme_div_2_1_one">
+								<view class="show_readme_div_2_1_one_1">
+									<image  src="../../static/img/index/banner.png"/>
+								</view>
+								<view class="show_readme_div_2_1_one_2">
+									<image src="/static/img/common/photo_common_21.png"/>
+								</view>
+							</view>
+							
+							<view class="show_readme_div_2_1_one">
+								<view class="show_readme_div_2_1_one_1">
+									<image  src="../../static/img/index/banner.png"/>
+								</view>
+								<view class="show_readme_div_2_1_one_2">
+									<image src="/static/img/common/photo_common_21.png"/>
+								</view>
+							</view>
+						</view>
+						
+					</view>
+					<view class="show_readme_div_line">						
+						<view class="show_readme_div_4" style="width: 220rpx;">
+							暂不生成
+						</view>
+						<view class="show_readme_div_3" style="width: 220rpx;">
+							前往创建
+						</view>
+					</view>
+					
+		        </view>
+		</u-popup>	
 	</view>
 </template>
 
@@ -71,8 +155,10 @@
 			return {
 				navbar_title: '上传图片',
 				theme: "blue",
-				margin_top: -7,
+				margin_top: 0,
-
+				show_1:false,
+				show_2:false,
+				show_3:false
 
 			}
 		},

pagesA/photo/this.scss

@@ -307,9 +307,105 @@ image{
 	}
 	
 	
+
+	
+}
+
+.show_readme_div{
+	width: 600rpx;
+	height: 560rpx; 
+	border-radius: 24rpx; 
+	background: linear-gradient(to bottom, #D2DCFF 0%, #fff 20%);   
+	overflow: hidden;
+	.show_readme_div_1{
+		color: #333333;
+		font-size: 30rpx;
+		font-weight: bold;
+		width: 100%;
+		display: flex;
+		justify-content: center; 
+		margin-top: 48rpx;
+	}
+	.show_readme_div_2{
+		margin-top: 30rpx;
+		color: #555555;
+		font-size: 24rpx;
+		width: 480rpx;
+		overflow: hidden;
+		margin-left:60rpx;
+		line-height: 50rpx;
+	}
+	
+	.show_readme_div_2_1{
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		
 	}
 	
+	.show_readme_div_2_1_one{
+		width: 170rpx;
+		display: flex; 
+		align-items: flex-end; 
+		.show_readme_div_2_1_one_1{
+			width: 150rpx;
+			height: 150rpx;
+			border-radius: 24rpx;
+			flex-shrink: 0;
+			image{
+				border-radius: 24rpx;
+			}
+		}
 		
+		.show_readme_div_2_1_one_2{
+			width: 40rpx;
+			height: 34rpx;	
+			flex-shrink: 0;
+			position: relative;
+			right: 32rpx ;			 
+		}
+	}
+	
+	.show_readme_div_line{
+		width: 480rpx;
+		
+		margin-left:60rpx;  
+		
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		
+	}
+	
+	.show_readme_div_3{
+		width: 478rpx;
+		height: 80rpx;
+		margin-top: 44rpx;
+		margin-left: 60rpx;
+		border-radius: 48rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color:#fff;
+		background: linear-gradient(to right, #4F93FF 0%, #9877FF 80%); 
+	}
+	
+	.show_readme_div_4{
+		width: 478rpx;
+		height: 80rpx;
+		margin-top: 44rpx;
+		border: 2rpx solid #5093FF;
+		color: #5093FF; 
+		border-radius: 48rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;		
+		background-color: #fff; 
+	}
+	
+	
+	
+}
 // ------------卡通1-----------------------