Merge branch 'dev_fix_sub' into user_action

peng

2 天以前 9653f4faa20699a2d9a03391f4a6175ff8ce59c3

 pages/mine/im/index.vue

@@ -198,6 +198,7 @@
var wh
// 顶部空盒子的高度
var mgUpHeight
import '@/components/uview-components/uview-ui'
import {
  getTalkMessage,
  getTalkByUser,
@@ -268,7 +269,6 @@
      this.getTalk(options.userId)

    }

    // this.ws.connect();
    this.sokcet();
  },