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

梁志锋
Commit 2d9c014bb6c0627cdbb157f6138fc2175197f455 2 parents 8c1c578a a3c703e1
Showing 7 changed files with 18 additions and 20 deletions
library/Action/AbstractAction.php
library/LibModels/Wap/Passport/BindData.php
library/Plugin/Helpers.php
yohobuy/m.yohobuy.com/application/models/Index/Cart.php
yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Bind.php
yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php
yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Reg.php
--- a/library/Action/AbstractAction.php
View file @2d9c014
+++ b/library/Action/AbstractAction.php
View file @2d9c014
@@ -376,8 +376,8 @@ class AbstractAction extends Controller_Abstract
      * 设置网站SEO的描述内容
      * 
      * @param string $description  描述内容
-     * @param string $sign 连接的字符串
      * @param bool $showMore 是否显示更多内容
+     * @param string $sign 连接的字符串
      * @return void
      */
     protected function setDescription($description, $showMore = true, $sign = ' ')
--- a/library/LibModels/Wap/Passport/BindData.php
View file @2d9c014
+++ b/library/LibModels/Wap/Passport/BindData.php
View file @2d9c014
@@ -19,16 +19,18 @@ class BindData
     /**
      * 绑定前检查
+     * 
+     * @param  string $mobile     绑定输入手机号 
      * @param  string $openId     第三方唯一识别码
      * @param  string $sourceType 登录方式 qq,sina,alipay,wechat
-     * @param  string $mobile     绑定输入手机号 
+     * @param  int $area   所在地区
      * @return array 登录返回结果
      */
-    public static function bindCheck($mobile, $openId, $sourceType)
+    public static function bindCheck($mobile, $openId, $sourceType, $area)
     {
         $param = Yohobuy::param();
-
         $param['method'] = 'app.passport.check';
+        $param['area'] = $area;
         $param['mobile'] = $mobile;
         $param['open_id'] = $openId;
         $param['source_type'] = $sourceType;
@@ -45,7 +47,6 @@ class BindData
     public static function sendBindMsg($area, $mobile)
     {
         $param = Yohobuy::param();
-
         $param['method'] = 'app.passport.smsbind';
         $param['mobile'] = $mobile;
         $param['area'] = $area;
@@ -61,7 +62,6 @@ class BindData
     public static function checkBindCode($area, $mobile, $code)
     {
         $param = Yohobuy::param();
-
         $param['method'] = 'app.register.validRegCode';
         $param['mobile'] = $mobile;
         $param['code'] = $code;
@@ -73,8 +73,9 @@ class BindData
     /**
      * 第三方绑定手机号
-     * @param  string $nickname   姓名
+     * 
      * @param  string $openId     第三方唯一识别码
+     * @param  string $nickname   姓名
      * @param  string $sourceType 登录方式
      * @param  string $mobile     手机号
      * @param  string $area       国别码
@@ -90,11 +91,9 @@ class BindData
         $param['nickname'] = $nickname;
         $param['source_type'] = $sourceType;
         $param['area'] = $area;
-        if (!empty($password))
-        {
+        if (!empty($password)) {
             $param['password'] = $password;
         }
-
         $param['client_secret'] = Sign::getSign($param);
         return Yohobuy::get(Yohobuy::API_URL, $param);
@@ -109,11 +108,9 @@ class BindData
     public static function changeCheck($mobile, $area)
     {
         $param = Yohobuy::param();
-
         $param['method'] = 'app.passport.changeCheck';
         $param['mobile'] = $mobile;
         $param['area'] = $area;
-
         $param['client_secret'] = Sign::getSign($param);
         return Yohobuy::get(Yohobuy::API_URL, $param);
@@ -123,9 +120,9 @@ class BindData
     /**
      * 换绑手机
      * @param  string $uid        用户Id
-     * @param  string $code       验证码
      * @param  string $mobile     手机号
      * @param  string $area       国别码
+     * @param  string $code       验证码
      */
     public static function changeMobile($uid, $mobile, $area, $code)
     {
@@ -136,7 +133,6 @@ class BindData
         $param['uid'] = $uid;
         $param['code'] = $code;
         $param['area'] = $area;
-
         $param['client_secret'] = Sign::getSign($param);
         return Yohobuy::get(Yohobuy::API_URL, $param);
--- a/library/Plugin/Helpers.php
View file @2d9c014
+++ b/library/Plugin/Helpers.php
View file @2d9c014
@@ -579,7 +579,8 @@ class Helpers
             $oneGoods['color'] = $value['color_name'];
             $oneGoods['size'] = $value['size_name'];
             $oneGoods['checked'] = $value['selected'] === 'Y';
-            $oneGoods['price'] = self::transPrice($value['sales_price']);
+            $oneGoods['price'] = self::transPrice($value['last_vip_price']);
+            $oneGoods['isVipPrice'] = $value['sales_price'] !== $value['last_vip_price'];
             $oneGoods['count'] = $value['buy_number'];
             if ($isValid) { // 库存不足
--- a/yohobuy/m.yohobuy.com/application/models/Index/Cart.php
View file @2d9c014
+++ b/yohobuy/m.yohobuy.com/application/models/Index/Cart.php
View file @2d9c014
@@ -413,6 +413,7 @@ class CartModel
                     //gift=>是否赠品,advanceBuy=>是否加价购;
                     if ($single['goods_type'] == 'gift' && !isset($single['isAdvanceBuy'])) {
                         $oneGoods['gift'] = true;
+                        $oneGoods['price'] = Helpers::transPrice($single['sale_price']);
                     } elseif ($single['goods_type'] == 'price_gift') {
                         $oneGoods['advanceBuy'] = true;
                         $oneGoods['price'] = Helpers::transPrice($single['sale_price']);
--- a/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Bind.php
View file @2d9c014
+++ b/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Bind.php
View file @2d9c014
@@ -125,7 +125,7 @@ class BindController extends AbstractAction
                 break;
             }
-            $res = BindData::bindCheck($phoneNum, $openId, $sourceType);
+            $res = BindData::bindCheck($phoneNum, $openId, $sourceType, $areaCode);
             if (!isset($res['code'])) {
                 break;
             }
--- a/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php
View file @2d9c014
+++ b/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Login.php
View file @2d9c014
@@ -26,7 +26,7 @@ class LoginController extends AbstractAction
         $data = array(
             'loginIndex' => true, // 模板中使用JS的标识
-            'backUrl' => '/', // 返回的URL链接
+            'backUrl' => 'javascript:history.go(-1)', // 返回的URL链接
             'showHeaderImg' => true, // 控制显示头部图片
             'isPassportPage' => true, // 模板中模块标识
             'registerUrl' => '/reg.html', // 注册的URL链接
@@ -56,7 +56,7 @@ class LoginController extends AbstractAction
         $data = array();
         $data['loginInternational'] = true; // 模板中使用JS的标识
-        $data['backUrl'] = '/'; // 返回的URL链接
+        $data['backUrl'] = 'javascript:history.go(-1)'; // 返回的URL链接
         $data['headerText'] = '登录'; // 头部信息
         $data['isPassportPage'] = true; // 模板中模块标识
         $data['areaCode'] = '+86'; // 默认区号
--- a/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Reg.php
View file @2d9c014
+++ b/yohobuy/m.yohobuy.com/application/modules/Passport/controllers/Reg.php
View file @2d9c014
@@ -19,7 +19,7 @@ class RegController extends AbstractAction
         $data = array();
         $data['regIndex'] = true; // 模板中使用JS的标识
-        $data['backUrl'] = '/'; // 返回的URL链接
+        $data['backUrl'] = 'javascript:history.go(-1)'; // 返回的URL链接
         $data['headerText'] = '注册'; // 头部信息
         $data['isPassportPage'] = true; // 模板中模块标识
         $data['areaCode'] = '+86'; // 默认的区号
@@ -56,7 +56,7 @@ class RegController extends AbstractAction
         $data = array(
             'regCode' => true, // 模板中使用JS的标识
-            'backUrl' => '/', // 返回的URL链接
+            'backUrl' => SITE_MAIN . '/?go=1', // 返回的URL链接
             'headerText' => '注册', // 头部信息
             'isPassportPage' => true, // 模板中模块标识
             'areaCode' => '+' . $area, // 地区编号