Authored by 郭成尧

shop-better

... ... @@ -55,6 +55,7 @@ class AbstractAction extends Controller_Abstract
$this->_request = $this->getRequest();
$this->_view->assign('isWechat', stripos($this->server('HTTP_USER_AGENT', ''), 'MicroMessenger') !== false);
$this->_view->assign('isApp', isset($_GET['app_version']) ? true : false);
// 设置环境变量
switch (APPLICATION_ENV) {
... ...
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.

24.7 KB | W: | H:

569 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -130,7 +130,7 @@ function postcssEnvPlugin(env) {
//Postcss开发环境
gulp.task('postcss-dev', function() {
return gulp.src('sass/index.css')
return gulp.src(['sass/index.css', 'sass/shop.css'])
.pipe(sourcemaps.init())
.pipe(postcss(postcssEnvPlugin('DEV')))
.pipe(sourcemaps.write('.'))
... ... @@ -143,7 +143,7 @@ gulp.task('postcss-watch', function() {
//Postcss正式环境生成
gulp.task('postcss-pro', ['assets'], function() {
return gulp.src('sass/index.css')
return gulp.src(['sass/index.css', 'sass/shop.css'])
.pipe(postcss(postcssEnvPlugin('PRO')))
.pipe(cssnano())
.pipe(gulp.dest(distDir.css))
... ...

19.4 KB | W: | H:

569 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -312,8 +312,18 @@
position: relative;
min-height: 440px;
/* padding-left: 15px; */
padding-top: 20px;
margin: 0 auto;
padding: 0 15PX;
width: 100%;
border-bottom: 1px solid #e0e0e0;
.good-info {
width: 41.5%;
&:nth-child(even) {
margin-right: 26px;
}
}
}
.pos-list {
... ... @@ -586,6 +596,11 @@
.category-list-only-one-row {
border-top: none!important;
}
.hot-category .category-list li {
width: 25%;
box-sizing: border-box;
}
}
.shop-index + .filter-mask {
... ...
@charset "utf-8";
@use postcss-clearfix;
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font: inherit;
font-size: 100%;
vertical-align: baseline;
}
html {
line-height: 1;
}
ol, ul {
list-style: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
caption, th, td {
text-align: left;
font-weight: normal;
vertical-align: middle;
}
q, blockquote {
quotes: none;
}
q:before, q:after, blockquote:before, blockquote:after {
content: "";
content: none;
}
a img {
border: none;
}
article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
display: block;
}
/*Reset End*/
.clearfix {
clear: fix;
}
* {
-webkit-tap-highlight-color: rgba(0,0,0,0);
-moz-tap-highlight-color: rgba(0,0,0,0);
tap-highlight-color: rgba(0,0,0,0);
}
html, body {
font-family: helvetica,Arial,"黑体";
width: 100%;
font-size: 12PX;
line-height: 1.4;
}
button, input, select, textarea {
font-size: 100%;
margin: 0;
}
img {
max-width: 100%;
display: block;
border: 0;
margin: 0 auto;
}
a {
text-decoration: none;
outline: none;
color: #000;
&:link,
&:visited,
&:hover,
&:actived {
color: #111;
}
}
/* 屏蔽统计代码对样式的影响 */
iframe[height="0"] {
display: none;
}
*:focus {
outline: none;
}
.hide {
display: none;
}
.overflow-hidden {
overflow: hidden;
}
@font-face {
font-family: "iconfont";
src: resolve('iconfont.eot'); /* IE9*/
src: resolve('iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
resolve('iconfont.woff') format('woff'), /* chrome、firefox */
resolve('iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
resolve('iconfont.svg#iconfont') format('svg'); /* iOS 4.1- */
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16PX;
font-style: normal;
text-decoration: none;
-webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2PX;
-moz-osx-font-smoothing: grayscale;
}
.yoho-tip {
position: fixed;
display: none;
text-align: center;
width: 70%;
padding: 34PX 0;
top: 50%;
left: 50%;
margin-left: -35%;
margin-top: -45PX;
background-color: rgba(0,0,0,.7);
color: #fff;
font-size: 18PX;
border: none;
z-index:4;
border-radius: 10PX;
}
.tap-hightlight {
&.highlight {
background: #eee!important;
}
}
.load-more-info {
width: 100%;
height: 70px;
line-height: 70px;
text-align: center;
font-size: 14PX;
overflow: hidden;
.status {
&.hide {
display: none;
}
}
}
@import "layout/header";
@import "layout/footer";
@import "layout/footer_tab";
@import "good";
@import "lazy-failure";
@import "filter";
@import "loading";
@import "index/index";
@import "home/index";
@import "category/index";
@import "product/index";
@import "shop/index";
\ No newline at end of file
... ...
... ... @@ -30,7 +30,9 @@
<!-- /tar modifield 160826 -->
<div class="branner-top">
<img class="shop-back-img" src="{{branerImg}}">
{{#if logoImg}}
<img class="logo" src="{{logoImg}}">
{{/if}}
<p class="store-name">{{storeName}}</p>
<div class="collect">
{{#if collect}}
... ...
<!-- Google Tag Manager -->
{{#unless isApp}}
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<script>
var _hmt = _hmt || [];
... ... @@ -17,3 +18,4 @@
}
window.addEventListener('load', async_load, false);
</script>
{{/unless}}
\ No newline at end of file
... ...
... ... @@ -27,16 +27,32 @@
<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/{{version}}/index.css">
{{#if shopPager}}
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/shop.css">
{{^}}
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css">
{{/if}}
{{/if}}
{{#if preEnv}}
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css">
{{#if shopPager}}
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/shop.css">
{{^}}
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css">
{{/if}}
{{/if}}
{{#if testEnv}}
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css">
{{#if shopPager}}
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/shop.css">
{{^}}
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css">
{{/if}}
{{/if}}
{{#if devEnv}}
<link rel="stylesheet" href="//static.dev.yohobuy.com/css/index.css">
{{#if shopPager}}
<link rel="stylesheet" href="//static.dev.yohobuy.com/css/shop.css">
{{^}}
<link rel="stylesheet" href="//static.dev.yohobuy.com/css/index.css">
{{/if}}
{{/if}}
<link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
<link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
... ...
... ... @@ -514,7 +514,8 @@ class IndexController extends AbstractAction
),
'gender' => $data['gender'],
'coverChannel' => $coverChannel,
'appVersion' => !empty($appVersion)
'appVersion' => !empty($appVersion),
'shopPager' => true
));
}
... ...