Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/bindMobile

@@ -9,6 +9,7 @@ var $ = require('jquery'),
     Hammer = require('yoho.hammer'),
     Hammer = require('yoho.hammer'),
     Handlebars = require('yoho.handlebars'),
     Handlebars = require('yoho.handlebars'),
     tip = require('../plugin/tip'),
     tip = require('../plugin/tip'),
+    loading = require('../plugin/loading'),
     orderInfo = require('./order-info').orderInfo;
     orderInfo = require('./order-info').orderInfo;
 
 
 var dispatchModeHammer,
 var dispatchModeHammer,
@@ -94,6 +95,7 @@ function orderCompute() {
 }
 }
 
 
 function submitOrder() {
 function submitOrder() {
+    loading.showLoadingMask();
     $.ajax({
     $.ajax({
         method: 'POST',
         method: 'POST',
         url: '/shoppingCart/orderSub',
         url: '/shoppingCart/orderSub',
@@ -114,6 +116,7 @@ function submitOrder() {
         var url;
         var url;
 
 
         if (!res) {
         if (!res) {
+            loading.hideLoadingMask();
             tip.show('网络出错');
             tip.show('网络出错');
             return;
             return;
         }
         }
@@ -125,11 +128,14 @@ function submitOrder() {
             } else {
             } else {
                 url = '/home/pay?order_code=' + res.data.order_code;
                 url = '/home/pay?order_code=' + res.data.order_code;
             }
             }
+            window.setCookie('order-info', '');
             window.location.href = url;
             window.location.href = url;
         } else {
         } else {
+            loading.hideLoadingMask();
             tip.show(res.messege || '网络出错');
             tip.show(res.messege || '网络出错');
         }
         }
     }).fail(function() {
     }).fail(function() {
+        loading.hideLoadingMask();
         tip.show('网络出错');
         tip.show('网络出错');
     });
     });
 }
 }

@@ -106,15 +106,13 @@
                 <span class="iconfont num">&#xe604;</span>
                 <span class="iconfont num">&#xe604;</span>
             </a>
             </a>
         </div>
         </div>
-        {{!
         <div class="group-list">
         <div class="group-list">
-            <a class="list-item" href="/help.html">
+            <a class="list-item" href="/home/help">
                 <span class="iconfont icon">&#xe639;</span>
                 <span class="iconfont icon">&#xe639;</span>
                 帮助
                 帮助
                 <span class="iconfont num">&#xe604;</span>
                 <span class="iconfont num">&#xe604;</span>
             </a>
             </a>
         </div>
         </div>
-        }}
 
 
         {{> product/recommend-for-you}}
         {{> product/recommend-for-you}}
         {{> product/suspend-cart}}
         {{> product/suspend-cart}}

@@ -835,46 +835,51 @@ class HomeController extends AbstractAction
         // 审判跳转登录页
         // 审判跳转登录页
         $this->auditJumpLogin();
         $this->auditJumpLogin();
 
 
+        /* 判断订单号是否传 */
         $orderCode = $this->get('order_code');
         $orderCode = $this->get('order_code');
         if (empty($orderCode)) {
         if (empty($orderCode)) {
             $this->error();
             $this->error();
         }
         }
 
 
+        /* 订单信息不存在 */
+        $orderDetail = OrderModel::orderDetail($orderCode, $this->_uid, $this->_usession);
+        if (empty($orderDetail)) {
+            $this->error();
+        }
+        
         $this->setTitle('订单详情');
         $this->setTitle('订单详情');
         $this->setNavHeader('订单详情');
         $this->setNavHeader('订单详情');
 
 
         $this->_view->display('order-detail', array(
         $this->_view->display('order-detail', array(
             'orderDetailPage' => true,
             'orderDetailPage' => true,
-            'orderDetail' => OrderModel::orderDetail($orderCode, $this->_uid, $this->_usession),
+            'orderDetail' => $orderDetail,
         ));
         ));
     }
     }
 
 
-   /**
-    * 帮助中心列表页
-    */
+    /**
+     * 帮助中心列表页
+     */
     public function helpAction()
     public function helpAction()
-    {   
-        $service = Home\HelpModel::serviceInfo();
+    {
         $this->setTitle('帮助中心');
         $this->setTitle('帮助中心');
         $this->setNavHeader('帮助中心');
         $this->setNavHeader('帮助中心');
-        $data = array(
-            'iHelp' =>$service,
-        );
-        $this->_view->display('i-help', $data);
-    }
 
 
+        $this->_view->display('help', array(
+            'iHelp' => Home\HelpModel::serviceInfo(),
+        ));
+    }
 
 
     /**
     /**
      * 帮助中心列表详细信息
      * 帮助中心列表详细信息
      */
      */
-    public function helpDetailAction() 
+    public function helpDetailAction()
     {
     {
         $caption = $this->get('caption', '帮助中心');
         $caption = $this->get('caption', '帮助中心');
         $code = $this->get('code', 0);
         $code = $this->get('code', 0);
         if (empty($code)) {
         if (empty($code)) {
             $this->error();
             $this->error();
         }
         }
-        
+
         $this->setTitle($caption);
         $this->setTitle($caption);
         $this->setNavHeader($caption);
         $this->setNavHeader($caption);
 
 
@@ -883,27 +888,24 @@ class HomeController extends AbstractAction
         ));
         ));
     }
     }
 
 
-  
-     /**
+    /**
      * YOHO币详情 新版
      * YOHO币详情 新版
      */
      */
     public function currencyDetailAction()
     public function currencyDetailAction()
     {
     {
+        // 审判跳转登录页
+        $this->auditJumpLogin();
+
         $this->setTitle('YOHO币');
         $this->setTitle('YOHO币');
         $this->setNavHeader('YOHO币', true, false);
         $this->setNavHeader('YOHO币', true, false);
 
 
-        $data['money'] = '0';
-        $page = $this->post('page',1);
-        $size = $this->post('size', 20);
-        // $data = UserModel::getYohoCoinLists($this->_uid,$page,$size);
-        $data = UserModel::getYohoCoinLists(3965746,$page,$size);
+        $data = UserModel::getYohoCoinLists($this->_uid, 0, 20);
         $this->_view->display('currency-detail', array(
         $this->_view->display('currency-detail', array(
             'money' => $data['money'],
             'money' => $data['money'],
             'pageFooter' => true,
             'pageFooter' => true,
             'currencyDetail' => true,
             'currencyDetail' => true,
             'currencyDetailPage' => true
             'currencyDetailPage' => true
         ));
         ));
-
     }
     }
 
 
     /**
     /**
@@ -911,18 +913,18 @@ class HomeController extends AbstractAction
      */
      */
     public function ajaxCurrencyDetailAction()
     public function ajaxCurrencyDetailAction()
     {
     {
-        $data['list'] = array();
-        $data['money'] = 0;
-        $page = $this->post('page',1);
-        $size = $this->post('size', 20);
-        $data = UserModel::getYohoCoinLists($this->_uid,$page,$size);
-        //$data = UserModel::getYohoCoinLists(3965746,$page,$size);
-        $this->_view->display('ajax-currency-detail', array(
-            'currency' => $data['list'],
-            'pageFooter' => true,
-            'currencyDetailPage' => true
-        ));
-
+        if ($this->isAjax()) {
+            $uid = $this->getUid();
+            $page = $this->post('page', 1);
+            $data = UserModel::getYohoCoinLists($uid, $page, 20);
+            $this->_view->display('ajax-currency-detail', array(
+                'currency' => $data['list'],
+                'pageFooter' => true,
+                'currencyDetailPage' => true
+            ));
+        } else {
+            echo ' ';
+        }
     }
     }
 
 
 }
 }

@@ -379,7 +379,7 @@ class UserModel
     public static function getYohoCoinLists($uid, $page, $limit)
     public static function getYohoCoinLists($uid, $page, $limit)
     {
     {
         $result = array();
         $result = array();
-
+        $data['money'] = '0';
         // 调用接口获取YOHO币
         // 调用接口获取YOHO币
         $yohoCoin = UserData::yohoCoinData($uid, $page, $limit, 'post');
         $yohoCoin = UserData::yohoCoinData($uid, $page, $limit, 'post');
         // 处理YOHO币数据
         // 处理YOHO币数据
@@ -396,6 +396,7 @@ class UserModel
             }
             }
         }
         }
         $data['list'] = $result;
         $data['list'] = $result;
+        
         return $data;
         return $data;
     }
     }
 
 

@@ -86,6 +86,7 @@ class BindController extends AbstractAction
         $sourceType = $this->get('sourceType');
         $sourceType = $this->get('sourceType');
         $nickname = $this->get('nickname');
         $nickname = $this->get('nickname');
         $areaCode = $this->get('areaCode', '86');
         $areaCode = $this->get('areaCode', '86');
+        $phoneNum=$this->get('phoneNum');
         $data = array(
         $data = array(
             'bindPwd'=>true,//js标识
             'bindPwd'=>true,//js标识
             'backUrl' => '/', // 返回的URL链接
             'backUrl' => '/', // 返回的URL链接
@@ -94,7 +95,8 @@ class BindController extends AbstractAction
             'sourceType' => $sourceType, // 第三方登录来源
             'sourceType' => $sourceType, // 第三方登录来源
             'openId' => $openId, // openId
             'openId' => $openId, // openId
             'nickname' => $nickname, //昵称
             'nickname' => $nickname, //昵称
-            'areaCode' => $areaCode   //国别码
+            'areaCode' => $areaCode,   //国别码
+            'phoneNum' => $phoneNum   //国别码
         );
         );
 
 
         // 渲染模板
         // 渲染模板