...
|
...
|
@@ -31,7 +31,14 @@ class IndexController extends AbstractAction |
|
|
{
|
|
|
$uid = $this->getUid($useSession);
|
|
|
if (!$uid) {
|
|
|
$this->go(Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', SITE_MAIN))));
|
|
|
$isWeixin = stripos($this->server('HTTP_USER_AGENT', ''), 'MicroMessenger') !== false;
|
|
|
|
|
|
if ($isWeixin) {
|
|
|
$this->go(Helpers::url('/passport/login/wechat', array('refer' => $this->server('HTTP_REFERER', SITE_MAIN))));
|
|
|
}
|
|
|
else {
|
|
|
$this->go(Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', SITE_MAIN))));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
...
|
...
|
@@ -551,7 +558,7 @@ class IndexController extends AbstractAction |
|
|
$deliveryId = $this->get('deliveryId', ''); //配送方式,1表示普通快递,2表示顺丰速运
|
|
|
$paymentType = $this->get('paymentType', ''); //支付方式,1表示在线支付,2表示货到付款
|
|
|
$couponCode = $this->get('couponCode', ''); //优惠券码
|
|
|
$yohoCoin = $this->get('yohoCoin', ''); //使用的YOHO币数量
|
|
|
$yohoCoin = $this->get('yohoCoin', ''); //使用的YOHO币数量
|
|
|
|
|
|
$data = CartModel::getPackageInfo($uid, $cartType, $skuList, $orderCode, $sessionKey, $deliveryId, $paymentType, $couponCode, $yohoCoin);
|
|
|
|
...
|
...
|
|