Browse Source

增加入口

gemercheung 2 years ago
parent
commit
93f5212f14
5 changed files with 44 additions and 14 deletions
  1. 3 3
      app.js
  2. 7 3
      pages/shareRoom/shareRoom.js
  3. 4 1
      pages/webview/index.js
  4. 7 0
      project.private.config.json
  5. 23 7
      socket.js

+ 3 - 3
app.js

@@ -253,9 +253,9 @@ App({
           text: res.data.cartTotal.goodsCount + '',
           text: res.data.cartTotal.goodsCount + '',
         });
         });
       } else {
       } else {
-        wx.removeTabBarBadge({
-          index: 1,
-        });
+        // wx.removeTabBarBadge({
+        //   index: 1,
+        // });
       }
       }
     })
     })
   },
   },

+ 7 - 3
pages/shareRoom/shareRoom.js

@@ -28,7 +28,8 @@ Page({
       many,
       many,
       vrLink,
       vrLink,
       id,
       id,
-      type
+      type,
+      inviterId
     } = options
     } = options
     //测试用
     //测试用
     // companyName = '1111'
     // companyName = '1111'
@@ -54,9 +55,10 @@ Page({
     console.log('version', version)
     console.log('version', version)
 
 
     let params = {
     let params = {
-      scene: `${id}_${type}_1_${roomId}_1`,
+      scene: `${id}_${type}_1_${roomId}_1_${inviterId}`,
       page: vrLink.substr(1, vrLink.length - 1), //截掉page前的 /
       page: vrLink.substr(1, vrLink.length - 1), //截掉page前的 /
-      envVersion: version || 'release'
+      envVersion: version || 'release',
+      // inviterId: inviterId || ''
     }
     }
 
 
     // this.getMIniCode =remote.requestHost+'/statics/tmp/images/1634032649766.png'
     // this.getMIniCode =remote.requestHost+'/statics/tmp/images/1634032649766.png'
@@ -65,6 +67,8 @@ Page({
     // trackRoom share
     // trackRoom share
 
 
     // 分享房间进入统计
     // 分享房间进入统计
+
+
     util.request(api.trackRoom, {
     util.request(api.trackRoom, {
       roomId: roomId,
       roomId: roomId,
       type: 1,
       type: 1,

+ 4 - 1
pages/webview/index.js

@@ -48,6 +48,8 @@ Page({
       this.options.join = "true"
       this.options.join = "true"
       this.options.roomId = options.roomId || arr[3]
       this.options.roomId = options.roomId || arr[3]
       this.options.many = "true"
       this.options.many = "true"
+      this.options.inviterId = options.inviterId || arr[5]
+    
     }
     }
     // debugger
     // debugger
     console.log(this.options)
     console.log(this.options)
@@ -77,7 +79,8 @@ Page({
       count: 0,
       count: 0,
       goodsList: [],
       goodsList: [],
       page: 1,
       page: 1,
-      size: 1000
+      size: 1000,
+      inviterId: this.options.inviterId || ''
     })
     })
 
 
     // console.log(options)
     // console.log(options)

+ 7 - 0
project.private.config.json

@@ -192,6 +192,13 @@
           "query": "",
           "query": "",
           "launchMode": "default",
           "launchMode": "default",
           "scene": null
           "scene": null
+        },
+        {
+          "name": "邀请人",
+          "pathName": "/pages/webview/index",
+          "query": "id=1047145&type=33&join=true&roomId=623AC6&many=true&inviterId=97209",
+          "launchMode": "default",
+          "scene": null
         }
         }
       ]
       ]
     }
     }

+ 23 - 7
socket.js

@@ -468,9 +468,17 @@ export default {
       return Promise.resolve(false)
       return Promise.resolve(false)
     }
     }
     // 真正进入统计
     // 真正进入统计
+
+    if (this.data.inviterId) {
+      wx.showToast({
+        title: '邀请人ID:' + this.data.inviterId,
+      })
+    }
+
     if (options.roomId !== '888888') {
     if (options.roomId !== '888888') {
       util.request(api.trackRoom, {
       util.request(api.trackRoom, {
         roomId: options.roomId,
         roomId: options.roomId,
+        inviterId: this.data.inviterId || '',
         type: 0
         type: 0
       }, 'POST', 'application/json')
       }, 'POST', 'application/json')
 
 
@@ -850,7 +858,6 @@ export default {
     const socketOptions = this.data.socketOptions
     const socketOptions = this.data.socketOptions
     getApp().globalData.roomId = socketOptions.roomId
     getApp().globalData.roomId = socketOptions.roomId
     const user = data.roomsPerson.find(user => user.userId == socketOptions.userId)
     const user = data.roomsPerson.find(user => user.userId == socketOptions.userId)
-
     if (!user) {
     if (!user) {
       return
       return
     }
     }
@@ -858,6 +865,11 @@ export default {
     // if (data.roomsPerson.length <= 1) {
     // if (data.roomsPerson.length <= 1) {
     //   return
     //   return
     // }
     // }
+    if (user && user.userId) {
+      this.setData({
+        userId: user.userId
+      })
+    }
     user.noMute = getApp().globalData.voiceProps.noMute
     user.noMute = getApp().globalData.voiceProps.noMute
     getApp().setVoiceProps({
     getApp().setVoiceProps({
       ...user,
       ...user,
@@ -1094,21 +1106,25 @@ export default {
       newPicUrl
       newPicUrl
     } = this.data
     } = this.data
 
 
+    const socketOptions = this.data.socketOptions
 
 
     if (res.from === 'button') {
     if (res.from === 'button') {
       this.setData({
       this.setData({
         sendShare: false
         sendShare: false
       })
       })
-
-      return {
+      const userId = socketOptions.userId
+      const share = {
         title: '【好友推荐】一起来云逛吧',
         title: '【好友推荐】一起来云逛吧',
         imageUrl: newPicUrl,
         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 {
     } else {
       return {
       return {
         imageUrl: newPicUrl,
         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) {
     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)
       console.log('share-debug', this.data.socketOptions)
       wx.navigateTo({
       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 {
     } 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}`);
       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}`);