修改

src/App.vue

@@ -43,7 +43,8 @@
 		},
 		created() {
 			let userId = this.$route.query.leavePhoneCustomerId ? this.$route.query.leavePhoneCustomerId : '129130';
-			let xcxHouseId = this.$route.query.xcxHouseId ? this.$route.query.xcxHouseId : $config.xcxHouseId;
+			// let xcxHouseId = this.$route.query.xcxHouseId ? this.$route.query.xcxHouseId : $config.xcxHouseId;
+			let xcxHouseId = '100296';
 			if (userId) { //如果存在用户id
 				this.$store.dispatch('setUserId', userId);
 			}

src/mixins/loadModel.js

@@ -95,8 +95,13 @@ export default {
 				allowSpaceId = this.spaceList.map(it=>it.spaceId)
 			}else{//空间模型模式
 				allowSpaceId = [this.curSpaceObj.spaceId];
-				if(this.curSpaceObj.spaceId==758){//二层主卧特殊处理
-					allowSpaceId.push(735);//休闲小客厅
+				if(this.curSpaceObj.spaceType==4){//厨房
+					let list = this.spaceList.filter(it=>it.spaceType==2)
+					allowSpaceId.push(...list.map(it=>it.spaceId));//客厅
+				}
+				if(this.curSpaceObj.spaceType==2){//餐厅
+					let list = this.spaceList.filter(it=>it.spaceType==4)
+					allowSpaceId.push(...list.map(it=>it.spaceId));//厨房
 				}
 				//花园类型的添加到家具加载目录里面
 				// this.spaceList.forEach(it=>{
@@ -152,6 +157,7 @@ export default {
 			this.realList = [];
 			//找到直接的家具模型
 			list && list.forEach((mod)=>{
+				// this.realList.push(mod);
 				let name = mod.modelName.substring(0,mod.modelName.length-2);
 				if(globlShowModel.includes(name)){
 					this.realList.push(mod);

src/mixins/wallMethod.js

@@ -374,7 +374,7 @@ export default {
 				let list = wallObj.wallData;//墙体列表
 				let scale = 100;
 				let spaceWallInfo = {wallN:false, wallS:false, wallW:false, wallE:false};
-				// console.log("computeWallHandle", spaceObj.spaceId, spaceObj.centerX, spaceObj.centerY,spaceObj.spaceWidth, spaceObj.spaceHeight);
+				spaceObj.spaceWallInfo = spaceWallInfo;
 				list.forEach((item)=>{//空间下的四面墙壁
 					let lastWallPosition = 0;
 					let wallDirection = item.wallDirection;

src/pages/webgl_rxdz/webgl_rxdz.vue

@@ -1705,7 +1705,7 @@
                         this.curSpaceObj = this.spaceList[0];
                     }
                 }
-                console.log("该户型空间数据:", this.spaceList, this.layoutIds,type);
+                console.log("该户型空间数据:", this.spaceList,this.spaceList.map(it=>it.spaceId), this.layoutIds,type);
                 console.log("当前选中的空间:", this.curSpaceObj,this.curHouseObj);
 				this.spaceListBackup = JSON.parse(JSON.stringify(this.spaceList));
 				this.loaderSpaceArr(this.spaceList);

src/static/globlShowModel.js

@@ -5,7 +5,11 @@ var globlShowModel = [
 	"BP_D_LongDiningTable_240CM",
 	"BP_D_DinnerChair01",
 	"BP_L_2Sofa01",
+	"BP_L_2Sofa02",
 	"BP_L_1Sofa01",
+	"BP_L_1Sofa02",
+	"BP_L_1sofa03",
+	"BP_L_backsofa01",
 	"BP_L_book01",
 	"BP_L_31TV01",
 	"BP_L_TeaRTable",

src/static/layoutModelData.js

@@ -58,6 +58,7 @@ var layoutModel = [
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_shuipen02.glb', name: '水盆02',modelName: 'BP_K_shuipen02', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_Kitchentable001.glb', name: '台面',modelName: 'BP_K_Kitchentable002', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_2sofa.glb', name: '2人沙发',modelName: 'BP_L_2sofa', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_2Sofa03.glb', name: '2人沙发03',modelName: 'BP_L_2Sofa03', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_caozuotai01.glb', name: '操作台01',modelName: 'BP_K_caozuotai001', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_caozuotai02.glb', name: '操作台02',modelName: 'BP_K_caozuotai002', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_caozuotai03.glb', name: '操作台03',modelName: 'BP_K_caozuotai03', type:1},
@@ -66,6 +67,7 @@ var layoutModel = [
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_children04.gltf', name: '儿童家具04',modelName: 'BP_L_children04', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_children05.glb', name: '儿童家具05',modelName: 'BP_L_children05', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_children06.glb', name: '儿童家具06',modelName: 'BP_L_children06', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_children07.glb', name: '儿童家具07',modelName: 'BP_L_children07', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_ReadingArea01.gltf', name: '阅读角01',modelName: 'BP_X_ReadingArea01', type:1},
 	
 	// {url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_OpenShower01.glb', name: '开敞侧淋浴间',modelName: 'BP_T_OpenShower01', type:1},