Merge branch 'hotfix/payNotUrlHttp'

@@ -58,7 +58,7 @@ class AliwapService
             'out_trade_no' => $params->orderCode,
             'out_trade_no' => $params->orderCode,
             'subject' => $params->goodsName,
             'subject' => $params->goodsName,
             'total_fee' => $params->totalFee / 100,   //单位为元
             'total_fee' => $params->totalFee / 100,   //单位为元
-            "show_url"	=> Helpers::url(''),
+            "show_url"	=> Helpers::transHttpsUrl(Helpers::url('')),
         );
         );
 
 
         ksort($parameter);
         ksort($parameter);

@@ -41,7 +41,7 @@ class PayController extends AbstractAction
             /* 判断用户是否登录 */
             /* 判断用户是否登录 */
             $uid = $this->getUid(true);
             $uid = $this->getUid(true);
             if (!$uid) {
             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;
                 break;
             }
             }