Merge branch 'master' of git.yoho.cn:fe/YOHOBUYWAP

@@ -119,7 +119,7 @@ class Yohobuy
     {
         $clientType = self::clientType();
         $param = array(
-            'app_version' => '4.6.0',
+            'app_version' => '3.8.2',
             'client_type' => $clientType,
             'os_version' => 'yohobuy:h5',
             'private_key' => self::$privateKeyList[$clientType],

@@ -4,6 +4,7 @@ namespace LibModels\Wap\Home;
 
 use Api\Sign;
 use Api\Yohobuy;
+use Plugin\Helpers;
 
 /**
  * 购物车的数据模型
@@ -382,6 +383,9 @@ class CartData
         $param = Yohobuy::param();
         $param['debug'] = 'Y';
         $param['client_type'] = 'h5'; // 需要ERP统计WAP的下单量
+        if(Helpers::is_weixin()) {
+            $param['client_type'] = 'wechat';
+        }
         $param['private_key'] = Yohobuy::$privateKeyList['android']; // H5默认使用Android的私钥
         $param['method'] = 'app.Shopping.submit';
         $param['address_id'] = $addressId;

@@ -4,6 +4,7 @@ namespace LibModels\Wap\Passport;
 
 use Api\Sign;
 use Api\Yohobuy;
+use Plugin\Helpers;
 
 /**
  * 绑定手机号 数据模型
@@ -28,7 +29,7 @@ class BindData
      */
     public static function bindCheck($mobile, $openId, $sourceType, $area)
     {
-        $param = Yohobuy::param();
+        $param = Yohobuy::param();      
         $param['method'] = 'app.passport.signCheck';
         $param['area'] = $area;
         $param['mobile'] = $mobile;
@@ -85,6 +86,9 @@ class BindData
     {
         $param = Yohobuy::param();
 
+        if(Helpers::is_weixin()) {
+            $param['client_type'] = 'wechat';
+        }
         $param['method'] = 'app.passport.bind';
         $param['mobile'] = $mobile;
         $param['open_id'] = $openId;

@@ -995,4 +995,16 @@ class Helpers
         }
         return $para_filter;
     }
+    
+        
+    /**
+     * 判断是否是微信客户端
+     * @return boolean
+     */
+    public static function is_weixin(){
+        if ( strpos($_SERVER['HTTP_USER_AGENT'], 'MicroMessenger') !== false ) {
+            return true;
+        }  
+        return false;
+    }
 }

@@ -49,7 +49,7 @@ class AliwapService
             'partner' => $this->config->partner,
             '_input_charset' => $this->config->input_charset,
             'notify_url' => Yohobuy::SERVICE_NOTIFY . $this->config->notify_url,
-            'return_url' => Helpers::url($this->config->return_url),
+            'return_url' => Helpers::transHttpsUrl(Helpers::url($this->config->return_url)),
             /* 业务参数 */
             'payment_type' => $this->config->payment_type,
             'seller_id' => $this->config->partner,
@@ -58,7 +58,7 @@ class AliwapService
             'out_trade_no' => $params->orderCode,
             'subject' => $params->goodsName,
             'total_fee' => $params->totalFee / 100,   //单位为元
-            "show_url"	=> Helpers::url(''),
+            "show_url"	=> Helpers::transHttpsUrl(Helpers::url('')),
         );
 
         ksort($parameter);

@@ -219,7 +219,7 @@ $('.btn-balance').on('touchend', function() {
     }
 });
 
-$('.off-shell-goods').on('touchstart touchend', function(e) {
+$('.off-shell-goods').on('click', function(e) {
     var $this = $(e.target).closest('span');
 
     if ($this.hasClass('icon-del')) {

 {
   "name": "yohobuy",
-  "version": "4.6.1",
+  "version": "4.6.3",
   "description": "yohobuy statics",
   "keywords": [],
   "homepage": "",

@@ -41,7 +41,7 @@ class PayController extends AbstractAction
             /* 判断用户是否登录 */
             $uid = $this->getUid(true);
             if (!$uid) {
-                $this->go( Helpers::url('/signin.html', array('refer' => $this->_request->server('HTTP_REFERER'))) );
+                $this->go( Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', SITE_MAIN))));
                 break;
             }
             

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "4.6.1"
+application.version = "4.6.3"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "4.6.1"
+application.version = "4.6.3"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "4.6.1"
+application.version = "4.6.3"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "4.6.1"
+application.version = "4.6.3"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"