Sākums Izpētīt Palīdzība
Pierakstīties
caimei365
/
caimei-mall-admin-ui
5
0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

样式优化

zhengjinyi 5 gadi atpakaļ
vecāks
fac9cebdee
revīzija
0a2cbd75ec
19 mainītis faili ar 69 papildinājumiem un 54 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. BIN
      public/favicon.png
  2. 1 1
      public/index.html
  3. 3 4
      src/components/Ctiy/index.vue
  4. 15 8
      src/layout/components/Navbar.vue
  5. 2 2
      src/layout/components/TagsView/index.vue
  6. 9 1
      src/views/club/editForm.vue
  7. 9 1
      src/views/club/form.vue
  8. 5 6
      src/views/club/list.vue
  9. 7 7
      src/views/club/operateList.vue
  10. 2 2
      src/views/finance/list.vue
  11. 2 3
      src/views/goods/category.vue
  12. 1 2
      src/views/goods/list-commonly.vue
  13. 1 2
      src/views/goods/list-preferential.vue
  14. 1 2
      src/views/goods/list-preferred.vue
  15. 1 1
      src/views/goods/list-select.vue
  16. 1 2
      src/views/goods/list.vue
  17. 1 1
      src/views/order/detail.vue
  18. 7 6
      src/views/order/list.vue
  19. 1 3
      src/views/order/refund.vue

BIN
public/favicon.png
Parādīt failu


+ 1 - 1
public/index.html
Parādīt failu 

@@ -5,7 +5,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta name="renderer" content="webkit">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
+    <link rel="icon" href="<%= BASE_URL %>favicon.png">
 
     <title><%= webpackConfig.name %></title>
 
   </head>
 
   <body>

+ 3 - 4
src/components/Ctiy/index.vue
Parādīt failu 

@@ -4,7 +4,7 @@
 
       <el-form-item label="会所地址:" prop="province" style="float: left;width: 300px;margin-right: 8px;">
 
         <el-select
 
           v-model="from.province"
 
-          placeholder="省级地区"
 
+          placeholder="请选择"
 
           style="width:167px;"
 
           @change="choseProvince"
 
         >
 
@@ -19,7 +19,7 @@
 
       <el-form-item prop="city" style="float: left;margin-left: 0;margin-right: 8px;">
 
         <el-select
 
           v-model="from.city"
 
-          placeholder="市级地区"
 
+          placeholder="请选择"
 
           style="width:167px;margin-left: 0;"
 
           @change="choseCity"
 
         >
 
@@ -34,7 +34,7 @@
 
       <el-form-item prop="town" style="float: left;margin-left:0;margin-right: 8px;">
 
         <el-select
 
           v-model="from.town"
 
-          placeholder="区级地区"
 
+          placeholder="请选择"
 
           style="width:167px;margin-left: 0;"
 
           @change="choseBlock"
 
         >
 
@@ -117,7 +117,6 @@ export default {
 
           const cityID = { cityid: this.cityArray[j].cityID }
 
           getTown(cityID).then(response => {
 
             this.townArray = response.data
 
-            this.from.town = this.cityArray[0].name
 
           })
 
         }
 
       }

+ 15 - 8
src/layout/components/Navbar.vue
Parādīt failu 

@@ -9,7 +9,7 @@
 
         <div class="avatar-wrapper">
 
           <span class="admin-name">{{ adminName }}</span>
 
           <img src="@/assets/avatar.jpg" class="user-avatar">
 
-          <i class="el-icon-caret-bottom" />
 
+          <!-- <i class="el-icon-caret-bottom" /> -->
 
         </div>
 
         <el-dropdown-menu slot="dropdown">
 
           <router-link to="/">
 
@@ -57,9 +57,15 @@ export default {
 
     toggleSideBar() {
 
       this.$store.dispatch('app/toggleSideBar')
 
     },
 
-    async logout() {
 
-      await this.$store.dispatch('user/logout')
 
-      this.$router.push(`/login?redirect=${this.$route.fullPath}`)
 
+    logout() {
 
+      this.$confirm('确定退出系统吗？', '系统提示', {
 
+        confirmButtonText: '确定',
 
+        cancelButtonText: '取消',
 
+        type: 'warning'
 
+      }).then(() => {
 
+        this.$store.dispatch('user/logout')
 
+        this.$router.push(`/login?redirect=${this.$route.fullPath}`)
 
+      })
 
     }
 
   }
 
 }
 
@@ -123,22 +129,23 @@ export default {
 
     }
 
 
     .avatar-container {
 
-      margin-right: 20px;
 
+      margin-right: 0;
 
 
       .avatar-wrapper {
 
         margin-top: 5px;
 
         position: relative;
 
         .admin-name{
 
           font-size: 14px;
 
-          color:#97a8be;
 
+          color:#333333;
 
           line-height: 46px;
 
           float:left;
 
           margin:0 8px;
 
         }
 
         .user-avatar {
 
           cursor: pointer;
 
-          width: 40px;
 
-          height: 40px;
 
+          margin-top: 8px;
 
+          width: 30px;
 
+          height: 30px;
 
           border-radius: 50%;
 
           float: left;
 
         }

+ 2 - 2
src/layout/components/TagsView/index.vue
Parādīt failu 

@@ -222,9 +222,9 @@ export default {
 
         margin-right: 15px;
 
       }
 
       &.active {
 
-        background-color: #42b983;
 
+        background-color: #1890FF;
 
         color: #fff;
 
-        border-color: #42b983;
 
+        border-color: #1890FF;
 
         &::before {
 
           content: '';
 
           background: #fff;

+ 9 - 1
src/views/club/editForm.vue
Parādīt failu 

@@ -97,7 +97,15 @@ export default {
 
       },
 
       rules: {
 
         name: [{ required: true, message: '会所名称不能为空', trigger: 'blur' }],
 
-        contractMobile: [{ required: true, message: '常用手机号不能为空', trigger: 'blur' }],
 
+        contractMobile: [
 
+          { required: true, message: '常用手机号不能为空', trigger: 'blur' },
 
+          {
 
+            required: true,
 
+            pattern: /^\d{11}|\d{13}$/,
 
+            message: '联系电话格式不正确',
 
+            trigger: 'blur'
 
+          }
 
+        ],
 
         linkMan: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
 
         socialCreditCode: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }],
 
         address: [{ required: true, message: '会所详细地址不能为空', trigger: 'blur' }],

+ 9 - 1
src/views/club/form.vue
Parādīt failu 

@@ -93,7 +93,15 @@ export default {
 
       },
 
       rules: {
 
         name: [{ required: true, message: '会所名称不能为空', trigger: 'blur' }],
 
-        contractMobile: [{ required: true, message: '常用手机号不能为空', trigger: 'blur' }],
 
+        contractMobile: [
 
+          { required: true, message: '常用手机号不能为空', trigger: 'blur' },
 
+          {
 
+            required: true,
 
+            pattern: /^\d{11}|\d{13}$/,
 
+            message: '联系电话格式不正确',
 
+            trigger: 'blur'
 
+          }
 
+        ],
 
         businessLicenseImage: [{ required: true, message: '营业执照不能为空', trigger: 'blur' }],
 
         linkMan: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
 
         socialCreditCode: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }],

+ 5 - 6
src/views/club/list.vue
Parādīt failu 

@@ -36,7 +36,7 @@
 
           />
 
         </el-form-item>
 
         <el-form-item style="width:100px;float: left;">
 
-          <el-button type="success" icon="el-icon-search" @click="handleFilter">搜索</el-button>
 
+          <el-button type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
 
         </el-form-item>
 
         <el-form-item style="width:100px;float: left;">
 
           <router-link :to="'/club/form/'">
 
@@ -78,24 +78,23 @@
 
       </el-table-column>
 
       <el-table-column align="center" label="创建时间" prop="registerTime">
 
         <template slot-scope="{row}">
 
-          <i class="el-icon-time" />
 
           <span>{{ row.registerTime }}</span>
 
         </template>
 
       </el-table-column>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
         <template slot-scope="{row}">
 
           <router-link :to="{path:'/club/editForm',query:{ clubID:row.clubID, userID: row.userID}}">
 
-            <el-button type="primary" size="small">编辑</el-button>
 
+            <el-button type="primary" size="mini" style="width: 100px;margin:5px 0 0 0;">编辑</el-button>
 
           </router-link>
 
           <router-link :to="{path:'/club/operateList',query:{name:row.name,clubID:row.clubID,userID:row.userID}}">
 
-            <el-button type="primary" size="small" style="margin:5px 0 0 0;">查看运营人员</el-button>
 
+            <el-button type="primary" size="mini" style="width: 100px;margin:5px 0 0 0;">查看运营人员</el-button>
 
           </router-link>
 
-          <el-button type="primary" size="small" style="margin:5px 0 0 0;" @click="handleEdit(row)">添加运营人员</el-button>
 
+          <el-button type="primary" size="mini" style="width: 100px;margin:5px 0 0 0;" @click="handleEdit(row)">添加运营人员</el-button>
 
         </template>
 
       </el-table-column>
 
     </el-table>
 
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
+    <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
 
       <el-form ref="dataForm" :rules="rules" :model="addPeople" label-position="left" label-width="70px" style="width: 400px; margin-left:24%;">

+ 7 - 7
src/views/club/operateList.vue
Parādīt failu 

@@ -34,7 +34,7 @@
 
           />
 
         </el-form-item>
 
         <el-form-item style="width:100px;float: left;">
 
-          <el-button type="success" icon="el-icon-search" @click="handleFilter">搜索</el-button>
 
+          <el-button type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
 
         </el-form-item>
 
         <el-form-item style="width:100px;float: left;">
 
           <el-button type="primary" @click="bindAddPeople()">添加运营人员</el-button>
 
@@ -85,26 +85,26 @@
 
       </el-table-column>
 
       <el-table-column align="center" label="添加时间" prop="addTime">
 
         <template slot-scope="{row}">
 
-          <span v-if="row.addTime"><i class="el-icon-time" style="margin-right:5px;" />{{ row.addTime }}</span>
 
+          <span v-if="row.addTime">{{ row.addTime }}</span>
 
           <span v-else>----</span>
 
         </template>
 
       </el-table-column>
 
       <el-table-column align="center" label="绑定时间" prop="bindTime">
 
         <template slot-scope="{row}">
 
-          <span v-if="row.bindTime"><i class="el-icon-time" style="margin-right:5px;" />{{ row.bindTime }}</span>
 
+          <span v-if="row.bindTime">{{ row.bindTime }}</span>
 
           <span v-else>----</span>
 
         </template>
 
       </el-table-column>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
         <template slot-scope="{row}">
 
-          <el-button type="primary" size="mini" style="margin:5px 0 0 0;" @click="handleEdit(row)">编辑</el-button>
 
-          <el-button v-if="row.status === '2'" type="primary" size="mini" style="margin:5px 0 0 0;" @click="handleUntying(row)">解绑</el-button>
 
-          <el-button v-else type="primary" size="small" style="margin:5px 0 0 0;" @click="handleGenerateCode(row)">{{ row.invitationCode ? '更新邀请码' : '生成邀请码' }}</el-button>
 
+          <el-button type="primary" size="mini" style="width: 90px;margin:5px 0 0 0;" @click="handleEdit(row)">编辑</el-button>
 
+          <el-button v-if="row.status === '2'" type="primary" size="mini" style="width: 90px;margin:5px 0 0 0;" @click="handleUntying(row)">解绑</el-button>
 
+          <el-button v-else type="primary" size="mini" style="width: 90px;margin:5px 0 0 0;" @click="handleGenerateCode(row)">{{ row.invitationCode ? '更新邀请码' : '生成邀请码' }}</el-button>
 
         </template>
 
       </el-table-column>
 
     </el-table>
 
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="initOperatorListData" />
 
+    <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="initOperatorListData" />
 
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="40%">
 
       <el-form ref="dataForm" :rules="rules" :model="editTemp" label-position="left" label-width="80px" style="width: 400px;">

+ 2 - 2
src/views/finance/list.vue
Parādīt failu 

@@ -59,7 +59,7 @@
 
       <el-table-column label="佣金(元)" align="center" prop="money6" />
 
     </el-table>
 
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="fetchData" />
 
+    <pagination v-show="total>20" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="fetchData" />
 
   </div>
 
 </template>
 
 
@@ -83,7 +83,7 @@ export default {
 
       list: null,
 
       listLoading: true,
 
       searchTimeVal: '',
 
-      total: 10,
 
+      total: 0,
 
       listQuery: {
 
         page: 1,
 
         limit: 10,

+ 2 - 3
src/views/goods/category.vue
Parādīt failu 

@@ -43,18 +43,17 @@
 
       </el-table-column>
 
       <el-table-column align="center" label="添加时间" prop="addTime">
 
         <template slot-scope="{row}">
 
-          <i class="el-icon-time" />
 
           <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
 
         </template>
 
       </el-table-column>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
         <template slot-scope="{row}">
 
-          <router-link :to="'/goods/category/edit/' + row.id "><el-button type="primary" size="small">编辑</el-button></router-link>
 
+          <router-link :to="'/goods/category/edit/' + row.id "><el-button type="primary" size="mini" style="width: 80px;">编辑</el-button></router-link>
 
         </template>
 
       </el-table-column>
 
     </el-table>
 
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="getList" />
 
+    <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="getList" />
 
   </div>
 
 </template>

+ 1 - 2
src/views/goods/list-commonly.vue
Parādīt failu 

@@ -70,7 +70,6 @@
 
       <el-table-column label="商品分类" align="center" prop="productClassifyName" />
 
       <el-table-column align="center" label="添加时间" prop="addTime">
 
         <template v-if="row.addTime" slot-scope="{row}">
 
-          <i class="el-icon-time" />
 
           <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
 
         </template>
 
       </el-table-column>
 
@@ -86,7 +85,7 @@
 
       </el-table-column>
 
     </el-table>
 
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
+    <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
     <template>
 
       <el-backtop style="right: 40px; bottom: 40px;">
 
         <i class="el-icon-upload2" />

+ 1 - 2
src/views/goods/list-preferential.vue
Parādīt failu 

@@ -70,7 +70,6 @@
 
       <el-table-column label="商品分类" align="center" prop="productClassifyName" />
 
       <el-table-column align="center" label="添加时间" prop="addTime">
 
         <template v-if="row.addTime" slot-scope="{row}">
 
-          <i class="el-icon-time" />
 
           <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
 
         </template>
 
       </el-table-column>
 
@@ -86,7 +85,7 @@
 
       </el-table-column>
 
     </el-table>
 
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
+    <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
     <template>
 
       <el-backtop style="right: 40px; bottom: 40px;">
 
         <i class="el-icon-upload2" />

+ 1 - 2
src/views/goods/list-preferred.vue
Parādīt failu 

@@ -70,7 +70,6 @@
 
       <el-table-column label="商品分类" align="center" prop="productClassifyName" />
 
       <el-table-column align="center" label="添加时间" prop="addTime">
 
         <template v-if="row.addTime" slot-scope="{row}">
 
-          <i class="el-icon-time" />
 
           <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
 
         </template>
 
       </el-table-column>
 
@@ -86,7 +85,7 @@
 
       </el-table-column>
 
     </el-table>
 
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
+    <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
     <template>
 
       <el-backtop style="right: 40px; bottom: 40px;">
 
         <i class="el-icon-upload2" />

+ 1 - 1
src/views/goods/list-select.vue
Parādīt failu 

@@ -66,7 +66,7 @@
 
       <el-table-column label="商品分类" align="center" prop="productClassifyName" />
 
     </el-table>
 
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
+    <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
     <template>
 
       <el-backtop style="right: 40px; bottom: 40px;">
 
         <i class="el-icon-upload2" />

+ 1 - 2
src/views/goods/list.vue
Parādīt failu 

@@ -115,7 +115,6 @@
 
       <el-table-column label="商品分类" align="center" prop="productClassifyName" />
 
       <el-table-column align="center" label="添加时间" prop="addTime">
 
         <template v-if="row.addTime" slot-scope="{row}">
 
-          <i class="el-icon-time" />
 
           <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
 
         </template>
 
       </el-table-column>
 
@@ -127,7 +126,7 @@
 
       </el-table-column>
 
     </el-table>
 
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
+    <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
 
     <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible">
 
       <el-form ref="dataForm" :rules="rules" :model="dialog" label-position="left" label-width="220px" style="width:360px; margin:0 auto;">

+ 1 - 1
src/views/order/detail.vue
Parādīt failu 

@@ -38,7 +38,7 @@
 
         </el-col>
 
         <el-col :span="6">
 
           <el-dropdown class="dropdown">
 
-            <el-button type="primary" round>
 
+            <el-button type="primary">
 
               功能<i class="el-icon-arrow-down el-icon--right" />
 
             </el-button>
 
             <el-dropdown-menu slot="dropdown">

+ 7 - 6
src/views/order/list.vue
Parādīt failu 

@@ -59,7 +59,7 @@
 
           <el-option label="有" value="1" />
 
           <el-option label="无" value="0" />
 
         </el-select>
 
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
 
+        <el-button class="filter-item" type="success" icon="el-icon-search" @click="handleFilter">查询</el-button>
 
       </el-form>
 
     </div>
 
 
@@ -84,7 +84,7 @@
 
       <el-table-column label="订单状态" align="center" prop="status">
 
         <template slot-scope="{row}">
 
           <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(row.status)>=0">
 
-            <el-tag type="success" size="small">交易中</el-tag><span>{{ '('+statusObj[row.status]+')' }}</span>
 
+            <el-tag type="success" size="small">交易中</el-tag><span style="display: inline-block;margin:5px;">{{ statusObj[row.status] }}</span>
 
           </template>
 
           <template v-else>
 
             <el-tag :type="row.status*1===6?'info':''" size="small">{{ statusObj[row.status] }}</el-tag>
 
@@ -132,15 +132,16 @@
 
       </el-table-column>
 
       <el-table-column align="center" label="下单时间" prop="orderTime">
 
         <template v-if="row.orderTime" slot-scope="{row}">
 
-          <i class="el-icon-time" />
 
           <span>{{ row.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
 
         </template>
 
       </el-table-column>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
         <template slot-scope="{row}">
 
-          <router-link :to="'/order/detail/' + row.orderID "><el-button type="primary" size="small">查看详情</el-button></router-link>
 
+          <router-link :to="'/order/detail/' + row.orderID ">
 
+            <el-button type="primary" size="mini" style="width: 80px;margin:5px 0 0 0;">查看详情</el-button>
 
+          </router-link>
 
           <el-dropdown>
 
-            <el-button type="success" size="small" style="width: 80px; margin-top:5px;">
 
+            <el-button type="success" size="mini" style="width: 80px;margin:5px 0 0 0;">
 
               功能<i class="el-icon-arrow-down el-icon--right" />
 
             </el-button>
 
             <el-dropdown-menu slot="dropdown">
 
@@ -154,7 +155,7 @@
 
       </el-table-column>
 
     </el-table>
 
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
+    <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
 
     <Remarks dialog-title="订单备注信息" :is-visible.sync="dialogRemarksVisible" :order-id="dialogRemarksOrderId" :remark-list="dialogRemarkList" />
 
     <template>

+ 1 - 3
src/views/order/refund.vue
Parādīt failu 

@@ -79,14 +79,12 @@
 
       <el-table-column label="申请人" align="center" prop="applicationUserName" />
 
       <el-table-column align="center" label="申请时间" prop="returnTime">
 
         <template v-if="row.returnTime" slot-scope="{row}">
 
-          <i class="el-icon-time" />
 
           <span>{{ row.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
 
         </template>
 
       </el-table-column>
 
       <el-table-column label="审核人" align="center" prop="reviewUserName" />
 
       <el-table-column align="center" label="审核时间" prop="confirmReturnTime">
 
         <template v-if="row.confirmReturnTime" slot-scope="{row}">
 
-          <i class="el-icon-time" />
 
           <span>{{ row.confirmReturnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
 
         </template>
 
       </el-table-column>
 
@@ -97,7 +95,7 @@
 
       </el-table-column>
 
     </el-table>
 
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
+    <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
     <template>
 
       <el-backtop style="right: 40px; bottom: 40px;">
 
         <i class="el-icon-upload2" />