fe / YOHOBUYWAP · Commits

Go to a project

Authored by 毕凯
Commit 71ead621eee3150ea6c9d943d3a0a23f546c5084 2 parents d04b3530 6830333a

Merge branch 'master' into release/4.9.2

Inline Side-by-side
Showing 23 changed files with 61 additions and 72 deletions
<?php
/**
* Created by PhpStorm.
* User: sefon
* Date: 16/9/7
* Time: 下午1:36
*/
\ No newline at end of file
... ...
... ... @@ -141,10 +141,10 @@ class Yohobuy
$urlBack = $url;
if (USE_INTER_FACE_SHUNT) {
if (strpos($url, 'api')) {
if (strpos($url, API_URL)) {
$isApi = true;
$url = self::_getUrl($url, $data);
} else if (strpos($url, 'service')) {
} else if (strpos($url, SERVICE_URL)) {
$isService = true;
$url = self::_getUrl($url, $data);
}
... ... @@ -293,10 +293,10 @@ class Yohobuy
$urlBack = $url;
if (USE_INTER_FACE_SHUNT) {
if (strpos($url, 'api')) {
if (strpos($url, API_URL)) {
$isApi = true;
$url = self::_getUrl($url, $data);
} else if (strpos($url, 'service')) {
} else if (strpos($url, SERVICE_URL)) {
$isService = true;
$url = self::_getUrl($url, $data);
}
... ... @@ -731,7 +731,7 @@ class Yohobuy
}
$paseUrl = parse_url($url);
if (strpos($url, 'api')) {
if (strpos($url, API_URL)) {
if (empty($ips['api.yoho.cn'])) {
return false;
... ... @@ -745,7 +745,7 @@ class Yohobuy
$url = 'http://' . $ips['api.yoho.cn'][$num]['ip'] . rtrim($paseUrl['path'], '/') . '/';
} else if (strpos($url, 'service')) {
} else if (strpos($url, SERVICE_URL)) {
if (empty($ips['service.yoho.cn'])) {
return false;
... ...
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.
... ... @@ -52,6 +52,7 @@ function invoiceInit() {
$('.invoice-type').text(invoiceCont[orderCont.invoiceType] + '(' + invoicesType[orderCont.invoicesType] + ')');
} else {
$('.invoice-type').text('服装(电子)');
//$('.invoice-type').text('服装(纸质)');
}
}
... ...
... ... @@ -84,7 +84,7 @@ var viewType = 1, // 1-首页,2-上新,3-人气
listModValue = 4 - listCount % 4,
listIndex;
lazyLoad($('img.lazy'));
//焦点效果
if ($('.banner-swiper').find('li').size() > 1) {
... ... @@ -177,7 +177,7 @@ function newData(callback) {
req.url = location.protocol + '//m.yohobuy.com/index/search/search';
req.data = {
type: 'newest',
type: 'new',
order: '1',
page: navInfo.new.page,
tagNew: '1'
... ... @@ -188,7 +188,7 @@ function newData(callback) {
req.callBack = function(data) {
$('#new-arrival').append(data);
navInfo.new.page++;
//myScroll.refresh();
myScroll.refresh();
lazyLoad($('#new-arrival .lazy'));
scH = $('#scroller').outerHeight();
searching = false;
... ... @@ -213,7 +213,7 @@ function hotData(callback) {
req.callBack = function(data) {
$('#popularity').append(data);
navInfo.hot.page++;
//myScroll.refresh();
myScroll.refresh();
lazyLoad($('#popularity .lazy'));
scH = $('#scroller').outerHeight();
searching = false;
... ... @@ -256,13 +256,11 @@ function tabChange(dom, index) {
hotData();
viewType = 3;
} else if (activeTab === 'home-page') {
//myScroll && myScroll.refresh();
scH = $('#scroller').outerHeight();
$nav1.removeClass('fixed-top absolute');
$nav2.removeClass('fixed-top absolute');
}
myScroll && myScroll.refresh();
scH = $('#scroller').outerHeight();
if (!$nav1.hasClass('hide')) {
myScroll && myScroll.scrollTo(0, 0 - imgH);
}
... ... @@ -320,7 +318,6 @@ function scrollHandler() {
var tra;
theY = sTop;
if (sTop + winH > scH - 0.25 * $goodsContainer.height() - 50) {
if ($pre !== undefined) {
... ... @@ -439,7 +436,7 @@ document.addEventListener('touchmove', function(e) {
//window ready 后重新refresh iscroll
$(window).ready(function() {
//myScroll && myScroll.refresh();
myScroll && myScroll.refresh();
imgH = $('#nav-top').outerHeight();
nav1H = $('#nav').outerHeight();
main1H = $('#nav-main').height();
... ... @@ -454,14 +451,12 @@ $(window).ready(function() {
click: true
});
//setTimeout(function() {
setTimeout(function() {
scH = $('#scroller').outerHeight();
//}, 1000);
}, 1000);
myScroll.on('scroll', function() {
window.requestAnimationFrame(scrollHandler);
});
myScroll.on('scroll', scrollHandler);
myScroll.on('scrollStart', function() {
... ... @@ -479,8 +474,9 @@ $(window).ready(function() {
multiSwiper && multiSwiper.startAutoplay();
$('#scroller').trigger('scroll');
scrollHandler.bind(this)();
});
lazyLoad($('img.lazy'));
});
function bindGoodThumbClick() {
... ... @@ -646,10 +642,7 @@ function search(opt) {
window.rePosFooter();
setTimeout(function() {
myScroll && myScroll.refresh();
}, 0);
myScroll.refresh();
reNav1Pos();
bindGoodThumbClick();
... ... @@ -830,14 +823,14 @@ $listNav.on('touchstart', 'li', function(e) {
$(this).addClass('bytouch');
}).on('touchend touchcancel', function() {
$listNav.find('li').removeClass('bytouch');
//myScroll && myScroll.refresh();
myScroll && myScroll.refresh();
});
$nav2.on('touchstart', 'li', function(e) {
$(this).addClass('bytouch');
}).on('touchend touchcancel', function() {
$nav2.find('li').removeClass('bytouch');
//myScroll && myScroll.refresh();
myScroll && myScroll.refresh();
});
//底部导航点击
... ... @@ -900,7 +893,7 @@ function postCollect(info) {
}
setTimeout(function() {
//myScroll.refresh();
myScroll.refresh();
scH = $('#scroller').outerHeight();
}, 1000);
searching = false;
... ...
{
"name": "yohobuy",
"version": "4.9.11",
"version": "4.9.13",
"description": "yohobuy statics",
"keywords": [],
"homepage": "",
... ...
... ... @@ -218,10 +218,9 @@
}
.product-list {
margin: 0;
padding: 0 0 30px 30px;
margin-left: auto;
margin-right: auto;
width: 610px;
margin: 0 auto;
overflow: hidden;
background: #fff;
border-bottom: 30px solid #f0f0f0;
... ... @@ -230,7 +229,8 @@
width: 275px;
height: 368px;
margin-top: 50px;
margin-right: 30px;
margin-left: 15px;
margin-right: 15px;
float: left;
text-align: center;
list-style: none;
... ...
{{> layout/main_header_shop}}
{{> layout/main_header}}
{{# shopIndex}}
<div class="shop-index yoho-page scroll-wrapper" id="wrapper">
... ... @@ -103,7 +103,7 @@
{{#each hotList}}
<li class="buriedpoint" data-bp-id="shop_hotList_{{url}}">
<a href="{{url}}">
<img class="lazy" data-original="{{img}}">
<img src="{{img}}">
</a>
<div class="list-price">
<p>{{productName}}</p>
... ... @@ -220,4 +220,4 @@
{{> filter}}
{{/ shopIndex}}
{{> product/query-param}}
{{> layout/footer_shop}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -11,17 +11,3 @@
}
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>
\ No newline at end of file
... ...
... ... @@ -4,16 +4,16 @@
<script type="text/javascript" charset="utf-8" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
{{/if}}
{{#if rlsEnv}}
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop2/lib.js"></script>
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop2/index.js"></script>
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/lib.js"></script>
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index.js"></script>
{{/if}}
{{#if preEnv}}
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop2/lib.js?v={{version}}"></script>
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop2/index.js?v={{version}}"></script>
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/lib.js?v={{version}}"></script>
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index.js?v={{version}}"></script>
{{/if}}
{{#if testEnv}}
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop2/lib.js?v={{version}}"></script>
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop2/index-debug.js?v={{version}}"></script>
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/lib.js?v={{version}}"></script>
<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index-debug.js?v={{version}}"></script>
{{/if}}
{{#if devEnv}}
<script src="//127.0.0.1:8000/static/js/sea.js?nowrap"></script>
... ...
... ... @@ -27,13 +27,13 @@
<link rel="dns-prefetch" href="//img12.static.yhbimg.com">
<link rel="dns-prefetch" href="//img13.static.yhbimg.com">
{{#if rlsEnv}}
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.11.shop2/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index.css">
{{/if}}
{{#if preEnv}}
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.11.shop2/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index.css">
{{/if}}
{{#if testEnv}}
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.11.shop2/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index.css">
{{/if}}
{{#if devEnv}}
<link rel="stylesheet" href="//static.dev.yohobuy.com/css/index.css">
... ...
... ... @@ -156,6 +156,7 @@ class SearchModel
'channel' => FILTER_DEFAULT,
'ageLevel' => FILTER_DEFAULT,
'p_d' => FILTER_DEFAULT,
'students' => FILTER_DEFAULT,
'filter_poolId' => FILTER_DEFAULT
), false);
... ... @@ -245,6 +246,7 @@ class SearchModel
'filter_poolId' => FILTER_DEFAULT,
'showTag' => FILTER_DEFAULT,
'tagNew' => FILTER_DEFAULT,
'students' => FILTER_DEFAULT,
'tagSale' => FILTER_DEFAULT), false);
... ... @@ -312,11 +314,6 @@ class SearchModel
$condition['filter_poolId'] = rawurldecode($condition['filter_poolId']);
}
// 是否显示学生价
if (isset($condition['students'])) {
$data['students'] = true;
}
// 转换排序方式
// $type = $this->get('type', '');
// $order = $this->get('order', 0);
... ... @@ -383,6 +380,11 @@ class SearchModel
}
}
// 是否显示学生价
if (isset($condition['students'])) {
$data['students'] = true;
}
return $data;
}
... ...
... ... @@ -404,7 +404,7 @@ class IndexController extends AbstractAction
else {
$invoices_title = '';
$invoiceType = '7'; //发票类型ID
$invoices_type = '1'; //发票类型 /**纸质 1 ，电子 2 */
// $invoices_type = '1'; //发票类型 /**纸质 1 ，电子 2 */
$invoices_type = '2'; //发票类型 /**纸质 1 ，电子 2 */
$invoice_Top = '个人';
}
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "4.9.11"
application.version = "4.9.13"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "4.9.11"
application.version = "4.9.13"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "4.9.11"
application.version = "4.9.13"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "4.9.11"
application.version = "4.9.13"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -11,7 +11,7 @@ define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'preview');
define('USE_INTER_FACE_SHUNT', true);//分流开关
define('USE_INTER_FACE_SHUNT', false);//分流开关
define('API_URL', 'http://api.yoho.yohoops.org/');
define('SERVICE_URL', 'http://service.yoho.yohoops.org/');
... ...
... ... @@ -11,7 +11,7 @@ define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'production');
define('USE_INTER_FACE_SHUNT', true);//分流开关
define('USE_INTER_FACE_SHUNT', false);//分流开关
define('API_URL', 'http://api.yoho.yohoops.org/');
define('SERVICE_URL', 'http://service.yoho.yohoops.org/');
... ...