调整模型

src/mixins/loadModel.js

@@ -307,7 +307,7 @@ export default {
 				resolve();
 			}else{
 				//不在白名单里面的，不加载
-				if(!globlShowModel.includes(realData.name)){
+				if(this.type==2 && !globlShowModel.includes(realData.name)){
 					resolve();
 					return false;
 				}
@@ -320,6 +320,7 @@ export default {
 							//realData 该模型被重复使用时的每一次的形变参数等
 							realData.list && realData.list.forEach((it,i)=>{
 								let gltfFurn = that.gltfLayouts.find(itme=>itme.uniId==it.uniId);//判断是否已经添加过
+								
 								gltf.scene.rotation.y = gltfFurn.rotation.y;
 								gltf.scene.position.set(gltfFurn.position.x,0,gltfFurn.position.z);
 								gltf.scene.scale.set(gltfFurn.scale.x,1,gltfFurn.scale.z);

src/static/globlShowModel.js

@@ -48,13 +48,10 @@ var globlShowModel = [
 	'BP_T_OpenShower02',
 	'BP_K_icebox_2door002',
 	'BP_K_flue002',
-	'BP_Kaozuotai001',
-	'BP_Kaozuotai03',
 	'BP_K_shuipen01',
-	'BP_Kaozuotai002',
-	'BP_Kookerhood3',
+	'BP_K_cookerhood3',
 	'BP_K_shuipen02',
-	'BP_Kookerhood02',
+	'BP_K_cookerhood02',
 	'BP_K_Kitchentable002',
 	'BP_AutoWall_39M',
 	'BP_T_Locker01',
@@ -63,8 +60,7 @@ var globlShowModel = [
 	'BP_T_stairs01',
 	'BP_K_caozuotai001',
 	'BP_K_caozuotai002',
-	'BP_K_caozuotai03',
-	'BP_K_cookerhood02'
+	'BP_K_caozuotai03'
 ];
 
 module.exports = globlShowModel;

src/static/layoutModelData.js

@@ -43,7 +43,7 @@ var layoutModel = [
 	
 	
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_table01.glb', name: '1m写字台',modelName: 'BP_B_table01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_stairs01.gltf', name: '楼梯01',modelName: 'BP_T_stairs01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_stairs01.glb', name: '楼梯01',modelName: 'BP_T_stairs01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_children01.gltf', name: '儿童家具01',modelName: 'BP_L_children01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_children02.gltf', name: '儿童家具02',modelName: 'BP_L_children02', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_children03.gltf', name: '儿童家具03',modelName: 'BP_L_children03', type:1},