Merge branch 'test' of http://git.yoho.cn/web/yoho-live into test

@@ -460,7 +460,9 @@
 	        "live_start_time": 321,
 	        "live_end_time": 0,
 	        "background_pic": "http://img11.static.yhbimg.com/global/2016/08/17/18/01f17a9cd44149052482e4ee58e590cf1b.png",
-			"share_url": "http://m.yohobuy.com/activity/live/replay/2"
+			"share_url": "http://m.yohobuy.com/activity/live/replay/2",
+			"share_title":"分享标题",
+			"share_content":"分享内容"
 	    },
 		"timestamp": 1471339317,
 	    "md5": "37a83576b0f194bdae7c9f52a8adbff4"

@@ -261,7 +261,8 @@ class LivingController extends BaseController
 
                 $ret['background_pic'] = 'http://img11.static.yhbimg.com/global/2016/08/17/18/01f17a9cd44149052482e4ee58e590cf1b.png';
                 $ret['share_url'] = 'http://m.yohobuy.com/activity/live/'.$room_id;
-                
+                $ret['share_title'] = '分享标题';
+                $ret['share_content'] = '分享内容';
                 $dependency = new \yii\caching\DbDependency(['sql' => Yii::$app->db
                     ->createCommand('SELECT update_time FROM {{%room}} WHERE room_id=:room_id')
                     ->bindValue(':room_id', $room_id)