Merge branch 'spp' into 'master'

1

See merge request !1

pages/translate/translate.js

@@ -43,13 +43,6 @@ Page({
     onLoad: function (options) {
         this.getList()
     },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
     getList() {
         let params = {
             url: apiList.live_list,
@@ -75,7 +68,7 @@ Page({
         base.newRequest(params)
     },
     goLive(e) {
-        console.log(e.currentTarget.dataset.roomid)
+        // console.log(e.currentTarget.dataset.roomid)
         let roomId = e.currentTarget.dataset.roomid // 房间号
         try {
             var userInfo = wx.getStorageSync('userInfo')