Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/models/Business/User/ShareService.php

@@ -93,8 +93,8 @@ class ShareServiceModel extends \Business\AbstractModel
                     $this->memberDb0Redis->tableCacheSet($fileName,$url,ApiConst::zero);
                     return $url;
                 }else{
-                   // return $this->getQrUrl($data['id']);
-                    return PathConst::wxDefaultPath;
+                   return $this->getQrUrl($data['id']);
+                   // return PathConst::wxDefaultPath;
                 }
             }else{
                 return $this->getQrUrl($data['id']);
@@ -115,8 +115,8 @@ class ShareServiceModel extends \Business\AbstractModel
                         $this->memberDb0Redis->tableCacheSet($fileName,$url,ApiConst::zero);
                         return $url;
                     }else{
-                        //return $this->getQrUrl($data['id']);
-                        return PathConst::wxDefaultPath;
+                        return $this->getQrUrl($data['id']);
+                        //return PathConst::wxDefaultPath;
                     }
             }else{
                 //不是微信分享就是普通下载的二维码图片

public/data/js/chat.js

@@ -37,7 +37,7 @@ function listenEvent() {
     /**
      * 连接建立时触发
      */
-    ws.onopen = function (e) {
+    ws.onopen = function (e) {a
         console.log(e.data);
         var msg = {"method":"join","key":key};
         ws.send($.toJSON(msg));