|
@@ -1237,7 +1237,7 @@
|
|
const res = await requestConfig('getCustomizedRecord', params);
|
|
const res = await requestConfig('getCustomizedRecord', params);
|
|
if (res.success && res.list && res.list[0]) {
|
|
if (res.success && res.list && res.list[0]) {
|
|
let single = res.list[0];
|
|
let single = res.list[0];
|
|
- this.form = single;
|
|
|
|
|
|
+ this.form = single || null;
|
|
// this.hardboundEffect = this.form.layoutImgCustomized? [this.form.layoutImgCustomized] : [];//赋值轮播图
|
|
// this.hardboundEffect = this.form.layoutImgCustomized? [this.form.layoutImgCustomized] : [];//赋值轮播图
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -1271,14 +1271,14 @@
|
|
// }
|
|
// }
|
|
// expand.push(_dt);
|
|
// expand.push(_dt);
|
|
// })
|
|
// })
|
|
- secondData.forEach(it=>{
|
|
|
|
|
|
+ secondData && secondData.forEach(it=>{
|
|
let _dt = {
|
|
let _dt = {
|
|
name:it.name,
|
|
name:it.name,
|
|
value:it.selectOptionName,
|
|
value:it.selectOptionName,
|
|
}
|
|
}
|
|
expand.push(_dt);
|
|
expand.push(_dt);
|
|
})
|
|
})
|
|
- thirdData.forEach(it=>{
|
|
|
|
|
|
+ thirdData && thirdData.forEach(it=>{
|
|
let _dt = {
|
|
let _dt = {
|
|
name:it.spaceName,
|
|
name:it.spaceName,
|
|
value:it.selectOptionName,
|
|
value:it.selectOptionName,
|
|
@@ -1289,7 +1289,7 @@
|
|
if(thirdData && thirdData.length>0){
|
|
if(thirdData && thirdData.length>0){
|
|
mainImage = thirdData[1] ? thirdData[1].hardboundEffect[0] : thirdData[0].hardboundEffect[0];
|
|
mainImage = thirdData[1] ? thirdData[1].hardboundEffect[0] : thirdData[0].hardboundEffect[0];
|
|
}
|
|
}
|
|
- houseData.houseJson = spaceList.concat(thirdData);
|
|
|
|
|
|
+ houseData.houseJson = thirdData ? spaceList.concat(thirdData) : spaceList;
|
|
// houseData.expand = expand;
|
|
// houseData.expand = expand;
|
|
let seletcIndex = curLayoutStruct.findIndex(it=>it.id==curHouseObj.id);
|
|
let seletcIndex = curLayoutStruct.findIndex(it=>it.id==curHouseObj.id);
|
|
let param = {
|
|
let param = {
|
|
@@ -1344,10 +1344,14 @@
|
|
houseId:houseId,
|
|
houseId:houseId,
|
|
id:res.single,
|
|
id:res.single,
|
|
}
|
|
}
|
|
- router.push({
|
|
|
|
- name: "webgl_rxdz_text_customize",
|
|
|
|
- query:data
|
|
|
|
- });
|
|
|
|
|
|
+ if(houseId=="10997"){
|
|
|
|
+ wx.miniProgram.redirectTo({url: '/webgl/pages/webgl_rxdz_customize/webgl_rxdz_customize?id='+data.id+"&houseId="+houseId})
|
|
|
|
+ }else{
|
|
|
|
+ router.push({
|
|
|
|
+ name: "webgl_rxdz_text_customize",
|
|
|
|
+ query:data
|
|
|
|
+ });
|
|
|
|
+ }
|
|
}
|
|
}
|
|
},
|
|
},
|
|
//修改结果数据处理
|
|
//修改结果数据处理
|
|
@@ -1388,7 +1392,7 @@
|
|
"curFloor":(seletcIndex+1),
|
|
"curFloor":(seletcIndex+1),
|
|
layoutStruct:[],
|
|
layoutStruct:[],
|
|
type:'QIANCE',
|
|
type:'QIANCE',
|
|
- expand:this.form.expand,
|
|
|
|
|
|
+ expand:this.form?this.form.expand:"",
|
|
// mainImage:this.form.mainImage,
|
|
// mainImage:this.form.mainImage,
|
|
}
|
|
}
|
|
//处理每一个楼层
|
|
//处理每一个楼层
|
|
@@ -1397,14 +1401,14 @@
|
|
if(index==seletcIndex){
|
|
if(index==seletcIndex){
|
|
houseData1 = {
|
|
houseData1 = {
|
|
"layoutId": curHouseObj.id,
|
|
"layoutId": curHouseObj.id,
|
|
- "layoutName": this.form.layoutStruct[0].layoutName || curHouseObj.name,
|
|
|
|
- "layoutArea": this.form.layoutStruct[0].layoutArea || curHouseObj.houseArea,
|
|
|
|
|
|
+ "layoutName": this.form ? this.form.layoutStruct[0].layoutName : curHouseObj.name,
|
|
|
|
+ "layoutArea": this.form ? this.form.layoutStruct[0].layoutArea : curHouseObj.houseArea,
|
|
"floor": (index+1),
|
|
"floor": (index+1),
|
|
"layoutImgCustomized": shottingImg,
|
|
"layoutImgCustomized": shottingImg,
|
|
- "style": this.form.layoutStruct[0].style || "",
|
|
|
|
|
|
+ "style": this.form ? this.form.layoutStruct[0].style : "",
|
|
"houseJson": []
|
|
"houseJson": []
|
|
}
|
|
}
|
|
- houseData1.houseJson = this.form.layoutStruct[0].houseJson.concat(spaceList);
|
|
|
|
|
|
+ houseData1.houseJson = this.form ? this.form.layoutStruct[0].houseJson.concat(spaceList) : spaceList;
|
|
}else{
|
|
}else{
|
|
houseData1 = {
|
|
houseData1 = {
|
|
"layoutId": layoutStruct.id,
|
|
"layoutId": layoutStruct.id,
|
|
@@ -1450,7 +1454,11 @@
|
|
});
|
|
});
|
|
console.warn("***_list***",_list)
|
|
console.warn("***_list***",_list)
|
|
// wx.miniProgram.redirectTo({url: '/webgl/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize?id='+data.id+"&houseId="+houseId})
|
|
// wx.miniProgram.redirectTo({url: '/webgl/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize?id='+data.id+"&houseId="+houseId})
|
|
- wx.miniProgram.redirectTo({url: '/extraPackage/pages/aiPublishPageV2/aiPublishPageV2?id='+data.id+"&houseId="+houseId+"&list="+JSON.stringify(_list)})
|
|
|
|
|
|
+ if(houseId=="10997"){
|
|
|
|
+ wx.miniProgram.redirectTo({url: '/webgl/pages/webgl_rxdz_customize/webgl_rxdz_customize?id='+data.id+"&houseId="+houseId})
|
|
|
|
+ }else{
|
|
|
|
+ wx.miniProgram.redirectTo({url: '/extraPackage/pages/aiPublishPageV2/aiPublishPageV2?id='+data.id+"&houseId="+houseId+"&list="+JSON.stringify(_list)})
|
|
|
|
+ }
|
|
// router.push({
|
|
// router.push({
|
|
// name: "webgl_rxdz_text_customize",
|
|
// name: "webgl_rxdz_text_customize",
|
|
// query:data
|
|
// query:data
|