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

@@ -30,9 +30,6 @@ class YuanxiaoController extends HuodongAction
      */
     public function indexAction()
     {
-        // 该变量用来控制和显示页面的弹出提示
-        $showPopupFlag = '0';
-
         $this->_view->display('index', array(
             'staticTitle' => '元宵抽签',
             'staticFile' => self::STATIC_FILE,
@@ -58,8 +55,11 @@ class YuanxiaoController extends HuodongAction
             $birthday = $this->post('birthday', '');
             $gender = $this->post('gender', 1);
 
+            // 格式化日期以便接口接收
+            $FormatBirthday = date_format(date_create_from_format('Y年m月d日', $birthday), 'Y-m-d');
+
             // 调用接口
-            $result = YuanxiaoModel::getChouqianInfo($uid, $nickName, $birthday, $gender);
+            $result = YuanxiaoModel::getChouqianInfo($uid, $nickName, $FormatBirthday, $gender);
             if ($result['code'] === 200) { // 处理成功就跳转到等待页
                 // 将返回的结果存入cookeie中15分钟
                 $cookieData = array(
@@ -90,7 +90,7 @@ class YuanxiaoController extends HuodongAction
                 'staticJS' => array(
                     'info.js'
                 ),
-                'birthday' => $userData['birthday'],
+                'birthday' => date_format(date_create($userData['birthday']), 'Y年m月d日'),
                 'gender' => $userData['gender'],
                 'isBoy' => $userData['gender'] == 1 // 性别是否是女标志位
             ));