调整AI生成逻辑

src/assets/common.css

@@ -165,129 +165,6 @@ div {
     border: none;
     color: #fff;
 }
-
-.time-select-item {
-    color: #fff;
-    text-align: center;
-}
-
-.time-select-item:hover {
-    background-color: rgba(255, 255, 255, 0.1) !important;
-}
-
-.time-select-item.selected {
-    color: var(--themeColor1) !important;
-    font-weight: 700;
-}
-.amap-ui-pointsimplifier-container .overlay-title{
-    width: max-content;
-    background-color: rgba(255, 255, 255, 0.2) !important;
-    border-radius: 5rem !important;
-    backdrop-filter: blur(30rem);
-    border:none !important;
-    font-size: 14px !important;
-    font-family: Verdana, Verdana-Regular;
-    font-weight: 400;
-    text-align: left;
-    color: #ffffff !important;
-    padding: 10rem !important;
- }
-.amap-ui-pointsimplifier-container .overlay-title.top:after{
-    border-top-color:rgba(255, 255, 255, 0) !important;
-
-
-}
-.amap-ui-pointsimplifier-container .overlay-title.top:before{
-    border-top-color:rgba(255, 255, 255, 0.2) !important;
-
-}
-.amap-ui-pointsimplifier-container .overlay-title.top {
-    transform: translate(-50%,-115%) !important;
-}
-
-.popper-class-11{
-    /*background-color: rgb(121, 121, 121);*/
-    background-color:rgba(255,255,255,0.2);
-    border: none;
-    color:rgba(255,255,255,0.9);
-    backdrop-filter: blur(12px);
-    min-width: auto;
-}
-
-.popper-class-12{
-    /*background-color: rgb(121, 121, 121);*/
-    background-color:rgba(255,255,255,0.4);
-    border: none;
-    color:rgba(255,255,255,0.8);
-    backdrop-filter: blur(30px);
-
-}
-
-.popper-class-12.el-popper .popper__arrow,.popper-class-11.el-popper .popper__arrow {
-    display: block !important;
-    border-top-color: rgba(255,255,255,0.41)
-}
-
-.popper-class-12 .popper__arrow::after {
-    bottom: 1px;
-    margin-left: -6px;
-    border-top-color: rgba(87, 87, 87, 0.41) !important;
-    border-bottom-width: 0;
-}
-
-.popper-class-11 .popper__arrow::after {
-    bottom: 1px;
-    margin-left: -6px;
-    border-top-color: rgba(87, 87, 87, 0.41) !important;
-    border-bottom-width: 0;
-}
-
-.popper-class-12 .el-input__inner,.popper-class-12 .el-input__inner,
-.popper-class-11 .el-input__inner,.popper-class-11 .el-input__inner{
-    background-color: transparent;
-    border: 1px solid rgba(255,255,255,0.3);
-    color: rgba(255,255,255,0.8);
-    height: 32px;
-    line-height: 32px;
-    padding-left: 20px;
-    padding-right: 35px;
-}
-
-.popper-class-11 .el-input__prefix,.popper-class-11 .el-input__suffix{
-    top: 9px;
-}
-
-.theme1 .el-radio__input.is-checked .el-radio__inner {
-    border-color: var(--themeColor11);
-    background: transparent;
-}
-.theme1 .el-radio__inner::after {
-    width: 8px;
-    height: 8px;
-    background-color: var(--themeColor11);
-}
-.theme1 .el-radio__inner:hover {
-    border-color: var(--themeColor11);
-}
-.theme1 .el-radio__inner {
-    border: 1px solid #cbc0c0;
-    border-radius: 100%;
-    width: 14px;
-    height: 14px;
-    background-color: transparent;
-    cursor: pointer;
-    box-sizing: border-box;
-}
-.theme1 .el-radio__input.is-checked+.el-radio__label {
-    color: rgba(255,255,255,0.7);
-}
-.theme1 .el-radio{
-    font-family: "Verdana";
-    font-weight: 400;
-    font-size: 14px;
-    text-align: left;
-    color: rgba(255,255,255,0.7);
-}
 .el-input__inner:focus.el-focus{
     border-color: var(--themeColor11);
 }

src/components/newBottomCom/viewMask/viewMask.html

@@ -103,16 +103,21 @@
 		<img src="https://skyforest.static.elaber.cn/detail/loading.gif" alt="" />
 		<div class="loadingMsg">{{loadingMsg}}</div>
 	</div>
+	<!-- <div class="dialog">
+		
+	</div> -->
 	<el-dialog
 		title="提醒"
 		:visible.sync="dialogVisible"
 		width="80%"
-		:fullscreen="true"
+		top="35vh"
+		:modal="false"
+		style="pointer-events: auto;"
 		>
 		<span>当前AI使用火爆，请继续尝试</span>
 		<span slot="footer" class="dialog-footer">
-			<el-button @click="dialogVisible = false;cancelHandle();">取消等待</el-button>
-			<el-button type="primary" @click="dialogVisible = false;confirmHandle();">继续尝试</el-button>
+			<el-button @click.stop="dialogVisible = false;cancelHandle();">取消等待</el-button>
+			<el-button type="primary" @click.stop="dialogVisible = false;confirmHandle();">继续尝试</el-button>
 		</span>
 	</el-dialog>
 </div>

src/components/newBottomCom/viewMask/viewMask.scss

@@ -409,4 +409,24 @@
         margin: 10px;
 		margin-top: 0px;
     }
+}
+.dialog{
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	overflow: auto;
+	margin: 0;
+	.main{
+		margin-top: 35vh;
+		width: 80%;
+		position: relative;
+		margin: 0 auto 50px;
+		background: #FFF;
+		border-radius: 2px;
+		box-shadow: 0 1px 3px rgba(0,0,0,.3);
+		box-sizing: border-box;
+	}
+	    
 }

src/components/newBottomCom/viewMask/viewMask.vue

@@ -671,10 +671,12 @@
 				let that = this;
 				if (res.success && res.single) {
 					this.taskId = res.single;
-					if(subType == 0){//首次
-						this.reqList[0].aiPicId = this.taskId;
-					}else{//重试
-						this.reqListReset[0].aiPicId = this.taskId;
+					if(this.modelType==2){//精准设计
+						if(subType == 0){//首次
+							this.reqList[0].aiPicId = this.taskId;
+						}else{//重试
+							this.reqListReset[0].aiPicId = this.taskId;
+						}
 					}
 					if (!this.img2imgTimer) {
 						this.count = 0;
@@ -723,22 +725,7 @@
 					if (self.img2imgTimer) {
 						self.clearInterval();//停止轮询
 						// self.$message.warning("AI开了个小差，请稍后再试");
-						uni.showModal({
-						    title: "提醒",
-						    content: "当前AI使用火爆，请继续尝试",
-						    confirmText: "继续尝试",
-						    cancelText: "取消等待",
-						    success(res) {
-						        if (res.confirm) {
-						            console.log('用户点击确定')
-									self.subType = 1;
-									self.submitAction();
-						        } else if (res.cancel) {
-						            console.log('用户点击取消')
-									self.subType = 0;
-						        }
-						    }
-						})
+						self.dialogVisible = true;
 					}
 					clearTimeout(self.outTimer);
 					self.outTimer = null
@@ -747,7 +734,7 @@
 			confirmHandle(){
 				console.log('用户点击确定')
 				this.subType = 1;
-				this.submitAction();
+				this.startServer();
 			},
 			cancelHandle(){
 				console.log('用户点击取消')
@@ -767,7 +754,7 @@
 					});
 				}
 				else{
-					this.singleHandle({})
+					this.singleHandle({aiPicId:this.taskId})
 				}
 			},
 			async singleHandle(model){