Merge branch 'master' into release

@@ -15,8 +15,10 @@ if (!YII_ENV_TEST) {
     $config['modules']['8FmTQbUC'] = [
         'class' => 'yii\debug\Module',
         'allowedIPs' => ['*'],
-        'historySize'=> 100000,
-        'dataPath' => is_dir('/dev/shm') ? '/dev/shm/debug' : '@runtime/debug',
+        'historySize'=> 2000,
+        //'dataPath' => is_dir('/dev/shm') ? '/dev/shm/debug' : '@runtime/debug',
+        'dataPath' => sys_get_temp_dir().'/debug',
+        'enableDebugLogs' => true,
     ];
 }
 

@@ -9,6 +9,10 @@ use Yii;
 class IndexController extends BaseController
 {
 
+    public function behaviors() {
+        return [];
+    }
+    
     /**
      * @inheritdoc
      */
@@ -23,7 +27,6 @@ class IndexController extends BaseController
 
     public function actionIndex()
     {
-        echo __FILE__;
         exit;
     }
     

@@ -213,6 +213,7 @@ class LivingController extends BaseController
                     'master_meta'=>'',
                     'title'=>$model->title,
                     'pic'=>CommonImages::getTemplateComplex($model->pic, 2),
+                    'background_pic'=>CommonImages::getSourceUrl($model->background_pic),
                     'watermark'=>$model->watermark,
                     'living'=>$model->living,
                     'like_num'=>0,
@@ -265,7 +266,7 @@ class LivingController extends BaseController
                     }
                 }
 
-                $ret['background_pic'] = 'http://img11.static.yhbimg.com/global/2016/08/17/18/01f17a9cd44149052482e4ee58e590cf1b.png';
+                $ret['background_pic'] = $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'] = 'YO\'HOOD嘉年华现场火热直播中，明星潮牌等你来！';