Merge branch 'master' into dev_1.1.7_by_nft

components/MobileLandPage.vue

@@ -328,6 +328,7 @@ export default {
 	padding: 0 16px;
 	&-invited-info {
 		min-width: 302px;
+		max-width: 98%;
 		height: 72px;
 		margin-top: 28px;
 		position: relative;
@@ -341,7 +342,6 @@ export default {
 		border: 1px solid #c0daeb;
 		padding-right: 12px;
 		box-sizing: border-box;
-		white-space: nowrap;
 
 		.invited-photo {
 			width: 70px;
@@ -369,6 +369,9 @@ export default {
 			line-height: 20px;
 			letter-spacing: 0.3px;
 			color: #f99d23;
+			height: 28px;
+			display: flex;
+			align-items: center;
 		}
 	}
 	&-icon-wrap {

pages/toolbox/index.vue

@@ -208,7 +208,7 @@ export default {
 				srcContentId: this.detail.srcContentId || '',
 				postNickName: this.detail.srcUserId || '',
 				createTime: Date.now(),
-				jump_type: 'jump_info',
+				jump_type: 'tool_box',
 			};
 			Cookies.set('jump_info', JSON.stringify(pickupInfo), { expires: 1000 });
 		},

pages/treasure/index.vue

@@ -80,6 +80,7 @@ export default {
 			isMobile: false,
 			isChrome: false,
 			linkHref: '',
+			pageLink: '',
 		};
 	},
 	components: {
@@ -100,6 +101,10 @@ export default {
 					name: 'og:image',
 					content: this.detail.imagePath || '',
 				},
+				{
+					name: 'og:url',
+					content: this.pageLink,
+				},
 				// twitter
 				{
 					name: 'twitter:card',
@@ -136,6 +141,7 @@ export default {
 		if (data.code == 0) {
 			return {
 				detail: data.data,
+				pageLink: `${jumpUrl}treasure/${route.params.id}`,
 			};
 		}
 	},

pages/treasure/invite.vue

@@ -84,6 +84,7 @@ export default {
 			isMobile: false,
 			isChrome: false,
 			linkHref: '',
+			pageLink: '',
 		};
 	},
 	components: {
@@ -104,6 +105,10 @@ export default {
 					name: 'og:image',
 					content: this.detail.imagePath || '',
 				},
+				{
+					name: 'og:url',
+					content: this.pageLink,
+				},
 				// twitter
 				{
 					name: 'twitter:card',
@@ -140,6 +145,7 @@ export default {
 		if (data.code == 0) {
 			return {
 				detail: data.data,
+				pageLink: `${jumpUrl}treasure/invite/${route.params.id}/${route.params.channel}`,
 			};
 		}
 	},