Kaynağa Gözat

优化修改

zjs_project 11 ay önce
ebeveyn
işleme
8e83d42faf

+ 8 - 4
src/mixins/createImgHandle.js

@@ -130,8 +130,8 @@ export default {
 				"denoising": 0.9,
 				image: imgUrl,
 				// styleImage:imgUrl,
-				keyword: "replicate",
-				model: 'batouresearch/sdxl-controlnet-lora',
+				keyword: "zhiqite",
+				model: 'controlnet',
 			};
 			let result = await this.prevHandle(parmas);
 			console.warn("***prevHandle***", result)
@@ -355,7 +355,9 @@ export default {
 					this.loadingMsg = '启动中';
 				}
 				this.count = this.count + 1;
-				this.getOutPicture();
+                setTimeout(()=>{
+                    this.getOutPicture();
+                },10000)
 			} else if (single.status == 'processing') {
 				let random = single.progress || 0;
 				if (random >= 100) {
@@ -363,7 +365,9 @@ export default {
 				}
 				// this.myloading = true;
 				this.loadingMsg = '生成中…' + parseInt(random) + '%';
-				this.getOutPicture();
+				setTimeout(()=>{
+				    this.getOutPicture();
+				},10000)
 			} else if (single.status == 'succeeded') {
 				// this.myloading = true;
 				this.loadingMsg = '生成中…100%';

+ 2 - 2
src/pages/webgl_rxdz_test1_env/webgl_rxdz_test1_env.html

@@ -24,7 +24,7 @@
 			</div>
 			<!-- v-if="aiFlag && aiImagesList.length>0 && showAIImage" -->
 			<div class="load-mask"></div>
-			<!-- <div class="loading_more">
+			<div class="loading_more">
 				<template v-if="!startCreate">
 					<img class="leftSwiperImg"
 						src="https://dm.static2.elab-plus.com/miniProgram/leftSwiperImg.png"
@@ -36,7 +36,7 @@
 						mode="aspectFit" />
 					<span class="loading_text" v-if="loadingMsg">{{loadingMsg}}</span>
 				</template>
-			</div> -->
+			</div>
         </div>
 		
 		<!-- 底部视图 -->

+ 11 - 11
src/pages/webgl_rxdz_test1_env/webgl_rxdz_test1_env.vue

@@ -15,10 +15,10 @@
 	} from 'mint-ui';
 	import { MessageBox } from 'mint-ui';
 	import touchHandle from '@/mixins/touchHandle.js';
-	// import createImgHandle from '@/mixins/createImgHandle.js';
+	import createImgHandle from '@/mixins/createImgHandle.js';
 	import commonPageMethod from '@/mixins/commonPageMethod.js';
 	export default {
-		mixins: [touchHandle, commonPageMethod],
+		mixins: [touchHandle, commonPageMethod,createImgHandle],
 		/**
 		 * 页面的初始数据
 		 */
@@ -102,15 +102,15 @@
 					}
 					return false;
 				}
-				// console.log("***leftScroll***",this.currentIndex,this.aiImagesList.length)
-				// let obj = {
-				// 	imgUrl:this.AIImg,
-				// 	prompt:this.options[this.optionIndex].remark,
-				// 	negativePrompt:this.options[this.optionIndex].tips,
-				// 	tabIndex:this.tabIndex,
-				// 	optionIndex:this.optionIndex,
-				// }
-				// this.startServer(obj);//继续生成下一张
+				console.log("***leftScroll***",this.AIImg,this.options)
+				let obj = {
+					imgUrl:this.AIImg,
+					prompt:this.options[this.optionIndex].remark,
+					negativePrompt:this.options[this.optionIndex].tips,
+					tabIndex:this.tabIndex,
+					optionIndex:this.optionIndex,
+				}
+				this.startServer(obj);//继续生成下一张
 			},
 			//点赞喜欢
 			changeAIImg() {

+ 24 - 7
src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.html

@@ -66,22 +66,22 @@
 				喜欢我的设计吗,给我投一票吧~
 			</div>
 			<!-- 支持率 -->
-			<div class="rows justify-center info-point">
+			<!-- <div class="rows justify-center info-point">
 				<div class="left-word">{{proportion}}%</div>
 				<div class="line-view rows">
 					<div class="left-line" :style="{width:proportion+'%'}"></div>
 					<div class="right-line" :style="{width:(100 - proportion)+'%'}"></div>
 				</div>
 				<div class="right-word">{{100 - proportion}}%</div>
-			</div>
+			</div> -->
 			<div class="sub-view-result columns" v-if="layoutStruct.clickLike!=null">
 				<img class="img" :src="layoutStruct.clickLike?'https://dm.static.elab-plus.com/miniProgram/like.png':'https://dm.static.elab-plus.com/miniProgram/unlike.png'"></img>
-				<div class="text rows justify-center">感谢您的投票</div>
+				<!-- <div class="text rows justify-center">感谢您的投票</div> -->
 			</div>
-			<div class="sub-view rows justify-center" v-else>
+			<!-- <div class="sub-view rows justify-center" v-else>
 				<div class="left rows justify-center" @click="likeOrView(1)">喜欢</div>
 				<div class="right rows justify-center" @click="likeOrView(2)">不喜欢</div>
-			</div>
+			</div> -->
 			
 			<div class="info-head columns rows-between" v-if="total && headList && headList.length>0">
 				<div class="head-list rows justify-center">
@@ -92,14 +92,31 @@
 					已经有{{total}}人参与梦想家创建
 				</div>
 			</div>
+            <div class="rows justify-center" style="margin-top: 60px;">
+            	<div class="bottom-btn btn-qw rows justify-center" @click="toIndex">
+            	    设计我的梦想家
+            	</div>
+            	<div class="bottom-btn btn-share rows justify-center" @click="share">
+            		分享我的设计
+            	</div>
+            </div>
 		</div>
 		<div class="bottom-view rows rows-between" v-if="typeStatus">
-			<div class="bottom-btn btn-qw rows justify-center" @click="toIndex">
+			<!-- <div class="bottom-btn btn-qw rows justify-center" @click="toIndex">
 			    设计我的梦想家
 			</div>
 			<div class="bottom-btn btn-share rows justify-center" @click="share">
 				分享我的设计
-			</div>
+			</div> -->
+            <template v-if="layoutStruct.clickLike!=null">
+            	<!-- <img class="img" :src="layoutStruct.clickLike?'https://dm.static.elab-plus.com/miniProgram/like.png':'https://dm.static.elab-plus.com/miniProgram/unlike.png'"></img> -->
+            	<div class="text rows justify-center">感谢您的投票</div>
+            </template>
+            <template v-else>
+                <div class="left rows justify-center" @click="likeOrView(1)">喜欢</div>
+                <div class="right rows justify-center" @click="likeOrView(2)">不喜欢</div>
+            </template>
+            
 		</div>
 		<div class="bottom-view rows rows-between" v-else>
 			<div class="btn columns" @click="share">

+ 83 - 54
src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.scss

@@ -168,7 +168,7 @@ page {
         margin-left: 40px;
         margin-right: 40px;
         margin-top: 60px;
-        margin-bottom: 160px;
+        margin-bottom: 60px;
         position: relative;
         // border: 2px solid rgba(255, 255, 255, 0.5);
 		// border-top:none;
@@ -394,61 +394,90 @@ page {
 	background-image: url('https://dm.static.elab-plus.com/miniProgram/rxdz_btn_bg.png');
 	background-repeat: no-repeat;
 	background-size: cover;
-    .bottom-btn{
-        width: 290px;
-        height: 80px;
-        border-radius: 40px;
-		font-family: "DIN Alternate Bold";
-		font-weight: 700;
-		font-size: 28px;
-        .bottom-subtitle{
-            font-family: "DIN Alternate Bold";
-            font-weight: bold;
-            font-size: 30px;
-            white-space: nowrap;
-        }
+    .text{
+        font-family: "Verdana";
+        font-weight: 400;
+        font-size: 28px;
+        color:rgba(255, 255, 255, 0.55)
     }
-	.btn{
-		height: 96px;
-		font-family: "Verdana";
-		font-weight: 400;
-		font-size: 24px;
-		line-height: 32px;
-		text-align: center;
-		color: #eeefef;
-		.iconfont{
-			height: 45px;
-			font-size: 40px;
-			color: #FFD37E;
-		}
-	}
-	.btn1{
-		width: 418px;
-		height: 96px;
-		border-radius: 48px;
-		background: linear-gradient(130.79deg, #a0ed84 0%, #e8f4b7 100%);
-		border: 2px solid #ffffff38;
-		font-family: "DengXian Bold";
-		font-weight: 700;
-		font-size: 34px;
-		line-height: 32px;
-		color: #365d39;
-	}
-	.btn-qw{
-		background: linear-gradient(130.79deg, #a0ed84 0%, #e8f4b7 100%);
-		color: #365d39;
-		margin-right:30px;
-	}
-    .btn-share{
-        background: #f6a553;
-        box-shadow: 0 6px 20px rgba(208, 193, 168, 0.31);
-		color: #fff;
+    .left{
+        font-family: "FontName";
+        font-weight: 400;
+        font-size: 40px;
+        color: #fff;
+    	width: 50%;
+    	height: 80px;
+    	background: #e38330;
+    	border-radius: 40px 0% 0% 40px;
+    	margin-right: -10px;
+    	clip-path: polygon(0 0%, 100% 0, calc(100% - 20px) 100%, 0 100%);
     }
-	.icon-Shared{
-		color: #ffffff;
-		font-size:24px;
-		// margin-right:10px;
-	}
+    .right{
+        font-family: "FontName";
+        font-weight: 400;
+        font-size: 40px;
+        color: #fff;
+    	width: 50%;
+    	height: 80px;
+    	background: rgba(255, 255, 255, 0.33);
+    	border-radius: 0px 40px 40px 0px;
+    	clip-path: polygon(20px 0%, 100% 0, 100% 100%, 0 100%);
+    }
+}
+.bottom-btn{
+    width: 290px;
+    height: 80px;
+    border-radius: 40px;
+    font-family: "DIN Alternate Bold";
+    font-weight: 700;
+    font-size: 28px;
+    .bottom-subtitle{
+        font-family: "DIN Alternate Bold";
+        font-weight: bold;
+        font-size: 30px;
+        white-space: nowrap;
+    }
+}
+.btn{
+    height: 96px;
+    font-family: "Verdana";
+    font-weight: 400;
+    font-size: 24px;
+    line-height: 32px;
+    text-align: center;
+    color: #eeefef;
+    .iconfont{
+        height: 45px;
+        font-size: 40px;
+        color: #FFD37E;
+    }
+}
+.btn1{
+    width: 418px;
+    height: 96px;
+    border-radius: 48px;
+    background: linear-gradient(130.79deg, #a0ed84 0%, #e8f4b7 100%);
+    border: 2px solid #ffffff38;
+    font-family: "DengXian Bold";
+    font-weight: 700;
+    font-size: 34px;
+    line-height: 32px;
+    color: #365d39;
+}
+.btn-qw{
+    background: linear-gradient(130.79deg, #a0ed84 0%, #e8f4b7 100%);
+    color: #365d39;
+    margin-right:30px;
+}
+.btn-share{
+    background: #f6a553;
+    box-shadow: 0 6px 20px rgba(208, 193, 168, 0.31);
+    color: #fff;
+}
+.icon-Shared{
+    color: #ffffff;
+    font-size:24px;
+    // margin-right:10px;
 }
 .info-head{
 	width: 100%;