diff --git a/pagesA/merge/index.vue b/pagesA/merge/index.vue
index 4738f51..230f67a 100644
--- a/pagesA/merge/index.vue
+++ b/pagesA/merge/index.vue
@@ -15,7 +15,7 @@
-
+
+ }" itemStyle="padding-left: 15; padding-right:15px; height: 100rpx; width:203rpx">
@@ -37,17 +37,46 @@
lower-threshold="50">
-
-
-
-
-
-
- {{item.title}}
-
-
+
+
+
+
+
+
+
+ {{item.title}}
+ {{item.w_h_mm.w}}×{{item.w_h_mm.h}}mm | {{item.w_h_px.w}}×{{item.w_h_px.h}}px
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 自定义寸照
+ 自己设置照片的宽和高
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,6 +84,92 @@
+
+
+
+
+
+
+
+
@@ -87,15 +202,19 @@
curPage: 0,
total: 0,
- temList:[]
+ temList:[],
+
+ //自定义弹窗
+ custom_show:false,
+ //选面部档案 弹窗
+ select_show:false,
}
},
-
- mounted() {
- //this.getScreenSize();
- //initListHeight();
+ onLoad(){
+ this.getList();
},
+
methods: {
lower(){
console.log('this is lower')
@@ -131,20 +250,73 @@
},1000)
},
- onLoad(){
- this.getList();
- },
+
getListData(){
- let list = [];
- let n= 0;
- for(n=0;n<10;n++){
- let t = {};
- t.url = 'https://img30.360buyimg.com/sku/jfs/t1/221254/4/39390/74349/661e039aF46114279/48532008a0001dd0.jpg'
- t.id = '123';
- t.title = '哈哈哈哈哈哈哈哈哈哈或或或哈哈哈哈哈哈哈哈哈哈或或或';
- list.push(t);
- }
+ let list = [
+ {
+ "id": 3,
+ "type": 1,
+ "ilk": 1,
+ "title": "大一寸照",
+ "icon": "https://resourcedev.aicverse.com/ai_tour/assets/static/images/map/scenic_HL.png",
+ "w_h_mm": {
+ "h": "48",
+ "w": "33"
+ },
+ "w_h_px": {
+ "h": "567",
+ "w": "390"
+ }
+ },
+ {
+ "id": 4,
+ "type": 1,
+ "ilk": 1,
+ "title": "小一寸照",
+ "icon": "https://resourcedev.aicverse.com/ai_tour/assets/static/images/map/scenic_HL.png",
+ "w_h_mm": {
+ "h": "32",
+ "w": "22"
+ },
+ "w_h_px": {
+ "h": "378",
+ "w": "260"
+ }
+ },
+ {
+ "id": 5,
+ "type": 1,
+ "ilk": 1,
+ "title": "三寸照",
+ "icon": "https://resourcedev.aicverse.com/ai_tour/assets/static/images/map/scenic_HL.png",
+ "w_h_mm": {
+ "h": "84",
+ "w": "55"
+ },
+ "w_h_px": {
+ "h": "992",
+ "w": "650"
+ }
+ },
+ {
+ "id": 6,
+ "type": 1,
+ "ilk": 1,
+ "title": "五寸生活照",
+ "icon": "https://resourcedev.aicverse.com/ai_tour/assets/static/images/map/scenic_HL.png",
+ "w_h_mm": {
+ "h": "127",
+ "w": "89"
+ },
+ "w_h_px": {
+ "h": "1500",
+ "w": "1050"
+ }
+ }
+ ];
+
+
return {total:32,list:list};
},
@@ -178,7 +350,36 @@
uni.navigateTo({
url:'/pagesA/photo/photo_2?id='+id
})
- }
+ },
+ //证件照图片加载失败默认
+ specsErr(index)
+ {
+ this.temList[index].icon = '/static/img/index/zj_icon.png';
+ },
+ //自定义
+ showEdit(){
+ var _this = this;
+ _this.custom_show = true;
+ },
+ open(key) {
+ console.log('open',key);
+ },
+ close(key) {
+ var _this = this;
+ _this[key] = false;
+
+ },
+ //自定义 确认
+ submit(key){
+ var _this =this;
+ _this.close(key);
+ },
+ //判断选择
+ checkHave(item){
+ var _this = this;
+ _this.select_show = true;
+ },
+
}
@@ -191,7 +392,11 @@
// page {
// //background-color: #E3E8FE !important;
// }
-
+ .tabs_div1{
+ width:700rpx;
+ margin: 10rpx auto;
+ }
+
.photo_back {
background-color: #E3E8FE;
min-height: 100vh;
@@ -201,4 +406,156 @@
height: 100%;
overflow: hidden;
}
+
+
+ .listBox{ width: 100%; height: auto;}
+ .photoBox{
+ padding:20rpx 10rpx 10rpx 10rpx;
+ height: auto;
+ border-radius: 24rpx 24rpx 24rpx 24rpx;
+ opacity: 1;
+ background: #FFFFFF;
+ width: 670rpx;
+ margin: 15rpx auto;
+ }
+ .photoTop{width: 100%; height: auto; display: flex;
+
+ }
+ .photoTop .topLeft{
+ width: 100rpx;
+ height: 88rpx;
+
+ }
+ .topLeft image{ width: 60rpx; height: auto; margin-left: 14rpx;}
+ .photoTop .topCenter{
+ width: 400rpx;
+ height: auto;
+ padding-left: 18rpx;
+
+ }
+ .topCenter .title{
+ font-size: 30rpx;
+ font-weight: 400;
+ color:#333333;
+ line-height: 50rpx;
+ width: 100%;
+ overflow: hidden; //超出文本隐藏
+ white-space: nowrap; //不换行，只显示一行
+ text-overflow: ellipsis; //超出部分省略号显示
+ }
+ .topCenter .desc{
+ font-size: 24rpx;
+ color:#999999;
+ line-height: 30rpx;
+ width: 100%;
+ overflow: hidden; //超出文本隐藏
+ white-space: nowrap; //不换行，只显示一行
+ text-overflow: ellipsis; //超
+ }
+
+
+ .photoTop .topRight{
+ width: 160rpx;
+ height: auto;
+ text-align: right;
+
+ }
+ .topRight .distance{ color: #90A1AA; font-size: 24rpx; font-family: PingFang SC-Regular; padding-top: 20rpx;}
+ .topRight .distance image{ width: 32rpx; height: 32rpx; margin-right: 24rpx;}
+
+
+
+.popupBox{
+ width: 600rpx;
+ height: auto;
+ border-radius: 24rpx;
+ background-color: #FFFFFF;
+}
+.popupTop{
+ width: 600rpx;
+ height: 140rpx;
+ background: linear-gradient(to bottom, #D3D5FF 20%, #FFFFFF 50%);
+ border-radius: 24rpx 24rpx 0rpx 0rpx;
+ line-height: 140rpx;
+ text-align: center;
+ font-weight: 700;
+ font-size: 30rpx;
+ color: #333333;
+}
+
+.popupBtn{ width: 100%; height: auto;
+ display: flex; flex-wrap: wrap;
+ justify-content: space-around; /* 使子元素在容器中均匀分布 */
+ align-items: center; /* 如果需要垂直居中子元素 */
+}
+.sbtnBox{
+ margin: 30rpx auto;
+ width: 478rpx;
+ height: 80rpx;
+ font-weight: 700;
+ font-size: 30rpx;
+ line-height: 80rpx;
+ border: 2rpx solid #4D94FF;
+ text-align: center;
+ border-radius: 44rpx;
+
+
+}
+
+.popupDesc{
+ width:560rpx;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #555555;
+ height: auto;
+ padding: 0rpx 20rpx;
+}
+
+.custom-input-height {
+ height: 40px !important;
+ min-height: 40px !important;
+}
+.inputLine{ width: 100%; height: 64rpx; display: flex; margin: 10rpx auto;}
+.inputLine .item1{width: 200rpx; height: 64rpx; line-height: 64rpx;text-align: center;}
+.inputLine .item2{width: 140rpx;}
+::v-deep .item2 .u-input{height:64rpx; padding: 0rpx 10rpx !important; text-align: center !important;}
+.inputLine .item3{width: 80rpx;text-align: center;height: 64rpx; line-height: 64rpx;}
+.inputLine .item4{width: 140rpx;}
+::v-deep .item4 .u-input{height:64rpx;padding: 0rpx 10rpx !important;text-align: center !important;}
+.inputLine .item5{width: 80rpx; text-align: center;height: 64rpx; line-height: 64rpx;}
+.sbtnBox1{
+ margin: 30rpx auto;
+ width: 226rpx;
+ height: 80rpx;
+ font-weight: 700;
+ font-size: 30rpx;
+ line-height: 80rpx;
+ border: 2rpx solid #4D94FF;
+ text-align: center;
+ border-radius: 44rpx;
+
+}
+.scrollBox {
+ width: 100%;
+ height: 160rpx;
+ white-space: nowrap;
+
+ }
+.imgBox{width: 160rpx; height: 160rpx; position: relative; margin: 0rpx 0rpx 0rpx 20rpx; display: inline-block;}
+.imgBox .imgBg{width: 160rpx; height: 160rpx; border-radius: 20rpx; position: absolute; left: 0; top: 0;}
+.imgBox .imgSelect{width: 40rpx; height: 40rpx;position: absolute; bottom: 0; right: 0; z-index: 5;}
+.a1{
+ background: linear-gradient( 270deg, rgba(46,87,241,0.15) 0%, rgba(131,88,246,0.15) 100%);
+ color:#7A74F0;
+}
+.a2{
+ background: linear-gradient( 270deg, #2E57F1 0%, #8358F6 100%);
+ color:#FFFFFF;
+}
+.a3{
+ background: linear-gradient( 270deg, #2E57F1 0%, #8358F6 100%);
+ color:#FFFFFF;
+}
+
+
\ No newline at end of file
diff --git a/static/img/index/select.png b/static/img/index/select.png
new file mode 100644
index 0000000..a4c419d
Binary files /dev/null and b/static/img/index/select.png differ