fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 9e202176d9f020001fa2edd265427c5efa0b3486 2 parents 54890765 c61294f9

Merge branch 'release/5.2' into feature/listen

Inline Side-by-side
Showing 34 changed files with 68 additions and 114 deletions
... ... @@ -75,18 +75,4 @@
}
window.addEventListener('load', async_load, false);
</script>
<script>
window._py = window._py||[];
window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
window._py.push(['domain','stats.ipinyou.com']);
window._py.push(['e','']);
if(typeof _goodsData!='undefined'){
window._py.push(['pi',_goodsData]);
}
-function(d){
var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
}(document);
</script>
</html>
\ No newline at end of file
... ...
... ... @@ -93,18 +93,4 @@
}
window.addEventListener('load', async_load, false);
</script>
<script>
window._py = window._py||[];
window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
window._py.push(['domain','stats.ipinyou.com']);
window._py.push(['e','']);
if(typeof _goodsData!='undefined'){
window._py.push(['pi',_goodsData]);
}
-function(d){
var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
}(document);
</script>
</html>
\ No newline at end of file
... ...
... ... @@ -107,18 +107,4 @@
}
window.addEventListener('load', async_load, false);
</script>
<script>
window._py = window._py||[];
window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
window._py.push(['domain','stats.ipinyou.com']);
window._py.push(['e','']);
if(typeof _goodsData!='undefined'){
window._py.push(['pi',_goodsData]);
}
-function(d){
var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
}(document);
</script>
</html>
\ No newline at end of file
... ...
<?php
/**
* Created by PhpStorm.
* User: sefon
* Date: 16/11/14
* Time: 下午2:15
*/
\ No newline at end of file
... ...
... ... @@ -757,8 +757,6 @@ class Helpers
// 分析用: 商品ID列表
$analysis['ids'][] = $value['product_id'];
// 分析用: 品友
$analysis['ipinyou'] .= $value['product_skn'] . ',' . $value['buy_number'] . ';';//iponyou变更为skn
// 分析用: CRITEO
$analysis['criteo'][] = array(
'id' => $value['product_skn'],
... ... @@ -769,8 +767,6 @@ class Helpers
else {
// 分析用: 商品ID列表
$analysis['ids'][] = $value['product_id'];
// 分析用: 品友
$analysis['ipinyou'] .= $value['product_skn'] . ',' . $value['buy_number'] . ';';
// 分析用: CRITEO
$analysis['criteo'][] = array(
'id' => $value['product_skn'],
... ...
... ... @@ -377,12 +377,4 @@ _mvq.push(['$logConversion']);
_mvq.push(['$addItem', '', /*商品id*/ '{{cartEnsure.ids}}', '', '']);
_mvq.push(['$logData']);
</script>
<script>
!function(w,d,e){
var _money='{{cartEnsure.ipinyouAmount}}';
var _productList='{{cartEnsure.ipinyou}}';
var b=location.href,c=d.referrer,f,s,g=d.cookie,h=g.match(/(^|;)\s*ipycookie=([^;]*)/),i=g.match(/(^|;)\s*ipysession=([^;]*)/);if (w.parent!=w){f=b;b=c;c=f;};u='//stats.ipinyou.com/cvt?a='+e('MC.Ok.7NFMIlCH_F_LE2riRlF2r_')+'&c='+e(h?h[2]:'')+'&s='+e(i?i[2].match(/jump\%3D(\d+)/)[1]:'')+'&u='+e(b)+'&r='+e(c)+'&rd='+(new Date()).getTime()+'&Money='+e(_money)+'&ProductList='+e(_productList)+'&e=';
function _(){if(!d.body){setTimeout(_(),100);}else{s= d.createElement('script');s.src = u;d.body.insertBefore(s,d.body.firstChild);}}_();
}(window,document,encodeURIComponent);
</script>
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -142,6 +142,10 @@
<h3>送货时间</h3>
<ul>
<li class="pay-type-tips">
温馨提示：快递公司会尽力按您选择的送货时间配送，如遇特殊情况（天气、环境等）无法按您要求的时间配送，还请您谅解。
</li>
{{#each delivery}}
<li>
<input {{#if checked}}checked{{/if}} value={{id}} class="radio" name="pay-time-radio" type="radio" id="{{id}}"/>
... ... @@ -149,9 +153,7 @@
</li>
{{/each}}
<li class="pay-dashed-hr pay-type-tips">声明：我们会努力按照您指定的时间配送，但因为天气、交通等各类因素影响，您的订单有可能会有延误现象，敬请谅解！</li>
<li>
<li class="delivery-second-confirm">
<span>送货前是否联系：</span>
<input value="Y" class="radio" name="call-me" type="radio" id=""/>
<label for="">是</label>
... ...
... ... @@ -52,6 +52,7 @@
</div>
{{/ progress}}
{{#if hastrace}}
{{# traceOrder}}
<div class="trace-order">
<p class="sub-title">
... ... @@ -87,6 +88,7 @@
</div>
</div>
{{/ traceOrder}}
{{/if}}
{{# orderInfo}}
<div class="order-info">
... ...
... ... @@ -62,9 +62,6 @@
{{/ shoppingpay}}
</div>
{{!-- 品有统计代码 --}}
{{> shopping/pinyou-analysis}}
{{!-- criteo统计代码 --}}
{{> pay/pay-analysis}}
... ...
... ... @@ -148,7 +148,4 @@
{{> shopping/box-buy-analysis}}
{{/ shoppingpay}}
{{!-- 品有统计代码 --}}
{{> shopping/pinyou-analysis}}
{{> layout/footer}}
... ...
... ... @@ -26,9 +26,6 @@
</script>
{{/shoppingpay}}
{{!-- 品有统计代码 --}}
{{> shopping/pinyou-analysis}}
{{!-- criteo统计代码 --}}
{{> pay/pay-analysis}}
... ...
... ... @@ -81,11 +81,11 @@
</div>
<div class="order-status">
{{#if noPay}}
<span class="no-pay">待付款</span>
<span class="no-pay">等待付款</span>
{{/if}}
{{#if paid}}
<span class="paid">备货中</span>
<span class="paid">待发货</span>
{{/if}}
{{#if shipped}}
... ... @@ -112,7 +112,7 @@
{{/if}}
{{#if complete}}
<span class="complete">备货中</span>
<span class="complete">待发货</span>
{{/if}}
{{#if cancel}}
... ... @@ -137,7 +137,7 @@
{{#if confirmReceived}}
<span class="op-item confirm-received">确认收货</span>
{{^}}
<a class="op-item{{#if payNow}} pay-now{{/if}}" href="{{href}}" target="_blank">
<a class="op-item{{#if payNow}} pay-now{{/if}} {{#if comment}}comment-show-btn{{/if}}" href="{{href}}" target="_blank">
{{#if payNow}}
立即付款
{{^}}
... ...
... ... @@ -31,18 +31,4 @@ var _gaq = _gaq || [];
window.attachEvent('onload', async_load);
}
})();
</script>
<script>
window._py = window._py||[];
window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
window._py.push(['domain','stats.ipinyou.com']);
window._py.push(['e','']);
if(typeof _goodsData!='undefined'){
window._py.push(['pi',_goodsData]);
}
-function(d){
var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
}(document);
</script>
\ No newline at end of file
... ...
... ... @@ -144,7 +144,7 @@
</div>
<div class="gobuy float-left {{gobytype}}" id="miniCartBox">
<span class="ic-infomation">0</span>
<span class="ic-infomation hide">0</span>
<div class="gobuy-wrapper"></div>
</div>
... ...
{{# pinyou}}
<script>
!function(w,d,e){
var _orderno='{{orderNum}}';
var _money='{{count}}';
var _productList='{{productList}}';
var b=location.href,c=d.referrer,f,s,g=d.cookie,h=g.match(/(^|;)\s*ipycookie=([^;]*)/),i=g.match(/(^|;)\s*ipysession=([^;]*)/);if (w.parent!=w){f=b;b=c;c=f;};u='//stats.ipinyou.com/cvt?a='+e('MC.2z.Rg-AQqSqQi2GykX12LUxI0')+'&c='+e(h?h[2]:'')+'&s='+e(i?i[2].match(/jump\%3D(\d+)/)[1]:'')+'&u='+e(b)+'&r='+e(c)+'&rd='+(new Date()).getTime()+'&OrderNo='+e(_orderno)+'&Money='+e(_money)+'&ProductList='+e(_productList)+'&e=';
function _(){if(!d.body){setTimeout(_(),100);}else{s= d.createElement('script');s.src = u;d.body.insertBefore(s,d.body.firstChild);}}_();
}(window,document,encodeURIComponent);
</script>
{{/ pinyou}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -156,6 +156,8 @@ function actionGoodsCart() {
var text = '';
$.fn.miniCart = function(options) {
var $cartNum = $(params.cartNum);
params = $.extend(defaults, options);
if (typeof window.cookie(params.cookie) === 'undefined') {
cartInfo = null;
... ... @@ -177,8 +179,10 @@ function actionGoodsCart() {
} else {
$('#icart-num').attr('class', 'icart-num');
}
$(params.cartNum).html(totalNum);
$cartNum.html(totalNum);
}
totalNum ? $cartNum.removeClass('hide') : $cartNum.addClass('hide');
};
$.fn.search = function(searchDomain) {
... ...
{
"name": "web-yohobuy",
"version": "5.1.0",
"version": "5.1.3",
"description": "web yohobuy static",
"keywords": [],
"homepage": "",
... ...
... ... @@ -264,10 +264,11 @@
cursor: pointer;
}
.operation .pay-now {
.operation .pay-now,
.operation .confirm-received {
display: block;
color: #fff;
background: #de034a;
background: #353535;
height: 20px;
line-height: 20px;
text-align: center;
... ... @@ -285,6 +286,18 @@
text-align: center;
border: 1px solid #000;
}
.operation .comment-show-btn {
display: block;
color: #fff;
background: #349bba;
height: 20px;
line-height: 20px;
text-align: center;
margin: 0 auto;
margin-bottom: 2px;
border-radius: 4px;
width: 68px;
}
}
}
... ...
... ... @@ -422,7 +422,11 @@
.pay-type-tips {
color: #999;
padding-left: 15px;
}
.delivery-second-confirm {
padding-top: 10px;
border-top: 1px dashed #ccc;
}
div.pay-type-legend {
... ...
... ... @@ -190,6 +190,11 @@ class OrderModel
$detail['traceOrder']['orderDate'] = date('Y.m.d H:i:s', $orderDetail['create_time']);
$expressInfo = self::getExpressInfo($orderCode, $uid, $orderDetail['payment_type'], $orderDetail['create_time'], true);
$detail['traceOrder']['logistics'] = $expressInfo['logistics']; //物流信息
if(empty($expressInfo['logistics'][0])){
$detail['hastrace']=false;
}else{
$detail['hastrace']=true;
}
$detail['traceOrder']['logisticsCompany'] = $expressInfo['logisticsCompany'];
$detail['traceOrder']['courierNumbe'] = $expressInfo['courierNumbe'];
//虚拟商品
... ... @@ -338,7 +343,7 @@ class OrderModel
$result['courierNumbe'] = '';
if ($paymetType == 1) {
if ($isDetail) {
$result['logistics'][] = array(date('Y-m-d H:i:s', $createTime), ' ', '您的订单已提交，等待付款');
$result['logistics'][] = '';//array(date('Y-m-d H:i:s', $createTime), ' ', '您的订单已提交，等待付款');
}
else {
$result['logistics'][] = date('Y-m-d H:i:s', $createTime) . ' ' . '您的订单已提交，等待付款';
... ... @@ -529,12 +534,12 @@ class OrderModel
//'订单已付款，等待备货中'
elseif ($payType != 2 && $payStatus == 'Y') {
$ret['keyName'] = 'paid';
$ret['statusStr'] = '备货中';
$ret['statusStr'] = '待发货';//'备货中';
}
//'订单已成功，等待备货中'-货到付款
elseif ($payType == 2 && $payStatus == 'N') {
$ret['keyName'] = 'complete';
$ret['statusStr'] = '备货中';
$ret['statusStr'] = '待发货';//'备货中';
}
break;
case 1:
... ... @@ -542,7 +547,7 @@ class OrderModel
case 3:
//'订单已付款,等待备货中'
$ret['keyName'] = 'paid';
$ret['statusStr'] = '备货中';
$ret['statusStr'] = '待发货';//'备货中';
break;
case 4:
case 5:
... ... @@ -587,6 +592,8 @@ class OrderModel
$ticketUrl = Helpers::url('/home/QRcode', array('orderCode' => $orderCode));//改成node重构的
//立即付款
$payUrl = Helpers::url('/shopping/pay', array('ordercode' => $orderCode));
//评价晒单 node
$commentUrl = Helpers::url('/home/comment/order', array('orderId' => $orderCode));
//取消订单
$cancelOrderUrl = 'javascript:void(0)';
//确认订单
... ... @@ -595,6 +602,10 @@ class OrderModel
$exchangeUrl = Helpers::url('/home/returns/exchangeRequest', array('orderCode' => $orderCode));
//申请退货
$refundUrl = Helpers::url('/home/returns/refundrequest', array('orderCode' => $orderCode));
if($status >= 6 && $isCancel == 'N' && $payStatus == 'Y') {
$operation[] = array('href' => $commentUrl, 'name' => '晒单评价', 'comment' => true);
}
//再次购买 use_limit_code
if ( $isCancel == 'Y' && $useLimitCode !== 'Y') {
$operation[] = array( 'name' => '再次购买', 'reBuy' => true);
... ...
... ... @@ -42,7 +42,7 @@ class CartModel
$result = array();
// 存放分析用的数据
$analysisData = array('ipinyou' => '');
$analysisData = array();
do {
$result['isEmpty'] = false;
... ... @@ -200,8 +200,6 @@ class CartModel
// 增加第三方分析用的数据
$result['ids'] = empty($analysisData['ids']) ? '' : implode(',', $analysisData['ids']);
$result['ipinyou'] = empty($analysisData['ipinyou']) ? '' : $analysisData['ipinyou'];
$result['ipinyouAmount'] = isset($result['productAllA']) ? $result['productAllA'] : '0.00';
$result['criteo'] = empty($analysisData['criteo']) ? "''" : json_encode($analysisData['criteo']);
return $result;
... ... @@ -707,7 +705,7 @@ class CartModel
private static function filterCartPay($pay, $cartType, $isAdvanceCart, $uid)
{
// 存放分析用的数据
$analysisData = array('ipinyou' => '');
$analysisData = array();
$result = array();
do {
... ... @@ -773,7 +771,7 @@ class CartModel
// 默认
if (!isset($result['defaultDelivery'])) {
$result['defaultDelivery'] = '只工作日送货（双休日、节假日不送）';
$result['defaultDelivery'] = '送货时间不限';
if (isset($result['delivery'][0])) {
$result['delivery'][0]['checked'] = true;
}
... ...
... ... @@ -131,6 +131,7 @@ class OrdersController extends WebAction
if (isset($detail['noramlPayMode'])) {
$data['orderInfo'] = $detail['orderInfo'];
$data['traceOrder'] = $detail['traceOrder'];
$data['hastrace'] = $detail['hastrace'];
$data['noramlPayMode'] = $detail['noramlPayMode'];
}
else if (isset($detail['virtualPayMode'])) {
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.1.0"
application.version = "5.1.3"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.1.0"
application.version = "5.1.3"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.1.0"
application.version = "5.1.3"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.1.0"
application.version = "5.1.3"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...