柔性定制修改

src/components/newBottomCom/viewCareful/viewCareful.html

@@ -6,7 +6,7 @@
 			<div class="careful-item" v-for="(carefulItem,index) in carefulList" :key="carefulItem.spaceId">
 				<div class="columns rows-between" >
 					<div class="item-top rows rows-between" :class="{active:selectIndex==index}">
-						<div class="rows">
+						<div class="rows" @click="selectSpace(carefulItem,index)">
 							<div class="index-view rows justify-center">{{carefulItem.index+1}}</div>
 							<div class="name-view eslipe" >{{carefulItem.name}}</div>
 							<div class="percent-view">{{carefulItem.percent}}%</div>

src/components/newBottomCom/viewCareful/viewCareful.vue

@@ -124,7 +124,7 @@
 					return false;
 				}
 				this.selectIndex = index;
-				this.$parent.$parent.selectSpaceId = item.spaceId;
+				// this.$parent.$parent.selectSpaceId = item.spaceId;
 				let _area = value - parseFloat(item.area);
 				if(_area==0){
 					return false;
@@ -161,6 +161,10 @@
 				this.$parent.$parent.callBackFun = this.callBack;//向父页面注册通知回调函数
 				this.$emit("curSpaceChange",data);//通知父组件-空间面积变化
 			},
+			selectSpace(item,index){
+				this.selectIndex = index;
+				this.$parent.$parent.curSpaceSelect(item);//向父页面通知空间被选中了
+			},
 			//去往详情页面
 			goRoam(){
 				let item = this.lastCareList[this.selectIndex];

src/components/newBottomCom/viewlayout/viewlayout.html

@@ -7,12 +7,19 @@
 			<!-- <div class="btn voice rows justify-center" :class="recording?'voice2':'voice3'" @touchstart="streamRecord" @touchmove="mytouchmove">
 				<img class="icon" :src="recording?'https://dm.static.elab-plus.com/miniProgram/iconfont/source.png':'https://dm.static.elab-plus.com/miniProgram/iconfont/source1.png'" mode="widthFix"/>
 			</div> -->
-			<div class="btn rows up justify-center" @click="upCom" :class="styleType==1?'up1':'up2'">开始定制户型 ></div>
+			<!-- 版本2 -->
+			<!-- <div class="btn rows up justify-center" @click="upCom" :class="styleType==1?'up1':'up2'">开始定制户型 ></div> -->
 			
+			<div class="btn houseType rows justify-center up2" @click="upCom">
+				<div class="iconfont icon-huxingjianshang style1"></div>我来设计
+			</div>
+			<div class="btn AiBtn rows justify-center up1" @click="goRoam">
+				<div class="iconfont icon-a-lujing35039 style1"></div>AI精软装
+			</div>
 		</div>
 		<div class="btn-list rows rows-between" v-else-if="styleType==2">
 			<div class="btn houseType rows justify-center up2" >
-				<div class="iconfont icon-huxingjianshang style1"></div>户型空间
+				<div class="iconfont icon-huxingjianshang style1"></div>更改功能
 			</div>
 			<div class="btn AiBtn rows justify-center up1" @click="goRoam">
 				<div class="iconfont icon-a-lujing35039 style1"></div>AI精软装

src/components/newQCCom/viewCareful/viewCareful.vue

@@ -138,7 +138,7 @@
 					return false;
 				}
 				this.selectIndex = index;
-				this.$parent.$parent.selectSpaceId = item.spaceId;
+				// this.$parent.$parent.selectSpaceId = item.spaceId;
 				let _area = value - parseFloat(item.area);
 				if(_area==0){
 					return false;

src/pages/webgl_rxdz/webgl_rxdz.vue

@@ -915,7 +915,13 @@
 			
 			    }
 			},
-			
+			curSpaceSelect(data){
+				console.warn("***curSpaceSelect***",data);
+				let spaceId = data.spaceId;
+				let space = this.spaceList.find(it=>it.spaceId==spaceId);
+				this.currentChangeSpaceId = spaceId;
+				this.moveMeshCenter(space);
+			},
 			//具体空间面积变化-拖动产生的
 			//data = {
 			//		spaceId:245,

src/pages/webgl_rxdz_customize/webgl_rxdz_customize.html

@@ -11,7 +11,7 @@
 					:current="currImgIdx" ref="carousel">
                     <el-carousel-item v-for="(img,s) in tabData[tabIndex].hardboundEffect" :key="s" :item-id="s" class="master-pic-img">
                         <img @touchstart="mytouchstart" @touchmove="mytouchmove" @touchend="mytouchend" class="master-pic-img" :src="img" mode="aspectFill" />
-						<div class="lookHouseView rows justify-center" v-if="tabIndex==2 && (!shareUserId || shareUserId==userId)" @click="toMode">
+						<div class="lookHouseView rows justify-center" v-if="tabIndex==TdIndex && (!shareUserId || shareUserId==userId)" @click="toMode">
 							<img class="icon-ai" src="https://dm.static.elab-plus.com/miniProgram/iconfont/icon-ai.png" mode="widthFix"/>
 							查看户型
 						</div>

src/pages/webgl_rxdz_customize/webgl_rxdz_customize.vue

@@ -7,6 +7,7 @@
 	import router from "@/router";
 	import touchHandle from '@/mixins/touchHandle.js';
 	import commonPageMethod from '@/mixins/commonPageMethod.js';
+	import spaceTypes from '@/static/spaceTypesIE.js';
 // const app = getApp(); //获取应用实例
 // import requestConfig from '@/static/lib/requestConfig.js';
 // import commonPageMethod from '@/common/commonPageMethod.js';
@@ -54,6 +55,7 @@ export default {
 			showPhoneModel:false,
 			gsImage:'',
 			layoutStruct:null,
+			TdIndex:0,
 		}
     },
     /**
@@ -130,7 +132,8 @@ export default {
 				gsImage:tmp.baseImg,
 				area:'',
 			}
-			this.tabData.push(data)
+			this.tabData.push(data);
+			this.TdIndex = 2;
 		},
         async getIdData(){
 			let userId = this.userId || '';
@@ -173,8 +176,15 @@ export default {
 				this.form.houseJson.forEach((item,index)=>{
 					//获取面积
 					let curSpaceArea = parseFloat((item.spaceWidth * item.spaceHeight) / 10000).toFixed(1);
+					let text = item.spaceName;
+					if(item.spaceId && item.spaceType){
+						text = spaceTypes[item.spaceType - 1];
+						if(item.spaceType==15 && item.layoutSpaceType){
+							text = spaceTypes[item.layoutSpaceType - 1]; 
+						}
+					}
 					let data = {
-						name : item.spaceName,
+						name : text,
 						imgUrl : item.hardboundEffect[0],
 						hardboundEffect:item.hardboundEffect,
 						gsImage:item.hardboundEffect[0],

src/pages/webgl_rxdz_test_env/webgl_rxdz_test_env.vue

@@ -370,7 +370,14 @@
 					});
 					return false;
 				}
-				this.resultDataHandle();
+				//三个题都存在，则是完整的前测
+				if(this.queryObj && this.queryObj.id1 && this.queryObj.id2 && this.queryObj.id3){
+					this.resultDataHandle();
+				}else{
+					Toast({
+						message: '谢谢参与',
+					});
+				}
 				// console.log("进入订制户型: ", this.curHouseObj);
 				// setStorage('curHouseObj', this.curHouseObj);
 				// this.$store.dispatch('setCurHouseObj', this.curHouseObj);

src/services/urlConfig.js

@@ -188,7 +188,7 @@ var config = function(env) {
             uploadUrl: 'https://dm-api.elab-plus.cn', //文件上传
             api_url: 'https://dm-api.elab-plus.cn/', //接口地址
             redirect_uri: 'http://city.1949plus.com', // 授权回调地址
-			min_uri: 'https://dm.static.elab-plus.com/miniProgram/webgl/test1/index.html#/', // H5小程序的地址
+			min_uri: 'https://map.elab-plus.com.cn/1949plus/index.html#/', // H5小程序的地址
 			ws_url: 'wss://websocket.elab-plus.cn/',
 			xcxHouseId: '11121',
             themeColor1: '#7AB47C',