UI变更

src/assets/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2438458 */
-  src: url('iconfont.woff2?t=1678862353261') format('woff2'),
-       url('iconfont.woff?t=1678862353261') format('woff'),
-       url('iconfont.ttf?t=1678862353261') format('truetype');
+  src: url('iconfont.woff2?t=1697521332858') format('woff2'),
+       url('iconfont.woff?t=1697521332858') format('woff'),
+       url('iconfont.ttf?t=1697521332858') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,58 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-a-lujing35039:before {
+  content: "\e702";
+}
+
+.icon-huxingjianshang:before {
+  content: "\e701";
+}
+
+.icon-shouzhongfenxi:before {
+  content: "\e6fd";
+}
+
+.icon-xiansuofenxi:before {
+  content: "\e6fe";
+}
+
+.icon-ladiyefenxi:before {
+  content: "\e6ff";
+}
+
+.icon-toushoufenxi:before {
+  content: "\e700";
+}
+
+.icon-baocun:before {
+  content: "\e6fc";
+}
+
+.icon-xiansuo:before {
+  content: "\e6fb";
+}
+
+.icon-xia:before {
+  content: "\e6f8";
+}
+
+.icon-shang:before {
+  content: "\e6f9";
+}
+
+.icon-wu:before {
+  content: "\e6fa";
+}
+
+.icon-xiayibu:before {
+  content: "\e6f6";
+}
+
+.icon-shangyibu:before {
+  content: "\e6f7";
+}
+
 .icon-wenhao1:before {
   content: "\e6f5";
 }

src/components/newBottomCom/viewMask/viewMask.html

@@ -20,11 +20,18 @@
 			mode="heightFix"></image> -->
 			自动生成更多图片中{{random+'%'}}...
 	</div>
-	<!-- 切换视角 -->
-	<div class="change-angle columns" @click.stop="switchActor" v-if="showAIImage==false">
-		<img class="camera" src="https://dm.static.elab-plus.com/miniProgram/iconfont/camera.png" mode="widthFix"/>
-		视角切换
+	<div class="btn-view columns" v-if="showAIImage==false">
+		<!-- 切换视图-退出当前模式 -->
+		<div class="compareBtn btn1" @click.stop="showOrHideWebGl">
+			<img class="compareIcon" src="https://dm.static.elab-plus.com/miniProgram/space1/compareAI_btn.png" mode="widthFix" />
+		</div>
+		<!-- 切换视角 -->
+		<div class="change-angle columns" @click.stop="switchActor" >
+			<img class="camera" src="https://dm.static.elab-plus.com/miniProgram/iconfont/camera.png" mode="widthFix"/>
+			视角切换
+		</div>
 	</div>
+	
 	<!-- 左侧按钮  -->
 	<div class="btn-view columns" v-else-if="aiImagesList && aiImagesList.length>0">
 		<!-- 下载 -->
@@ -36,7 +43,7 @@
 			<img class="compareIcon" src="https://dm.static.elab-plus.com/miniProgram/space1/compareAI_btn.png" mode="widthFix" />
 		</div>
 		<!-- 点赞喜欢 -->
-		<div class="likeBtn columns" @click.stop="changeAIImg">
+		<div class="likeBtn columns" @click.stop="changeAIImg" :class="{like:checked}">
 			<div class="iconfont icon-qeuren" style="margin-bottom:10rem;font-size:30rem;"></div>
 			喜欢
 		</div>
@@ -44,8 +51,7 @@
 	<!-- 微信客服 -->
 	<div class="connect-view columns"
 		@click="mynavigateFuc" data-jumptype="50">
-		<img class="defaultHead" src="https://dm.static.elab-plus.com/miniProgram/iconfont/defaultHead.png" mode="widthFix"/>
-		联系定制
+		<img class="defaultHead" src="https://dm.static.elab-plus.com/miniProgram/conentUs.png" mode="widthFix"/>
 	</div>
 	<!-- 风格层主操作视图 -->
 	<div class="layout-view">
@@ -80,10 +86,10 @@
 			</div> -->
 			<div class="btn-list rows rows-between" >
 				<div class="btn houseType rows justify-center up1" @click.stop="goback">
-					<div class="iconfont icon-danjiangongyu" style="margin-right:10rem;"></div>户型空间
+					<div class="iconfont icon-huxingjianshang" style="margin-right:17rem;"></div>户型空间
 				</div>
 				<div class="btn AiBtn rows justify-center up2" @click.stop="aiSubmit(1)">
-					<div class="iconfont icon-chuangyilinggan" style="margin-right:10rem;"></div>{{aiImagesList && aiImagesList.length>0?'继续生成':'AI精软装'}}
+					<div class="iconfont icon-a-lujing35039" style="margin-right:17rem;"></div>{{aiImagesList && aiImagesList.length>0?'继续生成':'AI精软装'}}
 				</div>
 			</div>
 		</div>

src/components/newBottomCom/viewMask/viewMask.scss

@@ -23,29 +23,6 @@
 /deep/.el-carousel__container{
 	height:calc(100vh - 408rem);
 }
-.change-angle{
-	position: absolute;
-	width: 72rem;
-	height: 160rem;
-	left:30rem;
-	bottom:620rem;
-	border-radius: 36rem;
-	padding:20rem 10rem;
-	background: rgba(0, 0, 0, 0.5);
-	box-sizing: border-box;
-	font-family: "Verdana Bold";
-	font-weight: 700;
-	font-size: 24rem;
-	color: #fff;
-	text-align: center;
-	justify-content:unset;
-	z-index: 13;
-	.camera{
-		width: 43.07rem;
-		height: 49.22rem;
-	}
-	pointer-events: auto;
-}
 .btn-view{
 	position: absolute;
 	bottom: 620rem;
@@ -53,6 +30,27 @@
 	width: 72rem;
 	z-index: 13;
 	pointer-events: auto;
+	.change-angle{
+		position: relative;
+		width: 72rem;
+		height: 160rem;
+		border-radius: 36rem;
+		padding:20rem 10rem;
+		background: rgba(0, 0, 0, 0.5);
+		box-sizing: border-box;
+		font-family: "Verdana Bold";
+		font-weight: 700;
+		font-size: 24rem;
+		color: #fff;
+		text-align: center;
+		justify-content:unset;
+		z-index: 13;
+		.camera{
+			width: 43.07rem;
+			height: 49.22rem;
+		}
+		pointer-events: auto;
+	}
 	.compareBtn {
 		position: relative;
 		background: rgba(0,0,0,0.2);
@@ -81,6 +79,9 @@
 		z-index: 13;
 		pointer-events: auto;
 	}
+	.like{
+		background: rgba(249, 193, 102, 0.5);
+	}
 	.btn1{
 		margin-bottom:20rem;
 	}
@@ -299,31 +300,21 @@
 }
 .connect-view{
 	position: absolute;
-	width: 72rem;
-	height: 160rem;
-	border-radius: 36rem;
-	background: rgba(0, 0, 0, 0.4);
-	bottom: 600rem;
-	right:30rem; 
-	padding:2rem;
-	padding-bottom:18rem;
+	width: 139rem;
+	height: 184rem;
+	background: transparent;
+	bottom: 605rem;
+	right:24rem; 
 	box-sizing: border-box;
-	font-family: "Verdana";
-	font-weight: 400;
-	font-size: 24rem;
-	line-height: 28rem;
-	color: #fff;
-	text-align: center;
-	justify-content:unset;
 	.defaultHead{
-		width: 68rem;
-		height: 68rem;
+		width: 139rem;
+		height: 184rem;
 	}
 }
 .indicator-view{
 	position: absolute;
 	z-index: 12;
-	bottom: 468rem;
+	bottom: 620rem;
 	left:50%;
 	transform: translateX(-50%);
 	.indicator-item{
@@ -345,7 +336,7 @@
 	position: absolute;
 	width: 100%;
 	z-index: 12;
-	bottom: 498rem;
+	bottom: 640rem;
 	display: flex;
 	align-items: center;
 	justify-content: center;

src/components/newBottomCom/viewMask/viewMask.vue

@@ -334,47 +334,42 @@
 				this.styleList = [];
 				if (res.success) {
 					let list = res.list;
-					list.push({
-						id:1,
-						imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
-						spaceName: "客厅",
-						styleName: "现代轻奢",
-					});
-					list.push({
-						id:2,
-						imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
-						spaceName: "客厅",
-						styleName: "现代轻奢",
-					});
-					list.push({
-						id:3,
-						imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
-						spaceName: "客厅",
-						styleName: "现代轻奢",
-					});
-					list.push({
-						id:4,
-						imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
-						spaceName: "客厅",
-						styleName: "现代轻奢",
-					});
-					list.push({
-						id:5,
-						imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
-						spaceName: "客厅",
-						styleName: "现代轻奢",
-					});
-					list.push({
-						id:6,
-						imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
-						spaceName: "客厅",
-						styleName: "现代轻奢",
-					});
-					// list.push(res.list[1]);
-					// list.push(res.list[1]);
-					// list.push(res.list[1]);
-					// list.push(res.list[1]);
-					// list.push(res.list[1]);
+					// list.push({
+					// 	id:1,
+					// 	imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
+					// 	spaceName: "客厅",
+					// 	styleName: "现代轻奢",
+					// });
+					// list.push({
+					// 	id:2,
+					// 	imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
+					// 	spaceName: "客厅",
+					// 	styleName: "现代轻奢",
+					// });
+					// list.push({
+					// 	id:3,
+					// 	imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
+					// 	spaceName: "客厅",
+					// 	styleName: "现代轻奢",
+					// });
+					// list.push({
+					// 	id:4,
+					// 	imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
+					// 	spaceName: "客厅",
+					// 	styleName: "现代轻奢",
+					// });
+					// list.push({
+					// 	id:5,
+					// 	imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
+					// 	spaceName: "客厅",
+					// 	styleName: "现代轻奢",
+					// });
+					// list.push({
+					// 	id:6,
+					// 	imgUrl:"https://dm.static.elab-plus.com/aiBeauty/AI3/exPic/livingroom02.png",
+					// 	spaceName: "客厅",
+					// 	styleName: "现代轻奢",
+					// });
 					this.styleList = list;
 				}
 				if(!this.styleList || this.styleList.length==0){

src/components/newBottomCom/viewShell/viewShell.html

@@ -17,9 +17,8 @@
 	</div>
 	<!-- 微信客服 -->
 	<div class="connect-view columns"
-		@click="mynavigateFuc" data-jumplink="客服链接" data-jumptype="50" data-jumpvalue="企业id">
-		<img class="defaultHead" src="https://dm.static.elab-plus.com/miniProgram/iconfont/defaultHead.png" mode="widthFix"/>
-		联系定制
+		@click="mynavigateFuc" data-jumptype="50">
+		<img class="defaultHead" src="https://dm.static.elab-plus.com/miniProgram/conentUs.png" mode="widthFix"/>
 	</div>
 	<!-- 手势操作区域 -->
 	<!-- <div v-if="showSignscoll" class="shell-signscoll rows justify-center" @click="upScrollOrDown" @touchstart="mytouchstart" @touchmove="mytouchmove" @touchend="mytouchend">

src/components/newBottomCom/viewShell/viewShell.scss

@@ -86,26 +86,16 @@
 }
 .connect-view{
 	position: absolute;
-	width: 72rem;
-	height: 160rem;
-	border-radius: 36rem;
-	background: rgba(0, 0, 0, 0.4);
+	width: 139rem;
+	height: 184rem;
+	background: transparent;
 	top:-190rem;
-	right:30rem; 
-	padding:2rem;
-	padding-bottom:18rem;
+	right:24rem; 
 	box-sizing: border-box;
-	font-family: "Verdana";
-	font-weight: 400;
-	font-size: 24rem;
-	line-height: 28rem;
-	color: #fff;
-	text-align: center;
-	justify-content:unset;
-}
-.connect-view .defaultHead{
-	width: 68rem;
-	height: 68rem;
+	.defaultHead{
+		width: 139rem;
+		height: 184rem;
+	}
 }
 button{
 	background-color: unset;

src/components/newBottomCom/viewlayout/viewlayout.css

@@ -60,7 +60,6 @@
 	box-sizing: border-box;
 }
 .up{
-	/* width: 546rem; */
 	width: 690rem;
 	box-shadow: 0 6rem 20rem #f2980233;
 }
@@ -74,7 +73,6 @@
 }
 
 .houseType{
-	/* width: 546rem; */
 	width: 320rem;
 	box-shadow: 0 6rem 20rem #f2980233;
 }

src/components/newBottomCom/viewlayout/viewlayout.html

@@ -12,10 +12,10 @@
 		</div>
 		<div class="btn-list rows rows-between" v-else-if="styleType==2">
 			<div class="btn houseType rows justify-center up2" >
-				<div class="iconfont icon-danjiangongyu" style="margin-right:10rem;"></div>户型空间
+				<div class="iconfont icon-huxingjianshang" style="margin-right:17rem;"></div>户型空间
 			</div>
 			<div class="btn AiBtn rows justify-center up1" @click="goRoam">
-				<div class="iconfont icon-chuangyilinggan" style="margin-right:10rem;"></div>AI精软装
+				<div class="iconfont icon-a-lujing35039" style="margin-right:17rem;"></div>AI精软装
 			</div>
 		</div>
 	</div>

src/components/newBottomCom/viewlayout/viewlayout.vue

@@ -150,8 +150,12 @@
 				// 	this.selectSeedId = this.seedLayoutList[this.defaultIndex].spaceStructure;
 				// }
 				this.selectSeedId = this.seedLayoutList[this.defaultIndex].spaceStructure;
-				if(this.$route.query.structureName){//如果存在结构特征，则定位到该模型大类下
-					this.selectSeedId = this.seedLayoutList.find(it=>it.spaceName==this.$route.query.structureName).spaceStructure;
+				let keyWord = this.$route.query.layer;
+				if(keyWord){//如果存在结构特征，则定位到该模型大类下
+					let item = this.seedLayoutList.find(it=>keyWord.includes(it.spaceName));
+					if(item){
+						this.selectSeedId = item.spaceStructure;
+					}
 				}
 				if(this.selectSeedId){
 					let item = this.seedLayoutList.find(it=>{