Browse Source

Merge branch 'bug-undefined-9.2' of DeNet/de-net-official into master

zhangwei 2 years ago
parent
commit
b872400f7b
6 changed files with 14 additions and 58 deletions
  1. 2 14
      pages/index.vue
  2. 2 14
      pages/luckdraw.vue
  3. 1 7
      pages/nft/group.vue
  4. 1 7
      pages/nft/index.vue
  5. 2 8
      pages/treasure/index.vue
  6. 6 8
      pages/treasure/invite.vue

+ 2 - 14
pages/index.vue

@@ -202,13 +202,7 @@
 			</div>
 			<div v-if="status == 'error'"></div>
 		</div>
-		<MobileGuidePage
-			v-if="show_moblie"
-			:playType="PlayType.common"
-			:detail="detail"
-			:postBizData="detail.postBizData"
-			:postUserInfo="detail.postBizData.postUserInfo">
-		</MobileGuidePage>
+		<MobileGuidePage v-if="show_moblie" :playType="PlayType.common" :detail="detail" :postBizData="detail.postBizData" :postUserInfo="detail.postBizData.postUserInfo"> </MobileGuidePage>
 	</div>
 </template>
 
@@ -606,13 +600,7 @@ export default {
 		let { data } = await axios.post(`${baseURL}/denet/post/getDetail`, {
 			baseInfo: {
 				appVersionCode: appVersionCode,
-				mid: (function () {
-					return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-						var r = (Math.random() * 16) | 0,
-							v = c == 'x' ? r : (r & 0x3) | 0x8;
-						return v.toString(16);
-					});
-				})(),
+				mid: '00000000-0000-0000-0000-000000000000',
 			},
 			params: {
 				postId: route.params.id || '',

+ 2 - 14
pages/luckdraw.vue

@@ -6,13 +6,7 @@
 		</template>
 		<template v-else>
 			<!-- 手机端 -->
-			<MobileGuidePage
-				v-if="isMobile"
-				:playType="PlayType.lottery"
-				:detail="detail"
-				:postBizData="detail.postBizData"
-				:postUserInfo="detail.postBizData.postUserInfo">
-			</MobileGuidePage>
+			<MobileGuidePage v-if="isMobile" :playType="PlayType.lottery" :detail="detail" :postBizData="detail.postBizData" :postUserInfo="detail.postBizData.postUserInfo"> </MobileGuidePage>
 			<!-- PC端 -->
 			<template v-else>
 				<div class="logo">
@@ -313,13 +307,7 @@ export default {
 		let { data } = await axios.post(`${baseURL}/denet/post/getDetail`, {
 			baseInfo: {
 				appVersionCode: appVersionCode,
-				mid: (function () {
-					return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-						var r = (Math.random() * 16) | 0,
-							v = c == 'x' ? r : (r & 0x3) | 0x8;
-						return v.toString(16);
-					});
-				})(),
+				mid: '00000000-0000-0000-0000-000000000000',
 			},
 			params: {
 				postId: route.params.id || '',

+ 1 - 7
pages/nft/group.vue

@@ -141,13 +141,7 @@ export default {
 		let { data } = await axios.post(`${baseURL}/denet/post/getDetail`, {
 			baseInfo: {
 				appVersionCode: appVersionCode,
-				mid: (function () {
-					return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-						var r = (Math.random() * 16) | 0,
-							v = c == 'x' ? r : (r & 0x3) | 0x8;
-						return v.toString(16);
-					});
-				})(),
+				mid: '00000000-0000-0000-0000-000000000000',
 			},
 			params: {
 				postId: route.params.id || '',

+ 1 - 7
pages/nft/index.vue

@@ -118,13 +118,7 @@ export default {
 		let { data } = await axios.post(`${baseURL}/denet/nft/project/getNftProjectInfo`, {
 			baseInfo: {
 				appVersionCode: appVersionCode,
-				mid: (function () {
-					return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-						var r = (Math.random() * 16) | 0,
-							v = c == 'x' ? r : (r & 0x3) | 0x8;
-						return v.toString(16);
-					});
-				})(),
+				mid: '00000000-0000-0000-0000-000000000000',
 			},
 			params: {
 				nftProjectId: route.params.id || '',

+ 2 - 8
pages/treasure/index.vue

@@ -5,7 +5,7 @@
 		</template>
 		<template v-else>
 			<template v-if="isMobile">
-				<MobileGuidePage :playType="PlayType.Treasure" :detail="detail" :postUserInfo="detail.postUserInfo"></MobileGuidePage>
+				<MobileGuidePage :playType="PlayType.Treasure" :detail="detail" :postUserInfo="detail.postUserInfo"> </MobileGuidePage>
 			</template>
 			<template v-else>
 				<div class="logo">
@@ -126,13 +126,7 @@ export default {
 		let { data } = await axios.post(`${baseURL}/denet/post/treasure/detail`, {
 			baseInfo: {
 				appVersionCode: appVersionCode,
-				mid: (function () {
-					return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-						var r = (Math.random() * 16) | 0,
-							v = c == 'x' ? r : (r & 0x3) | 0x8;
-						return v.toString(16);
-					});
-				})(),
+				mid: '00000000-0000-0000-0000-000000000000',
 			},
 			params: {
 				postId: route.params.id || '',

+ 6 - 8
pages/treasure/invite.vue

@@ -137,13 +137,7 @@ export default {
 		let { data } = await axios.post(`${baseURL}/denet/post/treasure/invite/detail`, {
 			baseInfo: {
 				appVersionCode: appVersionCode,
-				mid: (function () {
-					return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-						var r = (Math.random() * 16) | 0,
-							v = c == 'x' ? r : (r & 0x3) | 0x8;
-						return v.toString(16);
-					});
-				})(),
+				mid: '00000000-0000-0000-0000-000000000000',
 			},
 			params: {
 				inviteCode: route.params.id || '',
@@ -151,9 +145,13 @@ export default {
 			},
 		});
 		if (data.code == 0) {
+			let pageLink = `${jumpUrl}treasure/invite/${route.params.id}`;
+			if (route.params.channel) {
+				pageLink = `${pageLink}/${route.params.channel}`;
+			}
 			return {
 				detail: data.data,
-				pageLink: `${jumpUrl}treasure/invite/${route.params.id}/${route.params.channel}`,
+				pageLink,
 			};
 		}
 	},