Authored by Rock Zhang

Merge branch 'feature/wap/yuanxiao' into develop/wap

... ... @@ -35,7 +35,7 @@ class YuanxiaoModel
// 处理个人详情数
if (isset($userData['data']) && !empty($userData['data'])) {
$result['birthday'] = $userData['data']['birthday'] ?: '2000-01-01';
$result['gender'] = $userData['data']['gender'] == 1 ? '男' : '女';
$result['gender'] = $userData['data']['gender'];
}
return $result;
... ...
... ... @@ -38,13 +38,7 @@ class YuanxiaoController extends HuodongAction
'staticFile' => self::STATIC_FILE,
'staticJS' => array(
'home.js'
),
'weixinShare' => $this->_isApp ? false : true, // 是否需要微信分享
'shareLink' => 'http://feature.yoho.cn/2016lishifeng/index.html',
'shareTitle' => 'YOHO!BUY有货新年寻宝大作战,千元利是等你赢!',
'shareDesc' => 'YOHO!BUY有货,全球800+潮流品牌每日上新!',
'shareImg' => 'http://img12.static.yhbimg.com/couponImg/2015/12/30/12/02008a9724b898dee56852de9f1a3978bf.jpg',
'showPopupFlag' => $showPopupFlag,
)
));
}
... ... @@ -62,7 +56,7 @@ class YuanxiaoController extends HuodongAction
if (!empty($posts)) {
$nickName = $this->post('nick', '');
$birthday = $this->post('birthday', '');
$gender = $this->post('gender', 0);
$gender = $this->post('gender', 1);
// 调用接口
$result = YuanxiaoModel::getChouqianInfo($uid, $nickName, $birthday, $gender);
... ...