Merge branch 'dev-jinx' into new-api2

socket.js

@@ -80,7 +80,7 @@ export default {
 
     this.data.reload = false
     this.data.showCommodity = false
-    options.url = options.url + '&vlog';
+    // options.url = options.url + '&vlog';
     if (!this.data.webviewUrl) {
       console.log(base)
       this.setData({