Authored by Rock Zhang

merge

@@ -35,7 +35,11 @@ class YuanxiaoController extends HuodongAction @@ -35,7 +35,11 @@ class YuanxiaoController extends HuodongAction
35 'staticFile' => self::STATIC_FILE, 35 'staticFile' => self::STATIC_FILE,
36 'staticJS' => array( 36 'staticJS' => array(
37 'home.js' 37 'home.js'
38 - ) 38 + ),
  39 + 'shareDesc' => '元宵快乐!一起来YOHO!BUY有货玩2016年潮流开运测试!',
  40 + 'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/02/19/16/02dbd38c84eccf1097b7e240452f0de856.png',
  41 + 'shareUrl' => Helpers::url('/cuxiao/yuanxiao/index'),
  42 + 'playUrl' => $this->isApp() ? $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}': $playUrl,
39 )); 43 ));
40 } 44 }
41 45
@@ -75,6 +79,9 @@ class YuanxiaoController extends HuodongAction @@ -75,6 +79,9 @@ class YuanxiaoController extends HuodongAction
75 'staticJS' => array( 79 'staticJS' => array(
76 'info.js' 80 'info.js'
77 ), 81 ),
  82 + 'shareDesc' => '元宵快乐!一起来YOHO!BUY有货玩2016年潮流开运测试!',
  83 + 'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/02/19/16/02dbd38c84eccf1097b7e240452f0de856.png',
  84 + 'shareUrl' => Helpers::url('/cuxiao/yuanxiao/index'),
78 'birthday' => $birthday, 85 'birthday' => $birthday,
79 'birthdayNumber' => $FormatBirthday, 86 'birthdayNumber' => $FormatBirthday,
80 'gender' => $gender, 87 'gender' => $gender,
@@ -91,6 +98,9 @@ class YuanxiaoController extends HuodongAction @@ -91,6 +98,9 @@ class YuanxiaoController extends HuodongAction
91 'staticJS' => array( 98 'staticJS' => array(
92 'info.js' 99 'info.js'
93 ), 100 ),
  101 + 'shareDesc' => '元宵快乐!一起来YOHO!BUY有货玩2016年潮流开运测试!',
  102 + 'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/02/19/16/02dbd38c84eccf1097b7e240452f0de856.png',
  103 + 'shareUrl' => Helpers::url('/cuxiao/yuanxiao/index'),
94 'birthday' => date_format(date_create($userData['birthday']), 'Y年m月d日'), 104 'birthday' => date_format(date_create($userData['birthday']), 'Y年m月d日'),
95 'birthdayNumber' => $userData['birthday'], 105 'birthdayNumber' => $userData['birthday'],
96 'gender' => $userData['gender'], 106 'gender' => $userData['gender'],
@@ -114,6 +124,9 @@ class YuanxiaoController extends HuodongAction @@ -114,6 +124,9 @@ class YuanxiaoController extends HuodongAction
114 'staticJS' => array( 124 'staticJS' => array(
115 'wait.js' 125 'wait.js'
116 ), 126 ),
  127 + 'shareDesc' => '元宵快乐!一起来YOHO!BUY有货玩2016年潮流开运测试!',
  128 + 'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/02/19/16/02dbd38c84eccf1097b7e240452f0de856.png',
  129 + 'shareUrl' => Helpers::url('/cuxiao/yuanxiao/index'),
117 )); 130 ));
118 } 131 }
119 132
@@ -177,7 +190,9 @@ class YuanxiaoController extends HuodongAction @@ -177,7 +190,9 @@ class YuanxiaoController extends HuodongAction
177 'count' => $result['total'], 190 'count' => $result['total'],
178 'staticJS' => array( 191 'staticJS' => array(
179 'share.js' 192 'share.js'
180 - ) 193 + ),
  194 + 'shareDesc' => '元宵快乐!一起来YOHO!BUY有货玩2016年潮流开运测试!',
  195 + 'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/02/19/16/02dbd38c84eccf1097b7e240452f0de856.png'
181 )); 196 ));
182 } 197 }
183 198