fe / yoho-activity-platform · Commits

Go to a project

Authored by 李奇
Commit 75f14041eeefada181e613c0db1ed356f51727c8 1 parent f392786f

提交

Inline Side-by-side
Showing 7 changed files with 94 additions and 47 deletions
... ... @@ -177,6 +177,7 @@ const activity = {
const endTime = req.body.endTime;
const repeat_limit = req.body.repeatLimit;
const vote_limit = req.body.voteLimit;
const type = req.body.type || 0;
if (!title || !startTime || !endTime) {
return res.json({
... ... @@ -190,7 +191,8 @@ const activity = {
startTime,
endTime,
repeat_limit,
vote_limit
vote_limit,
type
};
req.ctx(ActivityModel).createActivity(params)
... ...
... ... @@ -12,6 +12,13 @@ const whSurfController = {
module: 'admin',
page: 'wheel-surf'
});
},
create(req, res) {
res.json({})
},
list(req, res) {
}
};
... ...
/* eslint-disable array-callback-return */
const { ActWheelSurfConf, ActWheelSurfPrize } = require('../../../db');
const { ActWheelSurfConf, ActWheelSurfPrize, Activity } = require('../../../db');
class ActWheelSurfModel extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
list() {
return Activity.findAll({where: {type: 1}})
}
create() {
}
}
module.exports = ActWheelSurfModel;
... ...
... ... @@ -94,5 +94,7 @@ router.get('/api/user/exportInfoUserList', user.exportInfoUserList);
// 大转盘活动管理
router.get('/wheelSurf', wheelSurf.entry);
router.get('/wheelSurf/*', wheelSurf.entry);
router.post('/wheelSurf/api/create', wheelSurf.create);
router.get('/wheelSurf/api/list', wheelSurf.list);
module.exports = router;
... ...
... ... @@ -142,7 +142,8 @@ module.exports = (env) => {
new webpack.ProvidePlugin({
$: 'jquery',
jQuery: 'jquery',
'window.jQuery': 'jquery'
'window.jQuery': 'jquery',
moment: 'moment'
}),
// new (require('webpack-bundle-analyzer').BundleAnalyzerPlugin)
]
... ...
/* eslint new-cap: "off" */
const options = require('../model-opts');
module.exports = function(Sequelize, DataTypes) {
const Activity = Sequelize.define('Activity', {
id: {
type: DataTypes.INTEGER(8),
allowNull: false,
primaryKey: true,
autoIncrement: true
},
title: {
type: DataTypes.STRING(100),
allowNull: false
},
start_time: {
type: DataTypes.INTEGER(10)
},
end_time: {
type: DataTypes.INTEGER(10)
},
create_time: {
type: DataTypes.DATE,
defaultValue: Sequelize.NOW
},
vote_limit: {
type: DataTypes.INTEGER(11)
},
type: {
type: DataTypes.INTEGER(2)
}
}, Object.assign(options, {tableName: 'activity'}));
return Activity;
};
... ...
... ... @@ -4,52 +4,23 @@
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2>大转盘活动</h2>
<h2>大转盘活动创建</h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
<br>
<form id="demo-form2" data-parsley-validate="" class="form-horizontal form-label-left" novalidate="">
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name">活动名称 <span
class="required">*</span>
</label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" id="first-name" required="required" class="form-control col-md-7 col-xs-12">
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name">活动时间 <span
class="required">*</span>
</label>
<div class="col-md-6 col-sm-6 col-xs-12">
<div class="input-prepend input-group">
<span class="add-on input-group-addon"><i
class="glyphicon glyphicon-calendar fa fa-calendar"></i></span>
<input type="text" name="activityTime" id="activityTime"
class="form-control col-md-7 col-xs-12"
placeholder="开始时间 - 结束时间"/>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12">Date Of Birth <span class="required">*</span>
</label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input id="birthday" class="date-picker form-control col-md-7 col-xs-12" required="required" type="text">
</div>
</div>
<div class="ln_solid"></div>
<div class="form-group">
<div class="col-md-6 col-sm-6 col-xs-12 col-md-offset-3">
<button class="btn btn-primary" type="button">取消</button>
<button class="btn btn-primary" type="reset">重置</button>
<button type="button" class="btn btn-success">创建活动</button>
<Button type="error" ghost>Error</Button>
</div>
</div>
</form>
<Form :label-width="80">
<FormItem label="活动名称">
<Input v-model="title" placeholder="活动名称" style="width: 400px"></Input>
</FormItem>
<FormItem label="活动时间">
<DatePicker type="datetimerange" placeholder="开始时间-结束时间"
style="width: 400px" @on-change="dateTimeChange"></DatePicker>
</FormItem>
<FormItem>
<Button type="primary" @click="save">保存</Button>
<Button style="margin-left: 8px">取消</Button>
</FormItem>
</Form>
</div>
</div>
</div>
... ... @@ -60,8 +31,32 @@
export default {
data() {
return {
test: 1
title: '',
startTime: '',
endTime: ''
};
},
methods: {
dateTimeChange(range) {
this.startTime = range[0];
this.endTime = range[1];
},
save() {
$.ajax({
method: 'post',
url: '/admin/wheelSurf/api/create',
data: {
title: this.title,
type: 1,
startTime: moment(this.startTime).format('X'),
endTime: moment(this.endTime).format('X')
}
}).then(res => {
console.log(res)
this.$router.push({name: 'decor', query: {actId: 1}})
});
}
}
}
</script>
... ...