zjs_project 10 miesięcy temu
rodzic
commit
d16d388a01

+ 5 - 4
src/components/newQCCom/viewMask/viewMask.vue

@@ -1262,10 +1262,11 @@
             			houseId:this.houseId || curHouseObj.houseId,
             			id:res.single,
             		}
-            		router.push({
-            			name: "webgl_rxdz_text_customize",
-            			query:data
-            		});
+                    wx.miniProgram.redirectTo({url: '/webgl/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize?id='+data.id+"&houseId="+this.houseId})
+            		// router.push({
+            		// 	name: "webgl_rxdz_text_customize",
+            		// 	query:data
+            		// });
             	}
             },
             

+ 12 - 2
src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.html

@@ -21,10 +21,20 @@
             </div>
 			<div class="mask"></div>
 			<img class="text-img" src="https://dm.static.elab-plus.com/miniProgram/text-img.png" mode="widthFix"/>
-			<div class="lookHouseView rows justify-center" v-if="tabIndex==0 && projectUserId==userId" @click="toMode">
+            <template v-if="tabIndex==0 && projectUserId==userId && form && form.layoutId">
+                <div class="lookHouseView rows justify-center" v-if="houseDZ==false" @click="toUEDatail">
+                	<img class="icon-ai" src="https://dm.static.elab-plus.com/miniProgram/iconfont/icon-ai.png" mode="widthFix"/>
+                	柔性定制
+                </div>
+                <div class="lookHouseView rows justify-center" v-else @click="toMode">
+                	<img class="icon-ai" src="https://dm.static.elab-plus.com/miniProgram/iconfont/icon-ai.png" mode="widthFix"/>
+                	查看户型
+                </div>
+            </template>
+			<!-- <div class="lookHouseView rows justify-center" v-if="tabIndex==0 && projectUserId==userId" @click="toMode">
 				<img class="icon-ai" src="https://dm.static.elab-plus.com/miniProgram/iconfont/icon-ai.png" mode="widthFix"/>
 				查看户型
-			</div>
+			</div> -->
             <div class="tabList rows flex-start">
 				<div @click="changeTab(index)" class="tab-item columns" :class="{'tabActive': tabIndex == index}" 
 					v-for="(tab,index) in tabData" :key="index" >

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

@@ -76,6 +76,7 @@ export default {
 			showPopup:false,
 			isIOS:false,
             payed:0,//当前柔性定制是否已经支付了  1:是,0:否,默认0
+            houseDZ:true,  //是否已经户型定制过,默认 有
 		}
     },
     /**
@@ -486,6 +487,12 @@ export default {
 					}
 					this.tabData.push(data);
 				})
+                //有户型id,说明已经进入过户型的柔性定制
+                if(this.form.houseJson && this.form.houseJson[0] && this.form.houseJson[0].spaceId){
+                    this.houseDZ = true;
+                }else{
+                    this.houseDZ = false;
+                }
 				this.gsImage = this.form.layoutImgCustomized;//获取高斯模糊的图片
             }else{
 				Toast({
@@ -516,7 +523,33 @@ export default {
         catchTouchMove: function() {
             return false;
         },
-        
+        // 点击跳转到h5柔性定制-继续
+        toUEDatail() {
+            console.warn("toUEDatail")
+            let data = {
+            	houseId:this.houseId,
+            	customizedRecordId:this.id,
+                ueId: this.form.layoutId,
+            }
+            router.push({
+            	name: "webgl_rxdz_test",
+            	query:data
+            });
+            // let expand = {
+            //     houseId: this.houseId,
+            //     customizedRecordId: this.id, //定制的作品id
+            //     ueId: this.form.layoutId,
+            // }
+            // let webUrl = config.rxdzUrl + "pages/webgl_rxdz_test";
+            // webUrl += util.converToUrl(expand);
+            // uni.navigateTo({
+            //     keep: true, //不处理
+            //     url: '/pages/webView/webView?view=' + encodeURIComponent(webUrl) + "&houseId=" + this.houseId,
+            //     fail: function(res) {
+            //         console.log(res)
+            //     },
+            // })
+        },
         toMode(){
 			let data = {
 				houseId:this.houseId,