From 5cafa2e1c83ff44d651f5d8b9bce3e662d663eba Mon Sep 17 00:00:00 2001
From: JING <leirance@live.com>
Date: Thu, 1 Aug 2024 11:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/archives/detail.vue |  4 +--
 pagesA/merge/index.vue         | 53 +++++++++++++++++++++++++++++-----
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/pages/user/archives/detail.vue b/pages/user/archives/detail.vue
index eb78149..661126c 100644
--- a/pages/user/archives/detail.vue
+++ b/pages/user/archives/detail.vue
@@ -58,8 +58,8 @@
 
 <style lang="scss">
 .container{padding: 20rpx 26rpx;}
-.imgList{width: 100%; height: auto; display: flex; flex-wrap: wrap;}
-.imgBox{width: 140rpx; height: 140rpx;}
+.imgList{width: 100%; height: auto; display: flex; flex-wrap: wrap; justify-content: space-between;}
+.imgBox{width: 130rpx; height: 130rpx; margin-top: 10rpx; }
 .imgBox image{width: 140rpx; height: 140rpx;}
 
 .newBtn{
diff --git a/pagesA/merge/index.vue b/pagesA/merge/index.vue
index d995e60..f90eef3 100644
--- a/pagesA/merge/index.vue
+++ b/pagesA/merge/index.vue
@@ -147,7 +147,13 @@
 						</view>
 						<view class="popupDesc">
 							<scroll-view class="scrollBox" scroll-x="true" @scroll="scroll" scroll-left="0">
-									<view class="imgBox">
+									
+									<view class="imgBox"  v-for="(item,index) in selectList" :key="index" @click="selectPortrait(index)">
+										<image class="imgBg" :src="item.model_image_thumbnail  || '/static/img/user/user.png'" mode="widthFix"></image>
+										<image class="imgSelect" v-if="index == selectIndex" src="/static/img/index/select.png" mode="widthFix"></image>
+									</view>
+									
+									<!-- <view class="imgBox">
 										<image class="imgBg" src="/static/img/user/user.png" mode="widthFix"></image>
 										<image class="imgSelect" src="/static/img/index/select.png" mode="widthFix"></image>
 									</view>
@@ -160,7 +166,7 @@
 									<view class="imgBox">
 										<image class="imgBg" src="/static/img/user/user.png" mode="widthFix"></image>
 										
-									</view>		
+									</view>		 -->
 							</scroll-view>	
 						</view>
 						<view class="popupBtn">
@@ -239,6 +245,10 @@
 							p: 'font-weight: 400;font-size: 28rpx;color: #555555;line-height: 60rpx;',
 						
 					 },
+				
+				//选择面部档案
+				selectList:[],
+				selectIndex:0,//默认选第一个
 
 			}
 		},
@@ -403,12 +413,28 @@
 			submit(key){
 				var _this =this;
 				 _this.close(key);
-				 if(key == 'tips_show')
+				 switch(key)
 				 {
-					 uni.navigateTo({
-					 	url:'/pagesA/merge/face_1'
-					 })
+					 //显示提示信息 跳转到创建面部档案
+					 case 'tips_show':
+						uni.navigateTo({
+							url:'/pagesA/merge/face_1'
+						});
+					 break;
+					 //选择面部档案 跳转到选择模板信息
+					 case 'select_show':
+					 	uni.navigateTo({
+					 		url:'/pagesA/merge/idcard'
+					 	});
+					 break;
+					 //自定义尺寸确认操作
+					 case 'custom_show':
+					 
+					 break;
 				 }
+				 
+				 
+				 
 			},
 			//判断选择
 			checkHave(item){
@@ -426,6 +452,13 @@
 									}
 									else
 									{
+										var selectList = d;
+										selectList.forEach((item, index) => {
+											selectList[index].model_image = _this.$api.ossurl(item.model_image);
+											selectList[index].model_image_thumbnail = _this.$api.ossurl(item.model_image_thumbnail);
+										});
+										_this.selectList = selectList;
+										_this.selectIndex = 0;
 										_this.select_show = true;
 									}
 					});	
@@ -440,6 +473,12 @@
 					
 				
 				
+			},
+			//选择面部档案
+			selectPortrait(index)
+			{
+				var _this =this;
+				_this.selectIndex = index;
 			},
 			
 			
@@ -607,7 +646,7 @@
  	white-space: nowrap;
  	
  }
-.imgBox{width: 160rpx; height: 160rpx; position: relative; margin: 0rpx 0rpx 0rpx 20rpx; display: inline-block;}
+.imgBox{width: 160rpx; height: 160rpx; position: relative; margin: 0rpx 0rpx 0rpx 20rpx; display: inline-block; overflow: hidden;}
 .imgBox .imgBg{width: 160rpx; height: 160rpx; border-radius: 20rpx; position: absolute; left: 0; top: 0;}
 .imgBox .imgSelect{width: 40rpx; height: 34rpx;position: absolute; bottom: 0; right: 0; z-index: 5;}
 .a1{