fe / yohobuy-portal-fe · Commits

Go to a project

Authored by liuyue
Commit 6835622b931ce3383fa4e2fff57d3da5baa86160 1 parent 876ed17c

vip累计金额翻倍

Inline Side-by-side
Showing 11 changed files with 372 additions and 127 deletions
... ... @@ -40,6 +40,9 @@ tab.prototype={
var li = $("<li></li>");
var a = $("<a href='javascript:void(0);'></a>");
if (column.name == 'all') {
li = $('<li class="active"></li>');
};
if (column.name) a.attr({ columnname: column.name });
if (column.key) a.attr({ key: column.key});
if (column.value) a.attr({ value: column.value});
... ...
... ... @@ -53,7 +53,7 @@ var edit=require('../common/edit');
res=res.data;
if(res.code=="200"){
e.$tip('提交成功',function(){
location.href="/limit/index";
location.href="/market/limitcode/index";
},'growl-success');
}else{
e.$tip(res.message);
... ... @@ -63,6 +63,7 @@ var edit=require('../common/edit');
option.error=function(res){
e.$tip("提交失败");
}
console.log(option.data);
callback&&callback(option.data);
});
}
... ...
... ... @@ -5,15 +5,32 @@ var $ = require('jquery'),
new common.dropDown({el: '#filter-dep'});
var ENUM={
status:{0:'待审核',1:'审核通过',2:'驳回',3:'过期',4:'作废'}//全部
status:{0:'待审核',1:'审核通过',2:'驳回',3:'过期',4:'作废'},//全部
tips:{"0":0,"1":0,"2":0,"3":0,"4":0,"all":0}
}
var t = new common.tab({
el:"#basicTab",
click:function(){
g.reload();
},
columns:[
{name:"0",display:"待审核({0})"},
{name:"1",display:"审核通过({1})"},
{name:"2",display:"驳回({2})"},
{name:"3",display:"过期({3})"},
{name:"4",display:"作废({4})"},
{name:"all",display:"全部({all})"}
]
}).init(ENUM.tips);
var g = new common.grid({
el: '#basicTable',
parms:function(){
return {
batchNo:common.util.__input("batchNo"),
name:common.util.__input("name"),
reqDepartment:common.util.__input("reqDepartment")
batchNo:common.util.__input("filter-id"),
name:common.util.__input("filter-name"),
reqDepartment:common.util.__input("filter-dep")
};
},
columns:[
... ... @@ -61,12 +78,24 @@ var g = new common.grid({
});
g.init($("#gridurl").val());
$("#btn-search").click(function(){
g.reload();
});
$("#btn-reset").click(function(){
$("#batchNo").add("#name").val('');
$("#reqDepartment").val(-1);
//tab
var loadtab=function(){
t.active=undefined;
setTimeout(function(){
common.util.__ajax({
url:'/market/limitcode/getCodeCount',
data:g.options.parms()
},function(res){
var __dt=$.extend({},ENUM.tips,res.data);
t.init(__dt);
},true);
},400);
}
loadtab();
$("#filter-btn").click(function(){
loadtab();
g.reload();
});
... ...
var $ = require('jquery');
var edit=require('../common/edit');
var e=new edit("#basicForm");
e.on("bind",function(){
$("select").change(function() {
if ($(this).is($("#type1"))) {
console.log(11);
$("#type").val($("#type1").val());
}
});
});
e.on("bind",function(){
$("select").change(function() {
if ($(this).is($("#num1"))) {
console.log(11);
$("#num").val($("#num1").val());
}
});
});
e.init();
//提交
var submit=function(callback){
e.submit($("#basicForm").attr("action"),function(option){
option.success=function(res){
res=res.data;
if(res.code=="200"){
e.$tip('提交成功',function(){
location.href="/coupon/index";
},'growl-success');
}else{
e.$tip(res.message);
}
return false;
},
option.error=function(res){
e.$tip("提交失败");
}
callback&&callback(option.data);
});
};
$("#save_brand").click(function(){
var promotionInfo={
type:$("input:checked[name=promotionInfo-type]").val(),
condition:{
amount_at_least:$("#promotionInfo-condition-amount_at_least").val(),
count_at_least:$("#promotionInfo-condition-count_at_least").val()
},
action:{
discount:$("#promotionInfo-action-discount").val(),
discount_at_most:$("#promotionInfo-action-discount_at_most").val()
}
}
$("#promotionInfo").val(JSON.stringify(promotionInfo));
submit(function(data){
//修改数据
if(data.status=="2"){
data.status=0;
}
});
return false;
});
... ...
'use strict';
var $ = require('jquery'),
common=require('../common/common');
var g = new common.grid({
el: '#basicTable',
parms: function(){
return {
type: 1
};
},
columns:[
{display: '活动名称', name: 'title'},
{display: '活动类型', render: function(item) {
return '积分翻倍';
}},
{display: '倍数', name: 'num'},
{display: '活动时间', render: function(item) {
var startTime = new Date(item.startTime * 1000),
endTime = new Date(item.endTime * 1000);
return startTime.getFullYear() + '-' + (startTime.getMonth() + 1) + '-' + startTime.getDate() + '至' +
endTime.getFullYear() + '-' + (endTime.getMonth() + 1) + '-' + endTime.getDate();
}},
{display: '创建人员', name: 'addUserName'},
{display: '活动创建时间', render: function(item) {
var date = new Date(item.createTime * 1000);
return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' '
+ date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
}},
{display: '操作', name: ''}
]
});
g.init($("#gridurl").val());
\ No newline at end of file
... ...
... ... @@ -12,7 +12,7 @@ var config = {
'development':{
redis:null,
apiKey:'sd4H1ecAqlp',
domain:'http://192.168.102.215:8081/platform',
domain:'http://192.168.102.215:8088/platform',
loggers: {
api: {
level:'verbose',
... ...
... ... @@ -12,6 +12,7 @@ exports.res = [
noApi: true,
data: {
pageTitle: '优惠码列表',
filter: true,
createUrl: '/market/coupon/add',
gridurl:'/market/coupon/getPromotion'
// tabUrl: '/getCodeCount',
... ... @@ -214,6 +215,7 @@ exports.res = [
noApi: true,
data: {
pageTitle: '限购码列表',
filter: true,
createUrl: '/market/limitcode/add',
gridurl:'/market/limitcode/getLimitCode'
}
... ... @@ -315,8 +317,9 @@ exports.res = [
{name:"status",type:"Number"},
{name:"id",type:"Number"}
]
}
,{//修改限购码接口状态[待验证]
},
{
//限购码管理 -> 修改限购码接口
route: '/market/limitcode/auditLimitCode',
method: 'POST',
view: 'pages/limitcode/info',
... ... @@ -327,5 +330,70 @@ exports.res = [
{name: 'status',type: 'Number'},
{name: 'reason',type: 'String'}
]
},
{
//营销码管理 -> tab卡数据
route: '/market/limitCode/getCodeCount',
method: 'POST',
url: '/limitCode/getLimitCodeCountByStatus',
isJsonRaw: true,
params: [
{
name: 'reqDepartment',
type: 'String'
},
{
name: 'name',
type: 'String'
},
{
name: 'batchNo',
type: 'Number'
}
]
},
{
//vip累计金额翻倍 -> 列表页面渲染
route: '/market/vipamount/index',
method: 'GET',
view: 'pages/market/index',
src: '/market/vipamount',
noApi: true,
data: {
pageTitle: 'vip累计金额翻倍',
createUrl: '/market/vipamount/add',
gridurl: '/market/vipamount/list'
}
},
{
//vip累计金额翻倍 -> 列表数据
route: '/market/vipamount/list',
method: 'POST',
url: '/activity/queryActivityList',
isJsonRaw: true,
params: [
{
name: 'type',
type: 'Number'
},
{
name: 'size',
type: 'Number'
},
{
name: 'page',
type: 'Number'
}
]
},
{
//vip累计金额翻倍 -> 添加页面渲染
route: '/market/vipamount/add',
method: 'GET',
view: 'pages/market/vipamount-edit',
src:'/market/vipamount-edit',
data: {
action: '',
}
}
]
\ No newline at end of file
... ...
... ... @@ -17,31 +17,31 @@
<div class="contentpanel">
<form id="limit-add-form" action="{{action}}">
<form id="limit-add-form" class="form-horizontal form-bordered" action="{{action}}">
{{# data}}
<div class="panel-group">
<div class="pannel">
<div class="panel-heading">
<h4>限购商品基本信息</h4>
</div>
<div class="panel-collapse collapse in">
<div class="panel-body">
<div class="row">
<div class="col-md-1 height40"><label>商品名称*：</label></div>
<div class="col-md-1">
<input id="productName" value="{{productName}}" type="text" class="form-control" style="width:280px;" placeholder="商品名称" required>
<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="productName" placeholder="商品名称" class="form-control" required maxlength="30" value="{{productName}}">
</div>
</div>
<div class="row">
<div class="col-md-1 height40"><label>限购码批次*：</label></div>
<div class="col-md-1">
<input id="batchNo" value="{{batchNo}}" type="text" class="form-control" style="width:280px;" placeholder="限购码批次" required>
<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="batchNo" placeholder="限购码批次" class="form-control" required maxlength="30" value="{{batchNo}}">
</div>
</div>
<div class="row mt20">
<div class="col-md-1 height40"><label>发售日期*：</label></div>
<div class="col-md-1">
<input id="saleTime" data-time="{{saleTime}}" value="" type="text" class="form-control" style="width:280px;" placeholder="发售日期" readonly required>
<div class="form-group">
<label class="col-sm-2 control-label">发售日期<span class="red">*</span>：</label>
<div class="col-sm-4">
<input id="saleTime" data-time="{{saleTime}}" value="" type="text" class="form-control" placeholder="发售日期" readonly required>
</div>
</div>
</div>
... ... @@ -52,23 +52,22 @@
<div class="panel-heading">
<h4>限购商品排序</h4>
</div>
<div class="panel-collapse collapse in">
<div class="panel-body">
<div class="row">
<div class="col-md-2">
<label>是否热门：</label>
<label class="radio-inline"><input type="radio" name="hotFlag" value="1">是</label>
<input type="hidden" value="{{hotFlag}}" id="hotFlag" for="radio">
</div>
<div class="col-md-3 height60">
<label>热门发售排序：</label>
<label><input id="orderBy" value="{{orderBy}}" type="text" class="form-control" placeholder=""></label>
<p>（提示：数字越大越靠前）</p>
</div>
<div class="col-md-3">
<label>未发售排序：</label>
<label><input id="notSaleOrderBy" value="{{notSaleOrderBy}}" type="text" class="form-control" placeholder=""></label>
</div>
<div class="panel-body">
<div class="row">
<div class="col-md-3">
<label>是否热门：</label>
<label class="radio-inline"><input type="radio" name="hotFlag" value="1">是</label>
<label class="radio-inline"><input type="radio" name="hotFlag" value="0">否</label>
<input type="hidden" value="{{hotFlag}}" id="hotFlag" for="radio">
</div>
<div class="col-md-3 height60">
<label>热门发售排序：</label>
<label><input id="orderBy" value="{{orderBy}}" type="text" class="form-control" placeholder=""></label>
<p>（提示：数字越大越靠前）</p>
</div>
<div class="col-md-3">
<label>未发售排序：</label>
<label><input id="notSaleOrderBy" value="{{notSaleOrderBy}}" type="text" class="form-control" placeholder=""></label>
</div>
</div>
</div>
... ... @@ -79,60 +78,58 @@
<div class="panel-heading">
<h4>限量详情内容</h4>
</div>
<div class="panel-collapse collapse in">
<div class="panel-body">
<div class="row mb20">
<h6><label>封面图*：</label></h6>
<div class="col-md-1" id="coverImgBox">
{{# attachment}}
{{#if isDefault}}
<input type="file" name="coverImg" id="coverImg" value="{{attachUrl}}" placeholder="封面图" required/>
<div class="panel-body">
<div class="row mb20">
<label class="col-sm-2 control-label">封面图<span class="red">*</span>：</label>
<div class="col-md-1" id="coverImgBox">
{{# attachment}}
{{#if isDefault}}
<input type="file" name="coverImg" id="coverImg" value="{{attachUrl}}" placeholder="封面图" required/>
{{/if}}
{{/ attachment}}
{{/if}}
{{/ attachment}}
{{^ attachment}}
<input type="file" name="coverImg" id="coverImg" placeholder="封面图" required/>
{{/ attachment}}
{{^ attachment}}
<input type="file" name="coverImg" id="coverImg" placeholder="封面图" required/>
{{/ attachment}}
</div>
</div>
<div class="row mb20">
<div id="editor" class="col-md-12" value="{{#attachment}}{{attachType}}{{/attachment}}">
<!-- <div class="quota-text"></div>
<div class="quota-img"></div>
<div class="quota-video"></div> -->
{{# attachment}}
{{#if attachUrl}}
{{#unless isDefault}}
<div class="quota-content quota-img" data-type="1"><img src="{{attachUrl}}" alt=""><a href="javascript:;" class="editor-delete btn btn-default">删除</a></div>
{{/unless}}
{{/if}}
</div>
<div class="row mb20">
<div id="editor" class="col-md-12" value="{{#attachment}}{{attachType}}{{/attachment}}">
<!-- <div class="quota-text"></div>
<div class="quota-img"></div>
<div class="quota-video"></div> -->
{{# attachment}}
{{#if attachUrl}}
{{#unless isDefault}}
<div class="quota-content quota-img" data-type="1"><img src="{{attachUrl}}" alt=""><a href="javascript:;" class="editor-delete btn btn-default">删除</a></div>
{{/unless}}
{{/if}}
{{#if intro}}
<div class="quota-content quota-text" data-type="3"><span>{{intro}}</span><a href="javascript:;" class="editor-delete btn btn-default">删除</a></div>
{{/if}}
{{/ attachment}}
</div>
{{#if intro}}
<div class="quota-content quota-text" data-type="3"><span>{{intro}}</span><a href="javascript:;" class="editor-delete btn btn-default">删除</a></div>
{{/if}}
{{/ attachment}}
</div>
</div>
<div class="row">
<div class="col-md-12">
<button class="btn btn-primary mr5" id="textDialog">文本</button>
<button class="btn btn-primary mr5" id="picDialog">图片</button>
<button class="btn btn-primary mr5" id="videoDialog">视频</button>
</div>
</div>
<!-- <div class="row mb20" style="width: 800px;">
<h6><label>限量详情页内容：</label></h6>
<div id="editor-container" class="editor-container" style="height:200px"></div>
</div> -->
<div class="mt20">
<input id="limit-add-btn" class="btn btn-primary limit-add-btn" type="button" value="保存"></input>
<div class="row">
<div class="col-md-12">
<button class="btn btn-primary mr5" id="textDialog">文本</button>
<button class="btn btn-primary mr5" id="picDialog">图片</button>
<button class="btn btn-primary mr5" id="videoDialog">视频</button>
</div>
</div>
<!-- <div class="row mb20" style="width: 800px;">
<h6><label>限量详情页内容：</label></h6>
<div id="editor-container" class="editor-container" style="height:200px"></div>
</div> -->
<div class="mt20">
<input id="limit-add-btn" class="btn btn-primary limit-add-btn" type="button" value="保存"></input>
</div>
</div>
</div>
</div>
... ...
... ... @@ -22,49 +22,21 @@
</div>
<div class="panel-body">
<div class="row">
<div class="col-md-2">
<label class="control-label pull-left">名称：</label>
<div class="label-leading pull-left">
<input id="product-name" class="form-control" type="text"/>
</div>
</div>
<div class="col-md-2">
<label class="control-label pull-left">SKN：</label>
<div class="label-leading pull-left">
<input id="skn" class="form-control" type="text"/>
</div>
</div>
</div>
<div class="row" style="margin:10px 0;">
<div class="col-md-2">
<label class="control-label pull-left">热门：</label>
<div class="label-leading pull-left">
<label class="radio-inline"><input type="radio" name="hotFlag" value="1">是</label>
<label class="radio-inline"><input type="radio" name="hotFlag" value="0">否</label>
<input type="hidden" id="hotFlag" value="">
</div>
<div class="panel-col2">
<input id="product-name" class="form-control panel-input" type="text" placeholder="请输入名称">
</div>
<div class="col-md-2">
<label class="control-label pull-left">是否发售：</label>
<div class="label-leading pull-left">
<label class="radio-inline"><input type="radio" name="saleFlag" value="1">是</label>
<label class="radio-inline"><input type="radio" name="saleFlag" value="0">否</label>
</div>
<div class="panel-col2">
<input id="skn" class="form-control panel-input" type="text" placeholder="请输入SKN">
</div>
<div class="col-md-2">
<div class="panel-col2">
<label class="control-label pull-left">是否开启：</label>
<div class="label-leading pull-left">
<label class="radio-inline"><input type="radio" name="showFlag" value="1">是</label>
<label class="radio-inline"><input type="radio" name="showFlag" value="0">否</label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 mt20">
<button id="filter-btn" class="btn btn-primary pull-left mr20">筛选</button>
<a class="btn btn-primary pull-left mr20" href="">全部</a>
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
</div>
</div>
</div>
... ...
... ... @@ -27,6 +27,7 @@
<div class="panel-heading">
<a href="{{createUrl}}" class="btn btn-success"><i class="fa fa-plus"></i> 添加</a>
</div>
{{# filter}}
<div class="panel-body">
<div class="row">
<div class="panel-col2">
... ... @@ -49,9 +50,10 @@
</select>
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="javascript:;" class="btn btn-info">全部</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
</div>
</div>
{{/ filter}}
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab">
... ...
<div class="contentpanel">
<form id="basicForm" role="{{type}}" class="form-horizontal form-bordered" method="get" action="{{action}}">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">活动创建</h4>
</div>
<div class="panel-body">
<div class="row">
<div class="form-group">
<label for="title" class="col-sm-2 control-label">促销活动名称<i class="red">*</i></label>
<div class="col-sm-8">
<input type="text" id="title" placeholder="支持中英文、数字，建议20个字以内" class="form-control" required maxlength="15" value="{{name}}">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">店铺类型</label>
<div class="col-sm-3">
<select id="type1" class="form-control">
<option value="1">vip累计金额翻倍</option>
</select>
</div>
<input type="hidden" id="type" value="1" required>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">倍数设置</label>
<div class="col-sm-3">
<select id="num1" class="form-control">
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
</select>
</div>
<input type="hidden" id="num" value="1" required>
</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:start:limitDateFrom" id="endTime" placeholder="活动结束时间" value="" readonly required>
</div>
<div class="col-sm-3">
<input type="text" class="form-control" jsaction="time:end:limitDateTo" id="startTime" placeholder="活动开始时间" value="" readonly required>
</div>
<!-- readonly require-->
</div>
</div>
</div>
<div class="panel-footer">
<div class="row">
<div class="col-sm-8 col-sm-offset-2">
<a href="javascript:;" onclick="history.go(-1);" class="btn btn-default">取消</a>
<button id="save_brand" type="submit" data-loading-text="保存中..." class="btn btn-primary">保存</button>
</div>
</div>
</div>
</div>
</form>
</div>
... ...