fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 姜敏
Commit 4b5fe5a61682da62409474f3e09d95ad3cc420a5 2 parents fcb85554 6cb02893

Merge branch 'yohobuy_portak_dev_v4.8_20160620' of http://git.yoho.cn/fe/yohobuy… 

…-portal-fe2 into yohobuy_portak_dev_v4.8_20160620
Inline Side-by-side
Showing 4 changed files with 30 additions and 16 deletions
... ... @@ -63,12 +63,12 @@ var apiCofig = {
views: path.resolve(__dirname,"apps", "0", "views/1")
},
useToEntry:function(app){
// if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){
// options.store=new Redis({
// port: 6379,
// host: 'localhost'
// });
// }
if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){
options.store=new Redis({
port: 6379,
host: 'localhost'
});
}
app.use(session(options));
},
useToOuter:function(app,controllers){
... ... @@ -84,6 +84,7 @@ if(process.env.NODE_ENV!=='development'){
/*服务器环境*/
if(process.env.NODE_ENV!="coding"){
console.log("服务器环境");
apiCofig.MVC={
Interfacer:path.join(__dirname,"interfaces/0.js").replace(/0/g,'*'),
Controller:path.join(__dirname,"controllers/0.js").replace(/0/g,'*'),
... ...
... ... @@ -454,10 +454,6 @@ e.on("validate",function(){
}
if(map3.length>0&&common.util.__input("supplierId")){
map3=map3.filter(function(item){
return $.trim(item.factoryCode)?true:false;
});
var ispass=true;
common.util.__ajax2({
... ...
... ... @@ -63,12 +63,12 @@ var apiCofig = {
views: path.resolve(__dirname,"apps", "0", "views/1")
},
useToEntry:function(app){
// if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){
// options.store=new Redis({
// port: 6379,
// host: 'localhost'
// });
// }
if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){
options.store=new Redis({
port: 6379,
host: 'localhost'
});
}
app.use(session(options));
},
useToOuter:function(app,controllers){
... ... @@ -84,6 +84,7 @@ if(process.env.NODE_ENV!=='development'){
/*服务器环境*/
if(process.env.NODE_ENV!="coding"){
console.log("服务器环境");
apiCofig.MVC={
Interfacer:path.join(__dirname,"interfaces/0.js").replace(/0/g,'*'),
Controller:path.join(__dirname,"controllers/0.js").replace(/0/g,'*'),
... ...
... ... @@ -55,6 +55,22 @@ module.exports={
{name: 'batchList', type: 'String'}
]
},
updateProductPrice:{
title:'单个变价接口',
url: '/product/updateProductPrice',
params: [
{name: 'product_skn', type: 'number'},
{name: 'sales_price', type: 'number'},
{name: 'vip_discount_type', type: 'number'},
{name: 'return_coin', type: 'number'},
{name: 'vip_price', type: 'number'},
{name: 'vip1_price', type: 'number'},
{name: 'vip2_price', type: 'number'},
{name: 'vip3_price', type: 'number'},
{name: 'cgpriceStartTime', type: 'String'},
{name: 'cgpriceEndTime', type: 'String'}
]
},
queryBrandCooperationList:{
title:'品牌合作模式设置列表数据',
url: '/brandCooperation/queryBrandCooperationList',
... ...