fe / yoho-activity-platform · Commits

Go to a project

Authored by huangyi
Commit 249e2c92527d50669f4ae5e47e149f6399c9fca2 2 parents bf6b07c7 aa7d9b47

Merge branch 'feature/wheel-surf' of http://git.yoho.cn/fe/yoho-activity-platfor… 

…m into feature/wheel-surf
Inline Side-by-side
Showing 6 changed files with 228 additions and 35 deletions
... ... @@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS act_wheel_surf_prize (
`id` INT(8) NOT NULL PRIMARY KEY AUTO_INCREMENT,
`act_id` INT(8) NOT NULL DEFAULT 0,
`name` VARCHAR(50) COMMENT '奖品名称',
`type` INT(2) DEFAULT 0 COMMENT '奖品类型: 0、空奖 2、红包 3、优惠券',
`type` INT(2) DEFAULT 0 COMMENT '奖品类型: 1、空奖 2、红包 3、优惠券',
`value` VARCHAR(200) DEFAULT '' COMMENT '奖品口令或面值等',
`img` VARCHAR(300) COMMENT '奖品图片',
`total` INT(8) DEFAULT 0 COMMENT '奖品总数',
... ...
... ... @@ -157,4 +157,59 @@ var CURRENT_URL = window.location.href.split('#')[0].split('?')[0],
location.href = '/admin/login';
})
});
window.qn_dynamic_el_upload = function ($el) {
if (!$($el).length) {
return;
}
const imgArr = ['image/jpeg', 'image/jpg', 'image/png'];
// why? reference: https://github.com/qiniu/js-sdk/issues/266
Promise.all([
require('mOxie/bin/js/moxie'),
require('plupload/js/plupload.dev'),
require('qiniu-js')
]).then(([moxie, plupload]) => {
window.moxie = moxie;
window.plupload = plupload;
Qiniu.uploader({ // eslint-disable-line
runtimes: 'html5,flash,html4',
browse_button: $el,
uptoken_url: '/api/getToken?type=yohoCdn',
unique_names: true,
multi_selection: false,
filters: {
mime_types: [{
extensions: 'jpg,jpeg,png,mp4'
}]
},
dragdrop: false,
domain: 'https://cdn.yoho.cn/',
max_file_size: '10mb',
max_retries: 3,
chunk_size: '10mb',
auto_start: true,
init: {
BeforeUpload: function(up) {
window.checkup = up;
},
UploadProgress: function() {
console.log('上传中...');
},
FileUploaded: function(up, file, info) {
var domain = up.getOption('domain');
var res = JSON.parse(info.response);
var url = domain + res.key;
console.log(url)
},
Error: function(up, err, errTip) {
console.log(err, errTip);
}
}
});
});
}
})();
... ...
<template>
<div class="prize-add">
<div class="demo-split">
<Split v-model="split">
<div slot="left" class="split-pane">
<Form ref="formValidate" :model="formValidate" :label-width="120">
<FormItem label="奖品名称" prop="name">
<Input v-model="formValidate.name" placeholder="奖品名称"></Input>
</FormItem>
<FormItem label="奖品类型" prop="name">
<Select>
<Option value="1">谢谢惠顾</Option>
<Option value="2">红包</Option>
<Option value="3">优惠券</Option>
</Select>
</FormItem>
<FormItem label="奖品值" prop="name">
<Input v-model="formValidate.value" placeholder="口令或面值等"></Input>
</FormItem>
<FormItem label="奖品总数" prop="total">
<Input v-model="formValidate.total" placeholder="奖品总数"></Input>
</FormItem>
<FormItem label="中奖概率" prop="total">
<Input v-model="formValidate.total" placeholder="中奖概率"></Input>
</FormItem>
<FormItem label="奖品图片" prop="name">
<span ref="prizeImg">+添加奖品图片</span>
</FormItem>
<FormItem label="中奖背景图" prop="name">
<span ref="gotPrizeBg">+添加中奖背景图</span>
</FormItem>
</Form>
<div class="add-btn"><Button type="primary">添加</Button></div>
</div>
<div slot="right" class="split-pane right">
<Table :columns="columns1" :data="data1"></Table>
<div class="save">
<Button type="error" class="save-all">保存所有商品</Button>
</div>
</div>
</Split>
</div>
</div>
</template>
<script>
// # 大转盘活动奖品表
// CREATE TABLE IF NOT EXISTS act_wheel_surf_prize (
// `id` INT(8) NOT NULL PRIMARY KEY AUTO_INCREMENT,
// `act_id` INT(8) NOT NULL DEFAULT 0,
// `name` VARCHAR(50) COMMENT '奖品名称',
// `type` INT(2) DEFAULT 0 COMMENT '奖品类型: 0、空奖 2、红包 3、优惠券',
// `value` VARCHAR(200) DEFAULT '' COMMENT '奖品口令或面值等',
// `img` VARCHAR(300) COMMENT '奖品图片',
// `total` INT(8) DEFAULT 0 COMMENT '奖品总数',
// `total_left` INT(8) DEFAULT 0 COMMENT '奖品总数',
// `chance` FLOAT COMMENT '中奖概率',
// `prize_bg` VARCHAR(300) COMMENT '中奖背景图',
// `prize_idx` INT(2) NOT NULL COMMENT '圆盘上奖品位置序号',
// `create_time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
// ) DEFAULT CHARSET=utf8;
// GO;
export default {
name: 'PrizeItem',
data () {
return {
split: 0.5,
columns1: [
{
title: '奖品名称',
key: 'name'
},
{
title: '奖品类型',
key: 'age'
},
{
title: '奖品值',
key: 'address'
},
{
title: '奖品总数',
key: 'address'
},
{
title: '奖品图片',
key: 'address'
},
{
title: '中奖背景图',
key: 'address'
}
],
data1: [
{
name: 'John Brown',
age: 18,
address: 'New York No. 1 Lake Park',
total: 'New York No. 1 Lake Park',
img: 'New York No. 1 Lake Park',
got_img: '2016-10-03'
},
{
name: 'John Brown',
age: 18,
address: 'New York No. 1 Lake Park',
total: 'New York No. 1 Lake Park',
img: 'New York No. 1 Lake Park',
got_img: '2016-10-03'
}
],
formValidate: {
name: '',
mail: '',
city: '',
gender: '',
interest: [],
date: '',
time: '',
desc: ''
}
}
},
methods: {
},
mounted() {
window.qn_dynamic_el_upload(this.$refs.prizeImg);
window.qn_dynamic_el_upload(this.$refs.gotPrizeBg);
}
}
</script>
<style lang="scss">
.split-pane {
padding: 10px;
&.right {
padding-left: 20px;
}
}
.add-btn {
text-align: center;
margin: 0 auto;
}
.save {
text-align: center;
padding-top: 20px;
}
</style>
... ...
... ... @@ -40,10 +40,14 @@
</FormItem>
</Form>
</TabPane>
<TabPane label="奖品配置">标签二的内容</TabPane>
<TabPane label="奖品配置">
<add-prize v-for="item in prizes" :key="item"></add-prize>
</TabPane>
</Tabs>
</template>
<script>
import AddPrize from './components/add-prize';
export default {
data () {
return {
... ... @@ -58,34 +62,9 @@
desc: ''
},
ruleValidate: {
name: [
{ required: true, message: 'The name cannot be empty', trigger: 'blur' }
],
mail: [
{ required: true, message: 'Mailbox cannot be empty', trigger: 'blur' },
{ type: 'email', message: 'Incorrect email format', trigger: 'blur' }
],
city: [
{ required: true, message: 'Please select the city', trigger: 'change' }
],
gender: [
{ required: true, message: 'Please select gender', trigger: 'change' }
],
interest: [
{ required: true, type: 'array', min: 1, message: 'Choose at least one hobby', trigger: 'change' },
{ type: 'array', max: 2, message: 'Choose two hobbies at best', trigger: 'change' }
],
date: [
{ required: true, type: 'date', message: 'Please select the date', trigger: 'change' }
],
time: [
{ required: true, type: 'string', message: 'Please select time', trigger: 'change' }
],
desc: [
{ required: true, message: 'Please enter a personal introduction', trigger: 'blur' },
{ type: 'string', min: 20, message: 'Introduce no less than 20 words', trigger: 'blur' }
]
}
},
prizes: [1]
}
},
methods: {
... ... @@ -101,14 +80,15 @@
handleReset (name) {
this.$refs[name].resetFields();
}
},
components: {
AddPrize
},
mounted() {
}
}
</script>
<style lang="scss">
.ivu-form-item {
margin-bottom: 10px;
}
</style>
... ...
... ... @@ -18,7 +18,7 @@
</FormItem>
<FormItem>
<Button type="primary" @click="save">保存</Button>
<Button style="margin-left: 8px">取消</Button>
<Button style="margin-left: 8px" @click="cancel">取消</Button>
</FormItem>
</Form>
</div>
... ... @@ -55,7 +55,12 @@
this.$router.push({name: 'list'})
});
},
cancel() {
this.$router.push({name: 'list'});
}
},
components: {
}
}
</script>
... ...
... ... @@ -68,6 +68,7 @@
},
delete(id) {
this.$Modal.warning({
title: '删除',
content: '删除后不可恢复，确认删除？',
onOk: () => {
$.ajax({
... ...