master
fanfan 1 month ago
parent 7dc4054586
commit 9e635e42d0
  1. 4
      src/views/content/mall/index.vue
  2. 30
      src/views/content/mall/modules/EditForm.vue
  3. 2
      src/views/user/Index.vue
  4. 10
      src/views/user/modules/ConsumptionDetails.vue

@ -2,7 +2,7 @@
<a-card :bordered="false"> <a-card :bordered="false">
<div class="card-title">{{ $route.meta.title }}</div> <div class="card-title">{{ $route.meta.title }}</div>
<div class="table-operator"></div> <div class="table-operator"></div>
<s-table ref="table" rowKey="id" :loading="isLoading" :columns="columns" :data="loadData" :pagination="pagination"> <s-table ref="table" :scroll="{ x: 1450 }" rowKey="id" :loading="isLoading" :columns="columns" :data="loadData" :pagination="pagination">
<span slot="type" slot-scope="text"> <span slot="type" slot-scope="text">
{{ text == 10 ? '公司' : '个体户' }} {{ text == 10 ? '公司' : '个体户' }}
</span> </span>
@ -125,7 +125,7 @@ export default {
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
width: '180px', width: '110px',
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' },
}, },
], ],

@ -31,10 +31,9 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="法人身份证正面" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="法人身份证正面" :labelCol="labelCol" :wrapperCol="wrapperCol">
<SelectImage <SelectImage
v-if="record.card_front_url"
ref="childComponent" ref="childComponent"
:type="1"
multiple multiple
:source="1"
:maxNum="1" :maxNum="1"
:defaultList="record.card_front_url" :defaultList="record.card_front_url"
/> </a-form-item></a-col /> </a-form-item></a-col
@ -43,6 +42,7 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="法人身份证反面" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="法人身份证反面" :labelCol="labelCol" :wrapperCol="wrapperCol">
<SelectImage <SelectImage
v-if="record.card_back_url"
ref="childComponent" ref="childComponent"
:type="1" :type="1"
multiple multiple
@ -54,6 +54,7 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="营业执照" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="营业执照" :labelCol="labelCol" :wrapperCol="wrapperCol">
<SelectImage <SelectImage
v-if="record.business_license_url"
ref="childComponent" ref="childComponent"
:type="1" :type="1"
multiple multiple
@ -66,6 +67,7 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="法人手持营业执照" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="法人手持营业执照" :labelCol="labelCol" :wrapperCol="wrapperCol">
<SelectImage <SelectImage
v-if="record.photo_url"
ref="childComponent" ref="childComponent"
:type="1" :type="1"
multiple multiple
@ -77,6 +79,7 @@
<a-col :span="12" v-if="record.type == 20"> <a-col :span="12" v-if="record.type == 20">
<a-form-item label="法人收款二维码" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="法人收款二维码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<SelectImage <SelectImage
v-if="record.qr_code_url"
ref="childComponent" ref="childComponent"
:type="1" :type="1"
multiple multiple
@ -181,12 +184,11 @@
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'
import * as Api from '@/api/content/banner' import * as Api from '@/api/content/banner'
import { SelectImage, SelectActive } from '@/components' import { SelectImage } from '@/components'
export default { export default {
components: { components: {
SelectImage, SelectImage,
SelectActive,
}, },
data() { data() {
return { return {
@ -211,20 +213,16 @@ export default {
edit(record) { edit(record) {
// //
this.visible = true this.visible = true
this.record = {}
// //
this.record = record this.record.card_front_url = null
// this.record.card_back_url = null
this.setFieldsValue() this.record.business_license_url = null
}, this.record.photo_url = null
this.record.qr_code_url = null
// this.$forceUpdate()
setFieldsValue() {
const {
record,
form: { setFieldsValue },
} = this
this.$nextTick(() => { this.$nextTick(() => {
setFieldsValue(pick(record, ['name', 'image_id', 'redirect_url', 'status', 'sort'])) this.record = record
}) })
}, },

@ -80,7 +80,7 @@
<span class="actions" slot="action" slot-scope="item"> <span class="actions" slot="action" slot-scope="item">
<a v-if="$module('market-recharge')" v-action:recharge @click="handleRecharge(item)" title="会员充值">充值</a> <a v-if="$module('market-recharge')" v-action:recharge @click="handleRecharge(item)" title="会员充值">充值</a>
<a v-if="$module('user-grade')" v-action:grade @click="handleGrade(item)" title="会员等级">等级</a> <a v-if="$module('user-grade')" v-action:grade @click="handleGrade(item)" title="会员等级">等级</a>
<!-- <a v-action:recharge @click="handleConsumptionDetails(item)" title="消费明细">消费明细</a> --> <a v-action:recharge @click="handleConsumptionDetails(item)" title="消费明细">消费明细</a>
<a v-action:delete @click="handleDelete(item)">删除</a> <a v-action:delete @click="handleDelete(item)">删除</a>
</span> </span>
</s-table> </s-table>

@ -1,7 +1,7 @@
<template> <template>
<a-modal <a-modal
:title="title" :title="title"
:width="900" :width="700"
:visible="visible" :visible="visible"
:maskClosable="false" :maskClosable="false"
:destroyOnClose="true" :destroyOnClose="true"
@ -72,10 +72,6 @@ export default {
title: '明细ID', title: '明细ID',
dataIndex: 'id', dataIndex: 'id',
}, },
{
title: '用户ID',
dataIndex: 'user_id',
},
{ {
title: '日期', title: '日期',
dataIndex: 'month', dataIndex: 'month',
@ -84,10 +80,6 @@ export default {
title: '金额', title: '金额',
dataIndex: 'total_money', dataIndex: 'total_money',
}, },
{
title: '创建时间',
dataIndex: 'create_time',
},
], ],
// Promise // Promise
loadData: (param) => { loadData: (param) => {

Loading…
Cancel
Save