zjs_project 1 éve
szülő
commit
f11822d8a8

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

@@ -522,7 +522,7 @@
 			async getAiBeautyFamily() {
 				// const spaceName = this.spaceTypes[this.spaceObj.spaceType - 1].title;
 				let res = await requestConfig("getHardboundEffects", {
-					"houseId": this.$route.query.houseId || this.$store.state.houseId,
+					// "houseId": this.$route.query.houseId || this.$store.state.houseId,
 					"spaceType": this.spaceObj.layoutSpaceType || this.spaceObj.spaceType,
 					"spaceName": this.spaceObj.layoutSpaceName || this.spaceObj.spaceName,
 				});

+ 1 - 0
src/pages/webgl_rxdz_houseList/webgl_rxdz_houseList.scss

@@ -18,6 +18,7 @@
 	position: relative;
 	height: calc(100% - 210px);
 	padding-top: 170px;
+    box-sizing: border-box;
 	.main{
 		// max-height: 400px;
 		max-height: 100%;

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

@@ -313,7 +313,11 @@ export default {
         payOrder(){
         	if(window.__wxjs_environment === 'miniprogram'){
         		this.pvCloseHandle();//小程序跳转会主动杀死关闭当前页面-不经过vue跳转关闭逻辑-所以需要主动触发关闭埋点
-        		wx.miniProgram.redirectTo({url: '/amapPackage/pages/transfer/transfer?goodId='+this.id+"&landDataId="+this.landDataId})
+                if(this.landDataId){//有土地id
+                    wx.miniProgram.redirectTo({url: '/amapPackage/pages/transfer/transfer?goodId='+this.id+"&landDataId="+this.landDataId})
+                }else{
+                    wx.miniProgram.redirectTo({url: '/amapPackage/pages/transfer/transfer?goodId='+this.id+"&houseId="+this.houseId})
+                }
         	}else{
         		this.$message.warning("请在小程序中使用");
         		// this.showPop();
@@ -440,6 +444,9 @@ export default {
                 if (landDataId && !this.$store.state.landDataId) { //如果存在土地id并且进入时没有土地id
                     this.$store.state.landDataId = landDataId;
                 }
+                if(!this.houseId && single && single.houseId){
+                    this.houseId = single.houseId;
+                }
                 // this.number = single.landCode
                 this.form = single.layoutStruct[0];
 				this.headList = this.layoutStruct.heads || [];