fe / YOHOBUYPC · Commits

Go to a project

Authored by yyq
Commit 43a235fb81c004339fc2c907d0e36871a9343a59 1 parent 6e026021

pay success best for you

Inline Side-by-side
Showing 13 changed files with 261 additions and 25 deletions
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="pay-notice-page yoho-page"> 2 <div class="pay-notice-page yoho-page">
3 {{# payNotice}} 3 {{# payNotice}}
4 <div class="order-wrap"> 4 <div class="order-wrap">
5 - <h1><i class="iconfont">&#xe61f;</i>恭喜您，购买完成！您已成功支付<span class="red">{{pay}}</span>元！</h1> 5 + <h1><i class="pay-sure-icon"></i>恭喜您，购买完成！您已成功支付<span class="red">{{pay}}</span>元！</h1>
6 6
7 <div class="order-info"> 7 <div class="order-info">
8 <ul> 8 <ul>
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
37 {{/if}} 37 {{/if}}
38 </p> 38 </p>
39 </div> 39 </div>
  40 + {{> pay/best-for-you}}
40 {{/ payNotice}} 41 {{/ payNotice}}
41 </div> 42 </div>
42 {{> pay/pay-analysis}} 43 {{> pay/pay-analysis}}
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="pay-notice-page yoho-page"> 2 <div class="pay-notice-page yoho-page">
3 {{# payNotice}} 3 {{# payNotice}}
4 <div class="order-wrap"> 4 <div class="order-wrap">
5 - <h1><i class="iconfont">&#xe61f;</i>恭喜您，购买完成！您已成功支付<span class="red">{{pay}}</span>元！</h1> 5 + <h1><i class="pay-sure-icon"></i>恭喜您，购买完成！您已成功支付<span class="red">{{pay}}</span>元！</h1>
6 6
7 <div class="order-info"> 7 <div class="order-info">
8 <ul> 8 <ul>
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
37 {{/if}} 37 {{/if}}
38 </p> 38 </p>
39 </div> 39 </div>
  40 + {{> pay/best-for-you}}
40 {{/ payNotice}} 41 {{/ payNotice}}
41 </div> 42 </div>
42 {{> pay/pay-analysis}} 43 {{> pay/pay-analysis}}
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="shopping-cashondelivery-page yoho-page clearfix"> 2 <div class="shopping-cashondelivery-page yoho-page clearfix">
3 {{# shoppingpay}} 3 {{# shoppingpay}}
4 <div class="order-wrap"> 4 <div class="order-wrap">
5 - <h1><i class="iconfont">&#xe61f;</i>订单提交成功！您需要在收货时向送货员支付<span class="red">{{count}}</span>元！</h1> 5 + <h1><i class="pay-sure-icon"></i>订单提交成功！您需要在收货时向送货员支付<span class="red">{{count}}</span>元！</h1>
6 6
7 <div class="order-info"> 7 <div class="order-info">
8 <ul> 8 <ul>
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
37 {{/if}} 37 {{/if}}
38 </p> 38 </p>
39 </div> 39 </div>
  40 + {{> pay/best-for-you}}
40 {{/ shoppingpay}} 41 {{/ shoppingpay}}
41 </div> 42 </div>
42 43
  1 +{{#if bestForYou}}
  2 + <div id="best-for-you" class="best-for-you">
  3 + <div class="top-title">
  4 + <span>为您优选</span>
  5 + <label class="change-btn">换一批</label>
  6 + </div>
  7 + <div class="product-wrap">
  8 + <ul class="clearfix">
  9 + {{# bestForYou}}
  10 + <li>
  11 + <a href="{{href}}" data-id="{{productId}}" target="_blank">
  12 + <img class="thumb" src="{{thumb}}">
  13 + <p class="name">{{name}}</p>
  14 + <span class="price">¥{{price}}</span>
  15 + </a>
  16 + </li>
  17 + {{/ bestForYou}}
  18 + </ul>
  19 + </div>
  20 + </div>
  21 +{{/if}}
@@ -18,9 +18,12 @@ @@ -18,9 +18,12 @@
18 font-size: 26px; 18 font-size: 26px;
19 line-height: 1; 19 line-height: 1;
20 20
21 - .iconfont {  
22 - font-size: 26px;  
23 - margin-right: 16px; 21 + .pay-sure-icon {
  22 + display: inline-block;
  23 + width: 32px;
  24 + height: 32px;
  25 + background: resolve('cart/pay-sure-icon.png');
  26 + vertical-align: text-bottom;
24 } 27 }
25 } 28 }
26 } 29 }
@@ -92,4 +95,70 @@ @@ -92,4 +95,70 @@
92 color: #0883d1; 95 color: #0883d1;
93 } 96 }
94 } 97 }
  98 +
  99 + .best-for-you {
  100 + margin-top: 30px;
  101 +
  102 + .top-title {
  103 + font-weight: 300;
  104 + border-bottom: 1px solid #e0e0e0;
  105 +
  106 + span {
  107 + font-size: 18px;
  108 + display: inline-block;
  109 + padding: 0 4px;
  110 + height: 40px;
  111 + border-bottom: 3px solid #4a4a4a;
  112 + }
  113 +
  114 + .change-btn {
  115 + float: right;
  116 + font-size: 16px;
  117 + line-height: 18px;
  118 + cursor: pointer;
  119 + display: none;
  120 +
  121 + &:after {
  122 + content: '';
  123 + width: 13px;
  124 + height: 13px;
  125 + display: inline-block;
  126 + background: resolve('pay/change-icon.png');
  127 + }
  128 + }
  129 + }
  130 +
  131 + .product-wrap {
  132 + margin-top: 30px;
  133 + overflow: hidden;
  134 +
  135 + ul {
  136 + width: 3010px;
  137 + height: 307px;
  138 + overflow: hidden;
  139 + }
  140 +
  141 + li {
  142 + width: 190px;
  143 + margin-right: 10px;
  144 + font-size: 12px;
  145 + font-weight: bold;
  146 + line-height: 1.5;
  147 + float: left;
  148 + text-align: center;
  149 + }
  150 +
  151 + .thumb {
  152 + height: 256px;
  153 + }
  154 +
  155 + .name {
  156 + padding: 0 10px;
  157 + margin-top: 10px;
  158 + overflow: hidden;
  159 + text-overflow: ellipsis;
  160 + white-space: nowrap;
  161 + }
  162 + }
  163 + }
95 } 164 }
@@ -18,9 +18,12 @@ @@ -18,9 +18,12 @@
18 font-size: 26px; 18 font-size: 26px;
19 line-height: 1; 19 line-height: 1;
20 20
21 - .iconfont {  
22 - font-size: 26px;  
23 - margin-right: 16px; 21 + .pay-sure-icon {
  22 + display: inline-block;
  23 + width: 32px;
  24 + height: 32px;
  25 + background: resolve('cart/pay-sure-icon.png');
  26 + vertical-align: text-bottom;
24 } 27 }
25 } 28 }
26 } 29 }
@@ -50,7 +53,7 @@ @@ -50,7 +53,7 @@
50 } 53 }
51 54
52 .notice-link { 55 .notice-link {
53 - color: #0883d1; 56 + color: #017cf8;
54 } 57 }
55 } 58 }
56 59
@@ -89,7 +92,73 @@ @@ -89,7 +92,73 @@
89 margin-top: 30px; 92 margin-top: 30px;
90 93
91 .notice-link { 94 .notice-link {
92 - color: #0883d1; 95 + color: #017cf8;
  96 + }
  97 + }
  98 +
  99 + .best-for-you {
  100 + margin-top: 30px;
  101 +
  102 + .top-title {
  103 + font-weight: 300;
  104 + border-bottom: 1px solid #e0e0e0;
  105 +
  106 + span {
  107 + font-size: 18px;
  108 + display: inline-block;
  109 + padding: 0 4px;
  110 + height: 40px;
  111 + border-bottom: 3px solid #4a4a4a;
  112 + }
  113 +
  114 + .change-btn {
  115 + float: right;
  116 + font-size: 16px;
  117 + line-height: 18px;
  118 + cursor: pointer;
  119 + display: none;
  120 +
  121 + &:after {
  122 + content: '';
  123 + width: 13px;
  124 + height: 13px;
  125 + display: inline-block;
  126 + background: resolve('pay/change-icon.png');
  127 + }
  128 + }
  129 + }
  130 +
  131 + .product-wrap {
  132 + margin-top: 30px;
  133 + overflow: hidden;
  134 +
  135 + ul {
  136 + width: 3010px;
  137 + height: 307px;
  138 + overflow: hidden;
  139 + }
  140 +
  141 + li {
  142 + width: 190px;
  143 + margin-right: 10px;
  144 + font-size: 12px;
  145 + font-weight: bold;
  146 + line-height: 1.5;
  147 + float: left;
  148 + text-align: center;
  149 + }
  150 +
  151 + .thumb {
  152 + height: 256px;
  153 + }
  154 +
  155 + .name {
  156 + padding: 0 10px;
  157 + margin-top: 10px;
  158 + overflow: hidden;
  159 + text-overflow: ellipsis;
  160 + white-space: nowrap;
  161 + }
93 } 162 }
94 } 163 }
95 } 164 }
@@ -530,15 +530,15 @@ class PayModel @@ -530,15 +530,15 @@ class PayModel
530 'checkOrderUrl' => Helpers::url('/home/orders/detail', array('orderCode' => $orderData['order_code'])), 530 'checkOrderUrl' => Helpers::url('/home/orders/detail', array('orderCode' => $orderData['order_code'])),
531 'payMode' => ($orderData['payment_type'] == 1 ? '在线支付' : '货到付款'), 531 'payMode' => ($orderData['payment_type'] == 1 ? '在线支付' : '货到付款'),
532 'currency' => $orderData['yoho_give_coin'], 532 'currency' => $orderData['yoho_give_coin'],
533 - 'yohoCoinUrl' => Helpers::url('/help', array('category_id' => 87)), 533 + 'yohoCoinUrl' => Helpers::url('/help/detail', array('id' => 105, 'contId' => 233)),
534 'ordersUrl' => Helpers::url('/home/orders'), 534 'ordersUrl' => Helpers::url('/home/orders'),
535 - 'returnGoodsUrl' => Helpers::url('/help', array('category_id' => 121)), 535 + 'returnGoodsUrl' => Helpers::url('/help/detail', array('id' => 49)),
536 'vipSum' => $amount, 536 'vipSum' => $amount,
537 - 'vipUrl' => Helpers::url('/help', array('category_id' => 91)), 537 + 'vipUrl' => Helpers::url('/help/detail', array('id' => 9)),
538 'returnHomeUrl' => Helpers::url('/') 538 'returnHomeUrl' => Helpers::url('/')
539 ); 539 );
540 } while (false); 540 } while (false);
541 541
542 return $result; 542 return $result;
543 } 543 }
544 -}  
  544 +}
@@ -92,13 +92,13 @@ class PaymentModel @@ -92,13 +92,13 @@ class PaymentModel
92 // 订单详情链接地址 92 // 订单详情链接地址
93 $result['checkOrderUrl'] = Helpers::url('/home/orders/detail', array('orderCode' => $orderCode)); 93 $result['checkOrderUrl'] = Helpers::url('/home/orders/detail', array('orderCode' => $orderCode));
94 // 有货币地址 94 // 有货币地址
95 - $result['yohoCoinUrl'] = Helpers::url('/help', array('category_id' => 87)); 95 + $result['yohoCoinUrl'] = Helpers::url('/help/detail', array('id' => 105, 'contId' => 233));
96 // vip地址 96 // vip地址
97 - $result['vipUrl'] = Helpers::url('/help', array('category_id' => 91)); 97 + $result['vipUrl'] = Helpers::url('/help/detail', array('id' => 9));
98 // 订单中心地址 98 // 订单中心地址
99 $result['ordersUrl'] = Helpers::url('/home/orders'); 99 $result['ordersUrl'] = Helpers::url('/home/orders');
100 // 退换货地址 100 // 退换货地址
101 - $result['backGoodsUrl'] = Helpers::url('/help', array('category_id' => 121)); 101 + $result['backGoodsUrl'] = Helpers::url('/help/detail', array('id' => 49));
102 // 返回首页地址 102 // 返回首页地址
103 $result['returnHomeUrl'] = Helpers::url('/'); 103 $result['returnHomeUrl'] = Helpers::url('/');
104 break; 104 break;
@@ -310,11 +310,11 @@ class PaymentModel @@ -310,11 +310,11 @@ class PaymentModel
310 'checkOrderUrl' => Helpers::url('/home/orders/detail', array('orderCode' => $orderData['order_code'])), 310 'checkOrderUrl' => Helpers::url('/home/orders/detail', array('orderCode' => $orderData['order_code'])),
311 'payMode' => ($orderData['payment_type'] == 1 ? '在线支付' : '货到付款'), 311 'payMode' => ($orderData['payment_type'] == 1 ? '在线支付' : '货到付款'),
312 'currency' => $orderData['yoho_give_coin'], 312 'currency' => $orderData['yoho_give_coin'],
313 - 'yohoCoinUrl' => Helpers::url('/help', array('category_id' => 87)), 313 + 'yohoCoinUrl' => Helpers::url('/help/detail', array('id' => 105, 'contId' => 233)),
314 'ordersUrl' => Helpers::url('/home/orders'), 314 'ordersUrl' => Helpers::url('/home/orders'),
315 - 'returnGoodsUrl' => Helpers::url('/help', array('category_id' => 121)), 315 + 'returnGoodsUrl' => Helpers::url('/help/detail', array('id' => 49)),
316 'vipSum' => $amount, 316 'vipSum' => $amount,
317 - 'vipUrl' => Helpers::url('/help', array('category_id' => 91)), 317 + 'vipUrl' => Helpers::url('/help/detail', array('id' => 9)),
318 'returnHomeUrl' => Helpers::url('/'), 318 'returnHomeUrl' => Helpers::url('/'),
319 'fraudTip' => self::getFraudTip() 319 'fraudTip' => self::getFraudTip()
320 ); 320 );
@@ -6,18 +6,19 @@ use WebPlugin\Pay\PayFactory; @@ -6,18 +6,19 @@ use WebPlugin\Pay\PayFactory;
6 use WebPlugin\Pay\Rspparams; 6 use WebPlugin\Pay\Rspparams;
7 use WebPlugin\Pay\weixin\PayNotifyCallBack; 7 use WebPlugin\Pay\weixin\PayNotifyCallBack;
8 use WebPlugin\UdpLog; 8 use WebPlugin\UdpLog;
  9 +use Home\IndexModel;
9 /** 10 /**
10 * 支付Notice 11 * 支付Notice
11 */ 12 */
12 class NoticeController extends WebAction 13 class NoticeController extends WebAction
13 { 14 {
14 // 存储的UID键名 15 // 存储的UID键名
15 - const SESSION_UID_KEY = 'payUserid';  
16 - 16 + const SESSION_UID_KEY = 'payUserid';
  17 +
17 public function init() { 18 public function init() {
18 parent::init(); 19 parent::init();
19 } 20 }
20 - 21 +
21 /** 22 /**
22 * 支付宝后台服务器返回,主要是用于补单 23 * 支付宝后台服务器返回,主要是用于补单
23 */ 24 */
@@ -364,6 +365,30 @@ class NoticeController extends WebAction @@ -364,6 +365,30 @@ class NoticeController extends WebAction
364 $view = 'index'; 365 $view = 'index';
365 $point['payResult'] = 1;// 支付结果 366 $point['payResult'] = 1;// 支付结果
366 367
  368 + $uid = $this->getUid();
  369 + $udid = $uid . $this->getUdid();
  370 + $channel = Helpers::getChannelNameByCookie();
  371 +
  372 + $channelNum = 1;
  373 + switch ($channel) {
  374 + case 'boys':
  375 + $channelNum = 1;
  376 + break;
  377 + case 'girls':
  378 + $channelNum = 2;
  379 + break;
  380 + case 'kids':
  381 + $channelNum = 3;
  382 + break;
  383 + case 'lifestyle':
  384 + $channelNum = 4;
  385 + break;
  386 + default:
  387 + break;
  388 + }
  389 +
  390 + $dealResult['data']['bestForYou'] = IndexModel::preferenceData($channelNum, $uid, $udid, '100004', 15);
  391 +
367 $data = array( 392 $data = array(
368 'payNotice' => $dealResult['data'], 393 'payNotice' => $dealResult['data'],
369 'criteo' => array(// 统计代码有关数据 394 'criteo' => array(// 统计代码有关数据
@@ -5,6 +5,7 @@ use Shopping\PaymentModel; @@ -5,6 +5,7 @@ use Shopping\PaymentModel;
5 use WebPlugin\Pay\PayFactory; 5 use WebPlugin\Pay\PayFactory;
6 use WebPlugin\Pay\Rspparams; 6 use WebPlugin\Pay\Rspparams;
7 use WebPlugin\UdpLog; 7 use WebPlugin\UdpLog;
  8 +use Home\IndexModel;
8 9
9 /** 10 /**
10 * 支付 同步通知页面 11 * 支付 同步通知页面
@@ -22,7 +23,7 @@ class PayreturnController extends WebAction @@ -22,7 +23,7 @@ class PayreturnController extends WebAction
22 $dealResult['payData'] = array('payWay' => '支付宝', 'payWayId' => 2); 23 $dealResult['payData'] = array('payWay' => '支付宝', 'payWayId' => 2);
23 $this->commonShowResult($dealResult); 24 $this->commonShowResult($dealResult);
24 } 25 }
25 - 26 +
26 /** 27 /**
27 * 微信支付-轮询--jsonPcallback响应订单支付状态 28 * 微信支付-轮询--jsonPcallback响应订单支付状态
28 */ 29 */
@@ -142,6 +143,30 @@ class PayreturnController extends WebAction @@ -142,6 +143,30 @@ class PayreturnController extends WebAction
142 $view = 'index'; 143 $view = 'index';
143 $point['payResult'] = 1;// 支付结果 144 $point['payResult'] = 1;// 支付结果
144 145
  146 + $uid = $this->getUid();
  147 + $udid = $uid . $this->getUdid();
  148 + $channel = Helpers::getChannelNameByCookie();
  149 +
  150 + $channelNum = 1;
  151 + switch ($channel) {
  152 + case 'boys':
  153 + $channelNum = 1;
  154 + break;
  155 + case 'girls':
  156 + $channelNum = 2;
  157 + break;
  158 + case 'kids':
  159 + $channelNum = 3;
  160 + break;
  161 + case 'lifestyle':
  162 + $channelNum = 4;
  163 + break;
  164 + default:
  165 + break;
  166 + }
  167 +
  168 + $dealResult['data']['bestForYou'] = IndexModel::preferenceData($channelNum, $uid, $udid, '100004', 15);
  169 +
145 $data = array('payNotice' => $dealResult['data'], 'point' => $point); 170 $data = array('payNotice' => $dealResult['data'], 'point' => $point);
146 171
147 } 172 }
@@ -5,6 +5,7 @@ use Shopping\PaymentModel; @@ -5,6 +5,7 @@ use Shopping\PaymentModel;
5 use WebPlugin\Helpers; 5 use WebPlugin\Helpers;
6 use LibModels\Web\Home\UserData; 6 use LibModels\Web\Home\UserData;
7 use WebPlugin\Cache; 7 use WebPlugin\Cache;
  8 +use Home\IndexModel;
8 /** 9 /**
9 * 支付相关的控制器 10 * 支付相关的控制器
10 * 11 *
@@ -66,6 +67,29 @@ class PayController extends WebAction @@ -66,6 +67,29 @@ class PayController extends WebAction
66 $UserData = UserData::getUserInfo($uid); 67 $UserData = UserData::getUserInfo($uid);
67 $data['userName'] = isset($UserData['code']) && $UserData['code'] === 200 ? $UserData['data']['profile_name'] : $this->_uname; 68 $data['userName'] = isset($UserData['code']) && $UserData['code'] === 200 ? $UserData['data']['profile_name'] : $this->_uname;
68 69
  70 + $udid = $uid . $this->getUdid();
  71 + $channel = Helpers::getChannelNameByCookie();
  72 +
  73 + $channelNum = 1;
  74 + switch ($channel) {
  75 + case 'boys':
  76 + $channelNum = 1;
  77 + break;
  78 + case 'girls':
  79 + $channelNum = 2;
  80 + break;
  81 + case 'kids':
  82 + $channelNum = 3;
  83 + break;
  84 + case 'lifestyle':
  85 + $channelNum = 4;
  86 + break;
  87 + default:
  88 + break;
  89 + }
  90 +
  91 + $data['bestForYou'] = IndexModel::preferenceData($channelNum, $uid, $udid, '100004', 15);
  92 +
69 $this->setSimpleHeader(); 93 $this->setSimpleHeader();
70 $this->_view->display($view, array( 94 $this->_view->display($view, array(
71 'shoppingpay' =>$data, 95 'shoppingpay' =>$data,