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,74 +1,74 @@
<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.unionid" style="width: 370px;"/>
<el-form-item label="只有在用户将公众号绑定到微信开放平台帐号后,才会出现该字段">
<el-input v-model="form.unionid" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户的标识,对当前公众号唯一" >
<el-input v-model="form.openid" style="width: 370px;"/>
<el-form-item label="用户的标识,对当前公众号唯一">
<el-input v-model="form.openid" style="width: 370px;" />
</el-form-item>
<el-form-item label="小程序唯一身份ID" >
<el-input v-model="form.routineOpenid" style="width: 370px;"/>
<el-form-item label="小程序唯一身份ID">
<el-input v-model="form.routineOpenid" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户的昵称" >
<el-input v-model="form.nickname" style="width: 370px;"/>
<el-form-item label="用户的昵称">
<el-input v-model="form.nickname" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户头像" >
<el-input v-model="form.headimgurl" style="width: 370px;"/>
<el-form-item label="用户头像">
<el-input v-model="form.headimgurl" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户的性别值为1时是男性值为2时是女性值为0时是未知" >
<el-input v-model="form.sex" style="width: 370px;"/>
<el-form-item label="用户的性别值为1时是男性值为2时是女性值为0时是未知">
<el-input v-model="form.sex" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户所在城市" >
<el-input v-model="form.city" style="width: 370px;"/>
<el-form-item label="用户所在城市">
<el-input v-model="form.city" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户的语言简体中文为zh_CN" >
<el-input v-model="form.language" style="width: 370px;"/>
<el-form-item label="用户的语言简体中文为zh_CN">
<el-input v-model="form.language" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户所在省份" >
<el-input v-model="form.province" style="width: 370px;"/>
<el-form-item label="用户所在省份">
<el-input v-model="form.province" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户所在国家" >
<el-input v-model="form.country" style="width: 370px;"/>
<el-form-item label="用户所在国家">
<el-input v-model="form.country" style="width: 370px;" />
</el-form-item>
<el-form-item label="公众号运营者对粉丝的备注,公众号运营者可在微信公众平台用户管理界面对粉丝添加备注" >
<el-input v-model="form.remark" style="width: 370px;"/>
<el-form-item label="公众号运营者对粉丝的备注,公众号运营者可在微信公众平台用户管理界面对粉丝添加备注">
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户所在的分组ID兼容旧的用户分组接口" >
<el-input v-model="form.groupid" style="width: 370px;"/>
<el-form-item label="用户所在的分组ID兼容旧的用户分组接口">
<el-input v-model="form.groupid" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户被打上的标签ID列表" >
<el-input v-model="form.tagidList" style="width: 370px;"/>
<el-form-item label="用户被打上的标签ID列表">
<el-input v-model="form.tagidList" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户是否订阅该公众号标识" >
<el-input v-model="form.subscribe" style="width: 370px;"/>
<el-form-item label="用户是否订阅该公众号标识">
<el-input v-model="form.subscribe" style="width: 370px;" />
</el-form-item>
<el-form-item label="关注公众号时间" >
<el-input v-model="form.subscribeTime" style="width: 370px;"/>
<el-form-item label="关注公众号时间">
<el-input v-model="form.subscribeTime" 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.stair" style="width: 370px;"/>
<el-form-item label="一级推荐人">
<el-input v-model="form.stair" style="width: 370px;" />
</el-form-item>
<el-form-item label="二级推荐人" >
<el-input v-model="form.second" style="width: 370px;"/>
<el-form-item label="二级推荐人">
<el-input v-model="form.second" style="width: 370px;" />
</el-form-item>
<el-form-item label="一级推荐人订单" >
<el-input v-model="form.orderStair" style="width: 370px;"/>
<el-form-item label="一级推荐人订单">
<el-input v-model="form.orderStair" style="width: 370px;" />
</el-form-item>
<el-form-item label="二级推荐人订单" >
<el-input v-model="form.orderSecond" style="width: 370px;"/>
<el-form-item label="二级推荐人订单">
<el-input v-model="form.orderSecond" style="width: 370px;" />
</el-form-item>
<el-form-item label="佣金" >
<el-input v-model="form.nowMoney" style="width: 370px;"/>
<el-form-item label="佣金">
<el-input v-model="form.nowMoney" style="width: 370px;" />
</el-form-item>
<el-form-item label="小程序用户会话密匙" >
<el-input v-model="form.sessionKey" style="width: 370px;"/>
<el-form-item label="小程序用户会话密匙">
<el-input v-model="form.sessionKey" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户类型" >
<el-input v-model="form.userType" style="width: 370px;"/>
<el-form-item label="用户类型">
<el-input v-model="form.userType" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

View File

@ -5,56 +5,58 @@
<!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-permission="['ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_CREATE']"
v-permission="['admin','YXWECHATUSER_ALL','YXWECHATUSER_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="uid" label="微信用户id"/>
<el-table-column prop="unionid" label="只有在用户将公众号绑定到微信开放平台帐号后,才会出现该字段"/>
<el-table-column prop="openid" label="用户的标识,对当前公众号唯一"/>
<el-table-column prop="routineOpenid" label="小程序唯一身份ID"/>
<el-table-column prop="nickname" label="用户的昵称"/>
<el-table-column prop="headimgurl" label="用户头像"/>
<el-table-column prop="sex" label="用户的性别值为1时是男性值为2时是女性值为0时是未知"/>
<el-table-column prop="city" label="用户所在城市"/>
<el-table-column prop="language" label="用户的语言简体中文为zh_CN"/>
<el-table-column prop="province" label="用户所在省份"/>
<el-table-column prop="country" label="用户所在国家"/>
<el-table-column prop="remark" label="公众号运营者对粉丝的备注,公众号运营者可在微信公众平台用户管理界面对粉丝添加备注"/>
<el-table-column prop="groupid" label="用户所在的分组ID兼容旧的用户分组接口"/>
<el-table-column prop="tagidList" label="用户被打上的标签ID列表"/>
<el-table-column prop="subscribe" label="用户是否订阅该公众号标识"/>
<el-table-column prop="subscribeTime" label="关注公众号时间"/>
<el-table-column prop="addTime" label="添加时间"/>
<el-table-column prop="stair" label="一级推荐人"/>
<el-table-column prop="second" label="二级推荐人"/>
<el-table-column prop="orderStair" label="一级推荐人订单"/>
<el-table-column prop="orderSecond" label="二级推荐人订单"/>
<el-table-column prop="nowMoney" label="佣金"/>
<el-table-column prop="sessionKey" label="小程序用户会话密匙"/>
<el-table-column prop="userType" label="用户类型"/>
<el-table-column v-if="checkPermission(['ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_EDIT','YXWECHATUSER_DELETE'])" label="操作" width="150px" align="center">
<el-table-column prop="uid" label="微信用户id" />
<el-table-column prop="unionid" label="只有在用户将公众号绑定到微信开放平台帐号后,才会出现该字段" />
<el-table-column prop="openid" label="用户的标识,对当前公众号唯一" />
<el-table-column prop="routineOpenid" label="小程序唯一身份ID" />
<el-table-column prop="nickname" label="用户的昵称" />
<el-table-column prop="headimgurl" label="用户头像" />
<el-table-column prop="sex" label="用户的性别值为1时是男性值为2时是女性值为0时是未知" />
<el-table-column prop="city" label="用户所在城市" />
<el-table-column prop="language" label="用户的语言简体中文为zh_CN" />
<el-table-column prop="province" label="用户所在省份" />
<el-table-column prop="country" label="用户所在国家" />
<el-table-column prop="remark" label="公众号运营者对粉丝的备注,公众号运营者可在微信公众平台用户管理界面对粉丝添加备注" />
<el-table-column prop="groupid" label="用户所在的分组ID兼容旧的用户分组接口" />
<el-table-column prop="tagidList" label="用户被打上的标签ID列表" />
<el-table-column prop="subscribe" label="用户是否订阅该公众号标识" />
<el-table-column prop="subscribeTime" label="关注公众号时间" />
<el-table-column prop="addTime" label="添加时间" />
<el-table-column prop="stair" label="一级推荐人" />
<el-table-column prop="second" label="二级推荐人" />
<el-table-column prop="orderStair" label="一级推荐人订单" />
<el-table-column prop="orderSecond" label="二级推荐人订单" />
<el-table-column prop="nowMoney" label="佣金" />
<el-table-column prop="sessionKey" label="小程序用户会话密匙" />
<el-table-column prop="userType" label="用户类型" />
<el-table-column v-if="checkPermission(['admin','YXWECHATUSER_ALL','YXWECHATUSER_EDIT','YXWECHATUSER_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
<el-button v-permission="['admin','YXWECHATUSER_ALL','YXWECHATUSER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
<el-popover
v-permission="['ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_DELETE']"
:ref="scope.row.uid"
v-permission="['admin','YXWECHATUSER_ALL','YXWECHATUSER_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.uid].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.uid)">确定</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>
@ -66,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/yxWechatUser'
import eForm from './form'
export default {
@ -80,7 +83,7 @@ export default {
mixins: [initData],
data() {
return {
delLoading: false,
delLoading: false
}
},
created() {