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

@@ -443,13 +443,13 @@ class Helpers
      * @param string $areaMobile
      * @param string $areaMobile
      * @return boolean
      * @return boolean
      */
      */
-    public static function verifyAreaMobile($areaMobile)
+    public static function verifyAreaMobile($areaMobile, $area)
     {
     {
         if (empty($areaMobile)) {
         if (empty($areaMobile)) {
             return false;
             return false;
         }
         }
         if (!strpos($areaMobile, '-')) {
         if (!strpos($areaMobile, '-')) {
-            return self::areaMobielVerify($areaMobile);
+            return self::areaMobielVerify($areaMobile, $area);
         } else {
         } else {
             $mobileData = explode('-', $areaMobile);
             $mobileData = explode('-', $areaMobile);
             if (count($mobileData) != 2) {
             if (count($mobileData) != 2) {

@@ -385,7 +385,11 @@ class UserModel
         // 处理YOHO币数据
         // 处理YOHO币数据
         if(isset($yohoCoin['data']) && !empty($yohoCoin['data'])){
         if(isset($yohoCoin['data']) && !empty($yohoCoin['data'])){
             $coinList = $yohoCoin['data']['coinlist'];
             $coinList = $yohoCoin['data']['coinlist'];
-            $data['money'] = $yohoCoin['data']['total'];
+
+            // 获取有货币总数
+            $total = self::getYohoCoinData($uid);
+            $data['money'] = !empty($total) ? $total['yohoCoin']['coinNum'] : 0;
+
             foreach($coinList as $key => $val){
             foreach($coinList as $key => $val){
                 $result[$key]['title'] = $val['message'];
                 $result[$key]['title'] = $val['message'];
                 $result[$key]['time'] = $val['date'];
                 $result[$key]['time'] = $val['date'];

@@ -276,7 +276,7 @@ class IndexController extends AbstractAction
         $uid = $this->getUid(true);
         $uid = $this->getUid(true);
         $cartGoods = CartModel::getCartData($uid, $shoppingKey);
         $cartGoods = CartModel::getCartData($uid, $shoppingKey);
         if (empty($cartGoods) || isset($cartGoods['isEmptyCart'])) {
         if (empty($cartGoods) || isset($cartGoods['isEmptyCart'])) {
-            $this->go(Helpers::url('/shoppingcart'));
+            $this->go(Helpers::url('/cart/index/index'));
         }
         }
 
 
         $cartType = $this->get('cartType', 'ordinary');
         $cartType = $this->get('cartType', 'ordinary');

@@ -113,7 +113,7 @@ class LoginController extends AbstractAction
 
 
             /* 判断参数是否有效 */
             /* 判断参数是否有效 */
             $verifyEmail = Helpers::verifyEmail($profile);
             $verifyEmail = Helpers::verifyEmail($profile);
-            $verifyMobile = ($area === '86') ? Helpers::verifyMobile($profile) : Helpers::verifyAreaMobile($profile);
+            $verifyMobile = ($area === '86') ? Helpers::verifyMobile($profile) : Helpers::verifyAreaMobile($profile, $area);
             if (!$verifyEmail && !$verifyMobile) {
             if (!$verifyEmail && !$verifyMobile) {
                 break;
                 break;
             }
             }