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

application/library/Our/PathConst.php

@@ -24,7 +24,7 @@ class PathConst {
     const downLoadQrcode="http://www.shenbd.com";
 
     const sharePlat="http://www.shenbd.com";
-
+    const shareStore="http://share.shenbd.com/share.html?type=store&id={0}";
     const timeParam='&param='.TIMESTAMP;
 
     const cutVertical='|';

application/models/Business/User/ShareService.php

@@ -66,6 +66,9 @@ class ShareServiceModel extends \Business\AbstractModel
         ));
         return $res;
     }
+    public function getQrUrl($id){
+        return Common::format(PathConst::shareStore,$id);
+    }
     public function growQrcode($data){
         $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
         if($data['type']==\Our\ApiConst::shareStore){
@@ -81,11 +84,13 @@ class ShareServiceModel extends \Business\AbstractModel
                     $this->memberDb0Redis->tableCacheSet($fileName,$url,ApiConst::zero);
                     return $url;
                 }else{
-                    return PathConst::wxDefaultPath;
+                    return $this->getQrUrl($data['id']);
+                   // return PathConst::wxDefaultPath;
                 }
             }else{
+                return $this->getQrUrl($data['id']);
                 //不是微信分享就是普通下载的二维码图片
-                return PathConst::downLoadQrcode;
+               // return PathConst::downLoadQrcode;
             }
         }
         if($data['type']==\Our\ApiConst::shareGoods){