From 7af9be8c53eff115cc80145311783061b847272d Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Wed, 21 Feb 2024 18:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                   |  2 +-
 src/views/home.vue             |  2 +-
 src/views/order/order_list.vue | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index a5882a3..624f742 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vue-admin",
 	"private": true,
-	"version": "1.3.8",
+	"version": "1.3.10",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
diff --git a/src/views/home.vue b/src/views/home.vue
index 1253265..5d9a521 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -9,7 +9,7 @@
           <img class="img" src="../assets/home_icon1.png">
         </div>
         <div class="info">
-          <div class="title">昨日收款</div>
+          <div class="title">今日收款</div>
           <div class="num">
             <count-to :start-val="0" :decimals="2" :end-val="homeData.sumConsumeFee" :duration="1000" />
             <!-- {{ homeData.sumConsumeFee }} -->
diff --git a/src/views/order/order_list.vue b/src/views/order/order_list.vue
index 0731e7c..555a231 100644
--- a/src/views/order/order_list.vue
+++ b/src/views/order/order_list.vue
@@ -8,7 +8,12 @@
         </el-space>
         <div class="table mt15">
             <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">
                         <span v-if="scope.row.orderType == 1">反扫收款</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 == 99">插件</span>
                     </template>
-                </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> -->
+                <!-- <el-table-column prop="merchantCode" 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="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 == 5">待付款</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>
                 </el-table-column>
                 <el-table-column prop="orderInfo" label="订单备注"></el-table-column>