Merge branch 'release/6.0' into gray

@@ -71,7 +71,7 @@ module.exports = class extends global.yoho.BaseModel {
                     return o.template_name !== 'single_image';
                     return o.template_name !== 'single_image';
                 });
                 });
 
 
-                resData.popImgSrc = _.get(sourceData, '[0].data[0].src', '');
+                resData.popImgSrc = _.head(_.split(_.get(sourceData, '[0].data[0].src', ''), '?'));
             }
             }
 
 
             return resData;
             return resData;

@@ -7,7 +7,6 @@
 var $ = require('yoho-jquery');
 var $ = require('yoho-jquery');
 
 
 var Clipboard = require('clipboard'),
 var Clipboard = require('clipboard'),
-    QRCode = require('../plugins/qrcode'),
     Dialog = require('../common/dialog').Dialog;
     Dialog = require('../common/dialog').Dialog;
 
 
 var trendWordTpl = require('../../hbs/home/spread/trend-word.hbs');
 var trendWordTpl = require('../../hbs/home/spread/trend-word.hbs');
@@ -23,6 +22,7 @@ var clipboard;
 var defaultWord = $spreadWord.data('word');
 var defaultWord = $spreadWord.data('word');
 
 
 require('../common');
 require('../common');
+require('yoho-jquery-qrcode');
 
 
 function reseatWordSize(word) {
 function reseatWordSize(word) {
     if (!word) {
     if (!word) {
@@ -70,11 +70,10 @@ function saveTrendWord(dg) {
 }
 }
 
 
 // 生成二维码
 // 生成二维码
-new QRCode($qrcodeImg.get(0), {
-    text: $qrcodeImg.data('url'),
-    width: parseInt($qrcodeImg.width(), 10),
-    height: parseInt($qrcodeImg.width(), 10),
-    correctLevel: 1
+$qrcodeImg.qrcode({
+    render: 'div', // 显示方式，canvas，image和div
+    text: $qrcodeImg.data('url'), // 二维码的内容
+    size: parseInt($qrcodeImg.width(), 10) // 大小
 });
 });
 
 
 clipboard = new Clipboard('.copy-url', {
 clipboard = new Clipboard('.copy-url', {

@@ -41,8 +41,8 @@
         }
         }
 
 
         .card-main {
         .card-main {
-            height: 80px;
-            line-height: 80px;
+            height: 90px;
+            line-height: 90px;
             padding-top: 30px;
             padding-top: 30px;
             text-align: center;
             text-align: center;
 
 
@@ -52,8 +52,10 @@
         }
         }
 
 
         .spread-code {
         .spread-code {
-            width: 74px;
-            height: 74px;
+            width: 100px;
+            height: 100px;
+            position: relative;
+            top: -10px;
         }
         }
 
 
         .spread-id {
         .spread-id {