优化

src/components/krpanoVideo/panoramic_no_drag.xml

@@ -84,7 +84,7 @@
 		>
 		</hotspot>
 		<!-- 电子人的阴影 -->
-		<hotspot name="image_hotspot" ath="50.082" atv="14" rotate="0" zorder="1"
+		<hotspot name="image_hotspot" ath="50.082" atv="14" rotate="0" zorder="1" enabled="false"
 			distorted="true" scale="1" alpha="0.5" visible="false" width="180" height="320"
 			url="https://dm.static.elab-plus.com/miniProgram/shadow11.png" keep="true"></hotspot>
 		<!-- 宠物视频 -->

src/components/newBottomCom/viewMask/viewMask.vue

@@ -482,11 +482,12 @@
 			async getAiBeautyFamily() {
 				// const spaceName = this.spaceTypes[this.spaceObj.spaceType - 1].title;
 				let res = await requestConfig("getHardboundEffects", {
-					"houseId": this.$route.query.houseId,
+					"houseId": this.$route.query.houseId || this.$store.state.houseId,
 					"spaceType": this.spaceObj.spaceType,
 					"spaceName": this.spaceObj.spaceName,
 				});
 				this.styleList = [];
+				// alert("***getAiBeautyFamily-res***"+JSON.stringify(res))
 				if (res.success) {
 					let list = res.list;
 					this.styleList = list;
@@ -1035,7 +1036,7 @@
 				router.push({
 					name: "webgl_rxdz_env",
 					query:{
-						houseId:this.houseId,
+						houseId:this.$route.query.houseId || this.$store.state.houseId,
 					}
 				});
 			},

src/components/newBottomCom/viewShell/viewShell.html

@@ -21,9 +21,9 @@
 		<img class="defaultHead" :src="connectUsImg" mode="widthFix"/>
 	</div>
 	<!-- 手势操作区域 -->
-	<!-- <div v-if="showSignscoll" class="shell-signscoll rows justify-center" @click="upScrollOrDown" @touchstart="mytouchstart" @touchmove="mytouchmove" @touchend="mytouchend">
+	<div v-if="showSignscoll" class="shell-signscoll rows justify-center" @click="upScrollOrDown" @touchstart="mytouchstart" @touchmove="mytouchmove" @touchend="mytouchend">
 		<div class="signscoll-block"></div>
-	</div> -->
+	</div>
 	<!-- 精细化视图 -->
 	<viewCareful ref="viewCareful" v-show="styleType==2" @curSpaceChange="curSpaceChange" 
 	:overChange="overChange" :curHouseObj="houseObj"></viewCareful>

src/components/newBottomCom/viewShell/viewShell.vue

@@ -4,7 +4,7 @@
 <script>
 	const util = require('@/utils/util.js').default;
 	// import commonMethod from '@/common/commonMethod.js';
-	// import touchHandle from '@/mixins/touchHandle.js';
+	import touchHandle from '@/mixins/touchHandle.js';
 	// import requestConfig from '@/static/lib/requestConfig';
 	import viewlayout from'@/components/newBottomCom/viewlayout/viewlayout.vue';
 	import viewCareful from'@/components/newBottomCom/viewCareful/viewCareful.vue';
@@ -124,7 +124,7 @@
 			viewPlot,
 			// viewStyle,
 		},
-		// mixins: [touchHandle],
+		mixins: [touchHandle],
 		async mounted() {
 			// await this.getCityHouseList();		
 			console.warn("***viewShell***",this.houseList)

src/mixins/createImgHandle.js

@@ -383,13 +383,15 @@ export default {
 			}
 			// this.aiImagesList.push(_data);
 			this.paramObj = null;//生成成功后，清楚外界传入参数
-			this.tabData[this.createTabIndex].options[this.createOptionIndex].hardboundEffect.push(_data);
-			let len = this.tabData[this.createTabIndex].options[this.createOptionIndex].hardboundEffect.length;
+			// this.tabData[this.createTabIndex].options[this.createOptionIndex].hardboundEffect.push(_data);
 			if (this.createTabIndex == this.tabIndex) {
+				let len = this.aiImagesList.length;
+				this.aiImagesList.push(_data);
 				setTimeout(() => {
-					// this.$refs.carousel.next();
-					this.$refs.carousel.setActiveItem(len - 1); //切换到最后一张
-				}, 1000);
+					this.$refs.carousel.setActiveItem(len); //切换到最后一张
+				}, 200);
+			}else{
+				this.tabData[this.createTabIndex].options[this.createOptionIndex].hardboundEffect.push(_data);
 			}
 			// this.subDataList[this.tabIndex].hardboundEffect.push(_data);//把数据同步到对应的待提交对象中
 		},

src/pages/webgl_rxdz_env/webgl_rxdz_env.html

@@ -6,8 +6,9 @@
         <!-- 角色图片轮播区域 -->
         <div class="master-pic" v-if="aiImagesList && aiImagesList.length>0">
         	<el-carousel :autoplay="false" :loop="false" :indicator-dots="false"
+				:initial-index="currentIndex"
         		@change="swiperChangeImg" class="master-pic-swiper" arrow="none"
-        		:current="currentIndex" ref="carousel" indicator-position="none">
+        		 ref="carousel" indicator-position="none">
 				<!-- <el-carousel-item class="master-pic-item rows justify-center">
 				    <img @touchstart="mytouchstart" @touchmove="mytouchmove" @touchend="mytouchend" 
 					class="master-pic-img" :src="firstImg" mode="aspectFill" />
@@ -22,6 +23,7 @@
 				<div class="indicator-item" :class="{'active': currentIndex == idx}" v-for="(item, idx) in aiImagesList" :key="idx"></div>
 			</div>
 			<!-- v-if="aiFlag && aiImagesList.length>0 && showAIImage" -->
+			<div class="load-mask"></div>
 			<div class="loading_more">
 				<template v-if="!startCreate">
 					<img class="leftSwiperImg"
@@ -59,7 +61,7 @@
 						v-for="(tab,index) in tabData" :key="index" >
 						<div class="tab-text">{{tab.fatherContent}}</div>
 						<div class="tab-info rows justify-center" :class="{'select': tab.checkedIndex > -1}">
-							√
+							<i class="iconfont icon-Hook-1"></i>
 						</div>
 					</div>
 					<div class="tab-line"></div>

src/pages/webgl_rxdz_env/webgl_rxdz_env.scss

@@ -117,6 +117,9 @@ page {
 				&.select {
 					background: #ff870f;
 				}
+				i{
+					font-size: 14px;
+				}
 			}
         }
     }
@@ -191,7 +194,8 @@ page {
     border-radius: 44px;
 	left: 50px;
 	bottom: 60px;
-    background-image:linear-gradient(124deg, rgba(245, 201, 82, 0.5) 0%, rgba(253, 148, 41, 0.5) 100%);
+    // background-image:linear-gradient(124deg, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 1) 100%);
+	background-color: #D6D6D6;
     box-sizing: border-box;
 	z-index: 9;
 	font-family: "Verdana Bold";
@@ -224,6 +228,14 @@ page {
 		}
 	}
 }
+.load-mask{
+	position: absolute;
+	width: 100%;
+	height: 158px;
+	z-index: 2;
+	background: linear-gradient(180.00deg, #00000000 0%, #00000066 100%);
+	bottom: 20px;
+}
 .loading_more {
 	position: absolute;
 	width: 100%;

src/pages/webgl_rxdz_env/webgl_rxdz_env.vue

@@ -70,8 +70,8 @@
 			console.log("***onLoad-webgl_rxdz_customize***", this.$route.query)
 			const that = this;
 			this.houseId = this.$route.query.houseId ? this.$route.query.houseId : (this.$store.state.houseId || '');
-			// this.spaceId = this.$route.query.spaceId?this.$route.query.spaceId:'';
-			this.id = this.$route.query.id ? this.$route.query.id : '111';
+			let queryObj = getStorage('queryObj') ? JSON.parse(getStorage('queryObj')) : null;
+			this.id = this.$route.query.id3 ? this.$route.query.id3 : (queryObj && queryObj.id3?queryObj.id3:'111');;
 			this.queryTestcaseSingle();
 		},
 		computed: {
@@ -204,6 +204,7 @@
 				this.AIImg = this.options[this.optionIndex].imageUrl;//AI生成图的垫图
 				//替换对应的队列为选中的选项的数组对象
 				this.aiImagesList = this.options[this.optionIndex].hardboundEffect;
+				this.currentIndex = 0;
 				console.warn("***changeOption***", this.tabData,this.AIImg,this.subDataList)
 				// let param = {
 				// 	type: 'CLK', //埋点类型

src/pages/webgl_rxdz_houseList/webgl_rxdz_houseList.vue

@@ -53,9 +53,11 @@
 		watch: {},
 		mounted(options) {
 			console.log("***onLoad-webgl_rxdz_houseList***", this.$route.query)
-			this.id = this.$route.query.id ? this.$route.query.id : '110';
+			let queryObj = getStorage('queryObj') ? JSON.parse(getStorage('queryObj')) : null;
+			this.id = this.$route.query.id2 ? this.$route.query.id2 : (queryObj && queryObj.id2?queryObj.id2:'110');
 			this.findHouseTypeSpaceList();
 			this.queryTestcaseSingle();
+			document.title = this.navbar.title;
 		},
 		methods: {
 			backFun() {
@@ -63,10 +65,10 @@
 					url: 'pages/groupIndex2/groupIndex2'
 				})
 			},
-			selectHouseObj(obj) {
-				console.log("户型", obj);
-				this.enterAction(obj, 0, 0);
-			},
+			// selectHouseObj(obj) {
+			// 	console.log("户型", obj);
+			// 	this.enterAction(obj, 0, 0);
+			// },
 			//切换选项
 			changeOption(idx, idx1) {
 				if (idx1 == this.tabData[idx].checkedIndex) {

src/pages/webgl_rxdz_roam/webgl_rxdz_roam.vue

@@ -854,7 +854,8 @@
                     }
                 }
 				let curSpaceArea = parseFloat((this.curSpaceObj.spaceWidth * this.curSpaceObj.spaceHeight) / 10000).toFixed(1);
-				this.navbar.title = this.curSpaceObj.spaceName + "  " + curSpaceArea + "㎡"
+				this.navbar.title = this.curSpaceObj.spaceName + "  " + curSpaceArea + "㎡";
+				document.title = this.navbar.title;
                 console.log("该户型空间数据:", this.spaceList);
                 console.log("当前选中的空间:", this.curSpaceObj);
 				this.positionCamer(this.curSpaceObj);
@@ -870,6 +871,9 @@
 				this.spaceId = spaceId;
 				this.curSpaceObj = this.spaceList.find(it=>it.spaceId == spaceId);
 				this.positionCamer(this.curSpaceObj,true);
+				let curSpaceArea = parseFloat((this.curSpaceObj.spaceWidth * this.curSpaceObj.spaceHeight) / 10000).toFixed(1);
+				this.navbar.title = this.curSpaceObj.spaceName + "  " + curSpaceArea + "㎡";
+				document.title = this.navbar.title;
 			},
 			// 获取墙体数据
             async getHouseTypeSpaceWalls(){

src/pages/webgl_rxdz_role/webgl_rxdz_role.html

@@ -34,7 +34,7 @@
 		</div>
 		<!-- 选项 -->
 		<div class="swiper-view">
-			<div class="tab-content rows flex-start">
+			<div class="tab-content rows flex-start" :class="[options.length<= 6 ? 'jc' : 'pd']">
 				<div @click="changeOption(index)" class="tab-item columns"
 					:class="{'tabActive': optionIndex == index}" 
 					v-for="(tab,index) in options" :key="index" >

src/pages/webgl_rxdz_role/webgl_rxdz_role.scss

@@ -164,6 +164,13 @@ page {
 		z-index: 9;
 		.tab-content{
 			position: absolute;
+			width: 100%;
+		}
+		.jc{
+			justify-content: center;
+		}
+		.pd{
+			padding-left: 40px;
 		}
 		.tab-item{
 			// width:190px;
@@ -174,9 +181,9 @@ page {
 		    color: rgba(69, 69, 69, 0.6);
 			text-align:center;
 			box-sizing: border-box;
-			margin-right: 50px;
+			margin-right: 40px;
 			&:first-child{
-				margin-left: 50px;
+				// margin-left: 40px;
 			}
 			&:last-child{
 				margin-right: 0px;

src/pages/webgl_rxdz_role/webgl_rxdz_role.vue

@@ -83,11 +83,12 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		mounted(options) {
-			console.log("***onLoad-webgl_rxdz_customize***", this.$route.query)
 			const that = this;
+			let queryObj = getStorage('queryObj') ? JSON.parse(getStorage('queryObj')) : null;
 			this.houseId = this.$route.query.houseId ? this.$route.query.houseId : '';
 			// this.spaceId = this.$route.query.spaceId?this.$route.query.spaceId:'';
-			this.id = this.$route.query.id ? this.$route.query.id : '109';
+			this.id = this.$route.query.id1 ? this.$route.query.id1 : (queryObj && queryObj.id1?queryObj.id1:'109');
+			console.log("***onLoad-webgl_rxdz_role***", this.$route.query,this.id)
 			this.queryTestcaseSingle();
 		},
 		computed: {

src/pages/webgl_rxdz_test/webgl_rxdz_test.vue

@@ -42,7 +42,7 @@
 				canvas:null,
 				navbar: {
 					showCapsule: 0,
-					title: '',
+					title: '空间定制',
 					titleColor: '#000',
 					navPadding: 0,
 					navPaddingBg:'transparent',
@@ -1607,6 +1607,7 @@
 				console.warn("***curHouseObj***",this.curHouseObj,this.aiData)
 				// this.navbar.title = this.curHouseObj.name + "  " + this.curHouseObj.houseArea + "㎡";
 				this.navbar.title = "空间定制";
+				document.title = this.navbar.title;
 				this.sumArea = this.curHouseObj.houseArea;
 				this.fixedArea = this.curHouseObj.houseArea;
 				this.curHouseName = this.curHouseObj.name;

src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.scss

@@ -67,7 +67,7 @@ page {
 			.indicator-view{
 				position: absolute;
 				z-index: 12;
-				bottom: 100px;
+				bottom: 150px;
 				left:50%;
 				transform: translateX(-50%);
 				.indicator-item{

src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.vue

@@ -22,7 +22,7 @@ export default {
     data() {
         return {
             pvId: 'p_2cmina_23080403',
-            locusBehaviorName: "提交页面",
+            locusBehaviorName: "我的定制",
             locusValue: "",
             locusName: "",
             pvCurPageName: "submit_ret",
@@ -316,7 +316,7 @@ export default {
 				id: this.id,
 				brandId: $config.brandId,
 				houseId:this.houseId,
-				// userId,
+				userId,
 				type:'QIANCE',
 			};
 			if(this.shareUserId){//分享时 不带用户id