yshop1.7发布,后台升級eladmin2.4(前端,后台权限,代码生成器等重构),修复商品分类等一些问题

This commit is contained in:
hupeng
2020-01-07 23:32:27 +08:00
parent 24753759f4
commit b6cc8046db
451 changed files with 13868 additions and 8883 deletions

View File

@ -1,84 +1,96 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '开启砍价'" width="900px">
<el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
<el-form-item label="砍价活动名称" >
<el-input v-model="form.title" style="width: 500px;"/>
<el-form-item label="砍价名称">
<el-input v-model="form.title" style="width: 500px;" />
</el-form-item>
<el-form-item label="砍价活动简介" >
<el-input v-model="form.info" style="width: 500px;" rows="5" type="textarea"/>
<el-form-item label="砍价简介">
<el-input v-model="form.info" style="width: 500px;" rows="5" type="textarea" />
</el-form-item>
<el-form-item label="砍价产品名称" >
<el-input v-model="form.storeName" style="width: 500px;" />
<el-form-item label="单位">
<el-input v-model="form.unitName" style="width: 500px;" />
</el-form-item>
<el-form-item label="单位" >
<el-input v-model="form.unitName" style="width: 500px;"/>
</el-form-item>
<el-form-item label="秒杀开始时间" >
<el-form-item label="秒杀开始时间">
<template>
<el-date-picker
v-model="form.startTimeDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</template>
</el-form-item>
<el-form-item label="秒杀结束时间" >
<el-form-item label="秒杀结束时间">
<template>
<el-date-picker
v-model="form.endTimeDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</template>
</el-form-item>
<el-form-item label="砍价产品主图片" >
<pic-upload v-model="form.image" style="width: 500px;"/>
<el-form-item label="砍价产品主图片">
<pic-upload v-model="form.image" style="width: 500px;" />
</el-form-item>
<el-form-item label="砍价产品轮播图" >
<mulpic-upload v-model="form.images" style="width: 500px;"/>
<el-form-item label="砍价产品轮播图">
<mulpic-upload v-model="form.images" style="width: 500px;" />
</el-form-item>
<el-form-item label="库存" >
<el-form-item label="库存">
<el-input-number v-model="form.stock" />
</el-form-item>
<el-form-item label="销量" >
<el-form-item label="销量">
<el-input-number v-model="form.sales" />
</el-form-item>
<el-form-item label="砍价金额" >
<!-- <el-form-item label="砍价产品名称" >-->
<!-- <el-input v-model="form.storeName" />-->
<!-- </el-form-item>-->
<el-form-item label="砍价金额">
<el-input-number v-model="form.price" />
</el-form-item>
<el-form-item label="最低购买价" >
<el-form-item label="允许砍到最低价">
<el-input-number v-model="form.minPrice" />
</el-form-item>
<el-form-item label="允许购买数量" >
<el-form-item label="限购">
<el-input-number v-model="form.num" />
</el-form-item>
<el-form-item label="单次砍最高价" >
<el-form-item label="单次砍最高价">
<el-input-number v-model="form.bargainMaxPrice" />
</el-form-item>
<el-form-item label="单次砍最低价" >
<el-form-item label="单次砍最低价">
<el-input-number v-model="form.bargainMinPrice" />
</el-form-item>
<el-form-item label="成本价" >
<el-form-item label="用户每次砍价的次数">
<el-input-number v-model="form.bargainNum" />
</el-form-item>
<el-form-item label="反多少积分">
<el-input-number v-model="form.giveIntegral" />
</el-form-item>
<el-form-item label="砍价状态">
<el-radio v-model="form.status" :label="1">到砍价时间自动开启</el-radio>
<el-radio v-model="form.status" :label="0" style="width: 110px;">到砍价时间不自动开启</el-radio>
</el-form-item>
<el-form-item label="成本价">
<el-input-number v-model="form.cost" />
</el-form-item>
<el-form-item label="排序" >
<el-form-item label="排序">
<el-input-number v-model="form.sort" />
</el-form-item>
<el-form-item label="是否包邮" >
<el-form-item label="是否推荐">
<el-radio v-model="form.isHot" :label="1">是</el-radio>
<el-radio v-model="form.isHot" :label="0" style="width: 110px;">否</el-radio>
</el-form-item>
<el-form-item label="是否包邮">
<el-radio v-model="form.isPostage" :label="1"></el-radio>
<el-radio v-model="form.isPostage" :label="0" style="width: 110px;"></el-radio>
</el-form-item>
<el-form-item label="邮费" v-if="form.isPostage ===0">
<el-form-item v-if="form.isPostage ===0" label="邮费">
<el-input-number v-model="form.postage" />
</el-form-item>
<el-form-item label="活动状态" >
<el-radio v-model="form.status" :label="1">开启</el-radio>
<el-radio v-model="form.status" :label="0" style="width: 110px;">关闭</el-radio>
</el-form-item>
<el-form-item label="砍价规则" >
<el-form-item label="砍价规则">
<editor v-model="form.rule" />
</el-form-item>
<el-form-item label="砍价详情" >
<el-form-item label="砍价详情">
<editor v-model="form.description" />
</el-form-item>
</el-form>
@ -128,7 +140,7 @@ export default {
giveIntegral: '',
info: '',
cost: '',
sort: 0,
sort: 0,
isHot: 0,
isDel: 0,
addTime: '',

View File

@ -3,26 +3,32 @@
<!--工具栏-->
<div class="head-container">
<!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-permission="['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_CREATE']"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="add"
>新增</el-button>
</div>
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<eForm ref="form" :is-add="isAdd" />
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="title" label="砍价标题"/>
<el-table-column prop="info" label="砍价简介"/>
<el-table-column prop="id" label="砍价产品ID" />
<el-table-column prop="title" label="砍价标题" />
<el-table-column prop="info" label="砍价简介" />
<el-table-column prop="image" label="砍价图片">
<template slot-scope="scope">
<a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
</template>
</el-table-column>
<el-table-column prop="price" label="砍价价格"/>
<el-table-column prop="price" label="砍价区间">
<template slot-scope="scope">
<span>{{ scope.row.bargainMinPrice }}~{{ scope.row.bargainMaxPrice }}</span>
</template>
</el-table-column>
<el-table-column prop="minPrice" label="最低价"/>
<el-table-column prop="stock" label="库存"/>
<el-table-column prop="unitName" label="单位名称" />
<el-table-column prop="stock" label="库存" />
<el-table-column prop="sales" label="销量" />
<el-table-column prop="startTime" label="开始时间">
<template slot-scope="scope">
<span>{{ formatTimeTwo(scope.row.startTime) }}</span>
@ -33,21 +39,24 @@
<span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
</template>
</el-table-column>
<el-table-column prop="look" label="浏览量"/>
<el-table-column v-if="checkPermission(['ADMIN','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT','YXSTOREBARGAIN_DELETE'])" label="操作" width="150px" align="center">
<!-- <el-table-column prop="storeName" label="砍价产品名称"/>-->
<el-table-column prop="look" label="浏览量" />
<el-table-column prop="share" label="分享量" />
<el-table-column v-if="checkPermission(['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT','YXSTOREBARGAIN_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
<el-button v-permission="['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
<el-popover
v-permission="['ADMIN','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_DELETE']"
:ref="scope.row.id"
v-permission="['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_DELETE']"
placement="top"
width="180">
width="180"
>
<p>确定删除本条数据吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
</el-popover>
</template>
</el-table-column>
@ -59,13 +68,14 @@
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
@current-change="pageChange"
/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del } from '@/api/yxStoreBargain'
import eForm from './form'
import { formatTimeTwo, parseTime } from '@/utils/index'
@ -74,7 +84,7 @@ export default {
mixins: [initData],
data() {
return {
delLoading: false,
delLoading: false
}
},
created() {

View File

@ -0,0 +1,124 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="用户ID">
<el-input v-model="form.uid" style="width: 370px;" />
</el-form-item>
<el-form-item label="砍价产品id">
<el-input v-model="form.bargainId" style="width: 370px;" />
</el-form-item>
<el-form-item label="砍价的最低价">
<el-input v-model="form.bargainPriceMin" style="width: 370px;" />
</el-form-item>
<el-form-item label="砍价金额">
<el-input v-model="form.bargainPrice" style="width: 370px;" />
</el-form-item>
<el-form-item label="砍掉的价格">
<el-input v-model="form.price" style="width: 370px;" />
</el-form-item>
<el-form-item label="状态 1参与中 2 活动结束参与失败 3活动结束参与成功">
<el-input v-model="form.status" style="width: 370px;" />
</el-form-item>
<el-form-item label="参与时间">
<el-input v-model="form.addTime" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否取消">
<el-input v-model="form.isDel" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="cancel">取消</el-button>
<el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
</div>
</el-dialog>
</template>
<script>
import { add, edit } from '@/api/yxStoreBargainUser'
export default {
props: {
isAdd: {
type: Boolean,
required: true
}
},
data() {
return {
loading: false, dialog: false,
form: {
id: '',
uid: '',
bargainId: '',
bargainPriceMin: '',
bargainPrice: '',
price: '',
status: '',
addTime: '',
isDel: ''
},
rules: {
}
}
},
methods: {
cancel() {
this.resetForm()
},
doSubmit() {
this.loading = true
if (this.isAdd) {
this.doAdd()
} else this.doEdit()
},
doAdd() {
add(this.form).then(res => {
this.resetForm()
this.$notify({
title: '添加成功',
type: 'success',
duration: 2500
})
this.loading = false
this.$parent.init()
}).catch(err => {
this.loading = false
console.log(err.response.data.message)
})
},
doEdit() {
edit(this.form).then(res => {
this.resetForm()
this.$notify({
title: '修改成功',
type: 'success',
duration: 2500
})
this.loading = false
this.$parent.init()
}).catch(err => {
this.loading = false
console.log(err.response.data.message)
})
},
resetForm() {
this.dialog = false
this.$refs['form'].resetFields()
this.form = {
id: '',
uid: '',
bargainId: '',
bargainPriceMin: '',
bargainPrice: '',
price: '',
status: '',
addTime: '',
isDel: ''
}
}
}
}
</script>
<style scoped>
</style>

View File

@ -0,0 +1,131 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-permission="['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_CREATE']"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="add"
>新增</el-button>
</div>
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd" />
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="用户参与砍价表ID" />
<el-table-column prop="uid" label="用户ID" />
<el-table-column prop="bargainId" label="砍价产品id" />
<el-table-column prop="bargainPriceMin" label="砍价的最低价" />
<el-table-column prop="bargainPrice" label="砍价金额" />
<el-table-column prop="price" label="砍掉的价格" />
<el-table-column prop="status" label="状态 1参与中 2 活动结束参与失败 3活动结束参与成功" />
<el-table-column prop="addTime" label="参与时间" />
<el-table-column prop="isDel" label="是否取消" />
<el-table-column v-if="checkPermission(['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_EDIT','YXSTOREBARGAINUSER_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
<el-popover
:ref="scope.row.id"
v-permission="['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_DELETE']"
placement="top"
width="180"
>
<p>确定删除本条数据吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
</el-popover>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<el-pagination
:total="total"
:current-page="page + 1"
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"
/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/crud'
import { del } from '@/api/yxStoreBargainUser'
import eForm from './form'
export default {
components: { eForm },
mixins: [initData],
data() {
return {
delLoading: false
}
},
created() {
this.$nextTick(() => {
this.init()
})
},
methods: {
checkPermission,
beforeInit() {
this.url = 'api/yxStoreBargainUser'
const sort = 'id,desc'
this.params = { page: this.page, size: this.size, sort: sort }
return true
},
subDelete(id) {
this.delLoading = true
del(id).then(res => {
this.delLoading = false
this.$refs[id].doClose()
this.dleChangePage()
this.init()
this.$notify({
title: '删除成功',
type: 'success',
duration: 2500
})
}).catch(err => {
this.delLoading = false
this.$refs[id].doClose()
console.log(err.response.data.message)
})
},
add() {
this.isAdd = true
this.$refs.form.dialog = true
},
edit(data) {
this.isAdd = false
const _this = this.$refs.form
_this.form = {
id: data.id,
uid: data.uid,
bargainId: data.bargainId,
bargainPriceMin: data.bargainPriceMin,
bargainPrice: data.bargainPrice,
price: data.price,
status: data.status,
addTime: data.addTime,
isDel: data.isDel
}
_this.dialog = true
}
}
}
</script>
<style scoped>
</style>

View File

@ -1,73 +1,73 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '开启拼团'" width="900px">
<el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
<el-form-item label="拼团名称" >
<el-input v-model="form.title" style="width: 500px;"/>
<el-form-item label="拼团名称">
<el-input v-model="form.title" style="width: 500px;" />
</el-form-item>
<el-form-item label="拼团简介" >
<el-input v-model="form.info" style="width: 500px;"/>
<el-form-item label="拼团简介">
<el-input v-model="form.info" style="width: 500px;" />
</el-form-item>
<el-form-item label="单位" >
<el-input v-model="form.unitName" style="width: 500px;"/>
<el-form-item label="单位">
<el-input v-model="form.unitName" style="width: 500px;" />
</el-form-item>
<el-form-item label="拼团开始时间" >
<el-form-item label="拼团开始时间">
<template>
<el-date-picker
v-model="form.startTimeDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</template>
</el-form-item>
<el-form-item label="拼团结束时间" >
<el-form-item label="拼团结束时间">
<template>
<el-date-picker
v-model="form.endTimeDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</template>
</el-form-item>
<el-form-item label="产品主图片" >
<pic-upload v-model="form.image" style="width: 500px;"/>
<el-form-item label="产品主图片">
<pic-upload v-model="form.image" style="width: 500px;" />
</el-form-item>
<el-form-item label="产品轮播图" >
<mulpic-upload v-model="form.images" style="width: 500px;"/>
<el-form-item label="产品轮播图">
<mulpic-upload v-model="form.images" style="width: 500px;" />
</el-form-item>
<el-form-item label="拼团时效(单位小时)" >
<el-input v-model="form.effectiveTime" style="width: 500px;"/>
<el-form-item label="拼团时效(单位小时)">
<el-input v-model="form.effectiveTime" style="width: 500px;" />
</el-form-item>
<el-form-item label="拼团价" >
<el-input v-model="form.price"/>
<el-form-item label="拼团价">
<el-input v-model="form.price" />
</el-form-item>
<el-form-item label="拼团人数" >
<el-input v-model="form.people"/>
<el-form-item label="拼团人数">
<el-input v-model="form.people" />
</el-form-item>
<el-form-item label="库存" >
<el-form-item label="库存">
<el-input v-model="form.stock" />
</el-form-item>
<el-form-item label="销量" >
<el-form-item label="销量">
<el-input v-model="form.sales" />
</el-form-item>
<el-form-item label="排序" >
<el-input v-model="form.sort"/>
<el-form-item label="排序">
<el-input v-model="form.sort" />
</el-form-item>
<el-form-item label="邮费" >
<el-input v-model="form.postage"/>
<el-form-item label="邮费">
<el-input v-model="form.postage" />
</el-form-item>
<el-form-item label="是否包邮" >
<el-form-item label="是否包邮">
<el-radio v-model="form.isPostage" :label="1">是</el-radio>
<el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
</el-form-item>
<el-form-item label="热门推荐" >
<el-form-item label="热门推荐">
<el-radio v-model="form.isHost" :label="1">是</el-radio>
<el-radio v-model="form.isHost" :label="0" style="width: 200px;">否</el-radio>
</el-form-item>
<el-form-item label="活动状态" >
<el-form-item label="活动状态">
<el-radio v-model="form.isShow" :label="1">开启</el-radio>
<el-radio v-model="form.isShow" :label="0" style="width: 200px;">关闭</el-radio>
</el-form-item>
<el-form-item label="详情" >
<el-form-item label="详情">
<editor v-model="form.description" />
</el-form-item>
</el-form>

View File

@ -3,38 +3,38 @@
<!--工具栏-->
<div class="head-container">
<!-- 搜索 -->
<el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
<el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
</el-select>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 -->
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<eForm ref="form" :is-add="isAdd" />
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="id"/>
<el-table-column prop="productId" label="商品id"/>
<el-table-column prop="id" label="id" />
<el-table-column prop="productId" label="商品id" />
<el-table-column prop="image" label="产品主图">
<template slot-scope="scope">
<a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
</template>
</el-table-column>
<el-table-column prop="title" label="拼团名称"/>
<el-table-column prop="people" label="参团人数"/>
<el-table-column prop="price" label="拼团价"/>
<el-table-column prop="cost" label="原价"/>
<el-table-column prop="stock" label="库存"/>
<el-table-column prop="browse" label="浏览量"/>
<el-table-column prop="countPeopleAll" label="参与人数"/>
<el-table-column prop="countPeoplePink" label="成团数量"/>
<el-table-column prop="countPeopleBrowse" label="访客人数"/>
<el-table-column prop="title" label="拼团名称" />
<el-table-column prop="people" label="参团人数" />
<el-table-column prop="price" label="拼团价" />
<el-table-column prop="cost" label="原价" />
<el-table-column prop="stock" label="库存" />
<el-table-column prop="browse" label="浏览量" />
<el-table-column prop="countPeopleAll" label="参与人数" />
<el-table-column prop="countPeoplePink" label="成团数量" />
<el-table-column prop="countPeopleBrowse" label="访客人数" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div @click="onSale(scope.row.id,scope.row.isShow)">
<el-tag v-if="scope.row.isShow === 1" style="cursor: pointer" :type="''">已开启</el-tag>
<el-tag style="cursor: pointer" v-else :type=" 'info' ">已关闭</el-tag>
<el-tag v-else style="cursor: pointer" :type=" 'info' ">已关闭</el-tag>
</div>
</template>
</el-table-column>
@ -43,20 +43,21 @@
<span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['ADMIN','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT','YXSTORECOMBINATION_DELETE'])" label="操作" width="150px" align="center">
<el-table-column v-if="checkPermission(['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT','YXSTORECOMBINATION_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
<el-button v-permission="['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
<el-popover
v-permission="['ADMIN','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_DELETE']"
:ref="scope.row.id"
v-permission="['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_DELETE']"
placement="top"
width="180">
width="180"
>
<p>确定删除本条数据吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
</el-popover>
</template>
</el-table-column>
@ -68,13 +69,14 @@
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
@current-change="pageChange"
/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del, onsale } from '@/api/yxStoreCombination'
import eForm from './form'
import { formatTimeTwo, parseTime } from '@/utils/index'

View File

@ -1,50 +1,50 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="用户id" >
<el-input v-model="form.uid" style="width: 370px;"/>
<el-form-item label="用户id">
<el-input v-model="form.uid" style="width: 370px;" />
</el-form-item>
<el-form-item label="订单id 生成" >
<el-input v-model="form.orderId" style="width: 370px;"/>
<el-form-item label="订单id 生成">
<el-input v-model="form.orderId" style="width: 370px;" />
</el-form-item>
<el-form-item label="订单id 数据库" >
<el-input v-model="form.orderIdKey" style="width: 370px;"/>
<el-form-item label="订单id 数据库">
<el-input v-model="form.orderIdKey" style="width: 370px;" />
</el-form-item>
<el-form-item label="购买商品个数" >
<el-input v-model="form.totalNum" style="width: 370px;"/>
<el-form-item label="购买商品个数">
<el-input v-model="form.totalNum" style="width: 370px;" />
</el-form-item>
<el-form-item label="购买总金额" >
<el-input v-model="form.totalPrice" style="width: 370px;"/>
<el-form-item label="购买总金额">
<el-input v-model="form.totalPrice" style="width: 370px;" />
</el-form-item>
<el-form-item label="拼团产品id" >
<el-input v-model="form.cid" style="width: 370px;"/>
<el-form-item label="拼团产品id">
<el-input v-model="form.cid" style="width: 370px;" />
</el-form-item>
<el-form-item label="产品id" >
<el-input v-model="form.pid" style="width: 370px;"/>
<el-form-item label="产品id">
<el-input v-model="form.pid" style="width: 370px;" />
</el-form-item>
<el-form-item label="拼图总人数" >
<el-input v-model="form.people" style="width: 370px;"/>
<el-form-item label="拼图总人数">
<el-input v-model="form.people" style="width: 370px;" />
</el-form-item>
<el-form-item label="拼团产品单价" >
<el-input v-model="form.price" style="width: 370px;"/>
<el-form-item label="拼团产品单价">
<el-input v-model="form.price" style="width: 370px;" />
</el-form-item>
<el-form-item label="开始时间" >
<el-input v-model="form.addTime" style="width: 370px;"/>
<el-form-item label="开始时间">
<el-input v-model="form.addTime" style="width: 370px;" />
</el-form-item>
<el-form-item label="stopTime" >
<el-input v-model="form.stopTime" style="width: 370px;"/>
<el-form-item label="stopTime">
<el-input v-model="form.stopTime" style="width: 370px;" />
</el-form-item>
<el-form-item label="团长id 0为团长" >
<el-input v-model="form.kId" style="width: 370px;"/>
<el-form-item label="团长id 0为团长">
<el-input v-model="form.kId" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否发送模板消息0未发送1已发送" >
<el-input v-model="form.isTpl" style="width: 370px;"/>
<el-form-item label="是否发送模板消息0未发送1已发送">
<el-input v-model="form.isTpl" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否退款 0未退款 1已退款" >
<el-input v-model="form.isRefund" style="width: 370px;"/>
<el-form-item label="是否退款 0未退款 1已退款">
<el-input v-model="form.isRefund" style="width: 370px;" />
</el-form-item>
<el-form-item label="状态1进行中2已完成3未完成" >
<el-input v-model="form.status" style="width: 370px;"/>
<el-form-item label="状态1进行中2已完成3未完成">
<el-input v-model="form.status" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

View File

@ -5,10 +5,10 @@
<!-- 新增 -->
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<eForm ref="form" :is-add="isAdd" />
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="id"/>
<el-table-column prop="id" label="id" />
<el-table-column prop="uid" label="开团团长" width="150">
<template slot-scope="scope">
<span>{{ scope.row.nickname }}/{{ scope.row.uid }}</span>
@ -19,15 +19,15 @@
<span>{{ formatTimeTwo(scope.row.addTime) }}</span>
</template>
</el-table-column>
<el-table-column label="拼团产品">
<el-table-column label="拼团产品">
<template slot-scope="scope">
<span>{{ scope.row.title }}/{{ scope.row.cid }}</span>
</template>
</el-table-column>
<el-table-column prop="orderId" label="订单号" width="150"/>
<el-table-column prop="totalPrice" label="拼团价"/>
<el-table-column prop="people" label="几人团"/>
<el-table-column prop="countPeople" label="几人参加"/>
<el-table-column prop="orderId" label="订单号" width="150" />
<el-table-column prop="totalPrice" label="拼团价" />
<el-table-column prop="people" label="几人团" />
<el-table-column prop="countPeople" label="几人参加" />
<el-table-column label="结束时间">
<template slot-scope="scope">
<span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
@ -48,13 +48,14 @@
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
@current-change="pageChange"
/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del } from '@/api/yxStorePink'
import eForm from './form'
import { formatTimeTwo, parseTime } from '@/utils/index'
@ -63,7 +64,7 @@ export default {
mixins: [initData],
data() {
return {
delLoading: false,
delLoading: false
}
},
created() {

View File

@ -1,22 +1,22 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="130px">
<el-form-item label="优惠券名称" >
<el-input v-model="form.title" style="width: 300px;"/>
<el-form-item label="优惠券名称">
<el-input v-model="form.title" style="width: 300px;" />
</el-form-item>
<el-form-item label="优惠券面值" >
<el-input v-model="form.couponPrice" style="width: 300px;"/>
<el-form-item label="优惠券面值">
<el-input v-model="form.couponPrice" style="width: 300px;" />
</el-form-item>
<el-form-item label="优惠券最低消费" >
<el-input v-model="form.useMinPrice" style="width: 300px;"/>
<el-form-item label="优惠券最低消费">
<el-input v-model="form.useMinPrice" style="width: 300px;" />
</el-form-item>
<el-form-item label="优惠券有效期限(天)" >
<el-input v-model="form.couponTime" style="width: 300px;"/>
<el-form-item label="优惠券有效期限(天)">
<el-input v-model="form.couponTime" style="width: 300px;" />
</el-form-item>
<el-form-item label="排序" >
<el-input v-model="form.sort" style="width: 300px;"/>
<el-form-item label="排序">
<el-input v-model="form.sort" style="width: 300px;" />
</el-form-item>
<el-form-item label="状态" >
<el-form-item label="状态">
<el-radio v-model="form.status" :label="1">开启</el-radio>
<el-radio v-model="form.status" :label="0">关闭</el-radio>
</el-form-item>
@ -49,8 +49,8 @@ export default {
couponTime: 1,
sort: 0,
status: 1,
addTime: '',
//isDel: 0
addTime: ''
// isDel: 0
},
rules: {
}

View File

@ -5,24 +5,25 @@
<!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-permission="['ADMIN','YXSTORECOUPON_ALL','YXSTORECOUPON_CREATE']"
v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_CREATE']"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="add">新增</el-button>
@click="add"
>新增</el-button>
</div>
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<eIForm ref="form2" :is-add="isAdd"/>
<eForm ref="form" :is-add="isAdd" />
<eIForm ref="form2" :is-add="isAdd" />
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<!--<el-table-column prop="id" label="ID"/>-->
<el-table-column prop="title" label="优惠券名称"/>
<el-table-column prop="couponPrice" label="优惠券面值"/>
<el-table-column prop="useMinPrice" label="优惠券最低消费"/>
<el-table-column label="优惠券有效期限">
<el-table-column prop="title" label="优惠券名称" />
<el-table-column prop="couponPrice" label="优惠券面值" />
<el-table-column prop="useMinPrice" label="优惠券最低消费" />
<el-table-column label="优惠券有效期限">
<template slot-scope="scope">
<span>{{ scope.row.couponTime }}</span>
</template>
@ -41,25 +42,35 @@
<span>{{ formatTime(scope.row.addTime) }}</span>
</template>
</el-table-column>
<el-table-column width="200" v-if="checkPermission(['ADMIN','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT','YXSTORECOUPON_DELETE'])" label="操作" align="center">
<el-table-column v-if="checkPermission(['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT','YXSTORECOUPON_DELETE'])" width="200" label="操作" align="center">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT']" size="mini"
type="primary" @click="edit2(scope.row)">
<el-button
v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT']"
size="mini"
type="primary"
@click="edit2(scope.row)"
>
发布
</el-button>
<el-dropdown size="mini" split-button type="primary" trigger="click">
操作
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>
<el-button v-permission="['ADMIN','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT']" size="mini"
type="primary" icon="el-icon-edit" @click="edit(scope.row)">编辑</el-button>
<el-button
v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT']"
size="mini"
type="primary"
icon="el-icon-edit"
@click="edit(scope.row)"
>编辑</el-button>
</el-dropdown-item>
<el-dropdown-item>
<el-popover
v-permission="['ADMIN','YXSTORECOUPON_ALL','YXSTORECOUPON_DELETE']"
:ref="scope.row.id"
v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_DELETE']"
placement="top"
width="180">
width="180"
>
<p>确定删除本条数据吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
@ -80,13 +91,14 @@
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
@current-change="pageChange"
/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del } from '@/api/yxStoreCoupon'
import eForm from './form'
import eIForm from '../couponissue/form'
@ -96,7 +108,7 @@ export default {
mixins: [initData],
data() {
return {
delLoading: false,
delLoading: false
}
},
created() {
@ -110,7 +122,7 @@ export default {
beforeInit() {
this.url = 'api/yxStoreCoupon'
const sort = 'id,desc'
this.params = { page: this.page, size: this.size, sort: sort, isDel:0 }
this.params = { page: this.page, size: this.size, sort: sort, isDel: 0 }
return true
},
subDelete(id) {

View File

@ -1,38 +1,38 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '发布优惠券'" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
<el-form-item label="优惠券ID" >
<el-form-item label="优惠券ID">
<el-input v-model="form.cid" style="width: 300px;" :disabled="true" />
</el-form-item>
<el-form-item label="优惠券名称" >
<el-form-item label="优惠券名称">
<el-input v-model="form.cname" style="width: 300px;" :disabled="true" />
</el-form-item>
<el-form-item label="领取开启时间" >
<el-form-item label="领取开启时间">
<template>
<el-date-picker
v-model="form.startTimeDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</template>
</el-form-item>
<el-form-item label="券领结束时间" >
<el-form-item label="券领结束时间">
<template>
<el-date-picker
v-model="form.endTimeDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</template>
</el-form-item>
<el-form-item label="发布数量" >
<el-input v-model="form.totalCount" style="width: 300px;"/>
<el-form-item label="发布数量">
<el-input v-model="form.totalCount" style="width: 300px;" />
</el-form-item>
<el-form-item label="是否不限量" >
<el-form-item label="是否不限量">
<el-radio v-model="form.isPermanent" :label="1">不限量</el-radio>
<el-radio v-model="form.isPermanent" :label="0">限量</el-radio>
</el-form-item>
<el-form-item label="状态" >
<el-form-item label="状态">
<el-radio v-model="form.status" :label="1">开启</el-radio>
<el-radio v-model="form.status" :label="0">关闭</el-radio>
</el-form-item>

View File

@ -1,7 +1,7 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '修改状态'" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
<el-form-item label="状态" >
<el-form-item label="状态">
<el-radio v-model="form.status" :label="1">开启</el-radio>
<el-radio v-model="form.status" :label="0">关闭</el-radio>
</el-form-item>
@ -53,7 +53,7 @@ export default {
} else this.doEdit()
},
doAdd() {
//console.log(this.form)
// console.log(this.form)
add(this.form).then(res => {
this.resetForm()
this.$notify({

View File

@ -5,18 +5,18 @@
<!-- 新增 -->
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<eForm ref="form" :is-add="isAdd" />
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="id"/>
<el-table-column prop="cname" label="优惠券名称"/>
<el-table-column prop="id" label="id" />
<el-table-column prop="cname" label="优惠券名称" />
<el-table-column label="领取日期">
<template slot-scope="scope">
<p>{{ formatTimeTwo(scope.row.startTime) }}</p>
<p>{{ formatTimeTwo(scope.row.endTime) }}</p>
</template>
</el-table-column>
<el-table-column label="发布数量">
<el-table-column label="发布数量">
<template slot-scope="scope">
<p>发布:{{ scope.row.totalCount }}</p>
<o>剩余:{{ scope.row.remainCount }}</o>
@ -30,20 +30,21 @@
</div>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['ADMIN','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_EDIT','YXSTORECOUPONISSUE_DELETE'])" label="操作" width="150px" align="center">
<el-table-column v-if="checkPermission(['admin','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_EDIT','YXSTORECOUPONISSUE_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
<el-button v-permission="['admin','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
<el-popover
v-permission="['ADMIN','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_DELETE']"
:ref="scope.row.id"
v-permission="['admin','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_DELETE']"
placement="top"
width="180">
width="180"
>
<p>确定删除本条数据吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
</el-popover>
</template>
</el-table-column>
@ -55,13 +56,14 @@
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
@current-change="pageChange"
/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del } from '@/api/yxStoreCouponIssue'
import eForm from './formt'
import { formatTimeTwo } from '@/utils/index'
@ -70,7 +72,7 @@ export default {
mixins: [initData],
data() {
return {
delLoading: false,
delLoading: false
}
},
created() {

View File

@ -1,14 +1,14 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="领取优惠券用户ID" >
<el-input v-model="form.uid" style="width: 370px;"/>
<el-form-item label="领取优惠券用户ID">
<el-input v-model="form.uid" style="width: 370px;" />
</el-form-item>
<el-form-item label="优惠券前台领取ID" >
<el-input v-model="form.issueCouponId" style="width: 370px;"/>
<el-form-item label="优惠券前台领取ID">
<el-input v-model="form.issueCouponId" style="width: 370px;" />
</el-form-item>
<el-form-item label="领取时间" >
<el-input v-model="form.addTime" style="width: 370px;"/>
<el-form-item label="领取时间">
<el-input v-model="form.addTime" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

View File

@ -5,36 +5,38 @@
<!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-permission="['ADMIN','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_CREATE']"
v-permission="['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_CREATE']"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="add">新增</el-button>
@click="add"
>新增</el-button>
</div>
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<eForm ref="form" :is-add="isAdd" />
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="id"/>
<el-table-column prop="uid" label="领取优惠券用户ID"/>
<el-table-column prop="issueCouponId" label="优惠券前台领取ID"/>
<el-table-column prop="addTime" label="领取时间"/>
<el-table-column v-if="checkPermission(['ADMIN','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_EDIT','YXSTORECOUPONISSUEUSER_DELETE'])" label="操作" width="150px" align="center">
<el-table-column prop="id" label="id" />
<el-table-column prop="uid" label="领取优惠券用户ID" />
<el-table-column prop="issueCouponId" label="优惠券前台领取ID" />
<el-table-column prop="addTime" label="领取时间" />
<el-table-column v-if="checkPermission(['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_EDIT','YXSTORECOUPONISSUEUSER_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
<el-button v-permission="['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
<el-popover
v-permission="['ADMIN','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_DELETE']"
:ref="scope.row.id"
v-permission="['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_DELETE']"
placement="top"
width="180">
width="180"
>
<p>确定删除本条数据吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
</el-popover>
</template>
</el-table-column>
@ -46,13 +48,14 @@
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
@current-change="pageChange"
/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del } from '@/api/yxStoreCouponIssueUser'
import eForm from './form'
export default {
@ -60,7 +63,7 @@ export default {
mixins: [initData],
data() {
return {
delLoading: false,
delLoading: false
}
},
created() {

View File

@ -1,18 +1,18 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="姓名" >
<el-input v-model="form.realName" style="width: 370px;"/>
<el-form-item label="姓名">
<el-input v-model="form.realName" style="width: 370px;" />
</el-form-item>
<el-form-item label="提现金额" >
<el-input v-model="form.extractPrice" style="width: 370px;"/>
<el-form-item label="提现金额">
<el-input v-model="form.extractPrice" style="width: 370px;" />
</el-form-item>
<el-form-item label="审核状态" >
<el-form-item label="审核状态">
<el-radio v-model="form.status" :label="-1">无效</el-radio>
<el-radio v-model="form.status" :label="1">通过</el-radio>
</el-form-item>
<el-form-item label="无效原因" >
<el-input v-model="form.failMsg" style="width: 300px;" rows="5" type="textarea"/>
<el-form-item label="无效原因">
<el-input v-model="form.failMsg" style="width: 300px;" rows="5" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

View File

@ -3,19 +3,19 @@
<!--工具栏-->
<div class="head-container">
<!-- 搜索 -->
<el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
<el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
</el-select>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 -->
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<eForm ref="form" :is-add="isAdd" />
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="id"/>
<el-table-column prop="extractPrice" label="提现金额"/>
<el-table-column prop="id" label="id" />
<el-table-column prop="extractPrice" label="提现金额" />
<el-table-column prop="extractType" label="提现方式">
<template slot-scope="scope">
<div v-if="scope.row.extractType='weixin'">
@ -39,7 +39,7 @@
提现通过
</div>
<div v-else-if="scope.row.status==-1">
提现未通过<br/>
提现未通过<br>
未通过原因{{ scope.row.failMsg }}
<br>
未通过时间{{ formatTimeTwo(scope.row.failTime) }}
@ -49,21 +49,25 @@
</div>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['ADMIN','YXUSEREXTRACT_ALL','YXUSEREXTRACT_EDIT','YXUSEREXTRACT_DELETE'])" label="操作" width="150px" align="center">
<el-table-column v-if="checkPermission(['admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_EDIT','YXUSEREXTRACT_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXUSEREXTRACT_ALL','YXUSEREXTRACT_EDIT']" size="mini" type="primary"
@click="edit(scope.row)">操作</el-button>
<el-button
v-permission="['admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_EDIT']"
size="mini"
type="primary"
@click="edit(scope.row)"
>操作</el-button>
<!--<el-popover-->
<!--v-permission="['ADMIN','YXUSEREXTRACT_ALL','YXUSEREXTRACT_DELETE']"-->
<!--:ref="scope.row.id"-->
<!--placement="top"-->
<!--width="180">-->
<!--<p>确定删除本条数据吗</p>-->
<!--<div style="text-align: right; margin: 0">-->
<!--<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>-->
<!--<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>-->
<!--</div>-->
<!--<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>-->
<!--v-permission="['admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_DELETE']"-->
<!--:ref="scope.row.id"-->
<!--placement="top"-->
<!--width="180">-->
<!--<p>确定删除本条数据吗</p>-->
<!--<div style="text-align: right; margin: 0">-->
<!--<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>-->
<!--<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>-->
<!--</div>-->
<!--<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>-->
<!--</el-popover>-->
</template>
</el-table-column>
@ -75,13 +79,14 @@
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
@current-change="pageChange"
/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del } from '@/api/yxUserExtract'
import eForm from './form'
import { formatTimeTwo } from '@/utils/index'

View File

@ -1,72 +1,72 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '开启秒杀'" width="900px">
<el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
<el-form-item label="秒杀名称" >
<el-input v-model="form.title" style="width: 500px;"/>
<el-form-item label="秒杀名称">
<el-input v-model="form.title" style="width: 500px;" />
</el-form-item>
<el-form-item label="秒杀简介" >
<el-input v-model="form.info" style="width: 500px;"/>
<el-form-item label="秒杀简介">
<el-input v-model="form.info" style="width: 500px;" />
</el-form-item>
<el-form-item label="单位" >
<el-input v-model="form.unitName" style="width: 500px;"/>
<el-form-item label="单位">
<el-input v-model="form.unitName" style="width: 500px;" />
</el-form-item>
<el-form-item label="秒杀开始时间" >
<el-form-item label="秒杀开始时间">
<template>
<el-date-picker
v-model="form.startTimeDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</template>
</el-form-item>
<el-form-item label="秒杀结束时间" >
<el-form-item label="秒杀结束时间">
<template>
<el-date-picker
v-model="form.endTimeDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</template>
</el-form-item>
<el-form-item label="产品主图片" >
<pic-upload v-model="form.image" style="width: 500px;"/>
<el-form-item label="产品主图片">
<pic-upload v-model="form.image" style="width: 500px;" />
</el-form-item>
<el-form-item label="产品轮播图" >
<mulpic-upload v-model="form.images" style="width: 500px;"/>
<el-form-item label="产品轮播图">
<mulpic-upload v-model="form.images" style="width: 500px;" />
</el-form-item>
<el-form-item label="秒杀价" >
<el-input-number v-model="form.price"/>
<el-form-item label="秒杀价">
<el-input-number v-model="form.price" />
</el-form-item>
<el-form-item label="成本" >
<el-form-item label="成本">
<el-input-number v-model="form.cost" />
</el-form-item>
<el-form-item label="原价" >
<el-input-number v-model="form.otPrice"/>
<el-form-item label="原价">
<el-input-number v-model="form.otPrice" />
</el-form-item>
<el-form-item label="库存" >
<el-form-item label="库存">
<el-input-number v-model="form.stock" />
</el-form-item>
<el-form-item label="虚拟销量" >
<el-form-item label="虚拟销量">
<el-input-number v-model="form.sales" />
</el-form-item>
<el-form-item label="排序" >
<el-input-number v-model="form.sort"/>
<el-form-item label="排序">
<el-input-number v-model="form.sort" />
</el-form-item>
<el-form-item label="限购" >
<el-form-item label="限购">
<el-input-number v-model="form.num" />
</el-form-item>
<el-form-item label="邮费" >
<el-input-number v-model="form.postage"/>
<el-form-item label="邮费">
<el-input-number v-model="form.postage" />
</el-form-item>
<el-form-item label="是否包邮" >
<el-form-item label="是否包邮">
<el-radio v-model="form.isPostage" :label="1">是</el-radio>
<el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
</el-form-item>
<el-form-item label="活动状态" >
<el-form-item label="活动状态">
<el-radio v-model="form.status" :label="1">开启</el-radio>
<el-radio v-model="form.status" :label="0" style="width: 200px;">关闭</el-radio>
</el-form-item>
<el-form-item label="详情" >
<el-form-item label="详情">
<editor v-model="form.description" />
</el-form-item>
</el-form>

View File

@ -3,30 +3,30 @@
<!--工具栏-->
<div class="head-container">
<!-- 搜索 -->
<el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
<el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
</el-select>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 -->
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<eForm ref="form" :is-add="isAdd" />
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="id"/>
<el-table-column prop="id" label="id" />
<el-table-column prop="image" label="产品主图">
<template slot-scope="scope">
<a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
</template>
</el-table-column>
<el-table-column prop="title" label="产品标题"/>
<el-table-column prop="price" label="秒杀价"/>
<el-table-column prop="otPrice" label="原价"/>
<el-table-column prop="stock" label="库存"/>
<el-table-column prop="sales" label="销量"/>
<el-table-column prop="num" label="限购"/>
<el-table-column prop="statusStr" label="秒杀状态"/>
<el-table-column prop="title" label="产品标题" />
<el-table-column prop="price" label="秒杀价" />
<el-table-column prop="otPrice" label="原价" />
<el-table-column prop="stock" label="库存" />
<el-table-column prop="sales" label="销量" />
<el-table-column prop="num" label="限购" />
<el-table-column prop="statusStr" label="秒杀状态" />
<el-table-column prop="stopTime" label="开始时间">
<template slot-scope="scope">
<span>{{ formatTimeTwo(scope.row.startTime) }}</span>
@ -37,20 +37,21 @@
<span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['ADMIN','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT','YXSTORESECKILL_DELETE'])" label="操作" width="150px" align="center">
<el-table-column v-if="checkPermission(['admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT','YXSTORESECKILL_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
<el-button v-permission="['admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
<el-popover
v-permission="['ADMIN','YXSTORESECKILL_ALL','YXSTORESECKILL_DELETE']"
:ref="scope.row.id"
v-permission="['admin','YXSTORESECKILL_ALL','YXSTORESECKILL_DELETE']"
placement="top"
width="180">
width="180"
>
<p>确定删除本条数据吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
</el-popover>
</template>
</el-table-column>
@ -62,13 +63,14 @@
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
@current-change="pageChange"
/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del } from '@/api/yxStoreSeckill'
import eForm from './form'
import { formatTimeTwo, parseTime } from '@/utils/index'

View File

@ -1,38 +1,38 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="兑换的项目id" >
<el-input v-model="form.cid" style="width: 370px;"/>
<el-form-item label="兑换的项目id">
<el-input v-model="form.cid" style="width: 370px;" />
</el-form-item>
<el-form-item label="优惠券所属用户" >
<el-input v-model="form.uid" style="width: 370px;"/>
<el-form-item label="优惠券所属用户">
<el-input v-model="form.uid" style="width: 370px;" />
</el-form-item>
<el-form-item label="优惠券名称" >
<el-input v-model="form.couponTitle" style="width: 370px;"/>
<el-form-item label="优惠券名称">
<el-input v-model="form.couponTitle" style="width: 370px;" />
</el-form-item>
<el-form-item label="优惠券的面值" >
<el-input v-model="form.couponPrice" style="width: 370px;"/>
<el-form-item label="优惠券的面值">
<el-input v-model="form.couponPrice" style="width: 370px;" />
</el-form-item>
<el-form-item label="最低消费多少金额可用优惠券" >
<el-input v-model="form.useMinPrice" style="width: 370px;"/>
<el-form-item label="最低消费多少金额可用优惠券">
<el-input v-model="form.useMinPrice" style="width: 370px;" />
</el-form-item>
<el-form-item label="优惠券创建时间" >
<el-input v-model="form.addTime" style="width: 370px;"/>
<el-form-item label="优惠券创建时间">
<el-input v-model="form.addTime" style="width: 370px;" />
</el-form-item>
<el-form-item label="优惠券结束时间" >
<el-input v-model="form.endTime" style="width: 370px;"/>
<el-form-item label="优惠券结束时间">
<el-input v-model="form.endTime" style="width: 370px;" />
</el-form-item>
<el-form-item label="使用时间" >
<el-input v-model="form.useTime" style="width: 370px;"/>
<el-form-item label="使用时间">
<el-input v-model="form.useTime" style="width: 370px;" />
</el-form-item>
<el-form-item label="获取方式" >
<el-input v-model="form.type" style="width: 370px;"/>
<el-form-item label="获取方式">
<el-input v-model="form.type" style="width: 370px;" />
</el-form-item>
<el-form-item label="状态0未使用1已使用, 2:已过期)" >
<el-input v-model="form.status" style="width: 370px;"/>
<el-form-item label="状态0未使用1已使用, 2:已过期)">
<el-input v-model="form.status" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否有效" >
<el-input v-model="form.isFail" style="width: 370px;"/>
<el-form-item label="是否有效">
<el-input v-model="form.isFail" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

View File

@ -3,21 +3,21 @@
<!--工具栏-->
<div class="head-container">
<!-- 搜索 -->
<el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
<el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
</el-select>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 -->
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<eForm ref="form" :is-add="isAdd" />
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="couponTitle" label="优惠券名称"/>
<el-table-column prop="nickname" label="所属用户"/>
<el-table-column prop="couponPrice" label="优惠券的面值"/>
<el-table-column prop="useMinPrice" label="优惠券最低消费"/>
<el-table-column prop="couponTitle" label="优惠券名称" />
<el-table-column prop="nickname" label="所属用户" />
<el-table-column prop="couponPrice" label="优惠券的面值" />
<el-table-column prop="useMinPrice" label="优惠券最低消费" />
<el-table-column label="优惠券开始时间">
<template slot-scope="scope">
{{ formatTimeTwo(scope.row.addTime) }}
@ -30,13 +30,13 @@
</el-table-column>
<el-table-column label="获取方式">
<template slot-scope="scope">
<div>
<el-tag v-if="scope.row.type == 'get'" style="cursor: pointer" :type="''">手动领取</el-tag>
<el-tag v-else :type=" 'info' ">后台发放</el-tag>
</div>
<div>
<el-tag v-if="scope.row.type == 'get'" style="cursor: pointer" :type="''">手动领取</el-tag>
<el-tag v-else :type=" 'info' ">后台发放</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="是否可用">
<el-table-column label="是否可用">
<template slot-scope="scope">
<div>
<el-tag v-if="scope.row.status == 0 && scope.row.isFail == 0" style="cursor: pointer" :type="''">可用</el-tag>
@ -47,9 +47,9 @@
<el-table-column label="状态">
<template slot-scope="scope">
<div>
<el-tag v-if="scope.row.status == 2" >已过期</el-tag>
<el-tag v-if="scope.row.status == 1" >已使用</el-tag>
<el-tag v-else >未使用</el-tag>
<el-tag v-if="scope.row.status == 2">已过期</el-tag>
<el-tag v-if="scope.row.status == 1">已使用</el-tag>
<el-tag v-else>未使用</el-tag>
</div>
</template>
</el-table-column>
@ -61,13 +61,14 @@
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
@current-change="pageChange"
/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del } from '@/api/yxStoreCouponUser'
import eForm from './form'
import { formatTimeTwo } from '@/utils/index'