zjs_project 1 anno fa
parent
commit
f1fd6b7e29

+ 6 - 1
src/App.vue

@@ -48,6 +48,7 @@
 			let userId = this.$route.query.leavePhoneCustomerId ? this.$route.query.leavePhoneCustomerId : (userInfo?userInfo.userId:'');
 			let xcxHouseId = this.$route.query.xcxHouseId ? this.$route.query.xcxHouseId : (this.$route.query.houseId || '');
 			let landDataId = this.$route.query.landDataId ? this.$route.query.landDataId : '';//土地id
+			let houseName = this.$route.query.houseName ? this.$route.query.houseName : '';//项目名称
 			let cityCode = this.$route.query.cityCode ? this.$route.query.cityCode : '';//土地id
 			let query = this.$route.query;
 			let brandId = this.$route.query.brandId || this.$route.query.special_ID;
@@ -57,6 +58,9 @@
             if (landDataId) { //如果存在土地id
                 this.$store.state.landDataId = landDataId;
             }
+            if (houseName) { //如果存在项目名称
+                this.$store.state.houseName = houseName;
+            }
             if (cityCode) { //如果存在cityCode
                 this.$store.state.cityCode = cityCode;
             }
@@ -152,9 +156,10 @@
 		color: #2c3e50;
 		margin-top: 60px; */
 	}
-
 	body {
 		background: #181C28;
+        overscroll-behavior: none; /* 禁用回弹效果 */
+        overflow: hidden; /* 如果需要隐藏滚动条 */  
 	}
 
 

+ 6 - 0
src/components/newQCCom/viewMask/viewMask.vue

@@ -267,6 +267,9 @@
 			},
             landDataId() {
             	return this.$store.state.landDataId;
+            },
+            houseName() {
+            	return this.$store.state.houseName;
             },
 			curHouseObj() {
 				return this.$store.state.curHouseObj;
@@ -1160,6 +1163,9 @@
                 if(this.landDataId){
                     param.landDataId = this.landDataId;
                 }
+                if(this.houseName){
+                    param.houseName = this.houseName;
+                }
             	console.warn("submitHouse-param: ", param);
             	// setStorage('envData',checkIndexList);
             	const loading = this.$loading({

+ 2 - 2
src/mixins/createImgHandle.js

@@ -122,8 +122,8 @@ export default {
 				prompt: prompt,
 				"batchSize": 1,
 				brandId: $config.brandId,
-				height: 1024,
-				width: 1024,
+				height: 512,
+				width: 768,
 				"moduleType": "AI_Biography",
 				"steps": 20,
 				"sampler": "DDIM",

+ 7 - 1
src/pages/webgl_rxdz_test1_env/webgl_rxdz_test1_env.html

@@ -15,8 +15,14 @@
 				</el-carousel-item> -->
                 <el-carousel-item v-for="(item,s) in aiImagesList" :key="item.id" 
         			:item-id="item.id" class="master-pic-item rows justify-center">
-                    <img @touchstart="mytouchstart" @touchmove="mytouchmove" @touchend="mytouchend" 
+                    <img @touchstart.stop="mytouchstart" @touchmove.stop="mytouchmove" @touchend.stop="mytouchend"
+                    @click="previewImg(item.imageUrl)" 
         			class="master-pic-img" :src="item.imageUrl" mode="aspectFill" />
+                    <!-- <el-image 
+                        @touchstart.stop="mytouchstart" @touchmove.stop="mytouchmove" @touchend.stop="mytouchend"
+                        class="master-pic-img" :src="item.imageUrl" mode="aspectFill"
+                        :preview-src-list="[item.imageUrl]">
+                    </el-image> -->
                 </el-carousel-item>
             </el-carousel>
 			<div class="indicator-view rows" v-if="aiImagesList && aiImagesList.length>1">

+ 9 - 8
src/pages/webgl_rxdz_test1_env/webgl_rxdz_test1_env.scss

@@ -27,6 +27,7 @@ page {
 		.master-pic-swiper{
 			width: 100%;
 			height: 100%;
+            overflow: hidden;
 		}
 		.master-pic-item{
 			width: 100%;
@@ -64,6 +65,7 @@ page {
 		.tab-content{
 			position: absolute;
 			min-width: 100vw;
+            justify-content: space-around;
 			.tab-line{
 				position: absolute;
 				left: 0px;
@@ -77,7 +79,6 @@ page {
 		}
         .tab-item{
 			width:max-content;
-            margin-right: 20px;
             font-family: "Verdana";
             font-weight: 400;
             font-size: 24px;
@@ -85,14 +86,14 @@ page {
 			text-align:center;
 			padding:2px;
 			box-sizing: border-box;
-			margin-right: 60px;
+			// margin-right: 60px;
 			z-index: 2;
-			&:first-child{
-				margin-left: 112px;
-			}
-			&:last-child{
-				margin-right: 0px;
-			}
+			// &:first-child{
+			// 	margin-left: 112px;
+			// }
+			// &:last-child{
+			// 	margin-right: 0px;
+			// }
             
 			.tab-text{
 				font-family: "Verdana";

+ 12 - 2
src/pages/webgl_rxdz_test1_env/webgl_rxdz_test1_env.vue

@@ -162,7 +162,7 @@
 					this.tabData[0].checkedIndex = 0;
 					this.optionIndex = 0;
 					this.options = this.tabData[0].options; //选项数据
-					this.AIImg = this.tabData[0].options[0].imageUrl;//AI生成所需的垫图
+					this.AIImg = this.tabData[0].options[0].imageUrl2;//AI生成所需的垫图
 					this.aiImagesList = this.tabData[0].options[0].hardboundEffect;
 					if(envData && envData.length>0){
 						removeItem('envData');//用完后删除
@@ -215,7 +215,7 @@
 				this.optionIndex = id;
 				this.tabData[this.tabIndex].checkedIndex = this.optionIndex;
 				this.allSelect = !this.tabData.some(it=>it.checkedIndex==-1);
-				this.AIImg = this.options[this.optionIndex].imageUrl;//AI生成图的垫图
+				this.AIImg = this.options[this.optionIndex].imageUrl2;//AI生成图的垫图
 				//替换对应的队列为选中的选项的数组对象
 				this.aiImagesList = this.options[this.optionIndex].hardboundEffect;
 				this.currentIndex = 0;
@@ -272,6 +272,16 @@
 			catchTouchMove: function() {
 				return false;
 			},
+            //预览图片
+            previewImg(img){
+            	if(window.__wxjs_environment === 'miniprogram'){
+            		this.pvCloseHandle();//小程序跳转会主动杀死关闭当前页面-不经过vue跳转关闭逻辑-所以需要主动触发关闭埋点
+            		wx.miniProgram.navigateTo({url: '/activityPackage/pages/scale-img/scaleImg?imgPath=' + img + "&locusValue=" + img + "&houseId=" + this.houseId})
+            	}else{
+            		this.$message.warning("请在小程序中使用");
+            		// this.showPop();
+            	}
+            },
 			//提交结果数据处理
 			async resultDataHandle(){
                 let otherlist = [];

+ 3 - 3
src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.html

@@ -47,7 +47,7 @@
 					<div class="font52 wiriting-text">{{layoutStruct.houseName || ''}}</div>
 				</div>
 			</div> -->
-			<div class="title">{{layoutStruct.houseName}} · 我的梦想设计</div>
+			<div class="title">{{layoutStruct.houseName}} · 梦想设计</div>
             <!-- 文字信息区域 -->
             <div class="info-bar">
 				<div class="info-item" v-for="(item,index) in expand" :key="index">
@@ -57,11 +57,11 @@
             </div>
         </div>
 		<!-- 支付后的显示视图 -->
-		<div class="pay-view columns" v-if="payed==1 && projectUserId==userId">
+		<div class="pay-view columns" v-if="projectUserId==userId">
 		    <div class="t1 rows" style="margin-bottom: 6px;">订金权益说明<i class="iconfont icon-shuoming rows" style="margin-left: 6px;"></i></div>
 		    <div class="t2">支付订金 ¥99</div>
 		    <div class="t2" style="margin-bottom: 22.5px;">立得专属私人空间定制方案</div>
-		    <div class="rows ">
+		    <div class="rows " v-if="payed==1">
 		        <div class="bottom-btn btn-qw rows justify-center" @click="conectUS">
 		            加企微 · 定制服务
 		        </div>

+ 4 - 0
src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.vue

@@ -436,6 +436,10 @@ export default {
 				if((this.likeCount + this.unlikedCount)>0){
 					this.proportion = parseInt((this.likeCount / (this.likeCount + this.unlikedCount))*100);
 				}
+                let landDataId = this.layoutStruct.landDataId ? this.layoutStruct.landDataId : '';//土地id
+                if (landDataId && !this.$store.state.landDataId) { //如果存在土地id并且进入时没有土地id
+                    this.$store.state.landDataId = landDataId;
+                }
                 // this.number = single.landCode
                 this.form = single.layoutStruct[0];
 				this.headList = this.layoutStruct.heads || [];

+ 1 - 0
src/store/state.js

@@ -11,5 +11,6 @@ const state = {
 	curSpaceId:null,	//当前选中的空间id
 	landDataId:null,	//土地id
 	cityCode:null,	//城市编码
+	houseName:null,	//项目名称
 }
 export default state