Merge branch 'dev_1.1.0' of DeNet/de-net-official into master

nuxt.config.js

@@ -57,7 +57,7 @@ export default {
       },
       {
         name: 'nft',
-        path: '/nft/:id?',
+        path: '/nft/:id/:nft',
         component: resolve(__dirname, 'pages/nft.vue')
       },
       {

pages/index.vue

@@ -698,6 +698,26 @@ export default {
 		} else {
 			this.show_home = true
 			this.status = 'no-chrome'
+            Report.reportLog({
+				baseInfo: {
+					appVersionCode: this.appVersionCode,
+					mid: this.mid,
+					pageSource: Report.pageSource.newUserLandingPage,
+					appType,
+					machineCode: this.mid
+				},
+				params: {
+					eventData: {
+						businessType: Report.businessType.pageView,
+					},
+                    extParams: {
+                        postId: this.detail.postId,
+                        srcContentId: this.detail.srcContentId,
+                        senderId: this.detail.srcUserId,
+                        status: this.status,
+                    }
+				}
+			})
 		}
 	}
 }

pages/nft.vue

@@ -196,11 +196,9 @@ export default {
 			this.isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
 		},
         setNftInfo() {
-            let urlParams = new URL(location.href);
-            let searchParams = new URLSearchParams(urlParams.search);
 			let nftInfo = {
 				nftProjectId: this.detail.nftProjectId,
-                twitterAccount: atob(searchParams.get('twitterAccount') || ''),
+                twitterAccount: atob(this.$route.params.nft || ''),
                 createTime: Date.now(),
 			};
 			Cookies.set('nft_info', JSON.stringify(nftInfo), { expires: 100 });