From 002c29124d0ef654c66df0f30bdcd675d5e3674a Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Tue, 24 Nov 2020 15:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=AE=A2=E6=88=B7=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E5=AE=8C=E5=96=84---=E9=A1=B5=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order/failed.vue    | 8 ++++----
 src/components/user/statistics.vue | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/order/failed.vue b/src/components/order/failed.vue
index f8e1ab0..d04ce6e 100644
--- a/src/components/order/failed.vue
+++ b/src/components/order/failed.vue
@@ -42,11 +42,11 @@
       </div>
     </div>
     <el-table :data="retData.Data" row-key="Id" border size="medium" :height="$getHeight(100)">
-      <el-table-column prop="CreateTime" label="创建日期" width="180"></el-table-column>
-       <el-table-column prop="UpdateTime" label="支付日期" width="180"></el-table-column>
-      <el-table-column prop="OrderNo" label="订单号" width="215"></el-table-column>
+      <el-table-column prop="CreateTime" label="创建日期" width="140"></el-table-column>
+       <el-table-column prop="UpdateTime" label="支付日期" width="140"></el-table-column>
+      <el-table-column prop="OrderNo" label="订单号" width="180"></el-table-column>
       <el-table-column prop="OrderType" label="类型" :formatter="typeFormat"></el-table-column>
-      <el-table-column prop="UserName" label="用户" width="120">
+      <el-table-column prop="UserName" label="用户" width="100">
         <template slot-scope="scope">
           <phoneHide :text="scope.row.UserName"></phoneHide>
         </template>
diff --git a/src/components/user/statistics.vue b/src/components/user/statistics.vue
index 89ebb3d..c8382d1 100644
--- a/src/components/user/statistics.vue
+++ b/src/components/user/statistics.vue
@@ -317,7 +317,10 @@ export default {
       this.loading = true
       this.$api.get(this.$api.phpURL + 'manager/UserFollow/getList', {PageIndex: this.searchModel.PageIndex, search: this.searchModel}).then(res => {
         this.retData.Data = res.data.list
-        this.retData.TotalCount = parseInt(res.data.count)
+        // eslint-disable-next-line eqeqeq
+        if (res.data.count != 0) {
+          this.retData.TotalCount = parseInt(res.data.count)
+        }
         this.types = res.data.types
         this.loading = false
       })