fe / yohobuy-node · Commits

Go to a project

Authored by yyq
Commit 8d71a6359464d6b755e65efc87440a7c0a3102a0 2 parents 02a7c3a6 2e17dd90

commit

Inline Side-by-side
Showing 39 changed files with 67 additions and 50 deletions
... ... @@ -7,7 +7,7 @@
const currencyModel = require('../models/currency-model');
const index = (req, res, next)=>{
let uid = '8041246';
let uid = req.user.uid;
currencyModel.currencyData(uid, req.query).then(result => {
res.render('currency', {
... ...
... ... @@ -2,7 +2,7 @@
const redenvelopesModel = require('../models/redenvelopes-model');
const index = (req, res, next)=>{
let uid = '8040274';
let uid = req.user.uid;
redenvelopesModel.redenvelopesList(uid).then(result => {
res.render('redenvelopes', {
... ...
... ... @@ -16,12 +16,11 @@
{{/dnsPrefetch.hosts}}
{{#if devEnv}}
<link rel="stylesheet" href="//{{devHost}}:5002/css/index.css">
<link rel="stylesheet" href="//{{devHost}}:5002/css/cart.index.css">
<link rel="stylesheet" href="//{{devHost}}:5002/css/base.css">
<link rel="stylesheet" href="//{{devHost}}:5002/css/{{#if cssModule}}{{cssModule}}.css{{^}}{{module}}.css{{/if}}">
{{^}}
<link rel="stylesheet" href="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/{{version}}/index.css">
<link rel="stylesheet" href="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/{{version}}/cart.index.css">
<link rel="stylesheet" href="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/{{version}}/base.css">
<link rel="stylesheet" href="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/{{version}}/{{#if cssModule}}{{cssModule}}.css{{^}}{{module}}.css{{/if}}">
{{/if}}
</head>
<body>
... ...
... ... @@ -78,6 +78,7 @@
"gulp-cssnano": "^2.1.2",
"gulp-ftp": "^1.1.0",
"gulp-postcss": "^6.1.0",
"gulp-rename": "^1.2.2",
"gulp-sourcemaps": "^2.0.0-alpha",
"gulp-util": "^3.0.7",
"handlebars-loader": "^1.4.0",
... ...
... ... @@ -6,13 +6,17 @@
'use strict';
const path = require('path');
const gulp = require('gulp');
const _ = require('lodash');
const gutil = require('gulp-util');
const ftp = require('gulp-ftp');
const postcss = require('gulp-postcss');
const sourcemaps = require('gulp-sourcemaps');
const cssnano = require('gulp-cssnano');
const rename = require('gulp-rename');
const webpack = require('webpack');
const WebpackDevServer = require('webpack-dev-server');
... ... @@ -48,9 +52,8 @@ const postcssPlugin = (et) => {
padding: 2
},
groupBy(file) {
var group = file.url.split('/')[1];
group = group === '' ? 'yo' : group;
var dir = _.last(path.parse(file.styleFilePath).dir.split(path.sep));
var group = dir === 'scss' ? path.basename(file.styleFilePath, '.css') : dir;
return group ? Promise.resolve(group) : Promise.reject(group);
}
... ... @@ -125,13 +128,21 @@ gulp.task('dist', ['ge'], () => {
// postcss compile in dev
gulp.task('postcss-dev', () => {
return gulp.src(['scss/index.css', 'scss/cart.index.css'])
return gulp.src(['scss/base.css', 'scss/*/_index.css', '!scss/plugin/*', '!scss/common/*'])
.pipe(sourcemaps.init())
.pipe(postcss(postcssPlugin(env.dev)))
.on('error', function(err) {
gutil.log(err);
this.emit('end');
})
.pipe(rename((cssPath) => {
if (cssPath.dirname === '.') {
return;
}
cssPath.basename = `${cssPath.dirname}`;
cssPath.dirname = './';
}))
.pipe(sourcemaps.write('.'))
.pipe(gulp.dest('css/'));
});
... ... @@ -158,9 +169,17 @@ gulp.task('font', () => {
// postcss compile in pro
gulp.task('postcss', ['assets'], () => {
return gulp.src(['scss/index.css', 'scss/cart.index.css'])
return gulp.src(['scss/base.css', 'scss/*/_index.css', '!scss/plugin/*', '!scss/common/*'])
.pipe(postcss(postcssPlugin(env.pro)))
.pipe(cssnano())
.pipe(rename((cssPath) => {
if (cssPath.dirname === '.') {
return;
}
cssPath.basename = `${cssPath.dirname}`;
cssPath.dirname = './';
}))
.pipe(gulp.dest(dist.css));
});
... ...
@import "robot-check";
@import "../variables";
... ...
@define-mixin ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
... ...
@import "../channel/index"
... ...
... ... @@ -6,15 +6,6 @@
@import "common/dialog";
@import "pager";
@import "path-nav";
/* 模块 */
@import 'help/index';
@import "channel/index";
@import "product/index";
@import "passport/index";
@import "share";
@import 'home/index';
@import 'guang/index';
/*@import 'cart/index';*/
@import 'service/index';
@import '3party/index';
@import "variables";
... ...
@import "../channel/index"
... ...
@charset "utf-8";
/* 模块 */
@import 'cart/index';
... ... @@ -3,3 +3,4 @@
@import "cart";
@import "goods-detail";
@import "cart-togetherGoods";
@import "../variables";
... ...
... ... @@ -530,7 +530,8 @@
font-size: 20px;
line-height: 1;
@mixin ellipsis ;
@mixin ellipsis
;
}
.brand-desc {
... ...
... ... @@ -648,3 +648,4 @@
@import "min-index";
@import "brand";
@import "coupon";
@import "../variables";
... ...
... ... @@ -73,12 +73,6 @@ a {
left: 0;
}
@define-mixin ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/*
公共样式
*/
... ...
... ... @@ -320,3 +320,4 @@
@import "home";
@import "detail";
@import "list";
@import "../variables";
... ...
... ... @@ -229,3 +229,4 @@
@import "help";
@import "detail";
@import "../variables";
... ...
... ... @@ -265,6 +265,7 @@
@import "coupons";
@import "favorite";
@import "user-info";
@import "../variables";
/*@import "returns-detail";
@import "returns-save";
*/
... ...
... ... @@ -132,7 +132,8 @@
color: #468fa2;
max-width: 245px;
@mixin ellipsis;
@mixin ellipsis
;
}
.had-refund {
... ...
... ... @@ -404,7 +404,8 @@
text-align: left;
max-width: 230px;
@mixin ellipsis;
@mixin ellipsis
;
}
}
... ...
... ... @@ -220,3 +220,4 @@
@import "relate";
@import "third";
@import "_bind-tip.css";
@import "../variables";
... ...
... ... @@ -511,7 +511,8 @@
}
.username {
@mixin ellipsis ;
@mixin ellipsis
;
display: inline-block;
width: 160px;
color: #545454;
... ...
@import "slider";
@import "captcha";
... ...
... ... @@ -57,7 +57,8 @@
line-height: 1.5;
display: block;
@mixin ellipsis;
@mixin ellipsis
;
}
> .price {
... ...
... ... @@ -16,6 +16,8 @@
@import "top-coupon";
@import "new-arrive";
@import "good-slide";
@import "../variables";
.product-page {
.list-left {
width: 160px;
... ...
... ... @@ -34,7 +34,8 @@
max-width: 150px;
margin: 5px 0;
@mixin ellipsis;
@mixin ellipsis
;
}
.market-price {
... ...
... ... @@ -439,7 +439,8 @@
text-align: center;
font-weight: 600;
@mixin ellipsis;
@mixin ellipsis
;
}
> .price {
... ... @@ -483,7 +484,8 @@
text-align: center;
font-weight: 600;
@mixin ellipsis;
@mixin ellipsis
;
}
> .price {
... ...
@import "_emoji.css";
@import "../variables";
$bg-6e: #eeeeee;
$color-3a3a3a: #3a3a3a;
... ...
location ~ / {
proxy_redirect off;
proxy_pass http://yohobuy-node;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}