DELL 3 роки тому
батько
коміт
d3ea131bba
2 змінених файлів з 17 додано та 14 видалено
  1. 17 13
      src/packageOperate/activity/index.vue
  2. 0 1
      src/packagePrize/choice/index.vue

+ 17 - 13
src/packageOperate/activity/index.vue

@@ -238,6 +238,7 @@
 	import env from '../../config/env.js'
 	import $http from '@/utils/request.js'
 	import log from '@/common/log.js'
+	import appId from '@/config/appId.js'
 	import ActivityHelp from '@/components/activity-help/activity-help.vue'
 	import {
 		formatRichText
@@ -269,18 +270,9 @@
 			if (opthios.id) {
 				this.id = opthios.id
 			}
-			/**
-			 * 免费活动邀请助力分享跳转接收参数
-			 * inviteCodeTa: 邀请码
-			 * marketingId: 活动id
-			 * */
-			if (opthios.inviteCode && opthios.marketingId) {
-				this.inviteCodeTa = opthios.inviteCode
-				this.marketingId = opthios.marketingId
-				this.id = opthios.marketingId
-				this.activityShow = true
-			}
 			if (opthios.userId) {
+				console.log(opthios);
+				console.log('opthios',opthios.userId);
 				uni.setStorageSync('shareUid', opthios.userId != 'undefined' ? opthios.userId : null)
 				if (opthios.userId === undefined || opthios.userId === 'undefined') {
 					uni.getSystemInfo({
@@ -295,8 +287,18 @@
 			if (opthios.type) {
 				uni.setStorageSync('shareType', opthios.type)
 			}
+			/**
+			 * 免费活动邀请助力分享跳转接收参数
+			 * inviteCodeTa: 邀请码
+			 * marketingId: 活动id
+			 * */
+			if (opthios.inviteCode && opthios.marketingId) {
+				this.inviteCodeTa = opthios.inviteCode
+				this.marketingId = opthios.marketingId
+				this.id = opthios.marketingId
+				this.activityShow = true
+			}
 			this.getDetail()
-
 		},
 		onShow() {
 			this.pagesNum = getCurrentPages().length
@@ -394,7 +396,7 @@
 			},
 
 			getBaseInfo() {
-				$http.post('/api/v1/mp/user/getLoginUserinfo', {}).then(res => {
+				$http.post('/api/v1/mp/user/getLoginUserinfo', { appSource: appId }).then(res => {
 					uni.hideLoading();
 					if (res.code == 0) {
 						this.userInfo = res.data
@@ -403,6 +405,7 @@
 			},
 		},
 		onShareAppMessage(res) {
+			console.log(this.userInfo.userId);
 			return {
 				title: '超值宝贝免费抽,参与活动仅需3秒',
 				path: `/packageOperate/activity/index?marketingId=${ this.info.id }&inviteCode=${ this.inviteCode }&userId=${ this.userInfo.userId?this.userInfo.userId:null }&type=1`,
@@ -411,6 +414,7 @@
 		},
 		//分享朋友圈
 		onShareTimeline() {
+			console.log(this.userInfo.userId);
 			return {
 				title: '超值宝贝免费抽,参与活动仅需3秒',
 				imageUrl: 'https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/free_draw_bkg.jpeg',

+ 0 - 1
src/packagePrize/choice/index.vue

@@ -296,7 +296,6 @@
 						res.data.description.split(".jpeg\"").join(".jpeg?imageView2/2/w/750\"")
 						res.data.description.split(".png\"").join(".png?imageView2/2/w/750\"")
 						this.description = formatRichText(res.data.description);
-						console.log(this.description);
 						// #endif
 					}
 				}).catch(() => {