|
@@ -1112,7 +1112,7 @@
|
|
|
},
|
|
|
//提交结果数据处理
|
|
|
async resultDataHandle(){
|
|
|
-
|
|
|
+ let houseId = this.houseId || this.$route.query.houseId || this.$store.state.houseId || curHouseObj.houseId;
|
|
|
// let firstData = JSON.parse(getStorage('firstData'));
|
|
|
let secondData = JSON.parse(getStorage('secondData'));
|
|
|
let thirdData = JSON.parse(getStorage('thirdData'));
|
|
@@ -1161,7 +1161,7 @@
|
|
|
// houseData.expand = expand;
|
|
|
let param = {
|
|
|
"brandId": $config.brandId,
|
|
|
- "houseId": this.houseId || curHouseObj.houseId,
|
|
|
+ "houseId": houseId,
|
|
|
"userId": userId,
|
|
|
"floot": 1,
|
|
|
"spaceName": curHouseObj.name,
|
|
@@ -1190,7 +1190,7 @@
|
|
|
loading.close();
|
|
|
if(res && res.success && res.single){//提交成功
|
|
|
let data = {
|
|
|
- houseId:this.houseId || curHouseObj.houseId,
|
|
|
+ houseId:houseId,
|
|
|
id:res.single,
|
|
|
}
|
|
|
router.push({
|
|
@@ -1201,6 +1201,7 @@
|
|
|
},
|
|
|
//修改结果数据处理
|
|
|
async updateHandle(){
|
|
|
+ let houseId = this.houseId || this.$route.query.houseId || this.$store.state.houseId || curHouseObj.houseId;
|
|
|
// let firstData = JSON.parse(getStorage('firstData'));
|
|
|
// let secondData = JSON.parse(getStorage('secondData'));
|
|
|
// let thirdData = JSON.parse(getStorage('thirdData'));
|
|
@@ -1213,11 +1214,11 @@
|
|
|
let userId = this.userId ? this.userId : '';
|
|
|
let houseData = {
|
|
|
"layoutId": curHouseObj.id,
|
|
|
- "layoutName": curHouseObj.name,
|
|
|
- "layoutArea": curHouseObj.houseArea,
|
|
|
+ "layoutName": this.form.layoutStruct[0].layoutName || curHouseObj.name,
|
|
|
+ "layoutArea": this.form.layoutStruct[0].layoutArea || curHouseObj.houseArea,
|
|
|
"floor": 1,
|
|
|
"layoutImgCustomized": shottingImg,
|
|
|
- "style": "",
|
|
|
+ "style": this.form.layoutStruct[0].style || "",
|
|
|
"houseJson": []
|
|
|
}
|
|
|
|
|
@@ -1231,9 +1232,10 @@
|
|
|
let param = {
|
|
|
id:this.customizedRecordId,
|
|
|
"brandId": $config.brandId,
|
|
|
- "houseId": this.houseId || curHouseObj.houseId,
|
|
|
+ "houseId": houseId,
|
|
|
"userId": userId,
|
|
|
"floot": 1,
|
|
|
+ // "spaceName": this.form.spaceName || curHouseObj.name,
|
|
|
"spaceName": curHouseObj.name,
|
|
|
"spaceStructure": '',
|
|
|
"curFloor":1,
|
|
@@ -1260,10 +1262,10 @@
|
|
|
loading.close();
|
|
|
if(res && res.success && res.single){//提交成功
|
|
|
let data = {
|
|
|
- houseId:this.houseId || curHouseObj.houseId,
|
|
|
+ houseId:houseId,
|
|
|
id:res.single,
|
|
|
}
|
|
|
- wx.miniProgram.redirectTo({url: '/webgl/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize?id='+data.id+"&houseId="+(this.houseId || curHouseObj.houseId)})
|
|
|
+ wx.miniProgram.redirectTo({url: '/webgl/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize?id='+data.id+"&houseId="+houseId})
|
|
|
// router.push({
|
|
|
// name: "webgl_rxdz_text_customize",
|
|
|
// query:data
|