更新

pages/user/index.vue

@@ -27,7 +27,7 @@
 					</view>
 					<view class="mright">
 						<view class="mbItem" v-for="(item,index) in portraitList" :key="index">
-							<image v-if="item.can == true" :src="item.image" mode="widthFix" @click="goTo('/pages/user/archives/detail?id='+item.id)"></image>
+							<image v-if="item.can == true" :src="item.image" mode="widthFix" @click="goTo('/pages/user/portrait/detail?id='+item.id)"></image>
 							<image v-if="item.can == false" :src="item.image" mode="widthFix" @click="showShare"></image>
 						</view>
 						<!-- <view class="mbItem">
@@ -55,13 +55,15 @@
 				:activeStyle="{
 					color: '#000000',
 					fontWeight: 'bold',
-					transform: 'scale(1.05)'
+					transform: 'scale(1.05)',
+					fontSize:'28rpx',
 				}"
 				:inactiveStyle="{
 					color: '#000000',
-					transform: 'scale(1)'
+					transform: 'scale(1)',
+					fontSize:'28rpx',
 				}"
-               itemStyle="padding-left: 15rpx; padding-right: 15rpx; width:157rpx;  height: 68rpx;"
+               itemStyle="padding: 20rpx 15rpx 0rpx 15rpx; width:157rpx;  height: 88rpx;"
 			   @click="tabChange"></u-tabs>
 			   
 			  <view class="datalist">
@@ -129,13 +131,15 @@
 									 </view>
 				</view>	 -->	  
 				 
-				<view class="imgBox" v-for="(item,index) in dataList" :key="index" @click="viewDetail(item)">
+				<view class="imgBox" v-if="tabList[current].type == 1"  v-for="(item,index) in dataList" :key="index" @click="viewDetail(item)">
 									 <view class="p_left">
-										 <image class="p_bg" src="/static/img/index/zj_icon.png" mode="aspectFill"></image>
+										 <image class="p_bg" :src="item.merge_thumbnail" mode="aspectFill"></image>
+										 <image v-if="item.status != 3" class="p_pic" src="/static/img/user/ing.png" mode="widthFix"></image>
 									 </view>
 									 <view class="p_center">
 										 <view class="p_title">{{item.specs.title}}</view>
-										 <view class="p_desc">25×35mm | 295×413px</view>
+										 <view class="p_desc" v-if="item.specs.w_h_mm.w == 0 && item.specs.w_h_px.w == 0">{{item.custom_kb.min}}-{{item.custom_kb.max}}kb | {{item.custom_w_h_px.w}}×{{item.custom_w_h_px.h}}px</view>
+										 <view class="p_desc" v-else>{{item.specs.w_h_mm.w}}×{{item.specs.w_h_mm.h}}mm | {{item.specs.w_h_px.w}}×{{item.specs.w_h_px.h}}px</view>
 									 </view>
 									 <view class="p_right">
 										 <view class="distance">
@@ -149,6 +153,28 @@
 				</view>
 				
 				
+				
+				<view class="picBox"  v-if="tabList[current].type == 2"  v-for="(item,index) in dataList" :key="index" @click="viewDetail(item)">
+						<view class="p_left">
+						  	<image class="p_bg" src="/static/img/user/pic_bg.png" mode="aspectFill"></image>
+							<image v-if="item.status != 3" class="p_pic" src="/static/img/user/ing.png" mode="widthFix"></image>
+						</view>
+						<view class="p_center">
+						  	<view class="p_title">{{item.create_time}}</view>
+						</view>
+						<view class="p_right">
+						  	<view class="distance">
+									<image src="/static/img/index/right.png" mode="widthFix" v-if="item.status == 3"></image>
+									<view class="ing" v-if="item.status == 1">排队中...</view>
+									<view class="ing" v-if="item.status == 2">生成中...</view>
+									<view class="ing" v-if="item.status == 2">生成失败</view>
+						  	</view>
+						</view>
+				 </view>	 
+				
+				
+				 
+				
 			  </view>
 			  <u-empty icon="/static/img/user/nodata.png" mode="list" text="暂无数据，快去添加吧！" width="180rpx" marginTop="120px" v-if="dataList.length == 0"></u-empty>	
 			  <view class="newBtn" @click="createNew" v-if="dataList.length == 0">去创建</view>  	  
@@ -207,7 +233,7 @@ export default {
 			},
 			sceneList:[], //场景	
 			tabList: [
-							{
+							/* {
 								type:1,
 			                    name: '证件照合成',
 			                }, {
@@ -219,7 +245,7 @@ export default {
 			                }, {
 								type:4,
 			                    name: '卡通风格'
-			                }
+			                } */
 					 ],
 			current:0,
 			//档案
@@ -253,7 +279,7 @@ export default {
 	},
 	onReady: function (res) {
 		var _this = this;
-		console.log('/pages/user/photo/merge?url='+encodeURIComponent('https://resourcedev.aicverse.com/ai_tour/spot_template/2.jpg'));
+		//console.log('/pages/user/photo/merge?url='+encodeURIComponent('https://resourcedev.aicverse.com/ai_tour/spot_template/2.jpg'));
 	},
 	onShow() {
 		var _this =this;
@@ -262,7 +288,10 @@ export default {
 		_this.getSceneMenu();
 		//面部档案
 		_this.getPortraitList();
-		_this.tabChange({index:0});
+		setTimeout(function(res){
+			_this.tabChange({index:0});
+		},1000);
+		
 		
 	},
 	onReachBottom () {
@@ -376,11 +405,47 @@ export default {
 		loadDataList(url)
 		{
 			var _this = this;
+			var type = _this.tabList[_this.current].type;
 			var post = {page:_this.page,limit:10};
 			_this.$api.get(url, post, function(res) {
 						//console.log(res);
 						var d = res;
-						_this.dataList = _this.dataList.concat(d.data);
+						var Data = d.data;
+						Data.forEach((item, index) => {
+							switch(type)
+							{
+								case 1:
+									if(!_this.$com.isNull(item.merge_thumbnail))
+									{
+										Data[index].merge_thumbnail = _this.$api.ossurl(item.merge_thumbnail);
+									}
+									else
+									{
+										Data[index].merge_thumbnail = '/static/img/index/zj_icon.png';
+									}
+								
+								break;
+								case 2:
+									if(!_this.$com.isNull(item.merge_thumbnail))
+									{
+										Data[index].merge_thumbnail = _this.$api.ossurl(item.merge_thumbnail);
+									}
+									else
+									{
+										Data[index].merge_thumbnail = '/static/img/user/pic_bg.png';
+									}
+								
+								break;
+								case 3:
+								
+								break;
+								case 4:
+								
+								break;
+							}
+							
+						});
+						_this.dataList = _this.dataList.concat(Data);
 	
 			});
 		},
@@ -481,18 +546,14 @@ export default {
 				break;
 				case 2:
 				uni.navigateTo({
-					url:'/pagesA/color/index',
+					url:'/pages/user/photo/merge?url='+encodeURIComponent(_this.$api.ossurl(item.merge_image)),
 				})
 				break;
 				case 3:
-				uni.navigateTo({
-					url:'/pagesA/photo/photo_1',
-				})
+				
 				break;
 				case 4:
-				uni.navigateTo({
-					url:'/pagesA/photo/cartoon_1',
-				})
+				
 				break;
 			}
 		},
@@ -594,6 +655,9 @@ height: 50rpx;
 		font-size: 30rpx;
 		font-weight: bold;
 	}
+	.tabList{
+		width: 100%; height: auto;
+	}
 
 	.datalist{ width: 100%; height: auto;}
 	.picBox{

pagesA/color/index.vue

@@ -151,6 +151,7 @@
 			deletePic(event) {
 					var _this = this; 
 					_this.uploadImg = [];
+					_this.users_image = '';
 			},
 						// 新增图片
 			afterRead(event) {
@@ -209,12 +210,29 @@
 			submit(){
 				
 				var _this = this;
+				var color_id = _this.colorList[_this.selectIndex].id ?? 0;
+				if(color_id == 0)
+				{
+					_this.$com.showError('请选择背景颜色!');
+					return false;		
+				}
+				var users_image  = _this.users_image;
+				if(_this.$com.isNull(users_image))
+				{
+					_this.$com.showError('请上传需要换色的照片!');
+					return false;	
+				}
 				var post = {
-					back_color_id:_this.colorList[_this.selectIndex].id,
-					users_image:_this.users_image,
+					back_color_id:color_id,
+					users_image:users_image,
 				};
+				_this.$com.showLoading('保存图片中');
 				_this.$api.post('api/color/append', post,function(rs){
-				   console.log(rs);
+						console.log(rs);
+						_this.$com.hideLoading();
+						uni.navigateTo({
+							url:"/pagesA/merge/success"
+						});
 						
 				});
 			},

pagesA/photo/cartoon_1.vue

@@ -7,7 +7,7 @@
 				</view>
 				<view class="photo_main_cartoon_one" style="margin-top: -180rpx;" :style="'background: url('+img_1+') ;background-size: 100% 100%;'">
 					<view class="photo_main_cartoon_one_1">莫奈的花园</view>
-					<view class="photo_main_cartoon_one_2">
+					<view class="photo_main_cartoon_one_2" @click="goTo('/pagesA/photo/cartoon_2')">
 						开始制作
 					</view>					
 				</view>
@@ -74,7 +74,13 @@
 
 			getNavHeight(e) {
 				this.margin_top += e;
-			}
+			},
+			goTo(url)
+			{
+				uni.navigateTo({
+					url:url,
+				})
+			},
 
 
 

pagesA/photo/cartoon_2.vue

@@ -20,7 +20,7 @@
 					<view class="photo_cartoon_2_2_1">
 						<image src="/static/img/photo/cartoon_4.png" />
 					</view>
-					<view class="photo_cartoon_2_2_2">
+					<view class="photo_cartoon_2_2_2" @click="goTo('/pagesA/photo/cartoon_3')">
 						<image src="/static/img/photo/cartoon_3.png" />
 					</view>
 					<view class="photo_cartoon_2_2_1">
@@ -84,6 +84,12 @@
 			getNavHeight(e) {
 				this.margin_top += e;
 			},
+			goTo(url)
+			{
+				uni.navigateTo({
+					url:url,
+				})
+			},
 		}
 	}
 </script>