From e7c5824f7015e062c1b97ab6fa2a445477163dff Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Tue, 13 Jun 2023 11:59:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/components/wx-material-select/main.vue | 63 +++++++++++--------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/src/views/mp/components/wx-material-select/main.vue b/src/views/mp/components/wx-material-select/main.vue
index 792a52d9..74e068a6 100644
--- a/src/views/mp/components/wx-material-select/main.vue
+++ b/src/views/mp/components/wx-material-select/main.vue
@@ -13,14 +13,15 @@
           <img class="material-img" :src="item.url" />
           <p class="item-name">{{ item.name }}</p>
           <el-row class="ope-row">
-            <el-button type="success" @click="selectMaterialFun(item)">
-              选择 <Icon icon="ep:circle-check" />
+            <el-button type="success" @click="selectMaterialFun(item)"
+            >选择 <Icon icon="ep:circle-check" />
             </el-button>
           </el-row>
         </div>
       </div>
       <!-- 分页组件 -->
-      <Pagination
+      <pagination
+        v-show="total > 0"
         :total="total"
         v-model:page="queryParams.pageNo"
         v-model:limit="queryParams.pageSize"
@@ -29,6 +30,7 @@
     </div>
     <!-- 类型：voice -->
     <div v-else-if="objData.type === 'voice'">
+      <!-- 列表 -->
       <el-table v-loading="loading" :data="list">
         <el-table-column label="编号" align="center" prop="mediaId" />
         <el-table-column label="文件名" align="center" prop="name" />
@@ -37,23 +39,27 @@
             <WxVoicePlayer :url="scope.row.url" />
           </template>
         </el-table-column>
-        <el-table-column
-          label="上传时间"
-          align="center"
-          prop="createTime"
-          width="180"
-          :formatter="dateFormatter"
-        />
-        <el-table-column label="操作" align="center" fixed="right">
+        <el-table-column label="上传时间" align="center" prop="createTime" width="180">
           <template #default="scope">
-            <el-button type="text" @click="selectMaterialFun(scope.row)">
-              选择 <Icon icon="ep:plus" />
+            <span>{{ formatDate(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          fixed="right"
+          class-name="small-padding fixed-width"
+        >
+          <template #default="scope">
+            <el-button type="text" @click="selectMaterialFun(scope.row)"
+            >选择<Icon icon="ep:plus" />
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <Pagination
+      <pagination
+        v-show="total > 0"
         :total="total"
         v-model:page="queryParams.pageNo"
         v-model:limit="queryParams.pageSize"
@@ -73,23 +79,27 @@
             <WxVideoPlayer :url="scope.row.url" />
           </template>
         </el-table-column>
+        <el-table-column label="上传时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ formatDate(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
-          label="上传时间"
+          label="操作"
           align="center"
-          prop="createTime"
-          width="180"
-          :formatter="dateFormatter"
-        />
-        <el-table-column label="操作" align="center">
+          fixed="right"
+          class-name="small-padding fixed-width"
+        >
           <template #default="scope">
             <el-button type="text" @click="selectMaterialFun(scope.row)"
-              >选择<Icon icon="akar-icons:circle-plus" />
+            >选择<Icon icon="akar-icons:circle-plus" />
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <Pagination
+      <pagination
+        v-show="total > 0"
         :total="total"
         v-model:page="queryParams.pageNo"
         v-model:limit="queryParams.pageSize"
@@ -104,14 +114,15 @@
             <WxNews :articles="item.content.newsItem" />
             <el-row class="ope-row">
               <el-button type="success" @click="selectMaterialFun(item)">
-                选择 <Icon icon="ep:circle-check" />
+                选择<Icon icon="ep:circle-check" />
               </el-button>
             </el-row>
           </div>
         </div>
       </div>
       <!-- 分页组件 -->
-      <Pagination
+      <pagination
+        v-show="total > 0"
         :total="total"
         v-model:page="queryParams.pageNo"
         v-model:limit="queryParams.pageSize"
@@ -120,6 +131,7 @@
     </div>
   </div>
 </template>
+
 <script lang="ts" name="WxMaterialSelect">
 import WxNews from '@/views/mp/components/wx-news/main.vue'
 import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue'
@@ -127,7 +139,7 @@ import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue'
 import { getMaterialPage } from '@/api/mp/material'
 import { getFreePublishPage } from '@/api/mp/freePublish'
 import { getDraftPage } from '@/api/mp/draft'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 import { defineComponent, PropType } from 'vue'
 
 export default defineComponent({
@@ -231,6 +243,7 @@ export default defineComponent({
       selectMaterialFun,
       getMaterialPageFun,
       getPage,
+      formatDate,
       newsTypeRef,
       queryParams,
       objDataRef,