Merge branch 'ccw' of http://git.shenbd.com/api-project-dev/api.shenbd.com into master_dev

application/views/index/goods.phtml

@@ -14,7 +14,7 @@
         .price{color:#ff8519;font-size: 40px;margin-top: 20px;}
         .price #price{font-size: 30px;text-decoration:line-through;}
         .qrcode{background:url(/data/img/flower.png);height: 388px;margin: 40px auto 0 auto;padding-top: 100px;}
-        #qrImg {margin-top:80px;}
+        /*#qrImg {margin-top:80px;}*/
         #qrcodeImg img { margin: 0 auto;}
         .footer{font-size:30px;height:66px;line-height:66px;padding: 20px 0 55px 0;}
         .footer img{vertical-align:bottom; display:inline-block;}
@@ -32,7 +32,7 @@
         <span id="price"></span>
     </div>
     <div class="qrcode" id="qrcode">
-<!--        <img id="qrImg" width="250" height="250" src="" />-->
+        <img id="qrImg" width="250" height="250" src="" />
         <div id="qrcodeImg"></div>
         <p id="tip"></p>
     </div>
@@ -42,6 +42,12 @@
 </div>
 <script type="text/javascript" src="/data/js/qrcode.min.js"></script>
 <script type="text/javascript">
+    function removeElement(_element){
+        var _parentElement = _element.parentNode;
+        if(_parentElement){
+            _parentElement.removeChild(_element);
+        }
+    }
     var pageObj = {
         type : "<?php echo $params['shareType'];?>",//1或2是小程序码，其它是二维码
         id : "<?php echo $params['id'];?>",//1是小程序码，2是二维码,
@@ -64,8 +70,11 @@
     if(pageObj.price != pageObj.discount)
         document.getElementById("price").innerHTML = "<span style='font-size:30px;'>¥</span>"+(pageObj.price / 100).toFixed(2);
     if(pageObj.type<=2){
-        document.getElementById("qrImg").src = pageObj.qrImg;}
+        document.getElementById("qrImg").src = pageObj.qrImg;
+    }
     else{
+        var ele=document.getElementById('qrImg');
+        removeElement(ele);
         new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
     }