Merge branch 'feature/v4socket' of http://192.168.0.115:3000/bill/mini-shop into feature/v4socket

socket.js

@@ -57,7 +57,7 @@ export default {
   joinUrl() {
     // 去除test-shop，转回shop
     // const url = true ? this.data.url.replace('shop.html', 'test-shop.html') : this.data.url;
-  const url =  this.data.url;
+    const url = this.data.url;
 
     let options = {
       API_BASE_URL: api.API_BASE_URL,