liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit 3a199734750b9f596ad5c0dc49ea5c8708c77453 2 parents ada4a06d 49c100d6

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 16 changed files with 672 additions and 10 deletions
module.exports = function (app) {
app.get("/activity/drawline/index", "activity.Index", function (req, res) {
this.$extend = {
gridurl:'/supplier/store/indexPage',
pagetitle:{
level1title:"活动管理",
level2title:"抽奖活动管理",
level3title:"抽奖活动列表"
}
}
});
app.get("/activity/drawline/add", "activity.Edit", function (req, res) {
this.$extend = {
pageTitel:"添加抽奖活动",
action:'/DrawlineActivityRest/addDrawlineActivity',
data:{
activityId:0,
backgroundStyle:"",
prizeList: ""
}
}
});
app.get("/activity/drawline/update/:activityId", "activity.Edit", function (req, res) {
this.$extend = {
pageTitel : "修改抽奖活动",
action : '/DrawlineActivityRest/updateDrawlineActivity'
}
});
app.get("/activity/drawline/data/:activityId", "activity.Data");
//抽奖活动列表
app.post("/DrawlineActivityRest/getDrawlineActivityList","activity_getDrawlineActivityList");
//关闭活动
app.post("/DrawlineActivityRest/closeActivity","activity_closeActivity");
//开启活动
app.post("/DrawlineActivityRest/openActivity","activity_openActivity");
//新增抽签活动
app.post("/DrawlineActivityRest/addDrawlineActivity","activity_addDrawlineActivity");
//保存编辑抽签活动
app.post("/DrawlineActivityRest/updateDrawlineActivity","activity_updateDrawlineActivity");
//获取抽奖活动详情
app.post("/DrawlineActivityRest/getDrawlineActivityDetail","activity_getDrawlineActivityDetail");
//手动开奖
app.post("/DrawlineActivityRest/luckyUserDraw","activity_luckyUserDraw");
//删除抽奖活动
app.post("/DrawlineActivityRest/deleteDrawlineActivity","activity_deleteDrawlineActivity");
}
... ...
module.exports= {
namespace: "activity",
apis: {
getDrawlineActivityList:{
title:"抽奖活动列表",
url:"/DrawlineActivityRest/getDrawlineActivityList",
params:[
{name: 'activityName', type: 'String'},
{name: 'status', type: 'Number'},
{name: 'size', type: 'Number'},
{name: 'page', type: 'Number'}
]
},
closeActivity:{
title:"关闭活动",
url:"/DrawlineActivityRest/closeActivity",
params:[
{name:"activityId",type:"Number"}
]
},
openActivity:{
title:"开启活动",
url:"/DrawlineActivityRest/openActivity",
params:[
{name:"activityId",type:"Number"}
]
},
addDrawlineActivity:{
title:"新增抽签活动",
url:"/DrawlineActivityRest/addDrawlineActivity",
params:[
{name: 'activityName',type: 'string'},
{name: 'beginTimeStr',type: 'string'},
{name: 'endTimeStr',type: 'string'},
{name: 'topBanner',type: 'string'},
{name: 'backgroundStyle',type: 'string'},
{name: 'activityDesc',type: 'string'},
{name: 'prizeList',type: 'string'},
{name: 'numberLimit',type: 'number'}
]
},
updateDrawlineActivity:{
title:"保存编辑抽签活动",
url:"/DrawlineActivityRest/updateDrawlineActivity",
params:[
{name: 'activityId',type: 'Number'},
{name: 'activityName',type: 'string'},
{name: 'beginTimeStr',type: 'string'},
{name: 'endTimeStr',type: 'string'},
{name: 'topBanner',type: 'string'},
{name: 'backgroundStyle',type: 'string'},
{name: 'activityDesc',type: 'string'},
{name: 'prizeList',type: 'string'},
{name: 'status',type: 'Number'},
{name: 'numberLimit',type: 'number'}
]
},
getDrawlineActivityDetail:{
title:"获取抽奖活动详情",
url:"/DrawlineActivityRest/getDrawlineActivityDetail",
params:[
{name: 'activityId', type:"number"}
]
},
luckyUserDraw:{
title:"手动开奖",
url:"/DrawlineActivityRest/luckyUserDraw",
params:[
{name: 'activityId', type:"number"}
]
},
deleteDrawlineActivity:{
title:"删除抽奖活动",
url:"/DrawlineActivityRest/deleteDrawlineActivity",
params:[
{name: 'activityId', type:"number"}
]
},
}
}
\ No newline at end of file
... ...
<div class="pageheader">
<div class="media">
<div class="pageicon pull-left">
<i class="fa fa-th-list"></i>
</div>
<div class="media-body">
<ul class="breadcrumb">
<li><a href=""><i class="glyphicon glyphicon-home"></i></a></li>
<li><a href="">抽奖活动管理</a></li>
<li>抽奖活动列表</li>
</ul>
<div>
<div style="width: 30%;float: left;">
<h4>抽奖活动中奖情况</h4>
</div>
</div>
</div>
</div>
</div>
<div class="contentpanel">
<div class="row">
<div class="col-md-12">
{{# data}}
<div id="activityForm" role="form" class="form-horizontal form-bordered" method="post" action="{{action}}">
<input type="hidden" id="luckUserInfoList" value="{{luckUserInfoList}}" />
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">中奖情况</h4>
</div><!-- panel-heading -->
<div class="panel-body">
<div class="row">
<div class="form-group">
<label class="col-sm-2 control-label">总参与人数</label>
<div class="col-sm-3">
<label class="col-sm-2 control-label">{{totalAttendNum}}</label>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">马甲参与人数</label>
<div class="col-sm-3">
<label class="col-sm-2 control-label">{{virtualAttendNum}}</label>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">奖品总数量</label>
<div class="col-sm-3">
<label class="col-sm-2 control-label">{{luckTotalNum}}</label>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">中奖明细</label>
<div class="row show-grid">
<div id="basicTable"></div>
</div>
</div>
</div>
</div>
<div class="panel-footer">
<div class="row">
<div class="col-sm-8 col-sm-offset-2">
<a href="javascript:;" class="btn btn-default" onclick="javascript:history.go(-1);">取消</a>
</div>
</div>
</div>
</div>
{{/ data}}
</div>
</div>
</div>
</div>
... ...
<div class="pageheader">
<div class="media">
<div class="pageicon pull-left">
<i class="fa fa-th-list"></i>
</div>
<div class="media-body">
<ul class="breadcrumb">
<li><a href=""><i class="glyphicon glyphicon-home"></i></a></li>
<li><a href="">抽奖活动管理</a></li>
<li>抽奖活动列表</li>
</ul>
<div>
<div style="width: 30%;float: left;">
<h4>{{pageTitel}}</h4>
</div>
</div>
</div>
</div>
</div>
<div class="contentpanel">
<div class="row">
<div class="col-md-12">
<div id="activityForm" role="form" class="form-horizontal form-bordered" method="post" action="{{action}}">
<input type="hidden" id="activityId" value="{{data.activityId}}" />
<input type="hidden" id="prizeId" value="{{data.prizeId}}" />
<input type="hidden" id="backgroundStyle" value="{{data.backgroundStyle}}" />
<input type="hidden" id="prizeList" value="{{data.prizeList}}" />
<input type="hidden" id="status" value="{{data.status}}" />
<div class="panel panel-default">
{{# data}}
<div class="panel-heading">
<h4 class="panel-title">{{pageTitel}}</h4>
</div><!-- panel-heading -->
<div class="panel-body">
<div class="row">
<div class="form-group">
<label class="col-sm-2 control-label">活动名称<span class="red">*</span></label>
<div class="col-sm-8">
<input type="text" id="activityName" placeholder="活动名称" class="form-control" required value="{{activityName}}">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">活动时间<span class="red">*</span></label>
<div class="col-sm-3">
<input type="text" class="form-control" jsaction="time" id="beginTimeStr" required placeholder="活动开始时间" value="{{beginTimeStr}}" readonly>
</div>
<div class="col-sm-3">
<input type="text" class="form-control" jsaction="time" id="endTimeStr" required placeholder="活动结束时间" value="{{endTimeStr}}" readonly >
</div>
<div class="col-sm-3">
<label class="control-label" id="totalHours"></label>
</div>
<!-- readonly require-->
</div>
<div class="form-group">
<label class="col-sm-2"></label>
<div class="input-group col-sm-6">
<span class="input-group-addon">人数上限：</span>
<input type="text" id="numberLimit" class="form-control number" value="{{numberLimit}}" placeholder="人数上限">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">奖品类型<span class="red">*</span></label>
<div class="col-sm-3">
<select name="prizeType" id="prizeType" value='{{prizeType}}' required class="form-control">
<option value="3">限购码</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">奖品设置<span class="red">*</span></label>
<div class="col-sm-6">
<div class="input-group">
<span class="input-group-addon">限购码批次号：<span class="red">*</span></span>
<input type="text" form="activityForm" name="prize" id="prize" class="form-control" value="{{ prize}}" placeholder="限购码批次号" required>
</div>
<!--<div class="input-group">-->
<!--<span class="input-group-addon">白名单：</span>-->
<!--<input type="text" form="activityForm" name="whiteList" id="whiteList" class="form-control" value="{{ whiteList}}" placeholder="请输入UID，用逗号隔开">-->
<!--</div>-->
<!--<div class="input-group">-->
<!--<span class="input-group-addon">真实用户中奖数：<span class="red">*</span></span>-->
<!--<input type="number" form="activityForm" name="realUserNum" id="realUserNum" class="form-control" value="{{ realUserNum}}" placeholder="请输入数量" required>-->
<!--</div>-->
<!--<div class="input-group">-->
<!--<span class="input-group-addon">马甲用户中奖数：</span>-->
<!--<input type="number" form="activityForm" name="sockUserNum" id="sockUserNum" class="form-control" value="{{ sockUserNum}}" placeholder="请输入数量">-->
<!--</div>-->
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">内容管理<span class="red">*</span></label>
<div class="col-sm-10">
<div class="input-group col-sm-4">
<div class="col-sm-3">
<label class="">顶部banner：<span class="red">*</span></label>
</div>
<div class="col-sm-7">
<input type="file" id="topBanner" name="topBanner" value="{{topBanner}}" placeholder="顶部banner" required />
</div>
</div>
<div class="input-group col-sm-12">
<div class="col-sm-1">
<label class="">背景样式：</label>
</div>
<div class="col-sm-1">
<input type="file" id="backgroundStyle1" name="backgroundStyle1" placeholder="背景样式" />
</div>
<div class="col-sm-1">
<input type="file" id="backgroundStyle2" name="backgroundStyle2" placeholder="背景样式" />
</div>
<div class="col-sm-1">
<input type="file" id="backgroundStyle3" name="backgroundStyle3" placeholder="背景样式" />
</div>
<div class="col-sm-1">
<input type="file" id="backgroundStyle4" name="backgroundStyle4" placeholder="背景样式" />
</div>
<div class="col-sm-1">
<input type="file" id="backgroundStyle5" name="backgroundStyle5" placeholder="背景样式" />
</div>
<div class="col-sm-1">
<input type="file" id="backgroundStyle6" name="backgroundStyle6" placeholder="背景样式" />
</div>
<div class="col-sm-1">
<input type="file" id="backgroundStyle7" name="backgroundStyle7" placeholder="背景样式" />
</div>
<div class="col-sm-1">
<input type="file" id="backgroundStyle8" name="backgroundStyle8" placeholder="背景样式" />
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">活动说明：</label>
<div class="col-sm-8">
<input type="text" id="activityDesc" placeholder="请输入链接" class="form-control" value="{{activityDesc}}">
</div>
</div>
</div>
</div>
{{/ data}}
<div class="panel-footer">
<div class="row">
<div class="col-sm-8 col-sm-offset-2">
<a href="javascript:;" class="btn btn-default" onclick="javascript:history.go(-1);">取消</a>
<button type="submit" class="btn btn-success mr5" data-loading-text="保存中..." id="btnReview">保存</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
... ...
<div class="pageheader">
<div class="media">
<div class="pageicon pull-left">
<i class="fa fa-th-list"></i>
</div>
{{#pagetitle}}
<div class="media-body">
<ul class="breadcrumb">
<li><a href=""><i class="glyphicon glyphicon-home"></i></a></li>
<li><a href="">{{level1title}}</a></li>
<li>{{level2title}}</li>
</ul>
<div>
<div style="width: 30%;float: left;">
<h4>{{level3title}}</h4>
</div>
</div>
</div>
{{/pagetitle}}
</div>
</div>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-heading">
<a href="/activity/drawline/add" class="btn btn-success"><i class="fa fa-plus"></i> 添加抽奖活动</a>
</div>
<div class="panel-body">
<div class="row">
<select name="status" id="status" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="-1" selected="">活动状态</option>
<option value="1">开启</option>
<option value="0">关闭</option>
<option value="2">未过期</option>
</select>
<div class="form-group col-md-2">
<input name="activityName" id="activityName" type="text" value="" class="form-control" placeholder="请输入活动名称" />
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
<input id="importFile" style="z-index: -99999" hidden name="productSkn" class="btn btn-default excel-upload" type="file" >
<div class="file-name btn btn-info" id="uploadFile">导入中奖信息</div>
</div>
</div>
<div class="panel panel-primary-head">
<div id="basicTable" class="dataTables_wrapper no-footer">
<div class="dataTables_length" id="storeadmin_Tabel"></div>
</div>
</div>
</div>
</div>
... ...
module.exports = function (app){
app.get("/erpproduct/brands/index", "shop.Index", function (req,res){
app.get("/erpproduct/brands/index", "brand.Index", function (req,res){
this.$extend={
bottons:'{"edit":true}',
gridurl:'/brand/getBrandList'
}
});
app.get("/erpproduct/brands/edit/:brandId", "shop.Edit", function (req,res){
app.get("/erpproduct/brands/edit/:brandId", "brand.Edit", function (req,res){
this.$extend={
action: '/brand/edit'
}
});
app.get("/erpproduct/brands/add", "shop.Edit", function (req,res){
app.get("/erpproduct/brands/add", "brand.Edit", function (req,res){
this.$extend={
action:'/erpproduct/ajax/brands/add',
data:{}
... ...
module.exports = function (app){
app.get("/erpproduct/brands/edit/:brandId", "shop.Edit", function (req,res){
this.$extend={
action: '/brand/edit'
}
});
}
... ...
module.exports = function (app){
app.get("/operations/helpcategory/index", "shop.Edit", function (req,res){
this.$extend={
action: '/brand/edit'
}
});
}
... ...
module.exports= {
namespace: "helpCategory",
apis: {
}
}
\ No newline at end of file
... ...
module.exports= {
namespace: "helpContent",
apis: {
}
}
... ...
<div class="pageheader">
<div class="media">
<div class="pageicon pull-left">
<i class="fa fa-th-list"></i>
</div>
<div class="media-body">
<div>
<div style="width: 30%;float: left;">
<h4>帮助分类</h4>
</div>
</div>
</div>
</div>
</div>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom: 10px;">
<div class="panel-body">
<div class="row">
<a class="btn btn-info" id="add-category">添加帮助分类</a>
</div>
</div>
<div id="help_list"></div>
</div>
</div>
<script type="text/template" id="template">
<div class="rows" id="baseform">
<div class="form-group">
<label for="categoryName" class="col-sm-2 control-label">分类名称</label>
<div class="col-sm-10">
<input type="hidden" value="{id}" id="id" />
<input type="text" value="{categoryName}" id="categoryName" class="form-control" required="required" />
<label>注：分类名称必填</label>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">一级分类</label>
<div class="col-sm-10">
<select id="parentId" style="width: 280px;" value="{parentId}" name="{parentId}">
<option value="{parentId}">请选择</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">品牌风格</label>
<div class="col-sm-8">
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="iphone">IOS手机</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="ipad">IOS Pad</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="android">安卓手机</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="androidpad">安卓Pad</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="h5">手机网站</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="web">网站</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="platform">平台</label>
</div>
<input type="hidden" id="platform" value="{platform}" for="checkbox">
</div>
</div>
</script>
\ No newline at end of file
... ...
<div class="pageheader">
<div class="media">
<div class="pageicon pull-left">
<i class="fa fa-th-list"></i>
</div>
<div class="media-body">
<ul class="breadcrumb">
<li><a href=""><i class="glyphicon glyphicon-home"></i></a></li>
<li><a href="">帮助管理</a></li>
<li>内容列表管理</li>
</ul>
<div>
<div style="width: 30%;float: left;">
<h4>内容列表管理</h4>
</div>
</div>
</div>
</div>
</div>
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-heading">
<a class="btn btn-success " id="add-content"><i class="fa fa-plus"></i> 添加内容</a>
</div>
<div class="panel-body">
<div class="row">
<div class="panel-col">
<select value="{categoryId}" name="categoryId" id="help-categoryId" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="-1">选择分类</option>
</select>
</div>
<div class="panel-col">
<select name="platform" id="help-platform" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">选择显示平台</option>
<option value="iphone">IOS手机</option>
<option value="ipad">IOS Pad</option>
<option value="android">安卓手机</option>
<option value="androidpad">安卓Pad</option>
<option value="h5">手机网站</option>
<option value="web">网站</option>
<option value="platform">平台</option>
</select>
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="filter-all" href="/operations/helpcontent/index" class="btn btn-info">全部</a>
</div>
</div>
<div id="content-list"></div>
</div>
<script type="text/template" id="template">
<div class="rows" id="baseform">
<div class="form-group">
<label class="col-sm-2 control-label" for="title">标题</label>
<input type="hidden" value="{id}" id="id" />
<div class="col-sm-10">
<input type="text" value="{title}" class="form-control" id="title" required="required" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="content">帮助内容</label>
<div class="col-sm-10">
<input type="text" value="{content}" class="form-control" id="content" required="required" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="categoryId">分类</label>
<div class="col-sm-10">
<select id="categoryId" style="width: 280px;" value="{categoryId}">
<option value="{categoryId}">请选择分类</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">显示平台</label>
<div class="col-sm-8">
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="iphone">IOS手机</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="ipad">IOS Pad</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="android">安卓手机</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="androidpad">安卓Pad</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="h5">手机网站</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="web">网站</label>
<label style="cursor: pointer;"><input type="checkbox" name="platform" value="platform">平台</label>
</div>
<input type="hidden" id="platform" value="{platform}" for="checkbox">
</div>
</div>
</script>
\ No newline at end of file
... ...
<div class="pageheader">
<div class="media">
<div class="pageicon pull-left">
<i class="fa fa-th-list"></i>
</div>
<div class="media-body">
<ul class="breadcrumb">
<li><a href=""><i class="glyphicon glyphicon-home"></i></a></li>
<li><a href="">客服管理</a></li>
<li>黑名单限制</li>
</ul>
<div>
<div style="width: 30%;float: left;">
<h4>黑名单限制</h4>
</div>
</div>
</div>
</div>
</div>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<div class="row">
<div class="panel-col-2">
<input placeholder="请输入用户uid" id="uid" class="form-control">
<a id="dismiss" href="javascript:;" class="btn btn-info">解除</a>
</div>
</div>
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTable" ></div>
</div>
</div>
\ No newline at end of file
... ...
module.exports = function (app){
app.get("/supplier/supplier/index", "shop.Index", function (req,res){
app.get("/supplier/supplier/index", "supplier.Index", function (req,res){
this.$extend={
iscreate:true,
bottons:'{"columnsHidOper":true,"columnsHidisFr":true}',
... ... @@ -14,7 +14,7 @@ module.exports = function (app){
}
});
app.get("/supplier/add", "shop.Edit", function (req,res){
app.get("/supplier/add", "supplier.Edit", function (req,res){
this.$extend={
action:'/brand/supplier/add',
data:{},
... ...
module.exports = function (app){
app.get("/supplier/supplier/auditlist", "shop.Index", function (req,res){
app.get("/supplier/supplier/auditlist", "supplier.Index", function (req,res){
this.$extend={
bottons:'{"edit":true,"columnsHidisFr":true}',
gridurl:'/supplier/create/getAuditSupplierList',
... ... @@ -7,7 +7,7 @@ module.exports = function (app){
}
});
app.get("/supplier/infoopt/:id", "shop.Info", function (req,res){
app.get("/supplier/infoopt/:id", "supplier.Info", function (req,res){
this.$extend={
edit:true
}
... ...
module.exports = function (app){
app.get("/supplier/supplier/managelist", "shop.Index", function (req,res){
app.get("/supplier/supplier/managelist", "supplier.Index", function (req,res){
this.$extend={
bottons:'{"resetlock":true,"updatecheck":true}',
gridurl:'/supplier/create/getManageSupplierList',
... ... @@ -13,7 +13,7 @@ module.exports = function (app){
}
});
app.get("/supplier/update/:id", "shop.Edit", function (req,res){
app.get("/supplier/update/:id", "supplier.Edit", function (req,res){
this.$extend={
action:'/brand/action/update',
pageTitle:"修改供应商",
... ... @@ -21,7 +21,7 @@ module.exports = function (app){
}
});
app.get("/supplier/updatecheck/:id", "shop.Edit", function (req,res){
app.get("/supplier/updatecheck/:id", "supplier.Edit", function (req,res){
this.$extend={
action:'/brand/action/update',
pageTitle:"修改供应商",
... ...