|
@@ -468,9 +468,17 @@ export default {
|
|
|
return Promise.resolve(false)
|
|
|
}
|
|
|
// 真正进入统计
|
|
|
+
|
|
|
+ if (this.data.inviterId) {
|
|
|
+ wx.showToast({
|
|
|
+ title: '邀请人ID:' + this.data.inviterId,
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
if (options.roomId !== '888888') {
|
|
|
util.request(api.trackRoom, {
|
|
|
roomId: options.roomId,
|
|
|
+ inviterId: this.data.inviterId || '',
|
|
|
type: 0
|
|
|
}, 'POST', 'application/json')
|
|
|
|
|
@@ -850,7 +858,6 @@ export default {
|
|
|
const socketOptions = this.data.socketOptions
|
|
|
getApp().globalData.roomId = socketOptions.roomId
|
|
|
const user = data.roomsPerson.find(user => user.userId == socketOptions.userId)
|
|
|
-
|
|
|
if (!user) {
|
|
|
return
|
|
|
}
|
|
@@ -858,6 +865,11 @@ export default {
|
|
|
// if (data.roomsPerson.length <= 1) {
|
|
|
// return
|
|
|
// }
|
|
|
+ if (user && user.userId) {
|
|
|
+ this.setData({
|
|
|
+ userId: user.userId
|
|
|
+ })
|
|
|
+ }
|
|
|
user.noMute = getApp().globalData.voiceProps.noMute
|
|
|
getApp().setVoiceProps({
|
|
|
...user,
|
|
@@ -1094,21 +1106,25 @@ export default {
|
|
|
newPicUrl
|
|
|
} = this.data
|
|
|
|
|
|
+ const socketOptions = this.data.socketOptions
|
|
|
|
|
|
if (res.from === 'button') {
|
|
|
this.setData({
|
|
|
sendShare: false
|
|
|
})
|
|
|
-
|
|
|
- return {
|
|
|
+ const userId = socketOptions.userId
|
|
|
+ const share = {
|
|
|
title: '【好友推荐】一起来云逛吧',
|
|
|
imageUrl: newPicUrl,
|
|
|
- path: `/pages/webview/index?id=${id}&type=${this.data.type}&join=true&roomId=${this.data.socketOptions.roomId}&many=${!!this.data.many}`,
|
|
|
+ path: `/pages/webview/index?id=${id}&type=${this.data.type}&join=true&roomId=${this.data.socketOptions.roomId}&many=${!!this.data.many}&inviterId=${userId}`,
|
|
|
}
|
|
|
+ console.log('分享', share);
|
|
|
+ return share
|
|
|
+
|
|
|
} else {
|
|
|
return {
|
|
|
imageUrl: newPicUrl,
|
|
|
- path: `/pages/webview/index?id=${id}&type=${this.data.type}&join=false`,
|
|
|
+ path: `/pages/webview/index?id=${id}&type=${this.data.type}&join=false&inviterId=${userId}`,
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -1143,10 +1159,10 @@ export default {
|
|
|
|
|
|
if (this.data.many && this.data.shareStatus == 1) {
|
|
|
//开启一起逛时候的分享
|
|
|
- console.log(`share-debug: /pages/shareRoom/shareRoom?img_url=${btoa(img_url)}&vrLink=${btoa(vrLink)}&id=${this.data.id}&type=${this.data.type}&roomId=${this.data.socketOptions.roomId}&many=${!!this.data.many}`)
|
|
|
+ console.log(`share-debug: /pages/shareRoom/shareRoom?img_url=${btoa(img_url)}&vrLink=${btoa(vrLink)}&id=${this.data.id}&type=${this.data.type}&roomId=${this.data.socketOptions.roomId}&many=${!!this.data.many}&inviterId=${this.data.userId}`)
|
|
|
console.log('share-debug', this.data.socketOptions)
|
|
|
wx.navigateTo({
|
|
|
- url: `/pages/shareRoom/shareRoom?img_url=${btoa(img_url)}&vrLink=${btoa(vrLink)}&id=${this.data.id}&type=${this.data.type}&roomId=${this.data.socketOptions.roomId}&many=${!!this.data.many}`,
|
|
|
+ url: `/pages/shareRoom/shareRoom?img_url=${btoa(img_url)}&vrLink=${btoa(vrLink)}&id=${this.data.id}&type=${this.data.type}&roomId=${this.data.socketOptions.roomId}&many=${!!this.data.many}&inviterId=${this.data.userId}`,
|
|
|
})
|
|
|
} else {
|
|
|
console.log(`share-debug: /pages/shared/shared?img_url=${btoa(img_url)}&shareImg=${btoa(shareImg)}&companyName=${companyName}&vrLink=${btoa(vrLink)}&id=${this.data.id}&type=${this.data.type}`);
|