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

application/library/Our/PathConst.php

@@ -13,7 +13,7 @@ class PathConst {
     const params="?";
     const wxTakeAccessUrl="https://api.weixin.qq.com/cgi-bin/token?grant_type={0}&appid={1}&secret={2}";
     const getWxQrCode="https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token={0}";
-    const wxStoreParams="id={0}&isScan=1";
+    const wxStoreParams="id={0}";
     const wxGoodsParams="id={0}";
     //1:店铺小程序二维码生成路径,2:商品小程序二维码路径
     const wxStorePath="pages/shops/home/index";

application/models/Business/User/ShareService.php

@@ -157,7 +157,7 @@ class ShareServiceModel extends \Business\AbstractModel
                     if(\Our\ApiConst::isWxPublish){
                         //$scene= \Our\Common::format(\Our\PathConst::wxGoodsParams,$data['id']);
                           $scene= \Our\Common::format(\Our\PathConst::wxGoodsParams,$data['goodsCommonid']);
-                        $page=\Our\PathConst::wxStorePath;
+                        $page=\Our\PathConst::wxGoodsPath;
                         $res=$this->getQrcode($page,$scene);
                         if(Common::isJson($res)){
                             $res=json_decode($res,true);