cxc/yshopb2c-qd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/shop/userlevel/form.vue
View File

@ -1,34 +1,34 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="600px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
<el-form-item label="等级名称" >
<el-input v-model="form.name" style="width: 370px;"/>
<el-form-item label="等级名称">
<el-input v-model="form.name" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否永久" >
<el-form-item label="是否永久">
<el-radio v-model="form.isForever" :label="1">是</el-radio>
<el-radio v-model="form.isForever" :label="0" style="width: 200px;">否</el-radio>
</el-form-item>
<el-form-item label="有效时间(天)" >
<el-input v-model="form.validDate" style="width: 370px;"/>
<el-form-item label="有效时间(天)">
<el-input v-model="form.validDate" style="width: 370px;" />
</el-form-item>
<el-form-item label="会员等级" >
<el-input v-model="form.grade" style="width: 370px;"/>
<el-form-item label="会员等级">
<el-input v-model="form.grade" style="width: 370px;" />
</el-form-item>
<el-form-item label="享受折扣" >
<el-input v-model="form.discount" style="width: 370px;"/>
<el-form-item label="享受折扣">
<el-input v-model="form.discount" style="width: 370px;" />
</el-form-item>
<el-form-item label="会员背景" >
<pic-upload v-model="form.image"/>
<el-form-item label="会员背景">
<pic-upload v-model="form.image" />
</el-form-item>
<el-form-item label="会员图标" >
<pic-upload v-model="form.icon"/>
<el-form-item label="会员图标">
<pic-upload v-model="form.icon" />
</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-input v-model="form.explain" rows="3" type="textarea"/>
<el-form-item label="说明">
<el-input v-model="form.explain" rows="3" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

41
src/views/shop/userlevel/index.vue
View File

@ -5,54 +5,56 @@
<!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-permission="['ADMIN','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_CREATE']"
v-permission="['admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_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="id" label="id" />
<el-table-column prop="icon" label="等级图标">
<template slot-scope="scope">
<a :href="scope.row.icon" style="color: #42b983" target="_blank"><img :src="scope.row.icon" alt="点击打开" class="el-avatar"></a>
</template>
</el-table-column>
<el-table-column prop="name" label="等级名称"/>
<el-table-column prop="grade" label="会员等级"/>
<el-table-column prop="discount" label="享受折扣"/>
<el-table-column prop="validDate" label="有效时间"/>
<el-table-column prop="name" label="等级名称" />
<el-table-column prop="grade" label="会员等级" />
<el-table-column prop="discount" label="享受折扣" />
<el-table-column prop="validDate" label="有效时间" />
<el-table-column prop="isForever" label="是否永久">
<template slot-scope="scope">
<el-tag v-if="scope.row.isForever === 1" style="cursor: pointer" :type="''">是</el-tag>
<el-tag style="cursor: pointer" v-else :type=" 'info' ">否</el-tag>
<el-tag v-if="scope.row.isForever === 1" style="cursor: pointer" :type="''">是</el-tag>
<el-tag v-else style="cursor: pointer" :type=" 'info' ">否</el-tag>
</template>
</el-table-column>
<el-table-column prop="isShow" label="是否显示">
<template slot-scope="scope">
<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>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['ADMIN','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_EDIT','YXSYSTEMUSERLEVEL_DELETE'])" label="操作" width="150px" align="center">
<el-table-column v-if="checkPermission(['admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_EDIT','YXSYSTEMUSERLEVEL_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
<el-button v-permission="['admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
<el-popover
v-permission="['ADMIN','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_DELETE']"
:ref="scope.row.id"
v-permission="['admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_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>
@ -64,13 +66,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/yxSystemUserLevel'
import eForm from './form'
export default {
@ -78,7 +81,7 @@ export default {
mixins: [initData],
data() {
return {
delLoading: false,
delLoading: false
}
},
created() {