优化&处理IOS崩溃时重载

src/main.js

@@ -28,6 +28,7 @@ Vue.component('mynavbar', mynavbar)
 window.$bus = new Vue(); //定义一个事件总线对象-方便组件通讯
 window.axios = axios;
 window.$ = $;
+Vue.prototype.$http = axios;
 Vue.prototype.axios = axios;
 // Vue.prototype.checkPermission = checkPermission; // 权限校验
 Vue.config.productionTip = false; //阻止启动生产消息
@@ -37,9 +38,9 @@ Vue.prototype.$message = message//重写提示
 import * as echarts from 'echarts'
 window.echarts = echarts
 
-console.log('***process.env***', process.env);
+console.log('***process.env***production', process.env);
 window.env = process.env.NODE_ENV;
-env = env == 'development' ? 'test2' : env;
+env = env == 'development' ? 'production' : env;
 window.$config = api(env);
 console.log("window.$config", window.$config);
 

src/mixins/loadModel.js

@@ -4,6 +4,7 @@ import modelData from '@/static/layoutModelData.js';
 import globlShowModel from '@/static/globlShowModel.js';
 // import requestConfig from '@/services/requestConfig.js';
 import { DRACOLoader } from 'three/addons/loaders/DRACOLoader.js';
+import { MeshoptDecoder } from 'three/addons/libs/meshopt_decoder.module.js';
 import * as THREE from 'three';
 // import { TWEEN } from '@/webgl/jsm/libs/tween.module.min.js';
 export default {
@@ -23,6 +24,7 @@ export default {
 			realList:[],
 			nextString:'_simple',//精简模型后缀
 			loadLayFlag:false,	//是否处在加载家具过程中
+			isIOS:false,
 			// lastFrunList:[],
 		}
 	},
@@ -33,6 +35,8 @@ export default {
 		this.dracoLoader.setDecoderPath('./gltf/');
 		this.dracoLoader.setDecoderConfig( { type: 'js' } );
 		this.dracoLoader.preload();
+		let isIOS = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+		this.isIOS = isIOS;
 	},
 	methods: {
 		// 设置空间数组的墙体信息 
@@ -284,7 +288,7 @@ export default {
 				if (layoutModel && layoutModel.url) {//该数据存在模型地址
 					let url = layoutModel.url;
 					//说明当前模型存在精简模型对象，则应该使用精简模型数据
-					if(this.type ==2){
+					if(this.type ==2 || this.isIOS){
 						if(globlShowModel.includes(layoutModel.modelName + this.nextString)){
 							if(!url.includes(this.nextString)){
 								let idx = url.lastIndexOf('.');
@@ -346,7 +350,7 @@ export default {
 				resolve();
 			}else{
 				//不在白名单里面的，不加载
-				if(this.type==2){
+				if(this.type==2 || this.isIOS){
 					if(!globlShowModel.includes(realData.name) 
 					&& !globlShowModel.includes(realData.name + this.nextString)){
 						resolve();
@@ -354,9 +358,23 @@ export default {
 					}
 				}
 				that.loader.setDRACOLoader(this.dracoLoader);
+				that.loader.setMeshoptDecoder(MeshoptDecoder);
+				//关键代码，如果是ios手机，则请求图片时压缩尺寸，当前最高是256
+				that.loader.manager.resolveURL = (url)=>{
+					let redirectUrl = url;
+					if(that.isIOS && url.startsWith('http') &&
+					(url.endsWith('.jpg') || url.endsWith('.png') || url.endsWith('.gif'))){
+						// redirectUrl = url + "?imageMogr2/auto-orient/thumbnail/!256x256r/gravity/Center/crop/256x256/interlace/1/format/jpg/blur/1x0/quality/75|imageslim"
+						redirectUrl = url + "?imageMogr2/auto-orient/format/webp/blur/1x0/quality/75"
+					}
+					return redirectUrl;
+				}
 				that.loader.load(realData.url, ( gltf ) => {
 					gltf.scene.traverse((child)=> {
 						if (child.isMesh && child.visible) {
+							if(realData.name=='BP_B_verysmallbed'){
+								console.warn("***child.material***",child.material)
+							}
 							let instancedMesh = new THREE.InstancedMesh(child.geometry.clone(), child.material.clone(), realData.list.length);
 							this.instancedFurList.push(instancedMesh);
 							//realData 该模型被重复使用时的每一次的形变参数等

src/mixins/wallMethod.js

@@ -142,7 +142,7 @@ export default {
 					item.uniId = Date.now() + index;//唯一标识
 					//获取墙体对应的gltb模型的相关信息
 					let modelTypeItem =  wallType.find(it=>it.type == item.wallModelData.wallType) //wallType[item.wallModelData.wallType];
-	 				console.log("取墙体对应的gltb模型的相关信息", modelTypeItem, item);
+	 				// console.log("取墙体对应的gltb模型的相关信息", modelTypeItem, item);
 					let object = realWallArr.find(it=>it.index==item.wallModelData.wallType);
 					//列表中还没有这个数据
 					if(!object){

src/pages/webgl_rxdz/webgl_rxdz.vue

@@ -7,6 +7,10 @@
 
     import TWEEN from 'three/addons/libs/tween.module.js';
 	import router from "@/router";
+	import {
+		setStorage,
+		getStorage,
+	} from '@/utils/localStorage';
 	var requestId = "";
 	const util = require('@/utils/util.js').default;
 	// const config = require('@/services/urlConfig.js');
@@ -120,7 +124,7 @@
 				screenshotResolve:null,
 				curLayoutStruct:null,//当前户型大类下所有楼层数据-用于提交
 				overChange:false,	//是否形变中
-				isIos:false,	//是否ios手机。默认不是
+				isIOS:false,	//是否ios手机。默认不是
 				currentChangeSpaceId:null,	//当前变化的空间id
 				styleType:1,
 				sumArea:0,	//总面积
@@ -177,6 +181,8 @@
 		},
         mounted() {
 			console.log("***onLoad-webgl_rxdz***", this.$route.query);
+			let isIOS = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+			this.isIOS = isIOS;
 			var that = this;
 			this.houseId = this.$store.state.houseId || '';
 			this.childLayout = this.$route.query.childLayout || 0;//4-测试户型
@@ -304,12 +310,12 @@
 				controls.enableZoom = true;//启用摄像机的缩放
 				
 				// 监听相机移动事件-限制只能在当前空间范围内移动
-				controls.addEventListener('change', () => {
-					// 检查相机位置是否超出边界框
-					if (camera.position.y < 0) {
-						camera.position.y = 0;
-					}
-				});
+				// controls.addEventListener('change', () => {
+				// 	// 检查相机位置是否超出边界框
+				// 	if (camera.position.y < 0) {
+				// 		camera.position.y = 0;
+				// 	}
+				// });
 				// stats = new Stats();
 				// container.appendChild(stats.dom);
 				// stats.domElement.style.top = '100px';
@@ -588,7 +594,7 @@
 				requestId = requestAnimationFrame(render, canvas3d);
 				renderer.render(scene, camera);//单次渲染
 				if (that.screenshotResolve) {
-					// if(that.isIos){//IOS手机
+					// if(that.isIOS){//IOS手机
 						stopRender();
 						that.screenshotResolve()
 						that.screenshotResolve = null;//释放Promise
@@ -1781,6 +1787,10 @@
 					name: "webgl_rxdz_roam",
 					query:data
 				});
+				if(this.isIOS){
+					setStorage('curHouseObj', this.curHouseObj);
+					setStorage('wallList', this.wallList);
+				}
 				this.$store.dispatch('setCurHouseObj', this.curHouseObj);
 				this.$store.dispatch('setWallList', this.wallList);
 				setTimeout(()=> {

src/pages/webgl_rxdz_roam/webgl_rxdz_roam.vue

@@ -8,7 +8,7 @@
 	import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
 	
 	import TWEEN from 'three/addons/libs/tween.module.js';
-
+	import {getStorage} from '@/utils/localStorage';
 	var requestId = "";
     const util = require('@/utils/util.js').default;
 	// import util from '@/utils/util.js';
@@ -139,7 +139,14 @@
 			// +"\nJavaScript 堆的总大小: "+performance.memory.totalJSHeapSize);
 			console.warn("***webgl_rxdz_roam-options***",this.$route.query)
 			this.isIOS = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
-			// alert("***mounted-webgl_rxdz_roam***"+this.curHouseObj)
+			if(this.isIOS){
+				this.curHouseObj = JSON.parse(getStorage('curHouseObj'));
+				this.wallList = JSON.parse(getStorage('wallList'));
+			}else{
+				this.curHouseObj = 	this.$store.state.curHouseObj;
+				this.wallList = 	this.$store.state.wallList;
+			}
+			// alert("***mounted-webgl_rxdz_roam***"+this.isIOS + this.curHouseObj)
 			let screenWidth = window.screen.width;
 			let screenHeight = window.screen.height;
 			if(window.innerWidth && window.screen.width){
@@ -743,28 +750,14 @@
             }
 
 		},
-		computed: {
-			curHouseObj() {
-				return this.$store.state.curHouseObj;
-			},
-			wallList() {
-				return this.$store.state.wallList;
-			},
-		},
-		watch: {
-			curHouseObj: {
-				handler(val) {
-					if (val) {
-						// setTimeout(()=> {
-						// if(this.renderer){
-						// 	this.setHouseDetail(val);
-						// }
-						// }, 1000);
-					}
-				},
-				immediate: true,
-			}
-		},
+		// computed: {
+		// 	curHouseObj() {
+		// 		return this.$store.state.curHouseObj;
+		// 	},
+		// 	wallList() {
+		// 		return this.$store.state.wallList;
+		// 	},
+		// },
 		methods: {
 			navbarBackClk() {
 				if(!this.$refs.viewMask){
@@ -794,9 +787,9 @@
 			 */
 			setHouseDetail(data){
 				if(data){
-					this.id = this.curHouseObj.id;
+					this.id = data.id;
 					this.spaceId = this.$route.query.spaceId?this.$route.query.spaceId:'';
-					console.warn("***curHouseObj***",this.curHouseObj)
+					console.warn("***curHouseObj***",data)
 					// 加载户型
 					this.loadSpace();
 				}else{

src/services/request.js

@@ -17,8 +17,9 @@ axios.interceptors.request.use(function(config) {
 	!config.url.includes('aiGenerateImg/img2Img')){
 		requestCount++;//请求数+1
 	}
-	if (config.url.includes('http')) {
-		config.headers['Authorization'] = 'Token 9837b7480a99ab4df7e3a06ad0d990fbc7b941e4';
+	if (config.url.endsWith('.jpg') || config.url.endsWith('.png') || config.url.endsWith('.gif')) {
+	    // 给图片get请求附加header
+		console.warn("***图片get请求***",config.url)
 		return config;
 	} else {
 		config.url = window.$config.api_url + config.url;

src/static/globlModel.js

@@ -0,0 +1,91 @@
+/*
+ * @Author: caodongdong caodongdoong@gmail.com
+ * @Date: 2023-10-26 13:18:07
+ * @LastEditors: caodongdong caodongdoong@gmail.com
+ * @LastEditTime: 2023-10-26 19:45:43
+ * @FilePath: \h5-webgl-program\src\static\globlShowModel.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+//需要精简加载的模型名称
+var globlShowModel = [
+	'BP_T_2PeopleBasin01',
+	'BP_T_bathtub01',
+	'BP_B_wardrobe01',
+	'BP_B_bigbed01',
+	'BP_B_smallcabinet01',
+	'BP_O_LightIndoorWall',
+	'BP_B_wardrobe03',
+	'BP_B_painting01',
+	'BP_T_2PeopleBasin02',
+	'BP_X_RelaxChair01_One',
+	'BP_B_dresser01',
+	'BP_B_Mbed01',
+	'BP_B_table01',
+	'BP_B_wardrobe02',
+	'BP_X_RelaxArea01',
+	'BP_B_smallbed01',
+	'BP_AutoWallr_08M',
+	'BP_B_verysmallbed',
+	'BP_AutoWall_195M',
+	'BP_XSPACE_painting_05',
+	'BP_Lhildren07',
+	'BP_L_backsofa01',
+	'BP_DLBT_painting01',
+	'BP_L_Exhibition02_simple',
+	'BP_D_LongDiningTable_240CM',
+	'BP_D_DiningDecoration01',
+	'BP_D_DinnerChair01',
+	'BP_L_1Sofa03',
+	'BP_L_TeaTable04',
+	'BP_Larpet01',
+	'BP_L_TeaTable05',
+	'BP_L_31TV01',
+	'BP_L_book01_simple',
+	'BP_B_penzai02',
+	'BP_furnitureBase',
+	'BP_L_1Sofa02',
+	'BP_L_2Sofa02',
+	'BP_L_Teatable03',
+	'BP_L_FloorLamp01',
+	'BP_LeilingLamp_01',
+	'BP_D_xiaobazhauo',
+	'BP_L_TeaTable02',
+	'BP_T_flue001',
+	'BP_T_1PeopleBasin01',
+	'BP_T_matong',
+	'BP_T_OpenShower02',
+	'BP_T_OpenShower03',
+	'BP_K_icebox_2door002',
+	'BP_K_flue002',
+	'BP_K_shuipen01',
+	'BP_K_cookerhood3',
+	'BP_K_shuipen02',
+	'BP_K_cookerhood02',
+	'BP_K_Kitchentable002',
+	'BP_AutoWall_39M',
+	'BP_T_Locker01',
+	'BP_G_tree01',
+	'BP_G_tree00',
+	'BP_T_stairs01',
+	'BP_K_caozuotai001',
+	'BP_K_caozuotai002',
+	'BP_K_caozuotai03',
+	'BP_L_carpet01',
+	'BP_K_cookerhood02',
+	'BP_K_cookerhood3',
+	'BP_BR_linyu_ce',
+	'BP_T_OpenShower01',
+	'BP_XSPACE_painting_08',
+	'BP_L_children07',
+	'BP_B_wardrobe04',
+	'BP_L_2Sofa03',
+	'BP_XSPACE_painting_05',
+	'BP_T_1PeopleBasin03',
+	'BP_AutoWall_51M',
+	'BP_G_grass01',
+	'BP_G_tree03',
+	'BP_sofa_with_toy_A',
+	'BP_sofa_with_toy_B',
+];
+
+module.exports = globlShowModel;

src/static/globlShowModel.js

@@ -35,7 +35,7 @@ var globlShowModel = [
 	'BP_D_LongDiningTable_240CM',
 	'BP_D_DiningDecoration01',
 	'BP_D_DinnerChair01',
-	'BP_L_1Sofa03',
+	'BP_L_1Sofa03_simple',
 	'BP_L_TeaTable04',
 	'BP_Larpet01',
 	'BP_L_TeaTable05',
@@ -45,7 +45,7 @@ var globlShowModel = [
 	'BP_furnitureBase',
 	'BP_L_1Sofa02',
 	'BP_L_2Sofa02',
-	'BP_L_Teatable03',
+	'BP_L_Teatable03_simple',
 	'BP_L_FloorLamp01',
 	'BP_LeilingLamp_01',
 	'BP_D_xiaobazhauo',
@@ -78,7 +78,7 @@ var globlShowModel = [
 	'BP_XSPACE_painting_08',
 	'BP_L_children07',
 	'BP_B_wardrobe04',
-	'BP_L_2Sofa03',
+	'BP_L_2Sofa03_simple',
 	'BP_XSPACE_painting_05',
 	'BP_T_1PeopleBasin03',
 	'BP_AutoWall_51M',

src/static/layoutModelData - 副本.js

@@ -0,0 +1,170 @@
+var layoutModel = [
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_Mbed.glb', name: '1.5m床',modelName: 'BP_B_Mbed01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_smallcabinet.glb', name: '床头柜',modelName: 'BP_B_smallcabinet01', type:1},
+	// {url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_195M_C.gltf', name: '1.95m',modelName: 'BP_AutoWall_195M_C', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_bigbed.glb', name: '1.8m床',modelName: 'BP_B_bigbed01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_smallbed.glb', name: '1.2m床',modelName: 'BP_B_smallbed01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_verysmallbed.glb', name: '0.9m床',modelName: 'BP_B_verysmallbed', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_31sofa.gltf', name: '4人沙发',modelName: 'BP_L_31sofa01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_31TV.glb', name: '电视墙',modelName: 'BP_L_31TV01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_4people_square.glb', name: '4人方桌',modelName: 'BP_D_4people_square', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_yigui.glb', name: '衣柜',modelName: 'BP_B_yigui01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_311sofa01.gltf', name: '5人沙发',modelName: 'BP_L_311sofa01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_321sofa.gltf', name: '6人沙发',modelName: 'BP_L_321sofa01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_2people_square.gltf', name: '2人方桌',modelName: 'BP_D_2people_square', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_6people_long.gltf', name: '6人长桌',modelName: 'BP_D_6people_long01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_6people_long.gltf', name: '6人长桌',modelName: 'BP_D_6people_long01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_8people_long.gltf', name: '8人长桌',modelName: 'BP_D_8people_long', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_RoundTable01.glb', name: '12人圆桌',modelName: 'BP_D_12people_round', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_penzai01.glb', name: '盆栽',modelName: 'BP_B_penzai02', type:1},
+
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_facesofa01.gltf', name: '对坐沙发01',modelName: 'BP_D_facesofa01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_O_painting01.gltf', name: '挂画装饰',modelName: 'BP_DLBT_painting01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_painting01.glb', name: '挂画01',modelName: 'BP_B_painting01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_painting02.glb', name: '挂画02',modelName: 'BP_B_painting02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_XSPACE_painting_05.glb', name: '挂画5',modelName: 'BP_XSPACE_painting_05', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_bookshelf01.glb', name: '大书架01',modelName: 'BP_L_bookshelf01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_bookshelf02.glb', name: '大书架02',modelName: 'BP_L_bookshelf02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_book01.glb', name: '小书架',modelName: 'BP_L_book01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_dinetable01.gltf', name: '大展架01',modelName: 'BP_L_exhibition01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_Exhibition02.glb', name: '大展架02',modelName: 'BP_L_exhibition02', type:1},
+	
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_exhibition04.gltf', name: '4m展架',modelName: 'BP_L_exhibition04', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_exhibition05.gltf', name: '5m展架',modelName: 'BP_L_exhibition05', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_exhibition06.gltf', name: '6m展架',modelName: 'BP_L_exhibition06', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_exhibition07.gltf', name: '7m展架',modelName: 'BP_L_exhibition07', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_21sofa.glb', name: '3人沙发',modelName: 'BP_L_21sofa01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_facesofa02.gltf', name: '对坐沙发02',modelName: 'BP_D_facesofa02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_wardrobe01.glb', name: '1m衣柜',modelName: 'BP_B_wardrobe01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_wardrobe02.glb', name: '2m衣柜',modelName: 'BP_B_wardrobe02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_wardrobe03.glb', name: '3m衣柜',modelName: 'BP_B_wardrobe03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_wardrobe04.glb', name: '4m衣柜',modelName: 'BP_B_wardrobe04', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_dresser01.glb', name: '梳妆台01',modelName: 'BP_B_dresser01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_bathtub01.glb', name: '浴缸01',modelName: 'BP_T_bathtub01', type:1},
+	
+	
+	{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.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},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_2PeopleBasin01.glb', name: '2人台盆01',modelName: 'BP_T_2PeopleBasin01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_2PeopleBasin02.glb', name: '2人台盆02',modelName: 'BP_T_2PeopleBasin02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_flue001.glb', name: '烟道',modelName: 'BP_K_flue002', type:1},
+
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_cookerhood2.glb', name: '灶台2',modelName: 'BP_K_cookerhood02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_cookerhood3.glb', name: '灶台3',modelName: 'BP_K_cookerhood3', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_icebox_2door001.glb', name: '冰箱',modelName: 'BP_K_icebox_2door002', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_shuipen01.glb', name: '水盆01',modelName: 'BP_K_shuipen01', type:1},
+	{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_caozuotai001.glb', name: '操作台01',modelName: 'BP_K_caozuotai001', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_caozuotai002.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},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_O_LightIndoorWall.glb', name: '隔墙',modelName: 'BP_O_LightIndoorWall', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable01.glb', name: '茶几01',modelName: 'BP_L_TeaRTable', type:1},
+	{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.gltf', name: '开敞侧淋浴间',modelName: 'BP_T_OpenShower01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_OpenShower02.glb', name: '开敞侧淋浴间02',modelName: 'BP_T_OpenShower02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_OpenShower03.glb', name: '开敞侧淋浴间03',modelName: 'BP_T_OpenShower03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_matong.gltf', name: '马桶',modelName: 'BP_T_matong', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_1PeopleBasin01.glb', name: '1人台盆01',modelName: 'BP_T_1PeopleBasin01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_1PeopleBasin03.glb', name: '1人台盆03',modelName: 'BP_T_1PeopleBasin03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_flue001.glb', name: '水井管道01',modelName: 'BP_T_flue001', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_Locker01.glb', name: '储物柜01',modelName: 'BP_T_Locker01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_RelaxArea01.gltf', name: '休闲角01',modelName: 'BP_X_RelaxArea01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_RelaxArea02.gltf', name: '休闲角02',modelName: 'BP_X_RelaxArea02', type:1},
+
+
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_FlowerTerrace01_LongSide_0.3M.gltf', name: '长边花坛0.3M-长边位',modelName: 'BP_G_LongSide03M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_FlowerTerrace_Corner_0.3M.gltf', name: '长边花坛0.3M-转角位',modelName: 'BP_G_Corner03M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_FlowerTerrace_1.5M1.2M.gltf', name: '矩形花坛1.5M*1.2M',modelName: 'BP_G_1512M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_FitnessArea01.gltf', name: '健身区',modelName: 'BP_G_FitnessArea01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_SunChairs01.gltf', name: '太阳椅',modelName: 'BP_G_SunChairs01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_CLosedFrenchWindow_3.9M.glb', name: '关闭落地窗-3.9M',modelName: 'BP_AutoWall_39M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_CLosedFrenchWindow_5.1M.glb', name: '关闭落地窗-5.1M',modelName: 'BP_AutoWall_51M', type:1},
+
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_CLosedFrenchWindow_6.3M.glb', name: '关闭落地窗-6.3M',modelName: 'BP_AutoWall_63M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_FoldingInternalDoor_1.95M.glb', name: '户内折叠门',modelName: 'BP_AutoWall_195M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_OpenInternalDoor_0.8M.glb', name: '关闭户内门-0.8M',modelName: 'BP_AutoWallr_08M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tree00.glb', name: '大树',modelName: 'BP_G_tree00', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tree01.glb', name: '中树',modelName: 'BP_G_tree01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tree02.glb', name: '小树',modelName: 'BP_G_tree02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tree03.glb', name: '最小树',modelName: 'BP_G_tree03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_parterre01.gltf', name: '9格花坛',modelName: 'BP_G_parterre01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_parterre03.gltf', name: '三角花坛',modelName: 'BP_G_parterre03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_parterre04.gltf', name: '矩形花坛',modelName: 'BP_G_parterre04', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_parterre02.gltf', name: '内凹花坛',modelName: 'BP_G_parterre02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_parterre07.gltf', name: '双条花坛',modelName: 'BP_G_parterre07', type:1},
+
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_PartyTable01.gltf', name: '聚会长桌',modelName: 'BP_X_PartyTable01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_PoolTable01.gltf', name: '台球桌01',modelName: 'BP_X_PoolTable01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_weiqi01.gltf', name: '带伞棋坛',modelName: 'BP_G_weiqi01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_RelaxChair01_One.glb', name: '单独休闲椅01',modelName: 'BP_X_RelaxChair01_One', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_RelaxChair02_One.gltf', name: '单独休闲椅02',modelName: 'BP_X_RelaxChair02_One', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_RelaxChair03_One.gltf', name: '单独休闲椅03',modelName: 'BP_X_RelaxChair03_One', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_swimmingpool01.gltf', name: '泳池01',modelName: 'BP_X_swimmingpool01', type:1},
+
+	
+	// {url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles01.gltf', name: '地砖01',modelName: 'BP_G_tiles01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles02.gltf', name: '地砖02',modelName: 'BP_G_tiles02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles03.gltf', name: '地砖03',modelName: 'BP_G_tiles03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles04.gltf', name: '地砖04',modelName: 'BP_G_tiles04', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles05.gltf', name: '地砖05',modelName: 'BP_G_tiles05', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles06.gltf', name: '地砖06',modelName: 'BP_G_tiles06', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles07.gltf', name: '地砖07',modelName: 'BP_G_tiles07', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles08.gltf', name: '地砖08',modelName: 'BP_G_tiles08', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles09.gltf', name: '地砖09',modelName: 'BP_G_tiles09', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles10.gltf', name: '地砖10',modelName: 'BP_G_tiles10', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles11.gltf', name: '地砖11',modelName: 'BP_G_tiles11', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles12.gltf', name: '地砖12',modelName: 'BP_G_tiles12', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tiles13.gltf', name: '地砖13',modelName: 'BP_G_tiles13', type:1},
+
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_OutdoorBar01.gltf', name: '户外酒吧台',modelName: 'BP_X_OutdoorBar01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinnerChair_red.glb', name: '单人餐椅01',modelName: 'BP_D_DinnerChair01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningChiar01_90Degree.glb', name: '餐椅01_90度',modelName: 'BP_D_DinningChiar01_90Degree', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningChiar01_60Degree.glb', name: '餐椅01_60度',modelName: 'BP_D_DinningChiar01_60Degree', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningChiar01_30Degree.glb', name: '餐椅01_30度',modelName: 'BP_D_DinningChiar01_30Degree', type:1},
+	
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_LongDiningTable_240CM.glb', name: '2.4M长餐桌',modelName: 'BP_D_LongDiningTable_240CM', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DiningDecoration01.glb', name: '桌面饰品01',modelName: 'BP_D_DiningDecoration01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration03.glb', name: '餐桌装饰03',modelName: 'BP_D_DinningDecration03', type:1},
+	
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration02_30D.glb', name: '餐桌饰品02_30度',modelName: 'BP_D_DinningDecration02_30D', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration02_60D.glb', name: '餐桌饰品02_60度',modelName: 'BP_D_DinningDecration02_60D', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration02_90D.glb', name: '餐桌饰品02_90度',modelName: 'BP_D_DinningDecration02_90D', type:1},
+	
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable02.glb', name: '茶几02',modelName: 'BP_L_TeaTable02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable03.glb', name: '茶几03',modelName: 'BP_L_Teatable03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable04.glb', name: '茶几04',modelName: 'BP_L_TeaTable04', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable05.glb', name: '茶几05',modelName: 'BP_L_TeaTable05', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_xiaobazhauo.glb', name: '小吧桌',modelName: 'BP_D_xiaobazhauo', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_carpet01.glb', name: '地毯01',modelName: 'BP_L_carpet01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_2Sofa01.glb', name: '双人沙发01',modelName: 'BP_L_2Sofa01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_2Sofa02.glb', name: '双人沙发02',modelName: 'BP_L_2Sofa02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_1Sofa01.glb', name: '单人沙发01',modelName: 'BP_L_1Sofa01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_1Sofa02.glb', name: '单人沙发02',modelName: 'BP_L_1Sofa02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_1Sofa03.glb', name: '单人沙发03',modelName: 'BP_L_1Sofa03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_backsofa01.glb', name: '单人沙发03',modelName: 'BP_L_backsofa01', type:1},
+	
+	
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_RelaxTable01.gltf', name: '单独休闲桌01',modelName: 'BP_X_RelaxTable01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_pillow01.glb', name: '枕头',modelName: 'BP_B_pillow01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_sofa_with_toy_A.glb', name: 'xxx',modelName: 'BP_sofa_with_toy_A', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_sofa_with_toy_B.glb', name: 'xxx',modelName: 'BP_sofa_with_toy_B', type:1},
+	
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_XSPACE_deng_01.glb', name: '吊顶灯',modelName: 'BP_XSPACE_deng_01', type:2},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_CeilingLamp_01.glb', name: '吊灯01',modelName: 'BP_L_CeilingLamp_01', type:2},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_FloorLamp01.glb', name: '地灯05',modelName: 'BP_L_FloorLamp01', type:2},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_CeilingLamp_02.glb', name: '吊灯02',modelName: 'BP_L_CeilingLamp_02', type:2},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_grass01.glb', name: '草地',modelName: 'BP_G_grass01', type:1},
+];
+
+module.exports = layoutModel;

src/static/layoutModelData.js

@@ -1,84 +1,84 @@
 var layoutModel = [
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_Mbed.glb', name: '1.5m床',modelName: 'BP_B_Mbed01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_smallcabinet.glb', name: '床头柜',modelName: 'BP_B_smallcabinet01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_Mbed.glb', name: '1.5m床',modelName: 'BP_B_Mbed01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_smallcabinet.glb', name: '床头柜',modelName: 'BP_B_smallcabinet01', type:1},
 	// {url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_195M_C.gltf', name: '1.95m',modelName: 'BP_AutoWall_195M_C', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_bigbed.glb', name: '1.8m床',modelName: 'BP_B_bigbed01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_smallbed.glb', name: '1.2m床',modelName: 'BP_B_smallbed01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_verysmallbed.glb', name: '0.9m床',modelName: 'BP_B_verysmallbed', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_bigbed.glb', name: '1.8m床',modelName: 'BP_B_bigbed01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_smallbed.glb', name: '1.2m床',modelName: 'BP_B_smallbed01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_verysmallbed.glb', name: '0.9m床',modelName: 'BP_B_verysmallbed', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_31sofa.gltf', name: '4人沙发',modelName: 'BP_L_31sofa01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_31TV.glb', name: '电视墙',modelName: 'BP_L_31TV01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_4people_square.glb', name: '4人方桌',modelName: 'BP_D_4people_square', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_yigui.glb', name: '衣柜',modelName: 'BP_B_yigui01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_31TV.glb', name: '电视墙',modelName: 'BP_L_31TV01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_D_4people_square.glb', name: '4人方桌',modelName: 'BP_D_4people_square', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_yigui.glb', name: '衣柜',modelName: 'BP_B_yigui01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_311sofa01.gltf', name: '5人沙发',modelName: 'BP_L_311sofa01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_321sofa.gltf', name: '6人沙发',modelName: 'BP_L_321sofa01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_2people_square.gltf', name: '2人方桌',modelName: 'BP_D_2people_square', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_6people_long.gltf', name: '6人长桌',modelName: 'BP_D_6people_long01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_6people_long.gltf', name: '6人长桌',modelName: 'BP_D_6people_long01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_8people_long.gltf', name: '8人长桌',modelName: 'BP_D_8people_long', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_RoundTable01.glb', name: '12人圆桌',modelName: 'BP_D_12people_round', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_penzai01.glb', name: '盆栽',modelName: 'BP_B_penzai02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_D_RoundTable01.glb', name: '12人圆桌',modelName: 'BP_D_12people_round', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_penzai01.glb', name: '盆栽',modelName: 'BP_B_penzai02', type:1},
 
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_facesofa01.gltf', name: '对坐沙发01',modelName: 'BP_D_facesofa01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_O_painting01.gltf', name: '挂画装饰',modelName: 'BP_DLBT_painting01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_painting01.glb', name: '挂画01',modelName: 'BP_B_painting01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_painting02.glb', name: '挂画02',modelName: 'BP_B_painting02', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_XSPACE_painting_05.glb', name: '挂画5',modelName: 'BP_XSPACE_painting_05', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_bookshelf01.glb', name: '大书架01',modelName: 'BP_L_bookshelf01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_bookshelf02.glb', name: '大书架02',modelName: 'BP_L_bookshelf02', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_book01.glb', name: '小书架',modelName: 'BP_L_book01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_dinetable01.gltf', name: '大展架01',modelName: 'BP_L_exhibition01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_Exhibition02.glb', name: '大展架02',modelName: 'BP_L_exhibition02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_painting01.glb', name: '挂画01',modelName: 'BP_B_painting01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_painting02.glb', name: '挂画02',modelName: 'BP_B_painting02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_XSPACE_painting_05.glb', name: '挂画5',modelName: 'BP_XSPACE_painting_05', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_bookshelf01.glb', name: '大书架01',modelName: 'BP_L_bookshelf01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_bookshelf02.glb', name: '大书架02',modelName: 'BP_L_bookshelf02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_book01.glb', name: '小书架',modelName: 'BP_L_book01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_D_dinetable01.gltf', name: '大展架01',modelName: 'BP_L_exhibition01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_Exhibition02.glb', name: '大展架02',modelName: 'BP_L_exhibition02', type:1},
 	
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_exhibition04.gltf', name: '4m展架',modelName: 'BP_L_exhibition04', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_exhibition05.gltf', name: '5m展架',modelName: 'BP_L_exhibition05', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_exhibition06.gltf', name: '6m展架',modelName: 'BP_L_exhibition06', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_exhibition07.gltf', name: '7m展架',modelName: 'BP_L_exhibition07', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_21sofa.glb', name: '3人沙发',modelName: 'BP_L_21sofa01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_21sofa.glb', name: '3人沙发',modelName: 'BP_L_21sofa01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_facesofa02.gltf', name: '对坐沙发02',modelName: 'BP_D_facesofa02', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_wardrobe01.glb', name: '1m衣柜',modelName: 'BP_B_wardrobe01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_wardrobe02.glb', name: '2m衣柜',modelName: 'BP_B_wardrobe02', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_wardrobe03.glb', name: '3m衣柜',modelName: 'BP_B_wardrobe03', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_wardrobe04.glb', name: '4m衣柜',modelName: 'BP_B_wardrobe04', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_dresser01.glb', name: '梳妆台01',modelName: 'BP_B_dresser01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_bathtub01.glb', name: '浴缸01',modelName: 'BP_T_bathtub01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_wardrobe01.glb', name: '1m衣柜',modelName: 'BP_B_wardrobe01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_wardrobe02.glb', name: '2m衣柜',modelName: 'BP_B_wardrobe02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_wardrobe03.glb', name: '3m衣柜',modelName: 'BP_B_wardrobe03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_wardrobe04.glb', name: '4m衣柜',modelName: 'BP_B_wardrobe04', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_dresser01.glb', name: '梳妆台01',modelName: 'BP_B_dresser01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_T_bathtub01.glb', name: '浴缸01',modelName: 'BP_T_bathtub01', type:1},
 	
 	
-	{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.glb', name: '楼梯01',modelName: 'BP_T_stairs01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_table01.glb', name: '1m写字台',modelName: 'BP_B_table01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/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},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_2PeopleBasin01.glb', name: '2人台盆01',modelName: 'BP_T_2PeopleBasin01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_2PeopleBasin02.glb', name: '2人台盆02',modelName: 'BP_T_2PeopleBasin02', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_flue001.glb', name: '烟道',modelName: 'BP_K_flue002', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_T_2PeopleBasin01.glb', name: '2人台盆01',modelName: 'BP_T_2PeopleBasin01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_T_2PeopleBasin02.glb', name: '2人台盆02',modelName: 'BP_T_2PeopleBasin02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_K_flue001.glb', name: '烟道',modelName: 'BP_K_flue002', type:1},
 
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_cookerhood2.glb', name: '灶台2',modelName: 'BP_K_cookerhood02', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_cookerhood3.glb', name: '灶台3',modelName: 'BP_K_cookerhood3', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_icebox_2door001.glb', name: '冰箱',modelName: 'BP_K_icebox_2door002', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_shuipen01.glb', name: '水盆01',modelName: 'BP_K_shuipen01', type:1},
-	{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_caozuotai001.glb', name: '操作台01',modelName: 'BP_K_caozuotai001', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_caozuotai002.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},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_O_LightIndoorWall.glb', name: '隔墙',modelName: 'BP_O_LightIndoorWall', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable01.glb', name: '茶几01',modelName: 'BP_L_TeaRTable', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_K_cookerhood2.glb', name: '灶台2',modelName: 'BP_K_cookerhood02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_K_cookerhood3.glb', name: '灶台3',modelName: 'BP_K_cookerhood3', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_K_icebox_2door001.glb', name: '冰箱',modelName: 'BP_K_icebox_2door002', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_K_shuipen01.glb', name: '水盆01',modelName: 'BP_K_shuipen01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_K_shuipen02.glb', name: '水盆02',modelName: 'BP_K_shuipen02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_K_Kitchentable001.glb', name: '台面',modelName: 'BP_K_Kitchentable002', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_2sofa.glb', name: '2人沙发',modelName: 'BP_L_2sofa', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_2Sofa03.glb', name: '2人沙发03',modelName: 'BP_L_2Sofa03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_K_caozuotai001.glb', name: '操作台01',modelName: 'BP_K_caozuotai001', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_K_caozuotai002.glb', name: '操作台02',modelName: 'BP_K_caozuotai002', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_K_caozuotai03.glb', name: '操作台03',modelName: 'BP_K_caozuotai03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_O_LightIndoorWall.glb', name: '隔墙',modelName: 'BP_O_LightIndoorWall', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_TeaTable01.glb', name: '茶几01',modelName: 'BP_L_TeaRTable', type:1},
 	{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/dracomodel/BP_L_children05.glb', name: '儿童家具05',modelName: 'BP_L_children05', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_children06.glb', name: '儿童家具06',modelName: 'BP_L_children06', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/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.gltf', name: '开敞侧淋浴间',modelName: 'BP_T_OpenShower01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_OpenShower02.glb', name: '开敞侧淋浴间02',modelName: 'BP_T_OpenShower02', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_OpenShower03.glb', name: '开敞侧淋浴间03',modelName: 'BP_T_OpenShower03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_T_OpenShower02.glb', name: '开敞侧淋浴间02',modelName: 'BP_T_OpenShower02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_T_OpenShower03.glb', name: '开敞侧淋浴间03',modelName: 'BP_T_OpenShower03', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_matong.gltf', name: '马桶',modelName: 'BP_T_matong', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_1PeopleBasin01.glb', name: '1人台盆01',modelName: 'BP_T_1PeopleBasin01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_1PeopleBasin03.glb', name: '1人台盆03',modelName: 'BP_T_1PeopleBasin03', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_flue001.glb', name: '水井管道01',modelName: 'BP_T_flue001', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_Locker01.glb', name: '储物柜01',modelName: 'BP_T_Locker01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_T_1PeopleBasin01.glb', name: '1人台盆01',modelName: 'BP_T_1PeopleBasin01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_T_1PeopleBasin03.glb', name: '1人台盆03',modelName: 'BP_T_1PeopleBasin03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_T_flue001.glb', name: '水井管道01',modelName: 'BP_T_flue001', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_T_Locker01.glb', name: '储物柜01',modelName: 'BP_T_Locker01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_RelaxArea01.gltf', name: '休闲角01',modelName: 'BP_X_RelaxArea01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_RelaxArea02.gltf', name: '休闲角02',modelName: 'BP_X_RelaxArea02', type:1},
 
@@ -88,16 +88,16 @@ var layoutModel = [
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_FlowerTerrace_1.5M1.2M.gltf', name: '矩形花坛1.5M*1.2M',modelName: 'BP_G_1512M', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_FitnessArea01.gltf', name: '健身区',modelName: 'BP_G_FitnessArea01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_SunChairs01.gltf', name: '太阳椅',modelName: 'BP_G_SunChairs01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_CLosedFrenchWindow_3.9M.glb', name: '关闭落地窗-3.9M',modelName: 'BP_AutoWall_39M', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_CLosedFrenchWindow_5.1M.glb', name: '关闭落地窗-5.1M',modelName: 'BP_AutoWall_51M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_AutoWall_CLosedFrenchWindow_3.9M.glb', name: '关闭落地窗-3.9M',modelName: 'BP_AutoWall_39M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_AutoWall_CLosedFrenchWindow_5.1M.glb', name: '关闭落地窗-5.1M',modelName: 'BP_AutoWall_51M', type:1},
 
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_CLosedFrenchWindow_6.3M.glb', name: '关闭落地窗-6.3M',modelName: 'BP_AutoWall_63M', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_FoldingInternalDoor_1.95M.glb', name: '户内折叠门',modelName: 'BP_AutoWall_195M', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_OpenInternalDoor_0.8M.glb', name: '关闭户内门-0.8M',modelName: 'BP_AutoWallr_08M', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tree00.glb', name: '大树',modelName: 'BP_G_tree00', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tree01.glb', name: '中树',modelName: 'BP_G_tree01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tree02.glb', name: '小树',modelName: 'BP_G_tree02', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tree03.glb', name: '最小树',modelName: 'BP_G_tree03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_AutoWall_CLosedFrenchWindow_6.3M.glb', name: '关闭落地窗-6.3M',modelName: 'BP_AutoWall_63M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_AutoWall_FoldingInternalDoor_1.95M.glb', name: '户内折叠门',modelName: 'BP_AutoWall_195M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_AutoWall_OpenInternalDoor_0.8M.glb', name: '关闭户内门-0.8M',modelName: 'BP_AutoWallr_08M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_G_tree00.glb', name: '大树',modelName: 'BP_G_tree00', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_G_tree01.glb', name: '中树',modelName: 'BP_G_tree01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_G_tree02.glb', name: '小树',modelName: 'BP_G_tree02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_G_tree03.glb', name: '最小树',modelName: 'BP_G_tree03', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_parterre01.gltf', name: '9格花坛',modelName: 'BP_G_parterre01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_parterre03.gltf', name: '三角花坛',modelName: 'BP_G_parterre03', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_parterre04.gltf', name: '矩形花坛',modelName: 'BP_G_parterre04', type:1},
@@ -129,41 +129,41 @@ var layoutModel = [
 
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_OutdoorBar01.gltf', name: '户外酒吧台',modelName: 'BP_X_OutdoorBar01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinnerChair_red.glb', name: '单人餐椅01',modelName: 'BP_D_DinnerChair01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningChiar01_90Degree.glb', name: '餐椅01_90度',modelName: 'BP_D_DinningChiar01_90Degree', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningChiar01_60Degree.glb', name: '餐椅01_60度',modelName: 'BP_D_DinningChiar01_60Degree', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningChiar01_30Degree.glb', name: '餐椅01_30度',modelName: 'BP_D_DinningChiar01_30Degree', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_D_DinningChiar01_90Degree.glb', name: '餐椅01_90度',modelName: 'BP_D_DinningChiar01_90Degree', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_D_DinningChiar01_60Degree.glb', name: '餐椅01_60度',modelName: 'BP_D_DinningChiar01_60Degree', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_D_DinningChiar01_30Degree.glb', name: '餐椅01_30度',modelName: 'BP_D_DinningChiar01_30Degree', type:1},
 	
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_LongDiningTable_240CM.glb', name: '2.4M长餐桌',modelName: 'BP_D_LongDiningTable_240CM', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DiningDecoration01.glb', name: '桌面饰品01',modelName: 'BP_D_DiningDecoration01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration03.glb', name: '餐桌装饰03',modelName: 'BP_D_DinningDecration03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_D_LongDiningTable_240CM.glb', name: '2.4M长餐桌',modelName: 'BP_D_LongDiningTable_240CM', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_D_DiningDecoration01.glb', name: '桌面饰品01',modelName: 'BP_D_DiningDecoration01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_D_DinningDecration03.glb', name: '餐桌装饰03',modelName: 'BP_D_DinningDecration03', type:1},
 	
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration02_30D.glb', name: '餐桌饰品02_30度',modelName: 'BP_D_DinningDecration02_30D', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration02_60D.glb', name: '餐桌饰品02_60度',modelName: 'BP_D_DinningDecration02_60D', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration02_90D.glb', name: '餐桌饰品02_90度',modelName: 'BP_D_DinningDecration02_90D', type:1},
 	
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable02.glb', name: '茶几02',modelName: 'BP_L_TeaTable02', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable03.glb', name: '茶几03',modelName: 'BP_L_Teatable03', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable04.glb', name: '茶几04',modelName: 'BP_L_TeaTable04', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable05.glb', name: '茶几05',modelName: 'BP_L_TeaTable05', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_xiaobazhauo.glb', name: '小吧桌',modelName: 'BP_D_xiaobazhauo', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_carpet01.glb', name: '地毯01',modelName: 'BP_L_carpet01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_2Sofa01.glb', name: '双人沙发01',modelName: 'BP_L_2Sofa01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_2Sofa02.glb', name: '双人沙发02',modelName: 'BP_L_2Sofa02', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_1Sofa01.glb', name: '单人沙发01',modelName: 'BP_L_1Sofa01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_1Sofa02.glb', name: '单人沙发02',modelName: 'BP_L_1Sofa02', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_1Sofa03.glb', name: '单人沙发03',modelName: 'BP_L_1Sofa03', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_backsofa01.glb', name: '单人沙发03',modelName: 'BP_L_backsofa01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_TeaTable02.glb', name: '茶几02',modelName: 'BP_L_TeaTable02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_TeaTable03.glb', name: '茶几03',modelName: 'BP_L_Teatable03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_TeaTable04.glb', name: '茶几04',modelName: 'BP_L_TeaTable04', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_TeaTable05.glb', name: '茶几05',modelName: 'BP_L_TeaTable05', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_D_xiaobazhauo.glb', name: '小吧桌',modelName: 'BP_D_xiaobazhauo', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_carpet01.glb', name: '地毯01',modelName: 'BP_L_carpet01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_2Sofa01.glb', name: '双人沙发01',modelName: 'BP_L_2Sofa01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_2Sofa02.glb', name: '双人沙发02',modelName: 'BP_L_2Sofa02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_1Sofa01.glb', name: '单人沙发01',modelName: 'BP_L_1Sofa01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_1Sofa02.glb', name: '单人沙发02',modelName: 'BP_L_1Sofa02', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_1Sofa03.glb', name: '单人沙发03',modelName: 'BP_L_1Sofa03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_backsofa01.glb', name: '单人沙发03',modelName: 'BP_L_backsofa01', type:1},
 	
 	
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_RelaxTable01.gltf', name: '单独休闲桌01',modelName: 'BP_X_RelaxTable01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_pillow01.glb', name: '枕头',modelName: 'BP_B_pillow01', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_sofa_with_toy_A.glb', name: 'xxx',modelName: 'BP_sofa_with_toy_A', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_sofa_with_toy_B.glb', name: 'xxx',modelName: 'BP_sofa_with_toy_B', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_B_pillow01.glb', name: '枕头',modelName: 'BP_B_pillow01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_sofa_with_toy_A.glb', name: 'xxx',modelName: 'BP_sofa_with_toy_A', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_sofa_with_toy_B.glb', name: 'xxx',modelName: 'BP_sofa_with_toy_B', type:1},
 	
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_XSPACE_deng_01.glb', name: '吊顶灯',modelName: 'BP_XSPACE_deng_01', type:2},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_CeilingLamp_01.glb', name: '吊灯01',modelName: 'BP_L_CeilingLamp_01', type:2},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_FloorLamp01.glb', name: '地灯05',modelName: 'BP_L_FloorLamp01', type:2},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_CeilingLamp_02.glb', name: '吊灯02',modelName: 'BP_L_CeilingLamp_02', type:2},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_CeilingLamp_01.glb', name: '吊灯01',modelName: 'BP_L_CeilingLamp_01', type:2},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_FloorLamp01.glb', name: '地灯05',modelName: 'BP_L_FloorLamp01', type:2},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/dracomodel/BP_L_CeilingLamp_02.glb', name: '吊灯02',modelName: 'BP_L_CeilingLamp_02', type:2},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_grass01.glb', name: '草地',modelName: 'BP_G_grass01', type:1},
 ];