细节 银联支付

main
fanfan 4 months ago
parent 02d56d1a20
commit 00ec54814e
  1. 11
      src/views/setting/gmall/order.vue
  2. 30
      src/views/user/order/Index.vue

@ -27,6 +27,7 @@
<a-select-option :value="0">全部</a-select-option>
<a-select-option :value="'wechat'">微信支付</a-select-option>
<a-select-option :value="'balance'">余额支付 </a-select-option>
<a-select-option :value="'huifu'">银联支付 </a-select-option>
</a-select>
</a-form-item>
<a-form-item label="付款时间">
@ -62,7 +63,7 @@
<span slot="year" slot-scope="text"> {{ text }} </span>
<!-- 支付方式 -->
<span slot="pay_method" slot-scope="text">
<a-tag v-if="text">{{ text == 'wechat' ? '微信支付' : '余额支付' }}</a-tag>
<a-tag v-if="text">{{ PaymentMethodEnum[text].name }}</a-tag>
</span>
<!-- 状态 -->
<span slot="pay_status" slot-scope="text">
@ -76,6 +77,8 @@
</template>
<script>
import { PaymentMethodEnum } from '@/common/enum/payment'
import { inArray, assignment } from '@/utils/util'
import * as Api from '@/api/setting/gmall'
import { STable, UserItem } from '@/components/Table'
import PayStatusEnum from '@/common/enum/recharge/order/PayStatus'
@ -168,6 +171,12 @@ export default {
}
},
created() {},
beforeCreate() {
//
assignment(this, {
PaymentMethodEnum,
})
},
methods: {
/**
* 刷新列表

@ -27,10 +27,11 @@
<a-select-option :value="0">全部</a-select-option>
<a-select-option :value="'wechat'">微信支付</a-select-option>
<a-select-option :value="'balance'">余额支付 </a-select-option>
<a-select-option :value="'huifu'">银联支付 </a-select-option>
</a-select>
</a-form-item>
<a-form-item label="付款时间">
<a-range-picker format="YYYY-MM-DD" style="width:220px" v-decorator="['pay_time']" />
<a-range-picker format="YYYY-MM-DD" style="width: 220px" v-decorator="['pay_time']" />
</a-form-item>
<a-form-item class="search-btn">
<a-button type="primary" icon="search" html-type="submit">搜索</a-button>
@ -38,15 +39,22 @@
</a-form>
</a-row>
</div>
<s-table ref="table" rowKey="order_id" :loading="isLoading" :columns="columns" :data="loadData" :pagination="pagination">
<s-table
ref="table"
rowKey="order_id"
:loading="isLoading"
:columns="columns"
:data="loadData"
:pagination="pagination"
>
<!-- 会员信息 -->
<span slot="user" slot-scope="text">
<UserItem :user="text" />
</span>
<!-- 充值方式 -->
<span slot="order_type" slot-scope="text">
<a-tag v-if="text==10">会员</a-tag>
<a-tag v-if="text==20">分销商</a-tag>
<a-tag v-if="text == 10">会员</a-tag>
<a-tag v-if="text == 20">分销商</a-tag>
</span>
<!-- 时效 -->
<span slot="month" slot-scope="text">
@ -54,7 +62,7 @@
</span>
<!-- 支付方式 -->
<span slot="pay_method" slot-scope="text">
<a-tag v-if="text">{{ text=='wechat'?'微信支付':'余额支付' }}</a-tag>
<a-tag v-if="text">{{ PaymentMethodEnum[text].name }}</a-tag>
</span>
<!-- 状态 -->
<span slot="pay_status" slot-scope="text">
@ -72,6 +80,8 @@ import * as Api from '@/api/user/order'
import { STable, UserItem } from '@/components/Table'
import PayStatusEnum from '@/common/enum/recharge/order/PayStatus'
import moment from 'moment'
import { PaymentMethodEnum } from '@/common/enum/payment'
import { inArray, assignment } from '@/utils/util'
export default {
name: 'Index',
components: {
@ -106,7 +116,7 @@ export default {
{
title: '会员信息',
dataIndex: 'user',
scopedSlots: { customRender: 'user' }
scopedSlots: { customRender: 'user' },
},
{
title: '订单号',
@ -115,7 +125,7 @@ export default {
{
title: '订单类型',
dataIndex: 'order_type',
scopedSlots: { customRender: 'order_type' }
scopedSlots: { customRender: 'order_type' },
},
{
title: '会员时效',
@ -156,6 +166,12 @@ export default {
}
},
created() {},
beforeCreate() {
//
assignment(this, {
PaymentMethodEnum,
})
},
methods: {
/**
* 刷新列表

Loading…
Cancel
Save