fe / YOHOBUYPC · Commits

Go to a project

Authored by yyq
Commit 94137faf3158a5309a26a34a138b63ef1d09e49b 2 parents f5562fd0 43a235fb

Merge branch 'feature/paySuccess' into release/5.4.1

Inline Side-by-side
Showing 13 changed files with 261 additions and 25 deletions
... ... @@ -2,7 +2,7 @@
<div class="pay-notice-page yoho-page">
{{# payNotice}}
<div class="order-wrap">
<h1><i class="iconfont">&#xe61f;</i>恭喜您，购买完成！您已成功支付<span class="red">{{pay}}</span>元！</h1>
<h1><i class="pay-sure-icon"></i>恭喜您，购买完成！您已成功支付<span class="red">{{pay}}</span>元！</h1>
<div class="order-info">
<ul>
... ... @@ -37,6 +37,7 @@
{{/if}}
</p>
</div>
{{> pay/best-for-you}}
{{/ payNotice}}
</div>
{{> pay/pay-analysis}}
... ...
... ... @@ -2,7 +2,7 @@
<div class="pay-notice-page yoho-page">
{{# payNotice}}
<div class="order-wrap">
<h1><i class="iconfont">&#xe61f;</i>恭喜您，购买完成！您已成功支付<span class="red">{{pay}}</span>元！</h1>
<h1><i class="pay-sure-icon"></i>恭喜您，购买完成！您已成功支付<span class="red">{{pay}}</span>元！</h1>
<div class="order-info">
<ul>
... ... @@ -37,6 +37,7 @@
{{/if}}
</p>
</div>
{{> pay/best-for-you}}
{{/ payNotice}}
</div>
{{> pay/pay-analysis}}
... ...
... ... @@ -2,7 +2,7 @@
<div class="shopping-cashondelivery-page yoho-page clearfix">
{{# shoppingpay}}
<div class="order-wrap">
<h1><i class="iconfont">&#xe61f;</i>订单提交成功！您需要在收货时向送货员支付<span class="red">{{count}}</span>元！</h1>
<h1><i class="pay-sure-icon"></i>订单提交成功！您需要在收货时向送货员支付<span class="red">{{count}}</span>元！</h1>
<div class="order-info">
<ul>
... ... @@ -37,6 +37,7 @@
{{/if}}
</p>
</div>
{{> pay/best-for-you}}
{{/ shoppingpay}}
</div>
... ...
{{#if bestForYou}}
<div id="best-for-you" class="best-for-you">
<div class="top-title">
<span>为您优选</span>
<label class="change-btn">换一批</label>
</div>
<div class="product-wrap">
<ul class="clearfix">
{{# bestForYou}}
<li>
<a href="{{href}}" data-id="{{productId}}" target="_blank">
<img class="thumb" src="{{thumb}}">
<p class="name">{{name}}</p>
<span class="price">¥{{price}}</span>
</a>
</li>
{{/ bestForYou}}
</ul>
</div>
</div>
{{/if}}
... ...
... ... @@ -18,9 +18,12 @@
font-size: 26px;
line-height: 1;
.iconfont {
font-size: 26px;
margin-right: 16px;
.pay-sure-icon {
display: inline-block;
width: 32px;
height: 32px;
background: resolve('cart/pay-sure-icon.png');
vertical-align: text-bottom;
}
}
}
... ... @@ -92,4 +95,70 @@
color: #0883d1;
}
}
.best-for-you {
margin-top: 30px;
.top-title {
font-weight: 300;
border-bottom: 1px solid #e0e0e0;
span {
font-size: 18px;
display: inline-block;
padding: 0 4px;
height: 40px;
border-bottom: 3px solid #4a4a4a;
}
.change-btn {
float: right;
font-size: 16px;
line-height: 18px;
cursor: pointer;
display: none;
&:after {
content: '';
width: 13px;
height: 13px;
display: inline-block;
background: resolve('pay/change-icon.png');
}
}
}
.product-wrap {
margin-top: 30px;
overflow: hidden;
ul {
width: 3010px;
height: 307px;
overflow: hidden;
}
li {
width: 190px;
margin-right: 10px;
font-size: 12px;
font-weight: bold;
line-height: 1.5;
float: left;
text-align: center;
}
.thumb {
height: 256px;
}
.name {
padding: 0 10px;
margin-top: 10px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
}
... ...
... ... @@ -18,9 +18,12 @@
font-size: 26px;
line-height: 1;
.iconfont {
font-size: 26px;
margin-right: 16px;
.pay-sure-icon {
display: inline-block;
width: 32px;
height: 32px;
background: resolve('cart/pay-sure-icon.png');
vertical-align: text-bottom;
}
}
}
... ... @@ -50,7 +53,7 @@
}
.notice-link {
color: #0883d1;
color: #017cf8;
}
}
... ... @@ -89,7 +92,73 @@
margin-top: 30px;
.notice-link {
color: #0883d1;
color: #017cf8;
}
}
.best-for-you {
margin-top: 30px;
.top-title {
font-weight: 300;
border-bottom: 1px solid #e0e0e0;
span {
font-size: 18px;
display: inline-block;
padding: 0 4px;
height: 40px;
border-bottom: 3px solid #4a4a4a;
}
.change-btn {
float: right;
font-size: 16px;
line-height: 18px;
cursor: pointer;
display: none;
&:after {
content: '';
width: 13px;
height: 13px;
display: inline-block;
background: resolve('pay/change-icon.png');
}
}
}
.product-wrap {
margin-top: 30px;
overflow: hidden;
ul {
width: 3010px;
height: 307px;
overflow: hidden;
}
li {
width: 190px;
margin-right: 10px;
font-size: 12px;
font-weight: bold;
line-height: 1.5;
float: left;
text-align: center;
}
.thumb {
height: 256px;
}
.name {
padding: 0 10px;
margin-top: 10px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
}
... ...
... ... @@ -530,15 +530,15 @@ class PayModel
'checkOrderUrl' => Helpers::url('/home/orders/detail', array('orderCode' => $orderData['order_code'])),
'payMode' => ($orderData['payment_type'] == 1 ? '在线支付' : '货到付款'),
'currency' => $orderData['yoho_give_coin'],
'yohoCoinUrl' => Helpers::url('/help', array('category_id' => 87)),
'yohoCoinUrl' => Helpers::url('/help/detail', array('id' => 105, 'contId' => 233)),
'ordersUrl' => Helpers::url('/home/orders'),
'returnGoodsUrl' => Helpers::url('/help', array('category_id' => 121)),
'returnGoodsUrl' => Helpers::url('/help/detail', array('id' => 49)),
'vipSum' => $amount,
'vipUrl' => Helpers::url('/help', array('category_id' => 91)),
'vipUrl' => Helpers::url('/help/detail', array('id' => 9)),
'returnHomeUrl' => Helpers::url('/')
);
} while (false);
return $result;
}
}
\ No newline at end of file
}
... ...
... ... @@ -92,13 +92,13 @@ class PaymentModel
// 订单详情链接地址
$result['checkOrderUrl'] = Helpers::url('/home/orders/detail', array('orderCode' => $orderCode));
// 有货币地址
$result['yohoCoinUrl'] = Helpers::url('/help', array('category_id' => 87));
$result['yohoCoinUrl'] = Helpers::url('/help/detail', array('id' => 105, 'contId' => 233));
// vip地址
$result['vipUrl'] = Helpers::url('/help', array('category_id' => 91));
$result['vipUrl'] = Helpers::url('/help/detail', array('id' => 9));
// 订单中心地址
$result['ordersUrl'] = Helpers::url('/home/orders');
// 退换货地址
$result['backGoodsUrl'] = Helpers::url('/help', array('category_id' => 121));
$result['backGoodsUrl'] = Helpers::url('/help/detail', array('id' => 49));
// 返回首页地址
$result['returnHomeUrl'] = Helpers::url('/');
break;
... ... @@ -310,11 +310,11 @@ class PaymentModel
'checkOrderUrl' => Helpers::url('/home/orders/detail', array('orderCode' => $orderData['order_code'])),
'payMode' => ($orderData['payment_type'] == 1 ? '在线支付' : '货到付款'),
'currency' => $orderData['yoho_give_coin'],
'yohoCoinUrl' => Helpers::url('/help', array('category_id' => 87)),
'yohoCoinUrl' => Helpers::url('/help/detail', array('id' => 105, 'contId' => 233)),
'ordersUrl' => Helpers::url('/home/orders'),
'returnGoodsUrl' => Helpers::url('/help', array('category_id' => 121)),
'returnGoodsUrl' => Helpers::url('/help/detail', array('id' => 49)),
'vipSum' => $amount,
'vipUrl' => Helpers::url('/help', array('category_id' => 91)),
'vipUrl' => Helpers::url('/help/detail', array('id' => 9)),
'returnHomeUrl' => Helpers::url('/'),
'fraudTip' => self::getFraudTip()
);
... ...
... ... @@ -6,18 +6,19 @@ use WebPlugin\Pay\PayFactory;
use WebPlugin\Pay\Rspparams;
use WebPlugin\Pay\weixin\PayNotifyCallBack;
use WebPlugin\UdpLog;
use Home\IndexModel;
/**
* 支付Notice
*/
class NoticeController extends WebAction
{
// 存储的UID键名
const SESSION_UID_KEY = 'payUserid';
const SESSION_UID_KEY = 'payUserid';
public function init() {
parent::init();
}
/**
* 支付宝后台服务器返回,主要是用于补单
*/
... ... @@ -364,6 +365,30 @@ class NoticeController extends WebAction
$view = 'index';
$point['payResult'] = 1;// 支付结果
$uid = $this->getUid();
$udid = $uid . $this->getUdid();
$channel = Helpers::getChannelNameByCookie();
$channelNum = 1;
switch ($channel) {
case 'boys':
$channelNum = 1;
break;
case 'girls':
$channelNum = 2;
break;
case 'kids':
$channelNum = 3;
break;
case 'lifestyle':
$channelNum = 4;
break;
default:
break;
}
$dealResult['data']['bestForYou'] = IndexModel::preferenceData($channelNum, $uid, $udid, '100004', 15);
$data = array(
'payNotice' => $dealResult['data'],
'criteo' => array(// 统计代码有关数据
... ...
... ... @@ -5,6 +5,7 @@ use Shopping\PaymentModel;
use WebPlugin\Pay\PayFactory;
use WebPlugin\Pay\Rspparams;
use WebPlugin\UdpLog;
use Home\IndexModel;
/**
* 支付 同步通知页面
... ... @@ -22,7 +23,7 @@ class PayreturnController extends WebAction
$dealResult['payData'] = array('payWay' => '支付宝', 'payWayId' => 2);
$this->commonShowResult($dealResult);
}
/**
* 微信支付-轮询--jsonPcallback响应订单支付状态
*/
... ... @@ -142,6 +143,30 @@ class PayreturnController extends WebAction
$view = 'index';
$point['payResult'] = 1;// 支付结果
$uid = $this->getUid();
$udid = $uid . $this->getUdid();
$channel = Helpers::getChannelNameByCookie();
$channelNum = 1;
switch ($channel) {
case 'boys':
$channelNum = 1;
break;
case 'girls':
$channelNum = 2;
break;
case 'kids':
$channelNum = 3;
break;
case 'lifestyle':
$channelNum = 4;
break;
default:
break;
}
$dealResult['data']['bestForYou'] = IndexModel::preferenceData($channelNum, $uid, $udid, '100004', 15);
$data = array('payNotice' => $dealResult['data'], 'point' => $point);
}
... ...
... ... @@ -5,6 +5,7 @@ use Shopping\PaymentModel;
use WebPlugin\Helpers;
use LibModels\Web\Home\UserData;
use WebPlugin\Cache;
use Home\IndexModel;
/**
* 支付相关的控制器
*
... ... @@ -66,6 +67,29 @@ class PayController extends WebAction
$UserData = UserData::getUserInfo($uid);
$data['userName'] = isset($UserData['code']) && $UserData['code'] === 200 ? $UserData['data']['profile_name'] : $this->_uname;
$udid = $uid . $this->getUdid();
$channel = Helpers::getChannelNameByCookie();
$channelNum = 1;
switch ($channel) {
case 'boys':
$channelNum = 1;
break;
case 'girls':
$channelNum = 2;
break;
case 'kids':
$channelNum = 3;
break;
case 'lifestyle':
$channelNum = 4;
break;
default:
break;
}
$data['bestForYou'] = IndexModel::preferenceData($channelNum, $uid, $udid, '100004', 15);
$this->setSimpleHeader();
$this->_view->display($view, array(
'shoppingpay' =>$data,
... ...