Merge branch 'dev_1.1.7_lint' into pre

pages/nft/index.vue

@@ -154,22 +154,38 @@ export default {
 		// 埋点
 		if (this.isMobile) {
 			this.pageSource = Report.pageSource.mobileLandingPage;
-		}
-		Report.reportLog({
-			baseInfo: {
-				appVersionCode: appVersionCode,
-				mid: this.mid,
-				pageSource: this.pageSource,
-				machineCode: this.mid,
-			},
-			params: {
-				eventData: {
-					businessType: Report.businessType.pageView,
-					nftProjectId: this.detail.nftProjectId,
-					redPacketType: 2,
+			Report.reportLog({
+				baseInfo: {
+					appVersionCode: appVersionCode,
+					mid: this.mid,
+					pageSource: this.pageSource,
+					machineCode: this.mid,
 				},
-			},
-		});
+				params: {
+					eventData: {
+						businessType: Report.businessType.pageView,
+						nftProjectId: this.detail.nftProjectId,
+						redPacketType: 2,
+					},
+				},
+			});
+		} else {
+			Report.reportLog({
+				baseInfo: {
+					appVersionCode: appVersionCode,
+					mid: this.mid,
+					pageSource: this.pageSource,
+					machineCode: this.mid,
+				},
+				params: {
+					eventData: {
+						businessType: Report.businessType.pageView,
+						nftProjectId: this.detail.nftProjectId,
+						redPacketType: 2,
+					},
+				},
+			});
+		}
 	},
 	methods: {
 		trackingClick() {

pages/toolbox/index.vue

@@ -14,7 +14,7 @@
 			<!-- chrome -->
 			<div v-if="device == 'chrome'">
 				<div class="txt">Use chrome browser to access {{ detail.postBizData.linkTitle || '' }}</div>
-				<install-extension :extensionsInstallUrl="config.extensionsInstallUrl"></install-extension>
+				<install-extension :extensionsInstallUrl="config.extensionsInstallUrl" @installClick="installClick"></install-extension>
 			</div>
 		</div>
 

pages/treasure/index.vue

@@ -189,24 +189,25 @@ export default {
 					},
 				});
 			}, 500);
-		}
-		Report.reportLog({
-			baseInfo: {
-				appVersionCode: appVersionCode,
-				mid: this.mid,
-				pageSource: this.pageSource,
-				appType,
-				machineCode: this.mid,
-			},
-			params: {
-				eventData: {
-					businessType: Report.businessType.pageView,
-					postId: this.detail.postId,
-					srcContentId: this.detail.srcContentId,
-					redPacketType: 4,
+		} else {
+			Report.reportLog({
+				baseInfo: {
+					appVersionCode: appVersionCode,
+					mid: this.mid,
+					pageSource: this.pageSource,
+					appType,
+					machineCode: this.mid,
 				},
-			},
-		});
+				params: {
+					eventData: {
+						businessType: Report.businessType.pageView,
+						postId: this.detail.postId,
+						srcContentId: this.detail.srcContentId,
+						redPacketType: 4,
+					},
+				},
+			});
+		}
 	},
 	methods: {
 		clickBtn() {
@@ -225,7 +226,6 @@ export default {
 							postId: this.detail.postId,
 							srcContentId: this.detail.srcContentId,
 							redPacketType: 4,
-							shareLinkId: window.location.href,
 						},
 					},
 				});

pages/treasure/invite.vue

@@ -232,7 +232,7 @@ export default {
 							postId: this.detail.postId,
 							srcContentId: this.detail.srcContentId,
 							redPacketType: 4,
-							shareLinkId: window.location.href,
+							shareLinkId: this.$route.params.id,
 						},
 					},
 				});