fix:1

app.js

@@ -115,6 +115,7 @@ App({
         voiceCbs.splice(voiceCbs.indexOf(cb), 1)
     },
     setVoiceProps(props) {
+        console.log(props, 'props')
         Object.keys(props).forEach(k => {
             voiceProps[k] = props[k]
         })
@@ -130,7 +131,6 @@ App({
     },
 
     setLoginProps(props) {
-        console.error(props)
         loginProps.isLogin = props
         loginCbs.forEach(cb => cb())
     },
@@ -260,18 +260,4 @@ App({
         console.error('第一次进来')
         wx.setStorageSync('lastSceneNum', null)
     }
-})
-
-
-// {
-//     "pagePath": "pages/cart/cart",
-//     "iconPath": "static/images/hbtab_cart@2x.png",
-//     "selectedIconPath": "static/images/btab_cart@2x.png",
-//     "text": "购物车"
-//   },
-//   {
-//     "pagePath": "pages/catalog/catalog",
-//     "iconPath": "static/images/hbtab_classify@2x.png",
-//     "selectedIconPath": "static/images/btab_classify@2x.png",
-//     "text": "分类"
-//   },
+})

app.json

@@ -1,5 +1,6 @@
 {
   "pages": [
+    "pages/discover/discover",
     "pages/index/index",
     "pages/webview/index",
     "pages/user/user",
@@ -48,9 +49,7 @@
     "pages/share",
     "pages/godis/godis",
     "component/auth/auth",
-    "pages/user/imageCropper",
-    "pages/sync/sync",
-    "pages/sync/room/room"
+    "pages/user/imageCropper"
   ],
   "window": {
     "backgroundTextStyle": "dark",
@@ -73,7 +72,7 @@
         "live-player-plugin": {
           "version": "1.2.5",
           "provider": "wx2b03c6e691cd7370"
-        }
+      }
       },
       "independent": false
     }
@@ -93,10 +92,23 @@
         "text": "店铺"
       },
       {
-        "pagePath": "pages/sync/sync",
-        "iconPath": "static/images/members.png",
-        "selectedIconPath": "static/images/members-active.png",
-        "text": "VR带看"
+        "pagePath": "pages/catalog/catalog",
+        "iconPath": "static/images/hbtab_classify@2x.png",
+        "selectedIconPath": "static/images/btab_classify@2x.png",
+        "text": "分类"
+      },
+      {
+        "pagePath": "pages/discover/discover",
+        "iconPath": "static/images/btab_view@2x.png",
+        "selectedIconPath": "static/images/btab_view_active@2x.png",
+        "text": "发现",
+        "keynote": true
+      },
+      {
+        "pagePath": "pages/cart/cart",
+        "iconPath": "static/images/hbtab_cart@2x.png",
+        "selectedIconPath": "static/images/btab_cart@2x.png",
+        "text": "购物车"
       },
       {
         "pagePath": "pages/ucenter/index/index",
@@ -114,7 +126,6 @@
   "sitemapLocation": "sitemap.json",
   "usingComponents": {
     "lip-sync": "/component/voice/voice",
-    "lip-sync-v4": "/component/voice-v4/voice",
     "mp-sticky": "/component/sticky/index",
     "auth": "/component/auth/auth"
   }

component/auth/auth.js

@@ -14,7 +14,6 @@ Component({
   
   attached() {
     this.callback = () => {
-      console.error('aocoaozzasd', getApp().globalData.loginProps.isLogin)
       this.setData({show: !getApp().globalData.loginProps.isLogin})
 
       // let pages = getCurrentPages()

component/voice-v4/voice.js

@@ -1,166 +0,0 @@
-// component/voice/voice.js
-
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    show: true,
-    pushUrl: false,
-    pullUrls: [],
-    trtcConfig: {},
-    room: 0
-  },
-  
-
-
-  attached() {
-    this.callback = (user={}) => {
-      console.warn('---user---', user,'---user---')
-      if (user.action === 'stopCall' && this.hasEnter) {
-        this.unpublishLocalAudio()
-        this.trtcRoomContext.exitRoom()
-        this.hasEnter = false
-        return
-      }
-      if (user.userId) {
-        this.enterAudioRoom(user)
-        return
-      }
-      console.warn(user.noMute, '---noMute')
-      if (user.noMute) {
-        this.unpublishLocalAudio()
-      } else {
-        this.publishLocalAudio()
-      }
-    }
-    // console.log(getApp().globalData.pusher, 'getApp().globalData.pusher')
-    // if (getApp().globalData.pusher) {
-    //   this.callback(getApp().globalData.pusher)
-    // }
-    console.log('attch')
-    getApp().addVoicePropsListener(this.callback)
-  },
-  detached() {
-    console.log('detached')
-    getApp().removeVoicePropsListener(this.callback)
-    // this.trtcRoomContext.exitRoom()
-    this.hasEnter = false
-  },
-  pageLifetimes: {
-    show() {
-      this.setData({show: true})
-      // this.trtcRoomContext = this.selectComponent('#trtcroom')
-      // if (getApp().globalData.audioUser) {
-      //   this.enterAudioRoom(getApp().globalData.audioUser, true)
-      // }
-      // if (this.data.show) {
-      //   this.enterAudioRoom()
-      // }
-    },
-    hide() {
-      clearTimeout(this.time)
-      this.setData({show: false})
-    },
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    enterAudioRoom(user, noEnter) {
-      // if (this.hasEnter) {
-      //   return
-      // }
-      console.error('hasEnter', this.hasEnter)
-      this.hasEnter = true
-      getApp().globalData.audioUser = user
-      console.log(user, 'user')
-      this.setData({
-        trtcConfig: {
-          scene: 'rtc',
-          userID: user.userId, // 用户 ID，可以由您的帐号系统指定
-          // sdkAppID: '1400431163', // 开通实时音视频服务创建应用后分配的 SDKAppID
-          // userSig: user.sig, // 身份签名，相当于登录密码的作用
-          sdkAppID: "1400685498",
-          userSig: 'eJwtzcsOgjAQBdB-6RaDU2jLI3EhsrHRBdGNK2Po0IyvNAWJxvjvEmA5597c*bLj7hD26FnOohDYYrzJ4LOjhkZ*tejPd7wY9EJwnsV8brXmdnGODMu5AEggExBNSUcPHFQpnkopIJkU34784ApECjBvkB1e8MLJfWyLOAis06Wut4b0tVdL77RVTb35dGXby6o6rVfs9wdhLDRy',
-          template: 'custom', // 画面排版模式
-        }
-      }, () => {
-        this.trtcRoomContext = this.selectComponent('#trtcroom')
-        if (noEnter) {
-          return
-        }
-        console.log(this.trtcRoomContext, )
-        let EVENT =this.trtcRoomContext.EVENT
-  
-        if (this.trtcRoomContext) {
-          this.trtcRoomContext.on(EVENT.LOCAL_JOIN, (event) => {
-            // 进房成功后发布本地音频流和视频流 
-            console.error('进入房间')
-            this.successEnter = true
-            if (user.noMute) {
-              this.unpublishLocalAudio()
-            } else {
-              this.publishLocalAudio()
-            }
-          })
-  
-          this.trtcRoomContext.on(EVENT.LOCAL_LEAVE, (event) => {
-            console.error('离开房间')
-          })
-
-          // 监听远端用户的音频流的变更事件
-         this.trtcRoomContext.on(EVENT.REMOTE_AUDIO_ADD, (event) => {
-            // 订阅（即播放）远端用户的音频流
-            let userID = event.data.userID
-           this.trtcRoomContext.subscribeRemoteAudio({
-              userID: userID
-            })
-          })
-          // this.trtcRoomContext.on(EVENT.LOCAL_AUDIO_VOLUME_UPDATE, event => {
-          //   console.log(event)
-          // })
-          console.error('join')
-         this.trtcRoomContext.enterRoom({
-            roomID: getApp().globalData.roomId
-          }).then(() => {
-            
-            console.log('成功进入房间')
-          }).catch((res) => {
-            console.error('room joinRoom 进房失败:', res)
-            this.hasEnter = false
-          })
-          let timer = null
-          timer = setInterval(() => {
-            if (!this.successEnter) {
-              this.trtcRoomContext.enterRoom({
-                roomID: getApp().globalData.roomId
-              }).then(() => {
-                console.log('成功进入房间')
-              }).catch((res) => {
-                console.error('room joinRoom 进房失败:', res)
-                this.hasEnter = false
-              })
-            } else {
-              clearInterval(timer)
-              timer = null
-            }
-          }, 3000);
-        }
-      })
-    },
-    unpublishLocalAudio () {
-      this.trtcRoomContext && this.trtcRoomContext.unpublishLocalAudio()
-    },
-    publishLocalAudio () {
-      this.trtcRoomContext && this.trtcRoomContext.publishLocalAudio()
-    }
-  }
-})

component/voice-v4/voice.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "trtc-room": "../trtc-room/trtc-room"
-  }
-}

component/voice-v4/voice.wxml

@@ -1,9 +0,0 @@
-<!--component/voice/voice.wxml-->
-<view>
-  <view class="layer">
-    <trtc-room id="trtcroom" config="{{trtcConfig}}"></trtc-room>
-  </view>
-</view>
-  <!-- <cover-view style="position: fixed; background-color: rgba(0,0,0,0.5); color: #fff;white-space:pre-wrap;z-index:999999">
-    --{{JSON.stringify(trtcConfig)}}--
-  </cover-view> -->

component/voice-v4/voice.wxss

@@ -1,20 +0,0 @@
-/* component/voice/voice.wxss */
-.layer {
-  position: absolute;
-  z-index: -999999999;
-  left: -99999999999px;
-  top: -99999999999px;
-  opacity: 0;
-}
-
-.pp {
-  position: fixed;
-  left: -99999999999px;
-  top: -99999999999px;
-  background-color: rgba(0,0,0,0.3);
-  z-index: 99999999999999;
-}
-
-.pp {
-  color: #fff;
-}

component/voice/voice.js

@@ -75,10 +75,9 @@ Component({
    */
   methods: {
     enterAudioRoom(user, noEnter) {
-      if (this.hasEnter) {
-        return
-      }
-      console.error('重进房间')
+      // if (this.hasEnter) {
+      //   return
+      // }
       console.error('hasEnter', this.hasEnter)
       this.hasEnter = true
       getApp().globalData.audioUser = user
@@ -86,13 +85,12 @@ Component({
       this.setData({
         trtcConfig: {
           scene: 'rtc',
-          sdkAppID: user.sdkAppID || '1400431163', // 开通实时音视频服务创建应用后分配的 SDKAppID
+          sdkAppID: '1400431163', // 开通实时音视频服务创建应用后分配的 SDKAppID
           userID: user.userId, // 用户 ID，可以由您的帐号系统指定
           userSig: user.sig, // 身份签名，相当于登录密码的作用
           template: 'custom', // 画面排版模式
         }
       }, () => {
-        console.error(this.data.trtcConfig)
         this.trtcRoomContext = this.selectComponent('#trtcroom')
         if (noEnter) {
           return
@@ -101,13 +99,9 @@ Component({
         let EVENT =this.trtcRoomContext.EVENT
   
         if (this.trtcRoomContext) {
-          this.trtcRoomContext.on(EVENT.ERROR, (err) => {
-            console.error(err)
-          })
-          
           this.trtcRoomContext.on(EVENT.LOCAL_JOIN, (event) => {
             // 进房成功后发布本地音频流和视频流 
-            console.error('--------进入房间lalal')
+            console.error('进入房间')
             this.successEnter = true
             if (user.noMute) {
               this.unpublishLocalAudio()
@@ -131,7 +125,6 @@ Component({
           // this.trtcRoomContext.on(EVENT.LOCAL_AUDIO_VOLUME_UPDATE, event => {
           //   console.log(event)
           // })
-          console.error('房间号', getApp().globalData.roomId)
          this.trtcRoomContext.enterRoom({
             roomID: getApp().globalData.roomId
           }).then(() => {
@@ -143,7 +136,6 @@ Component({
           })
           let timer = null
           timer = setInterval(() => {
-            console.error('轮询', this.successEnter)
             if (!this.successEnter) {
               this.trtcRoomContext.enterRoom({
                 roomID: getApp().globalData.roomId
@@ -156,7 +148,6 @@ Component({
             } else {
               clearInterval(timer)
               timer = null
-              console.log('重试')
             }
           }, 3000);
         }

config.js

@@ -1,5 +1,3 @@
-import { ENV } from './env'
-
 const dev = {
   socketHost: 'wss://testshop.4dkankan.com',
   requestHost: 'https://testshop.4dkankan.com',
@@ -18,4 +16,5 @@ const mal = {
 }
 
 
-export default ENV === 'dev' ? dev : mal
+export default dev
+// export default mal

env.js

@@ -1 +0,0 @@
-export const ENV = 'dev'