zjs_project 11 meses atrás
pai
commit
b514f7e03b

+ 4 - 0
src/App.vue

@@ -51,6 +51,7 @@
 			let houseName = this.$route.query.houseName ? this.$route.query.houseName : '';//项目名称
 			let cityCode = this.$route.query.cityCode ? this.$route.query.cityCode : '';//土地id
 			let customizedRecordId = this.$route.query.customizedRecordId ? this.$route.query.customizedRecordId : '';//作品id-说明已经存储了
+			let ueId = this.$route.query.ueId ? this.$route.query.ueId : '';//ueId-说明选择了具体的户型
 			let query = this.$route.query;
 			let brandId = this.$route.query.brandId || this.$route.query.special_ID;
 			if (brandId) { //如果存在集团id
@@ -67,6 +68,9 @@
             }
             if (customizedRecordId) { //如果存在customizedRecordId
                 this.$store.state.customizedRecordId = customizedRecordId;
+            }
+            if (ueId) { //如果存在ueId
+                this.$store.state.ueId = ueId;
             }
 			if (xcxHouseId) { //如果存在houseid
 				this.$store.dispatch('setHouseId', xcxHouseId);

+ 1 - 0
src/components/newQCCom/viewMask/viewMask.vue

@@ -1223,6 +1223,7 @@
             	houseData.houseJson = spaceList.concat(this.form.layoutStruct[0].houseJson);
             	// houseData.expand = expand;
             	let param = {
+                    id:this.customizedRecordId,
             		"brandId": $config.brandId,
             		"houseId": this.houseId || curHouseObj.houseId,
             		"userId": userId,

+ 15 - 12
src/pages/webgl_rxdz_test/webgl_rxdz_test.vue

@@ -134,7 +134,7 @@
 				layoutArea:0,	//总面积
 				selectSpace:null,//
 				changeStatus:false,
-                selectIndex:'',
+                // selectIndex:'',
 			}
 		},
 		beforeDestroy() {
@@ -184,12 +184,12 @@
 			console.warn("***beforeDestroy-webgl_rxdz***");
 		},
         mounted() {
-			console.log("***onLoad-webgl_rxdz_test***", this.$route.query,this.$store.state.houseId);
+			console.log("***onLoad-webgl_rxdz_test***", this.$route.query,this.$store.state.houseId,this.customizedRecordId);
 			let isIOS = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
 			this.isIOS = isIOS;
 			var that = this;
 			this.houseId = this.$store.state.houseId || '';
-			this.selectIndex = this.$route.query.selectIndex || 0;
+			// this.selectIndex = this.$route.query.selectIndex || 0;
             if(this.customizedRecordId){
                 this.curHouseObj = null;
             }else{
@@ -248,7 +248,7 @@
 			if(this.curHouseObj){
 				this.houseInit()
 			}else{
-                this.findHouseTypeSpaceList();
+                this.findHouseTypeSpaceListByIds();
             }
 			function init() {
 
@@ -700,22 +700,25 @@
 			},
             customizedRecordId() {
             	return this.$store.state.customizedRecordId;
+            },
+            ueId() {
+            	return this.$store.state.ueId;
             },
 		},
 
 		methods: {
             // 查询户型列表
-            async findHouseTypeSpaceList() {
+            async findHouseTypeSpaceListByIds() {
                 var parmas = {
                     brandId: $config.brandId,
                     houseId: this.houseId,
                     pageNo: 1,
                     pageSize: 2000,
-                    isCloud: 1,
+                    ids: [this.ueId],
                 };
-                let res = await requestConfig("findHouseTypeSpaceList", parmas);
-                if (res.success && res.pageModel) {
-                    let list = res.pageModel.resultSet || [];
+                let res = await requestConfig("findHouseTypeSpaceListByIds", parmas);
+                if (res.success && res.list) {
+                    let list = res.list || [];
                     list && list.forEach((item, index) => {
                         if (item.houseJson) {
                             let spaceList = JSON.parse(item.houseJson);
@@ -737,13 +740,13 @@
                                 }
                             }
                             item.houseJson = JSON.stringify(spaceList);
-                            console.log("户型详情列表: ", spaceList,this.selectIndex);
+                            console.log("户型详情列表: ", spaceList);
                         }
                     })
-                    this.curHouseObj = res.pageModel.resultSet[this.selectIndex];
+                    this.curHouseObj = res.list[0];
                     setStorage('curHouseObj', this.curHouseObj);
                     this.houseInit();
-                    // this.houseList = res.pageModel.resultSet || [];
+                    // this.houseList = res.list || [];
                 }
             },
 			voiceMaskChange(voiceMask){

+ 5 - 1
src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.vue

@@ -428,7 +428,11 @@ export default {
 				if(single.expand){
 					let list = JSON.parse(single.expand);
 					let ind = list.findIndex(it=>it.name == '户型偏好');
-					this.expand = list.slice(ind);
+                    if(ind>-1){
+                        this.expand = list.slice(ind);
+                    }else{
+                        this.expand = list;
+                    }
 				}
 				this.layoutStruct = JSON.parse(JSON.stringify(single));
 				this.payed = single.payStatus || 0;//是否支付成功  1:是,0:否,默认0

+ 1 - 0
src/services/requestConfig.js

@@ -18,6 +18,7 @@ const endpoints = {
 	
 	houseDetail: 'elab-marketing-user/house/detail',
 	findHouseTypeSpaceList: 'elab-marketing-file/space_generation_background/findHouseTypeSpaceList',
+	findHouseTypeSpaceListByIds: 'elab-marketing-file/space_generation_background/findHouseTypeSpaceListByIds',
 	layoutList: 'elab-marketing-content/aiDreamHouse/V3.0/layoutList',
 	labelList: 'elab-marketing-content/aiDreamHouse/V3.0/labelList',
 	findOverallArrangementList: 'elab-marketing-file/space_generation_background/findOverallArrangementList',

+ 1 - 0
src/store/state.js

@@ -13,5 +13,6 @@ const state = {
 	cityCode:null,	//城市编码
 	houseName:null,	//项目名称
 	customizedRecordId:null,	//项目名称
+	ueId:null,	//ueId
 }
 export default state