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

application/views/index/saleShare.phtml

@@ -150,8 +150,8 @@
         <!--        </div>-->
         <div class="code-box">
             <img src="/data/images/bg-code2.jpg" alt="">
-            <div id="qrcodeImg" class="code-in">
-                <!--                <img id="qrcodeImg" src="//static.shenbd.com/www/index/2018/img/app-share/code2.jpg" alt="">-->
+            <div id="qrcodeImg" class="code-in" >
+                               <img id="qrcodeImg" src="<?php echo $params['qrCode']."?x-oss-process=image/resize,m_fill,h_250,w_250";?>" alt="">
             </div>
             <p class="code-txt">长按图片识别二维码</p>
         </div>
@@ -160,11 +160,11 @@
 </div>
 </body>
 <script>
-    new QRCode(document.getElementById('qrcodeImg'), {
-        text: '<?php echo $params['qrCode']."?x-oss-process=image/resize,m_fill,h_186,w_186";?>',
-        width: 250,
-        height: 250
-
-    });
+//    new QRCode(document.getElementById('qrcodeImg'), {
+//        text: '<?php //echo $params['qrCode']."?x-oss-process=image/resize,m_fill,h_186,w_186";?>//',
+//        width: 250,
+//        height: 250
+//
+//    });
 </script>
 </html>
\ No newline at end of file