fixes bug to partner login
Showing
3 changed files
with
8 additions
and
8 deletions
@@ -779,7 +779,7 @@ class HomeController extends AbstractAction | @@ -779,7 +779,7 @@ class HomeController extends AbstractAction | ||
779 | public function payAction() | 779 | public function payAction() |
780 | { | 780 | { |
781 | // 审判跳转登录页 | 781 | // 审判跳转登录页 |
782 | - //$this->auditJumpLogin(); | 782 | + $this->auditJumpLogin(); |
783 | 783 | ||
784 | $this->setTitle('支付中心'); | 784 | $this->setTitle('支付中心'); |
785 | $this->setNavHeader('支付中心'); | 785 | $this->setNavHeader('支付中心'); |
@@ -805,7 +805,7 @@ class HomeController extends AbstractAction | @@ -805,7 +805,7 @@ class HomeController extends AbstractAction | ||
805 | 'payLink' => '', | 805 | 'payLink' => '', |
806 | 'appId' => 'weixin', | 806 | 'appId' => 'weixin', |
807 | 'app' => '微信支付', | 807 | 'app' => '微信支付', |
808 | - 'hint' => '需安装微信客户端', | 808 | + 'hint' => '推荐使用', |
809 | 'subHint' => '', | 809 | 'subHint' => '', |
810 | ), | 810 | ), |
811 | ), | 811 | ), |
@@ -79,7 +79,7 @@ class DetailModel | @@ -79,7 +79,7 @@ class DetailModel | ||
79 | $result['goodsPrice'] = array(); | 79 | $result['goodsPrice'] = array(); |
80 | $result['goodsPrice']['currentPrice'] = $baseInfo['productPriceBo']['formatSalesPrice']; | 80 | $result['goodsPrice']['currentPrice'] = $baseInfo['productPriceBo']['formatSalesPrice']; |
81 | if ($baseInfo['productPriceBo']['formatMarketPrice'] !== $baseInfo['productPriceBo']['formatSalesPrice']) { | 81 | if ($baseInfo['productPriceBo']['formatMarketPrice'] !== $baseInfo['productPriceBo']['formatSalesPrice']) { |
82 | - $result['goodsPrice']['previousPrice'] = $baseInfo['productPriceBo']['formatMarketPrice']; | 82 | + $result['goodsPrice']['previousPrice'] = strtr($baseInfo['productPriceBo']['formatMarketPrice'], array('¥' => '')); |
83 | } | 83 | } |
84 | } | 84 | } |
85 | // VIP商品价格 | 85 | // VIP商品价格 |
@@ -87,7 +87,7 @@ class DetailModel | @@ -87,7 +87,7 @@ class DetailModel | ||
87 | $build = array(); | 87 | $build = array(); |
88 | foreach ($baseInfo['productPriceBo']['vipPrices'] as $value) { | 88 | foreach ($baseInfo['productPriceBo']['vipPrices'] as $value) { |
89 | $build['level'] = $value['vipLevel']; | 89 | $build['level'] = $value['vipLevel']; |
90 | - $build['text'] = $value['vipPrice']; | 90 | + $build['text'] = strtr($value['vipPrice'], array('¥' => '')); |
91 | $build['currentLevel'] = ($value['vipLevel'] == $vipLevel) ? true : false; | 91 | $build['currentLevel'] = ($value['vipLevel'] == $vipLevel) ? true : false; |
92 | $result['vipLevel']['list'][] = $build; | 92 | $result['vipLevel']['list'][] = $build; |
93 | } | 93 | } |
@@ -419,7 +419,7 @@ class DetailModel | @@ -419,7 +419,7 @@ class DetailModel | ||
419 | if (isset($sizeInfo['productIntroBo']['productIntro'])) { | 419 | if (isset($sizeInfo['productIntroBo']['productIntro'])) { |
420 | $productIntro = ''; | 420 | $productIntro = ''; |
421 | if (!empty($sizeInfo['productDescBo']['phrase'])) { | 421 | if (!empty($sizeInfo['productDescBo']['phrase'])) { |
422 | - $productIntro .= $sizeInfo['productDescBo']['phrase']; | 422 | + $productIntro .= $sizeInfo['productDescBo']['phrase'] . '<br/>'; |
423 | } | 423 | } |
424 | $productIntro .= $sizeInfo['productIntroBo']['productIntro']; | 424 | $productIntro .= $sizeInfo['productIntroBo']['productIntro']; |
425 | if ($productIntro) { | 425 | if ($productIntro) { |
@@ -187,7 +187,7 @@ class LoginController extends AbstractAction | @@ -187,7 +187,7 @@ class LoginController extends AbstractAction | ||
187 | $refer = rawurldecode($refer); | 187 | $refer = rawurldecode($refer); |
188 | } | 188 | } |
189 | 189 | ||
190 | - if ($result['code'] == 200 && !empty($result['data']['uid'])) { | 190 | + if (isset($result['code']) && $result['code'] == 200 && !empty($result['data']['uid'])) { |
191 | $this->setSession('_TOKEN', Helpers::makeToken($result['data']['uid'])); | 191 | $this->setSession('_TOKEN', Helpers::makeToken($result['data']['uid'])); |
192 | $this->go(Helpers::syncUserSession($result['data']['uid'], $refer)); | 192 | $this->go(Helpers::syncUserSession($result['data']['uid'], $refer)); |
193 | } else { | 193 | } else { |
@@ -217,7 +217,7 @@ class LoginController extends AbstractAction | @@ -217,7 +217,7 @@ class LoginController extends AbstractAction | ||
217 | $refer = rawurldecode($refer); | 217 | $refer = rawurldecode($refer); |
218 | } | 218 | } |
219 | 219 | ||
220 | - if ($result['code'] == 200 && !empty($result['data']['uid'])) { | 220 | + if (isset($result['code']) && $result['code'] == 200 && !empty($result['data']['uid'])) { |
221 | $this->setSession('_TOKEN', Helpers::makeToken($result['data']['uid'])); | 221 | $this->setSession('_TOKEN', Helpers::makeToken($result['data']['uid'])); |
222 | $this->go(Helpers::syncUserSession($result['data']['uid'], $refer)); | 222 | $this->go(Helpers::syncUserSession($result['data']['uid'], $refer)); |
223 | } else { | 223 | } else { |
@@ -247,7 +247,7 @@ class LoginController extends AbstractAction | @@ -247,7 +247,7 @@ class LoginController extends AbstractAction | ||
247 | $refer = rawurldecode($refer); | 247 | $refer = rawurldecode($refer); |
248 | } | 248 | } |
249 | 249 | ||
250 | - if ($result['code'] == 200 && !empty($result['data']['uid'])) { | 250 | + if (isset($result['code']) && $result['code'] == 200 && !empty($result['data']['uid'])) { |
251 | $this->setSession('_TOKEN', Helpers::makeToken($result['data']['uid'])); | 251 | $this->setSession('_TOKEN', Helpers::makeToken($result['data']['uid'])); |
252 | $this->go(Helpers::syncUserSession($result['data']['uid'], $refer)); | 252 | $this->go(Helpers::syncUserSession($result['data']['uid'], $refer)); |
253 | } else { | 253 | } else { |
-
Please register or login to post a comment