liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by dongjunjie
Commit 5227c1664ff18d7d09fbd59cb9ea9611e6874077 2 parents 8fe92ab2 104b447c

Merge branch 'master' into yohobuy_portak_dev_v4.8_20160620

Inline Side-by-side
Showing 14 changed files with 276 additions and 264 deletions
... ... @@ -24,6 +24,7 @@ module.exports = {
} else {
var data = {};
data.list = [];
try{
body = JSON.parse(body);
var dataList = body.data.product_list;
var goodslist = [];
... ... @@ -44,6 +45,10 @@ module.exports = {
data.page = body.data.page;//页码
data.totalPage = 1;//body.data.page_total;
data.nums = data.list.length;//记录每一页数据量
}catch(ex){
return callback(null, {data: data, code: 500});
}
return callback(null, {data: data, code: 200});
}
});
... ...
... ... @@ -4,11 +4,12 @@
<div>
<ul class="nav nav-pills" style="margin-bottom: 10px">
<li>
<a class="tag" href="/goods/special/index" style="font-size: 14px;padding:10px">特殊商品</a>
<a class="tag" href="/goods/special/index" style="font-size: 14px;padding:20px;color: black">特殊商品</a>
</li>
<li class="active">
<a class="hand" href="javascript:void(0)" style="font-size: 14px;padding:10px">货到付款</a>
<li>
<a class="hand active" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #428bca">货到付款</a>
</li>
</ul>
</div>
<div class="panel panel-default" style="margin-bottom:10px;">
... ...
... ... @@ -6,73 +6,73 @@
module.exports=function(app) {
/*活动模板首页*/
app.get("/operations/activitytemplate/index","operations.activitytemplate.Index", function () {
this.$extend = {
moduleName: "活动模板管理",
pageName: "活动模板管理"
}
});
// app.get("/operations/activitytemplate/index","operations.activitytemplate.Index", function () {
// this.$extend = {
// moduleName: "活动模板管理",
// pageName: "活动模板管理"
// }
// });
/*活动模板添加页*/
app.get("/operations/activitytemplate/add","operations.activitytemplate.Edit", "resourceManage_getUrlAction", function (response) {
this.$extend = {
moduleName: "活动模板管理",
pageName: "添加活动模板",
type: "add",
url: "/activityTemplate/addTemplate",
data: response.data
}
});
// /*活动模板添加页*/
// app.get("/operations/activitytemplate/add","operations.activitytemplate.Edit", "resourceManage_getUrlAction", function (response) {
// this.$extend = {
// moduleName: "活动模板管理",
// pageName: "添加活动模板",
// type: "add",
// url: "/activityTemplate/addTemplate",
// data: response.data
// }
// });
/*活动模板编辑*/
app.get("/operations/activitytemplate/edit/:id","operations.activitytemplate.Edit","resourceManage_getUrlAction", function (response,req) {
this.$extend = {
moduleName: "活动模板管理",
pageName: "编辑活动模板",
type: "edit",
id: req.params.id,
url: "/activityTemplate/updateTemplate",
data: response.data
}
});
// /*活动模板编辑*/
// app.get("/operations/activitytemplate/edit/:id","operations.activitytemplate.Edit","resourceManage_getUrlAction", function (response,req) {
// this.$extend = {
// moduleName: "活动模板管理",
// pageName: "编辑活动模板",
// type: "edit",
// id: req.params.id,
// url: "/activityTemplate/updateTemplate",
// data: response.data
// }
// });
/*活动模板编辑*/
app.get("/operations/activitytemplate/product/:id","operations.activitytemplate.Product", function (req) {
this.$extend = {
moduleName: "模板商品管理",
pageName: "模板商品管理",
id: req.params.id,
url: req.originalUrl
}
});
// /*活动模板编辑*/
// app.get("/operations/activitytemplate/product/:id","operations.activitytemplate.Product", function (req) {
// this.$extend = {
// moduleName: "模板商品管理",
// pageName: "模板商品管理",
// id: req.params.id,
// url: req.originalUrl
// }
// });
/*查询模板列表接口*/
app.post("/activityTemplate/selectTemplateList","activitytemplate_selectTemplateList");
// /*查询模板列表接口*/
// app.post("/activityTemplate/selectTemplateList","activitytemplate_selectTemplateList");
/*添加模板接口*/
app.post("/activityTemplate/addTemplate","activitytemplate_addTemplate");
// /*添加模板接口*/
// app.post("/activityTemplate/addTemplate","activitytemplate_addTemplate");
/*获取单个模板接口*/
app.post("/activityTemplate/getTemplate","activitytemplate_getTemplate");
// /*获取单个模板接口*/
// app.post("/activityTemplate/getTemplate","activitytemplate_getTemplate");
/*更新模板接口*/
app.post("/activityTemplate/updateTemplate","activitytemplate_updateTemplate");
// /*更新模板接口*/
// app.post("/activityTemplate/updateTemplate","activitytemplate_updateTemplate");
/*开启模板接口*/
app.post("/activityTemplate/publishTemplate","activitytemplate_publishTemplate");
// /*开启模板接口*/
// app.post("/activityTemplate/publishTemplate","activitytemplate_publishTemplate");
/*关闭模板接口*/
app.post("/activityTemplate/closeTemplate","activitytemplate_closeTemplate");
// /*关闭模板接口*/
// app.post("/activityTemplate/closeTemplate","activitytemplate_closeTemplate");
/*根据条件查询活动商品列表接口*/
app.post("/activityTemplate/getProductListByCondition","activitytemplate_getProductListByCondition");
// /*根据条件查询活动商品列表接口*/
// app.post("/activityTemplate/getProductListByCondition","activitytemplate_getProductListByCondition");
/*插入活动商品信息接口*/
app.post("/activityTemplate/insertProduct","activitytemplate_insertProduct");
// /*插入活动商品信息接口*/
// app.post("/activityTemplate/insertProduct","activitytemplate_insertProduct");
/*更新商品信息接口*/
app.post("/activityTemplate/updateProduct","activitytemplate_updateProduct");
// /*更新商品信息接口*/
// app.post("/activityTemplate/updateProduct","activitytemplate_updateProduct");
/*删除商品信息接口*/
app.post("/activityTemplate/delOneProduct","activitytemplate_delOneProduct");
// /*删除商品信息接口*/
// app.post("/activityTemplate/delOneProduct","activitytemplate_delOneProduct");
}
... ...
... ... @@ -5,29 +5,29 @@
module.exports=function(app) {
/*图标管理首页*/
app.get("/operations/icon/index","operations.icon.Index", function () {
this.$extend = {
moduleName: "图标管理",
pageName: "图标管理"
}
});
// /*图标管理首页*/
// app.get("/operations/icon/index","operations.icon.Index", function () {
// this.$extend = {
// moduleName: "图标管理",
// pageName: "图标管理"
// }
// });
/*列表*/
app.post("/icon/getList","icon_getList");
// /*列表*/
// app.post("/icon/getList","icon_getList");
/*添加图标*/
app.post("/icon/addIcon","icon_addIcon");
// /*添加图标*/
// app.post("/icon/addIcon","icon_addIcon");
/*根据ID获取图标信息*/
app.post("/icon/getOneIcon","icon_getOneIcon");
// /*根据ID获取图标信息*/
// app.post("/icon/getOneIcon","icon_getOneIcon");
/*更新图标信息*/
app.post("/icon/updateIcon","icon_updateIcon");
// /*更新图标信息*/
// app.post("/icon/updateIcon","icon_updateIcon");
/*开启图标入口*/
app.post("/icon/publishIcon","icon_publishIcon");
// /*开启图标入口*/
// app.post("/icon/publishIcon","icon_publishIcon");
/*关闭图标信息入口*/
app.post("/icon/closeIcon","icon_closeIcon");
// /*关闭图标信息入口*/
// app.post("/icon/closeIcon","icon_closeIcon");
}
\ No newline at end of file
... ...
... ... @@ -5,42 +5,42 @@
module.exports = function (app) {
/*活动分享管理首页*/
app.get("/operations/webshare/index", "operations.webshare.Index", function () {
this.$extend = {
moduleName: "活动分享管理",
pageName: "活动分享列表管理"
}
});
/*添加活动分享页面*/
app.get("/operations/webshare/add", "operations.webshare.Edit", function () {
this.$extend = {
moduleName: "活动分享管理",
pageName: "添加活动分享",
url: "/webShare/addWebShare"
}
});
/*编辑活动分享*/
app.get("/operations/webshare/edit/:id", "operations.webshare.Edit", function (req) {
this.$extend = {
moduleName: "活动分享管理",
pageName: "编辑活动分享",
id: req.params.id,
url: "/webShare/updateWebShare"
}
});
/*首页列表*/
app.post("/webShare/getWebShareList", "webshare_getWebShareList");
/*新增活动分享 [注意在shareImage加上客户端需要的imageView参数]*/
app.post("/webShare/addWebShare", "webshare_addWebShare");
/*更新活动分享*/
app.post("/webShare/updateWebShare", "webshare_updateWebShare");
/*根据id查询数据*/
app.post("/webShare/selectWebShare", "webshare_selectWebShare");
// /*活动分享管理首页*/
// app.get("/operations/webshare/index", "operations.webshare.Index", function () {
// this.$extend = {
// moduleName: "活动分享管理",
// pageName: "活动分享列表管理"
// }
// });
// /*添加活动分享页面*/
// app.get("/operations/webshare/add", "operations.webshare.Edit", function () {
// this.$extend = {
// moduleName: "活动分享管理",
// pageName: "添加活动分享",
// url: "/webShare/addWebShare"
// }
// });
// /*编辑活动分享*/
// app.get("/operations/webshare/edit/:id", "operations.webshare.Edit", function (req) {
// this.$extend = {
// moduleName: "活动分享管理",
// pageName: "编辑活动分享",
// id: req.params.id,
// url: "/webShare/updateWebShare"
// }
// });
// /*首页列表*/
// app.post("/webShare/getWebShareList", "webshare_getWebShareList");
// /*新增活动分享 [注意在shareImage加上客户端需要的imageView参数]*/
// app.post("/webShare/addWebShare", "webshare_addWebShare");
// /*更新活动分享*/
// app.post("/webShare/updateWebShare", "webshare_updateWebShare");
// /*根据id查询数据*/
// app.post("/webShare/selectWebShare", "webshare_selectWebShare");
}
\ No newline at end of file
... ...
... ... @@ -5,23 +5,23 @@
module.exports=function(app) {
/*图片包首页*/
app.get("/operations/icon/ziplist","operations.ziplist.Index", function () {
this.$extend = {
moduleName: "图片包管理",
pageName: "图片包管理"
}
});
// /*图片包首页*/
// app.get("/operations/icon/ziplist","operations.ziplist.Index", function () {
// this.$extend = {
// moduleName: "图片包管理",
// pageName: "图片包管理"
// }
// });
/*列表*/
app.post("/icon/getZipList","ziplist_getZipList");
// /*列表*/
// app.post("/icon/getZipList","ziplist_getZipList");
/*上传图片包*/
app.post("/icon/addZip","ziplist_addZip");
// /*上传图片包*/
// app.post("/icon/addZip","ziplist_addZip");
/*启用图片包*/
app.post("/icon/publishZip","ziplist_publishZip");
// /*启用图片包*/
// app.post("/icon/publishZip","ziplist_publishZip");
/*关闭图片包*/
app.post("/icon/closeZip","ziplist_closeZip");
// /*关闭图片包*/
// app.post("/icon/closeZip","ziplist_closeZip");
}
\ No newline at end of file
... ...
{
"name": "yohobuy-portal-fe",
"version": "4.7.0",
"version": "4.7.6",
"description": "Construction of the presentation layer solution is based on express, handlebars",
"main": "app.js",
"scripts": {
... ...
... ... @@ -6,73 +6,73 @@
module.exports=function(app) {
/*活动模板首页*/
app.get("/operations/activitytemplate/index","operations.activitytemplate.Index", function () {
this.$extend = {
moduleName: "活动模板管理",
pageName: "活动模板管理"
}
});
// app.get("/operations/activitytemplate/index","operations.activitytemplate.Index", function () {
// this.$extend = {
// moduleName: "活动模板管理",
// pageName: "活动模板管理"
// }
// });
/*活动模板添加页*/
app.get("/operations/activitytemplate/add","operations.activitytemplate.Edit", "resourceManage_getUrlAction", function (response) {
this.$extend = {
moduleName: "活动模板管理",
pageName: "添加活动模板",
type: "add",
url: "/activityTemplate/addTemplate",
data: response.data
}
});
// /*活动模板添加页*/
// app.get("/operations/activitytemplate/add","operations.activitytemplate.Edit", "resourceManage_getUrlAction", function (response) {
// this.$extend = {
// moduleName: "活动模板管理",
// pageName: "添加活动模板",
// type: "add",
// url: "/activityTemplate/addTemplate",
// data: response.data
// }
// });
/*活动模板编辑*/
app.get("/operations/activitytemplate/edit/:id","operations.activitytemplate.Edit","resourceManage_getUrlAction", function (response,req) {
this.$extend = {
moduleName: "活动模板管理",
pageName: "编辑活动模板",
type: "edit",
id: req.params.id,
url: "/activityTemplate/updateTemplate",
data: response.data
}
});
// /*活动模板编辑*/
// app.get("/operations/activitytemplate/edit/:id","operations.activitytemplate.Edit","resourceManage_getUrlAction", function (response,req) {
// this.$extend = {
// moduleName: "活动模板管理",
// pageName: "编辑活动模板",
// type: "edit",
// id: req.params.id,
// url: "/activityTemplate/updateTemplate",
// data: response.data
// }
// });
/*活动模板编辑*/
app.get("/operations/activitytemplate/product/:id","operations.activitytemplate.Product", function (req) {
this.$extend = {
moduleName: "模板商品管理",
pageName: "模板商品管理",
id: req.params.id,
url: req.originalUrl
}
});
// /*活动模板编辑*/
// app.get("/operations/activitytemplate/product/:id","operations.activitytemplate.Product", function (req) {
// this.$extend = {
// moduleName: "模板商品管理",
// pageName: "模板商品管理",
// id: req.params.id,
// url: req.originalUrl
// }
// });
/*查询模板列表接口*/
app.post("/activityTemplate/selectTemplateList","activitytemplate_selectTemplateList");
// /*查询模板列表接口*/
// app.post("/activityTemplate/selectTemplateList","activitytemplate_selectTemplateList");
/*添加模板接口*/
app.post("/activityTemplate/addTemplate","activitytemplate_addTemplate");
// /*添加模板接口*/
// app.post("/activityTemplate/addTemplate","activitytemplate_addTemplate");
/*获取单个模板接口*/
app.post("/activityTemplate/getTemplate","activitytemplate_getTemplate");
// /*获取单个模板接口*/
// app.post("/activityTemplate/getTemplate","activitytemplate_getTemplate");
/*更新模板接口*/
app.post("/activityTemplate/updateTemplate","activitytemplate_updateTemplate");
// /*更新模板接口*/
// app.post("/activityTemplate/updateTemplate","activitytemplate_updateTemplate");
/*开启模板接口*/
app.post("/activityTemplate/publishTemplate","activitytemplate_publishTemplate");
// /*开启模板接口*/
// app.post("/activityTemplate/publishTemplate","activitytemplate_publishTemplate");
/*关闭模板接口*/
app.post("/activityTemplate/closeTemplate","activitytemplate_closeTemplate");
// /*关闭模板接口*/
// app.post("/activityTemplate/closeTemplate","activitytemplate_closeTemplate");
/*根据条件查询活动商品列表接口*/
app.post("/activityTemplate/getProductListByCondition","activitytemplate_getProductListByCondition");
// /*根据条件查询活动商品列表接口*/
// app.post("/activityTemplate/getProductListByCondition","activitytemplate_getProductListByCondition");
/*插入活动商品信息接口*/
app.post("/activityTemplate/insertProduct","activitytemplate_insertProduct");
// /*插入活动商品信息接口*/
// app.post("/activityTemplate/insertProduct","activitytemplate_insertProduct");
/*更新商品信息接口*/
app.post("/activityTemplate/updateProduct","activitytemplate_updateProduct");
// /*更新商品信息接口*/
// app.post("/activityTemplate/updateProduct","activitytemplate_updateProduct");
/*删除商品信息接口*/
app.post("/activityTemplate/delOneProduct","activitytemplate_delOneProduct");
// /*删除商品信息接口*/
// app.post("/activityTemplate/delOneProduct","activitytemplate_delOneProduct");
}
... ...
... ... @@ -5,29 +5,29 @@
module.exports=function(app) {
/*图标管理首页*/
app.get("/operations/icon/index","operations.icon.Index", function () {
this.$extend = {
moduleName: "图标管理",
pageName: "图标管理"
}
});
// /*图标管理首页*/
// app.get("/operations/icon/index","operations.icon.Index", function () {
// this.$extend = {
// moduleName: "图标管理",
// pageName: "图标管理"
// }
// });
/*列表*/
app.post("/icon/getList","icon_getList");
// /*列表*/
// app.post("/icon/getList","icon_getList");
/*添加图标*/
app.post("/icon/addIcon","icon_addIcon");
// /*添加图标*/
// app.post("/icon/addIcon","icon_addIcon");
/*根据ID获取图标信息*/
app.post("/icon/getOneIcon","icon_getOneIcon");
// /*根据ID获取图标信息*/
// app.post("/icon/getOneIcon","icon_getOneIcon");
/*更新图标信息*/
app.post("/icon/updateIcon","icon_updateIcon");
// /*更新图标信息*/
// app.post("/icon/updateIcon","icon_updateIcon");
/*开启图标入口*/
app.post("/icon/publishIcon","icon_publishIcon");
// /*开启图标入口*/
// app.post("/icon/publishIcon","icon_publishIcon");
/*关闭图标信息入口*/
app.post("/icon/closeIcon","icon_closeIcon");
// /*关闭图标信息入口*/
// app.post("/icon/closeIcon","icon_closeIcon");
}
\ No newline at end of file
... ...
... ... @@ -5,42 +5,42 @@
module.exports = function (app) {
/*活动分享管理首页*/
app.get("/operations/webshare/index", "operations.webshare.Index", function () {
this.$extend = {
moduleName: "活动分享管理",
pageName: "活动分享列表管理"
}
});
/*添加活动分享页面*/
app.get("/operations/webshare/add", "operations.webshare.Edit", function () {
this.$extend = {
moduleName: "活动分享管理",
pageName: "添加活动分享",
url: "/webShare/addWebShare"
}
});
/*编辑活动分享*/
app.get("/operations/webshare/edit/:id", "operations.webshare.Edit", function (req) {
this.$extend = {
moduleName: "活动分享管理",
pageName: "编辑活动分享",
id: req.params.id,
url: "/webShare/updateWebShare"
}
});
/*首页列表*/
app.post("/webShare/getWebShareList", "webshare_getWebShareList");
/*新增活动分享 [注意在shareImage加上客户端需要的imageView参数]*/
app.post("/webShare/addWebShare", "webshare_addWebShare");
/*更新活动分享*/
app.post("/webShare/updateWebShare", "webshare_updateWebShare");
/*根据id查询数据*/
app.post("/webShare/selectWebShare", "webshare_selectWebShare");
// /*活动分享管理首页*/
// app.get("/operations/webshare/index", "operations.webshare.Index", function () {
// this.$extend = {
// moduleName: "活动分享管理",
// pageName: "活动分享列表管理"
// }
// });
// /*添加活动分享页面*/
// app.get("/operations/webshare/add", "operations.webshare.Edit", function () {
// this.$extend = {
// moduleName: "活动分享管理",
// pageName: "添加活动分享",
// url: "/webShare/addWebShare"
// }
// });
// /*编辑活动分享*/
// app.get("/operations/webshare/edit/:id", "operations.webshare.Edit", function (req) {
// this.$extend = {
// moduleName: "活动分享管理",
// pageName: "编辑活动分享",
// id: req.params.id,
// url: "/webShare/updateWebShare"
// }
// });
// /*首页列表*/
// app.post("/webShare/getWebShareList", "webshare_getWebShareList");
// /*新增活动分享 [注意在shareImage加上客户端需要的imageView参数]*/
// app.post("/webShare/addWebShare", "webshare_addWebShare");
// /*更新活动分享*/
// app.post("/webShare/updateWebShare", "webshare_updateWebShare");
// /*根据id查询数据*/
// app.post("/webShare/selectWebShare", "webshare_selectWebShare");
}
\ No newline at end of file
... ...
... ... @@ -5,23 +5,23 @@
module.exports=function(app) {
/*图片包首页*/
app.get("/operations/icon/ziplist","operations.ziplist.Index", function () {
this.$extend = {
moduleName: "图片包管理",
pageName: "图片包管理"
}
});
// /*图片包首页*/
// app.get("/operations/icon/ziplist","operations.ziplist.Index", function () {
// this.$extend = {
// moduleName: "图片包管理",
// pageName: "图片包管理"
// }
// });
/*列表*/
app.post("/icon/getZipList","ziplist_getZipList");
// /*列表*/
// app.post("/icon/getZipList","ziplist_getZipList");
/*上传图片包*/
app.post("/icon/addZip","ziplist_addZip");
// /*上传图片包*/
// app.post("/icon/addZip","ziplist_addZip");
/*启用图片包*/
app.post("/icon/publishZip","ziplist_publishZip");
// /*启用图片包*/
// app.post("/icon/publishZip","ziplist_publishZip");
/*关闭图片包*/
app.post("/icon/closeZip","ziplist_closeZip");
// /*关闭图片包*/
// app.post("/icon/closeZip","ziplist_closeZip");
}
\ No newline at end of file
... ...
... ... @@ -24,6 +24,7 @@ module.exports = {
} else {
var data = {};
data.list = [];
try{
body = JSON.parse(body);
var dataList = body.data.product_list;
var goodslist = [];
... ... @@ -44,6 +45,10 @@ module.exports = {
data.page = body.data.page;//页码
data.totalPage = 1;//body.data.page_total;
data.nums = data.list.length;//记录每一页数据量
}catch(ex){
return callback(null, {data: data, code: 500});
}
return callback(null, {data: data, code: 200});
}
});
... ...
{"name":"yohobuy-portal-fe","version":"4.7.0","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","express":"^4.13.4","express-session":"^1.13.0","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","winston":"^2.2.0","glob":"^7.0.3"}}
\ No newline at end of file
{"name":"yohobuy-portal-fe","version":"4.7.6","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","express":"^4.13.4","express-session":"^1.13.0","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","winston":"^2.2.0","glob":"^7.0.3"}}
\ No newline at end of file
... ...
... ... @@ -4,11 +4,12 @@
<div>
<ul class="nav nav-pills" style="margin-bottom: 10px">
<li>
<a class="tag" href="/goods/special/index" style="font-size: 14px;padding:10px">特殊商品</a>
<a class="tag" href="/goods/special/index" style="font-size: 14px;padding:20px;color: black">特殊商品</a>
</li>
<li class="active">
<a class="hand" href="javascript:void(0)" style="font-size: 14px;padding:10px">货到付款</a>
<li>
<a class="hand active" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #428bca">货到付款</a>
</li>
</ul>
</div>
<div class="panel panel-default" style="margin-bottom:10px;">
... ...