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-21 18:41:36 +08:00
parent ab4e2e9663
commit 7af9be8c53
3 changed files with 11 additions and 11 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", "name": "vue-admin",
"private": true, "private": true,
"version": "1.3.8", "version": "1.3.10",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

2
src/views/home.vue
View File

@@ -9,7 +9,7 @@
<img class="img" src="../assets/home_icon1.png"> <img class="img" src="../assets/home_icon1.png">
</div> </div>
<div class="info"> <div class="info">
<div class="title">昨日收款</div> <div class="title">今日收款</div>
<div class="num"> <div class="num">
<count-to :start-val="0" :decimals="2" :end-val="homeData.sumConsumeFee" :duration="1000" /> <count-to :start-val="0" :decimals="2" :end-val="homeData.sumConsumeFee" :duration="1000" />
<!-- {{ homeData.sumConsumeFee }} --> <!-- {{ homeData.sumConsumeFee }} -->

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

@@ -8,7 +8,12 @@
</el-space> </el-space>
<div class="table mt15"> <div class="table mt15">
<el-table ref="table" :data="tableOptions.list" border height="100%" v-loading="tableOptions.loading"> <el-table ref="table" :data="tableOptions.list" border height="100%" v-loading="tableOptions.loading">
<el-table-column prop="orderType" label="订单类型"> <el-table-column prop="amount" label="金额">
<template #default="scope">
￥{{ scope.row.amount }}
</template>
</el-table-column>
<!-- <el-table-column prop="orderType" label="订单类型">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.orderType == 1">反扫收款</span> <span v-if="scope.row.orderType == 1">反扫收款</span>
<span v-if="scope.row.orderType == 2">收款码</span> <span v-if="scope.row.orderType == 2">收款码</span>
@@ -23,13 +28,8 @@
<span v-if="scope.row.orderType == 11">缴费通</span> <span v-if="scope.row.orderType == 11">缴费通</span>
<span v-if="scope.row.orderType == 99">插件</span> <span v-if="scope.row.orderType == 99">插件</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column prop="merchantCode" label="商户号"></el-table-column> <!-- <el-table-column prop="merchantCode" 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="orderNo" label="订单号"></el-table-column>
<el-table-column prop="transNo" 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="appletsAppId" label="小程序appid"></el-table-column>
@@ -47,7 +47,7 @@
<el-tag type="danger" disable-transitions round v-if="scope.row.status == 4">退款中</el-tag> <el-tag type="danger" disable-transitions round v-if="scope.row.status == 4">退款中</el-tag>
<el-tag type="danger" disable-transitions round v-if="scope.row.status == 5">待付款</el-tag> <el-tag type="danger" disable-transitions round v-if="scope.row.status == 5">待付款</el-tag>
<el-tag type="danger" disable-transitions round v-if="scope.row.status == 6">部分退款</el-tag> <el-tag type="danger" disable-transitions round v-if="scope.row.status == 6">部分退款</el-tag>
<el-tag type="warning" disable-transitions round v-if="scope.row.status == 7">待确认</el-tag> <el-tag type="warning" disable-transitions round v-if="scope.row.status == 7">待支付</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderInfo" label="订单备注"></el-table-column> <el-table-column prop="orderInfo" label="订单备注"></el-table-column>