czg_team/organization-manage
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
gyq
2024-02-20 14:56:22 +08:00
parent 408c611cca
commit ab4e2e9663
7 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "vue-admin",
"private": true,
"version": "1.3.6",
"version": "1.3.8",
"type": "module",
"scripts": {
"dev": "vite",

40
src/views/order/order_list.vue
View File

@@ -25,11 +25,19 @@
</template>
</el-table-column>
<el-table-column prop="merchantCode" label="商户号"></el-table-column>
<el-table-column prop="amount" label="金额"></el-table-column>
<el-table-column prop="amount" label="金额">
<template #default="scope">
￥{{ scope.row.amount }}
</template>
</el-table-column>
<el-table-column prop="orderNo" label="订单号"></el-table-column>
<el-table-column prop="transNo" label="三方订单号"></el-table-column>
<el-table-column prop="appletsAppId" label="小程序appid"></el-table-column>
<el-table-column prop="payType" label="支付类型"></el-table-column>
<el-table-column prop="payType" label="支付类型">
<template #default="scope">
{{ filterPayType(scope.row.payType) }}
</template>
</el-table-column>
<el-table-column prop="status" label="状态">
<template #default="scope">
<el-tag type="info" disable-transitions round v-if="scope.row.status == 0">交易失败</el-tag>
@@ -43,7 +51,11 @@
</template>
</el-table-column>
<el-table-column prop="orderInfo" label="订单备注"></el-table-column>
<el-table-column prop="transTime" label="支付时间"></el-table-column>
<el-table-column prop="transTime" label="支付时间">
<template #default="scope">
{{ scope.row.transTime && dayjs(scope.row.transTime).format('YYYY-MM-DD HH:mm:ss') }}
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间">
<template #default="scope">
<el-text>{{ dayjs(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</el-text>
@@ -87,6 +99,28 @@ import { queryOrder } from '@/api/shop.js'
const table = ref(null)
function filterPayType(type) {
const m = {
alipay: '支付宝App支付',
alipay_qr: '支付宝正扫',
alipay_wap: '支付宝H5支付',
alipay_lite: '支付宝小程序支付',
alipay_pub: '支付宝生活号支付',
alipay_scan: '支付宝反扫',
wx_pub: '微信公众号支付',
wx_lite: '微信小程序支付',
wx_scan: '微信反扫',
union: '银联云闪付App',
union_qr: '银联云闪付正扫',
union_wap: '银联云闪付H5支付',
union_scan: '银联云闪付反扫',
union_online: '银联H5支付',
union_checkout: '银联统一收银台支付',
fast_pay: '快捷支付',
b2c: '个人网银支付'
}
return m[type] || type
}
// 表格参数
const tableOptions = reactive({

8
src/views/organization/appkey.vue
View File

@@ -8,7 +8,7 @@
</el-space>
<div class="table mt15">
<el-table ref="table" :data="tableOptions.list" border height="100%" v-loading="tableOptions.loading">
<el-table-column prop="id" label="ID"></el-table-column>
<el-table-column prop="organNo" label="商户号"></el-table-column>
<el-table-column prop="privateKey" label="私钥">
<template #default="scope">
<el-tooltip>
@@ -33,9 +33,9 @@
</el-table-column>
<el-table-column prop="status" label="状态">
<template #default="scope">
<el-tag type="info" disable-transitions round v-if="scope.row.status == 0">申请中</el-tag>
<el-tag type="success" disable-transitions round v-if="scope.row.status == 1">已通过</el-tag>
<el-tag type="danger" disable-transitions round v-if="scope.row.status == 5">已驳回</el-tag>
<el-tag type="success" disable-transitions round v-if="scope.row.status == 0">正常</el-tag>
<el-tag type="info" disable-transitions round v-if="scope.row.status == 1">禁用</el-tag>
<el-tag type="warning" disable-transitions round v-if="scope.row.status == 2">待激活</el-tag>
</template>
</el-table-column>
<el-table-column prop="createTime" label="更新时间">

4
src/views/organization/components/authentication.vue
View File

@@ -117,9 +117,9 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<!-- <el-form-item>
<el-button type="primary" @click="submitHandle">立即提交</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
</template>

12
src/views/organization/components/settleInfo.vue
View File

@@ -71,9 +71,9 @@
<uploadCard ref="d1BankRef5" @selectFile="file => d1Form.publicimage = file"
@removeFile="d1Form.publicimage = ''" />
</el-form-item>
<el-form-item>
<!-- <el-form-item>
<el-button type="primary" @click="d1SubmitHandle">保存-D1</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
</el-col>
<el-col :span="span" v-if="false">
@@ -146,9 +146,9 @@
<uploadCard ref="d0BankRef5" @selectFile="file => d0Form.publicimage = file"
@removeFile="d0Form.publicimage = ''" />
</el-form-item>
<el-form-item>
<!-- <el-form-item>
<el-button type="primary" @click="d0SubmitHandle">保存-D0</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
</el-col>
</el-row>
@@ -164,9 +164,9 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<!-- <el-form-item>
<el-button type="primary" @click="updateAuthenticationAjax" :loading="authFormLoading">保存认证信息</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
</template>

4
src/views/organization/components/shopInfo.vue
View File

@@ -80,9 +80,9 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<!-- <el-form-item>
<el-button type="primary" @click="submitHandel">立即提交</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
<el-dialog title="经营类目" v-model="showDialog" @open="mccOpen">
<el-space>

8
src/views/organization/shop_detail.vue
View File

@@ -11,7 +11,7 @@
<div class="compont_wrap">
<component :is="componentList[type]" />
</div>
<div class="shop_info">
<!-- <div class="shop_info">
<div class="header">
<el-text size="large">商户关联信息</el-text>
</div>
@@ -58,7 +58,7 @@
@size-change="paginationChange" @current-change="paginationChange" />
</div>
</div>
</div>
</div> -->
</div>
</div>
</template>
@@ -222,8 +222,8 @@ async function messageChannelAjax() {
onMounted(async () => {
tableOptions.loading = false
connectInfoAjax()
userIpPageAjax()
// connectInfoAjax()
// userIpPageAjax()
await merchantInfoDetailAjax()
await merchBaseInfoAjax()
await merchLicenseAjax()