优化埋点和AI生图

src/components/newBottomCom/viewCareful/viewCareful.vue

@@ -199,7 +199,7 @@
 					clkName: 'AI_clk', //点击前往的页面名称
 					clkParams: {
 						locusName: "AI精软装",
-						carefulList:this.carefulList
+						locusValue:this.carefulList[this.selectIndex].name,
 					}
 				};
 				util.trackRequest(param);

src/components/newBottomCom/viewMask/viewMask.vue

@@ -295,6 +295,7 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23080417', //点击ID
 					clkName: 'changeangle_clk', //点击前往的页面名称
+					behaviorName:"空间切换",
 					clkParams: {
 						locusName: "空间切换",
 						locusValue:item.text,
@@ -315,9 +316,11 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23080417', //点击ID
 					clkName: 'changeangle_clk', //点击前往的页面名称
+					behaviorName:"视角切换",
 					clkParams: {
 						locusName: "视角切换",
-						type:this.$parent.actors[nextIndex].actorEum
+						type:this.$parent.actors[nextIndex].actorEum,
+					    locusValue:this.$parent.actors[nextIndex].actorEum,
 					}
 				};
 				util.trackRequest(param);
@@ -329,8 +332,10 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23080415', //点击ID
 					clkName: 'contrast_clk', //点击前往的页面名称
+					behaviorName:"对比",
 					clkParams: {
 						locusName: "对比",
+					    locusValue:this.showAIImage?"显示生成图":"隐藏生成图"
 					}
 				};
 				util.trackRequest(param);
@@ -347,9 +352,11 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23112701', //点击ID
 					clkName: 'AIstyle_theme_clk', //点击前往的页面名称
+					behaviorName:"主题切换",
 					clkParams: {
 						locusName: "AI 主题",
-						type:this.themeList[this.themeIndex].text
+						type:this.themeList[this.themeIndex].text,
+					    locusValue:this.themeList[this.themeIndex].text,
 					}
 				};
 				util.trackRequest(param);
@@ -374,9 +381,10 @@
 			        type: 'CLK', //埋点类型
 			        clkId: 'clk_2cmina_56', //点击ID,固定
 			        clkName: "share-savepic", //点击名称
-			        expand: {
-			            "resultImg": (_resultImg || ""),
-			        },
+			        behaviorName:"保存到相册",
+			        clkParams: {
+			            locusValue: (_resultImg || ""),
+			        }
 			    }
 			    util.trackRequest(para);
 				if(navigator.userAgent.toLocaleLowerCase().includes('micromessenger')){
@@ -411,9 +419,11 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23080414', //点击ID
 					clkName: 'download_clk', //点击前往的页面名称
+				    behaviorName:"下载",
 					clkParams: {
 						locusName: "下载",
-						img:_resultImg
+						img:_resultImg,
+				        locusValue:_resultImg,
 					}
 				};
 				util.trackRequest(param);
@@ -442,10 +452,12 @@
 						type: 'CLK', //埋点类型
 						clkId: 'clk_2cmina_23080418', //点击ID
 						clkName: 'chooseprogramme_clk', //点击前往的页面名称
+                        behaviorName:"点赞喜欢",
 						clkParams: {
 							locusName: "选定风格/视角",
 							style:this.styleList[this.curStyleIndex].styleName,
 							img:this.aiImagesList[this.currentIndex].image,
+                            locusValue:this.aiImagesList[this.currentIndex].image,
 						}
 					};
 					util.trackRequest(param);
@@ -531,9 +543,10 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23080416', //点击ID
 					clkName: 'AIstyle_ret_clk', //点击前往的页面名称
+					behaviorName:"风格选择",
 					clkParams: {
 						locusName: "AI 风格",
-						type:this.styleList[this.curStyleIndex].styleName
+						locusValue:this.styleList[this.curStyleIndex].styleName,
 					}
 				};
 				util.trackRequest(param);

src/components/newQCCom/viewCareful/viewCareful.vue

@@ -199,7 +199,7 @@
 					clkName: 'AI_clk', //点击前往的页面名称
 					clkParams: {
 						locusName: "AI精软装",
-						carefulList:this.carefulList
+                        locusValue:this.carefulList[this.selectIndex].name,
 					}
 				};
 				util.trackRequest(param);

src/components/newQCCom/viewMask/viewMask.html

@@ -19,34 +19,41 @@
 	<div class="indicator-view rows" v-if="aiImagesList && aiImagesList.length>1 && showAIImage">
 		<div class="indicator-item" :class="{'active': currentIndex == idx}" v-for="(item, idx) in aiImagesList" :key="idx"></div>
 	</div>
-	<div class="btn-view columns" v-if="showAIImage==false">
-		<!-- 切换视图-退出当前模式 -->
-		<div class="compareBtn btn1" @click.stop="showOrHideWebGl" v-if="aiImagesList && aiImagesList.length>0">
-			<img class="compareIcon" src="https://dm.static.elab-plus.com/miniProgram/space1/compareAI_btn.png" mode="widthFix" />
-		</div>
-		<!-- 切换视角 -->
-		<!-- <div class="change-angle columns" @click.stop="switchActor" >
-			<img class="camera" src="https://dm.static.elab-plus.com/miniProgram/iconfont/camera.png" mode="widthFix"/>
-			视角切换
-		</div> -->
-	</div>
+	
 	
 	<!-- 左侧按钮  -->
-	<div class="btn-view columns" v-else-if="aiImagesList && aiImagesList.length>0">
+	<div class="btn-view columns" v-if="showAIImage && (aiImagesList && aiImagesList.length>0)">
 		<!-- 下载 -->
-		<div class="compareBtn btn1" @click.stop="save" v-if="showAIImage">
+		<!-- <div class="compareBtn btn1" @click.stop="save" v-if="showAIImage">
 			<img class="down" src="https://dm.static.elab-plus.com/miniProgram/iconfont/down.png" mode="widthFix"/>
-		</div>
+		</div> -->
 		<!-- 切换视图-退出当前模式 -->
-		<div class="compareBtn btn1" @click.stop="showOrHideWebGl">
+		<!-- <div class="compareBtn btn1" @click.stop="showOrHideWebGl">
 			<img class="compareIcon" src="https://dm.static.elab-plus.com/miniProgram/space1/compareAI_btn.png" mode="widthFix" />
-		</div>
+		</div> -->
 		<!-- 点赞喜欢 -->
 		<div class="likeBtn columns" @click.stop="changeAIImg" :class="{like:checked}">
 			<div class="iconfont icon-qeuren"></div>
 			喜欢
 		</div>
 	</div>
+    <!-- 右侧按钮  -->
+    <div class="btn-view columns" style="left: unset;right: 30px;" v-if="showAIImage && (aiImagesList && aiImagesList.length>0)">
+    	<!-- 下载 -->
+    	<div class="compareBtn btn1" @click.stop="save">
+    		<img class="down" src="https://dm.static.elab-plus.com/miniProgram/iconfont/down.png" mode="widthFix"/>
+    	</div>
+    	<!-- 切换视图-退出当前模式 -->
+    	<div class="compareBtn btn1" @click.stop="showOrHideWebGl">
+    		<img class="compareIcon" src="https://dm.static.elab-plus.com/miniProgram/space1/compareAI_btn.png" mode="widthFix" />
+    	</div>
+    </div>
+    <div class="btn-view columns" style="left: unset;right: 30px;" v-if="showAIImage==false">
+    	<!-- 切换视图-退出当前模式 -->
+    	<div class="compareBtn btn1" @click.stop="showOrHideWebGl" v-if="aiImagesList && aiImagesList.length>0">
+    		<img class="compareIcon" src="https://dm.static.elab-plus.com/miniProgram/space1/compareAI_btn.png" mode="widthFix" />
+    	</div>
+    </div>
 	<!-- 微信客服 -->
 	<!-- <div class="connect-view columns"
 		@click.stop="mynavigateFuc" data-jumptype="50" v-if="connectUsImg">

src/components/newQCCom/viewMask/viewMask.vue

@@ -323,6 +323,7 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23080417', //点击ID
 					clkName: 'changeangle_clk', //点击前往的页面名称
+                    behaviorName:"空间切换",
 					clkParams: {
 						locusName: "空间切换",
 						locusValue:item.text,
@@ -343,9 +344,11 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23080417', //点击ID
 					clkName: 'changeangle_clk', //点击前往的页面名称
+                    behaviorName:"视角切换",
 					clkParams: {
 						locusName: "视角切换",
-						type:this.$parent.actors[nextIndex].actorEum
+						type:this.$parent.actors[nextIndex].actorEum,
+                        locusValue:this.$parent.actors[nextIndex].actorEum,
 					}
 				};
 				util.trackRequest(param);
@@ -357,8 +360,10 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23080415', //点击ID
 					clkName: 'contrast_clk', //点击前往的页面名称
+                    behaviorName:"对比",
 					clkParams: {
 						locusName: "对比",
+                        locusValue:this.showAIImage?"显示生成图":"隐藏生成图"
 					}
 				};
 				util.trackRequest(param);
@@ -375,9 +380,11 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23112701', //点击ID
 					clkName: 'AIstyle_theme_clk', //点击前往的页面名称
+                    behaviorName:"主题切换",
 					clkParams: {
 						locusName: "AI 主题",
-						type:this.themeList[this.themeIndex].text
+						type:this.themeList[this.themeIndex].text,
+                        locusValue:this.themeList[this.themeIndex].text,
 					}
 				};
 				util.trackRequest(param);
@@ -402,9 +409,10 @@
 			        type: 'CLK', //埋点类型
 			        clkId: 'clk_2cmina_56', //点击ID,固定
 			        clkName: "share-savepic", //点击名称
-			        expand: {
-			            "resultImg": (_resultImg || ""),
-			        },
+                    behaviorName:"保存到相册",
+                    clkParams: {
+                        locusValue: (_resultImg || ""),
+                    }
 			    }
 			    util.trackRequest(para);
 				if(navigator.userAgent.toLocaleLowerCase().includes('micromessenger')){
@@ -439,9 +447,11 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23080414', //点击ID
 					clkName: 'download_clk', //点击前往的页面名称
+                    behaviorName:"下载",
 					clkParams: {
 						locusName: "下载",
-						img:_resultImg
+						img:_resultImg,
+                        locusValue:_resultImg,
 					}
 				};
 				util.trackRequest(param);
@@ -467,10 +477,12 @@
 						type: 'CLK', //埋点类型
 						clkId: 'clk_2cmina_23080418', //点击ID
 						clkName: 'chooseprogramme_clk', //点击前往的页面名称
+                        behaviorName:"点赞喜欢",
 						clkParams: {
 							locusName: "选定风格/视角",
 							style:this.styleList[this.curStyleIndex].styleName,
 							img:this.aiImagesList[this.currentIndex].image,
+                            locusValue:this.aiImagesList[this.currentIndex].image,
 						}
 					};
 					util.trackRequest(param);
@@ -544,6 +556,10 @@
 				if (res.success) {
 					let list = res.list;
 					this.styleList = list;
+                    if(this.styleList.length < (Number(this.curStyleIndex) + 1)){//空间切换后的风格数量小于上次选的风格的序号
+                        this.curStyleIndex = 0;
+                        console.warn("***curStyleIndex-change***",)
+                    }
 				}
 			},
 			//风格选择
@@ -556,9 +572,10 @@
 					type: 'CLK', //埋点类型
 					clkId: 'clk_2cmina_23080416', //点击ID
 					clkName: 'AIstyle_ret_clk', //点击前往的页面名称
+                    behaviorName:"风格选择",
 					clkParams: {
 						locusName: "AI 风格",
-						type:this.styleList[this.curStyleIndex].styleName
+						locusValue:this.styleList[this.curStyleIndex].styleName,
 					}
 				};
 				util.trackRequest(param);
@@ -712,7 +729,7 @@
 					"cfgScale":12,
 					"denoising":0.9,
 					image:this.shottingImg,
-					styleImage:imgUrl,
+					style:imgUrl,
 					keyword: "elabSd",
 					model: this.modelType==1? "lucataco/ssd-1b" : 'catio-apps/controlnet-interior-design',
 				};
@@ -732,7 +749,7 @@
 					// }
 				}
                 parmas.keyword = "liblibai";
-                parmas.model = "img2img_canny_ipadapter";
+                parmas.model = "text2img";
                 parmas.loraModel = "98333991fc8744af8b162948ae33b15b";
 				this.curSpaceId = this.spaceObj.spaceId;//生成时的空间id
 				let result = await this.prevHandle(parmas);

src/mixins/commonPageMethod.js

@@ -19,6 +19,7 @@ export default {
 				pvId: this.pvId,
 				locusBehaviorName: this.locusBehaviorName,
 				pvCurPageName: this.pvCurPageName,
+				locusValue: this.$route.query.locusValue || "",
 			};
 			util.trackRequest(param);//发送统一PV埋点
 			window.addEventListener('beforeunload', this.pvCloseHandle);

src/pages/webgl_rxdz_roam/webgl_rxdz_roam.vue

@@ -556,7 +556,8 @@
 							clkName: 'visualangle_clk', //点击前往的页面名称
 							clkParams: {
 								locusName: "预制视角",
-								type:that.actors[index].actorEum
+								type:that.actors[index].actorEum,
+                                locusValue:that.curSpaceObj.text || that.curSpaceObj.spaceName,
 							}
 						};
 						util.trackRequest(param);

src/pages/webgl_rxdz_test/webgl_rxdz_test.vue

@@ -1805,6 +1805,7 @@
 				let data = {
 					spaceId:spaceId,
 					houseId:this.houseId,
+                    locusValue:gltf.text || "",
 				}
 				if(this.repeatFlag){
 					return false;

src/pages/webgl_rxdz_test_roam/webgl_rxdz_test_roam.vue

@@ -554,7 +554,8 @@
 							clkName: 'visualangle_clk', //点击前往的页面名称
 							clkParams: {
 								locusName: "预制视角",
-								type:that.actors[index].actorEum
+								type:that.actors[index].actorEum,
+                                locusValue:that.curSpaceObj.text || that.curSpaceObj.spaceName,
 							}
 						};
 						util.trackRequest(param);

src/utils/util.js

@@ -491,11 +491,14 @@ var util = {
 			pvCurPageParams.locusBehaviorName = para.locusBehaviorName  || '';
 			pvCurPageParams.locusValue = para.locusValue  || '';
 			pvCurPageParams.locusName = para.locusName  || '';
+            let _fromParam = {};
+            _fromParam["scene"] = urlObj.scene1 || '';
 			let data = {
 				session: '',
 				userAgent: navigator.userAgent.substring(0, 255) || '',
 				browserName: navigator.appName || '',
 				browserVersion: navigator.appVersion.substring(0, 255) || '',
+                fromParam: JSON.stringify(_fromParam), //转发者秘钥
 				platform: 'h5', //iframeUrl代表是顾问分享的外链
 				fromPlatform: urlObj.fromPlatform || urlObj.fromProduce || 'h5',
 				ip: window.ip || '',
@@ -525,6 +528,9 @@ var util = {
 				type: para.type || '', //埋点类型
 				reserve1: urlObj.channel || '', //来源平台，抖音百度微信
 			}
+            if(para.behaviorName){
+                data.behaviorName = para.behaviorName;
+            }
 			let timeNow = new Date().getTime();
 			let session = getStorage('sessionNumber') ? Number(getStorage('sessionNumber')) : timeNow;
 			if (timeNow - sessionTime > 180000 && !urlObj.session) {