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

14
src/views/activity/extract/form.vue
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">

47
src/views/activity/extract/index.vue
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'