优化

src/components/newQCCom/viewCareful/viewCareful.html

@@ -15,10 +15,23 @@
 							<div class="area-view">{{carefulItem.area}}㎡</div>
 						</div>
 					</div>
-					<div class="item-slider" :class="{active:selectIndex==index}">
-						<el-slider class="slider-style" :disabled="overChange" v-model="carefulItem.area"
-							@change="sliderChange($event,index)" :step="0.1" :show-tooltip="false"
-							:min='carefulItem.minArea' :max='carefulItem.maxArea' ></el-slider>
+					<div class="item-slider">
+                        <!-- 最大面积设置为0，无法参与面积变化 -->
+                        <template v-if="carefulItem.maxArea<carefulItem.area || (carefulItem.maxArea==carefulItem.minArea && carefulItem.maxArea==carefulItem.area)">
+                            <div class="lock rows justify-center" @click="toastLock">
+                                <i class="el-icon-lock" ></i>
+                            </div>
+                            <el-slider class="slider-style" :disabled="true" v-model="carefulItem.area"
+                            	@change="sliderChange($event,index)" :step="0.1" :show-tooltip="false"
+                            	:min='carefulItem.minArea' ></el-slider>
+                        </template>
+                        <template v-else>
+                            <div :class="{active:selectIndex==index}">
+                                <el-slider class="slider-style" :disabled="overChange" v-model="carefulItem.area"
+                                    @change="sliderChange($event,index)" :step="0.1" :show-tooltip="false"
+                                    :min='carefulItem.minArea' :max='carefulItem.maxArea' ></el-slider>
+                            </div>
+                        </template>
 					</div>
 				</div>
 				<!-- <div class="ai-btn rows justify-center" @click="goRoam()">

src/components/newQCCom/viewCareful/viewCareful.scss

@@ -61,10 +61,25 @@
 }
 
 .item-slider{
+    position: relative;
 	width: 100%;
+    // margin-top: 20px;
+    // box-sizing: border-box;
 	.slider-style{
-		margin:20px 16px
+		margin:20px 16px;
+        // margin-top: 0px;
 	}
+    .lock{
+        position: absolute;
+        width: 100%;
+        height: calc(100% - 40px);
+        top: 20px;
+        z-index: 9;
+        backdrop-filter: blur(59.77rpx);
+        background-color: rgba(0, 0, 0, 0);
+        // padding:20px 16px;
+        // box-sizing: border-box;
+    }
 }
 .ai-btn{
 	width: 80px;

src/components/newQCCom/viewCareful/viewCareful.vue

@@ -156,7 +156,7 @@
 					}else{
 						it.percent = (parseFloat(it.area) / parseFloat(result)*100).toFixed(0);
 					}
-					// console.warn("***carefulList-change1***", it.area,it)
+					// console.warn("***carefulList-change1***", it.area,result,it.percent)
 				})
 				if(this.curSpaceId){
 					let index = this.carefulList.findIndex(it=>it.spaceId==this.curSpaceId);
@@ -181,7 +181,11 @@
 			sliderChange(e,index) {
 				let value = e.detail?e.detail.value:e;
 				let item = this.lastCareList[index];
-				console.log("滑块值：", value,item);
+				console.log("滑块值：", value,item,e,this.overChange);
+                if(isNaN(value)){
+                    this.carefulList[index].area = item.area;
+                    return false;
+                }
 				if(this.overChange){
 					this.$message.warning("请慢一点!");
 					return false;
@@ -217,12 +221,27 @@
 				this.$emit("curSpaceChange",data);//通知父组件-空间面积变化
 			},
 			selectSpace(item,index){
+                // if(item.maxArea < item.area || (item.maxArea==item.minArea && item.maxArea==item.area) || item.isSizeLock){
+                if(item.isSizeLock){
+                    this.$message.warning("空间已经锁定!");
+                    return false;
+                }
+                if(this.selectIndex == index){
+                    return false;
+                }
 				this.selectIndex = index;
 				this.$parent.$parent.curSpaceSelect(item);//向父页面通知空间被选中了
 			},
+            toastLock(){
+                this.$message.warning("空间已经锁定!");
+            },
 			//去往详情页面
 			goRoam(){
 				let item = this.lastCareList[this.selectIndex];
+                if(!item || !item.spaceId){
+                    console.warn("***goRoam***",item,this.selectIndex);
+                    return false;
+                }
 				this.$parent.$parent.goRoam1(item.spaceId);
 				let param = {
 					type: 'CLK', //埋点类型

src/components/newQCCom/viewMask/viewMask.vue

@@ -1111,9 +1111,14 @@
 				this.showAIFlag = true;
 				let newImage = resultImg;
 				let aiStyleName = this.styleList[this.curStyleIndex].styleName;
+				let space = this.datalist.find(it=>it.spaceId == this.curSpaceId);
 				let _data = {
+                    url: this.shottingImg,
 					image:newImage,
 					checked:true,
+                    name:"室内风格",
+                    aTag:space?space.text:"",
+                    bTag:aiStyleName,
 					list:[newImage],
 					spaceId:this.curSpaceId,//记录下当前生成的AI图是哪个空间的，因为会切换空间
 					styleIndex:this.curStyleIndex,//记录下当前生成的AI图是哪个风格的
@@ -1433,8 +1438,18 @@
             			houseId:houseId,
             			id:res.single,
             		}
+                    let _list = this.aiImagesList.map(it=>{
+                        return {
+                            name:it.name,
+                            url:it.image,//结果图
+                            aiImgUrl:it.url.split('?')[0],//原始图
+                            aTag:it.aTag,
+                            bTag:it.bTag,
+                        }
+                    });
+                    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: '/extraPackage/pages/aiPublishPageV2/aiPublishPageV2?id='+data.id+"&houseId="+houseId})
+                    wx.miniProgram.redirectTo({url: '/extraPackage/pages/aiPublishPageV2/aiPublishPageV2?id='+data.id+"&houseId="+houseId+"&list="+JSON.stringify(_list)})
             		// router.push({
             		// 	name: "webgl_rxdz_text_customize",
             		// 	query:data

src/main.js

@@ -44,7 +44,7 @@ window.echarts = echarts;
 
 console.log('***process.env***production', process.env);
 window.env = process.env.NODE_ENV;
-env = env == 'development' ? 'test2' : env;
+env = env == 'development' ? 'production' : env;
 window.$config = api(env);
 console.log("window.$config", window.$config);
 

src/pages/webgl_rxdz_test_all/webgl_rxdz_test_all.vue

@@ -1169,7 +1169,13 @@
             	this.navbar.title = "空间定制";
             	document.title = this.navbar.title;
             	this.sumArea = this.curHouseObj.houseArea;
-            	this.fixedArea = this.curHouseObj.houseArea;
+                if(this.curHouseObj.fixedArea){
+                    this.fixedArea = this.curHouseObj.fixedArea;
+                    this.changeArea = parseFloat((this.sumArea - this.fixedArea).toFixed(2));
+                }else{
+                    this.fixedArea = this.curHouseObj.houseArea;
+                    this.curHouseObj.fixedArea = this.curHouseObj.houseArea
+                }
             	this.curHouseName = this.curHouseObj.name;
             	if(this.curHouseObj.houseArea<=100){//面积小于100平米，则摄像头靠近一点
             		this.cameraStarPosition.y = 20;
@@ -2342,12 +2348,12 @@
                         this.wallIds.push(element.wallId);
 						this.layoutIds.push(element.layoutId);
 						type.push(element.spaceType);
-                        if(element.isSelected){ // 默认选中空间
+                        if(element.isSelected && element.spaceName && !element.isSizeLock && !this.curSpaceObj){ // 默认选中空间
                             this.curSpaceObj = element;
                         }
                     }
                     if(!this.curSpaceObj && this.spaceList.length > 0){
-                        this.curSpaceObj = this.spaceList[0];
+                        this.curSpaceObj = this.spaceList.find(it=>it.spaceName && !it.isSizeLock && (it.spaceHeightMax!=0 && it.spaceWidthMax!=0))
                     }
                 }
                 this.allSpaceCenter = this.getAllSpaceCenter(this.spaceList);//获取所有空间的中心点