Skip to content

Commit 40699ed

Browse files
committed
微调微信公众号的回复和素材选择的排版
1 parent dd4be60 commit 40699ed

File tree

3 files changed

+42
-81
lines changed

3 files changed

+42
-81
lines changed

src/types/auto-components.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ declare module '@vue/runtime-core' {
5454
ElForm: typeof import('element-plus/es')['ElForm']
5555
ElFormItem: typeof import('element-plus/es')['ElFormItem']
5656
ElIcon: typeof import('element-plus/es')['ElIcon']
57+
ElImage: typeof import('element-plus/es')['ElImage']
5758
ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
5859
ElInput: typeof import('element-plus/es')['ElInput']
5960
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']

src/views/mp/components/wx-material-select/main.vue

Lines changed: 22 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
<img class="material-img" :src="item.url" />
1414
<p class="item-name">{{ item.name }}</p>
1515
<el-row class="ope-row">
16-
<el-button type="success" @click="selectMaterialFun(item)"
17-
>选择 <Icon icon="ep:circle-check" />
16+
<el-button type="success" @click="selectMaterialFun(item)">
17+
选择 <Icon icon="ep:circle-check" />
1818
</el-button>
1919
</el-row>
2020
</div>
2121
</div>
2222
<!-- 分页组件 -->
23-
<pagination
24-
v-show="total > 0"
23+
<Pagination
2524
:total="total"
2625
v-model:page="queryParams.pageNo"
2726
v-model:limit="queryParams.pageSize"
@@ -30,7 +29,6 @@
3029
</div>
3130
<!-- 类型:voice -->
3231
<div v-else-if="objData.type === 'voice'">
33-
<!-- 列表 -->
3432
<el-table v-loading="loading" :data="list">
3533
<el-table-column label="编号" align="center" prop="mediaId" />
3634
<el-table-column label="文件名" align="center" prop="name" />
@@ -39,27 +37,23 @@
3937
<WxVoicePlayer :url="scope.row.url" />
4038
</template>
4139
</el-table-column>
42-
<el-table-column label="上传时间" align="center" prop="createTime" width="180">
43-
<template #default="scope">
44-
<span>{{ formatDate(scope.row.createTime) }}</span>
45-
</template>
46-
</el-table-column>
4740
<el-table-column
48-
label="操作"
41+
label="上传时间"
4942
align="center"
50-
fixed="right"
51-
class-name="small-padding fixed-width"
52-
>
43+
prop="createTime"
44+
width="180"
45+
:formatter="dateFormatter"
46+
/>
47+
<el-table-column label="操作" align="center" fixed="right">
5348
<template #default="scope">
54-
<el-button type="text" @click="selectMaterialFun(scope.row)"
55-
>选择<Icon icon="ep:plus" />
49+
<el-button type="text" @click="selectMaterialFun(scope.row)">
50+
选择 <Icon icon="ep:plus" />
5651
</el-button>
5752
</template>
5853
</el-table-column>
5954
</el-table>
6055
<!-- 分页组件 -->
61-
<pagination
62-
v-show="total > 0"
56+
<Pagination
6357
:total="total"
6458
v-model:page="queryParams.pageNo"
6559
v-model:limit="queryParams.pageSize"
@@ -79,17 +73,14 @@
7973
<WxVideoPlayer :url="scope.row.url" />
8074
</template>
8175
</el-table-column>
82-
<el-table-column label="上传时间" align="center" prop="createTime" width="180">
83-
<template #default="scope">
84-
<span>{{ formatDate(scope.row.createTime) }}</span>
85-
</template>
86-
</el-table-column>
8776
<el-table-column
88-
label="操作"
77+
label="上传时间"
8978
align="center"
90-
fixed="right"
91-
class-name="small-padding fixed-width"
92-
>
79+
prop="createTime"
80+
width="180"
81+
:formatter="dateFormatter"
82+
/>
83+
<el-table-column label="操作" align="center">
9384
<template #default="scope">
9485
<el-button type="text" @click="selectMaterialFun(scope.row)"
9586
>选择<Icon icon="ep:circle-plus" />
@@ -98,8 +89,7 @@
9889
</el-table-column>
9990
</el-table>
10091
<!-- 分页组件 -->
101-
<pagination
102-
v-show="total > 0"
92+
<Pagination
10393
:total="total"
10494
v-model:page="queryParams.pageNo"
10595
v-model:limit="queryParams.pageSize"
@@ -114,15 +104,14 @@
114104
<WxNews :articles="item.content.newsItem" />
115105
<el-row class="ope-row">
116106
<el-button type="success" @click="selectMaterialFun(item)">
117-
选择<Icon icon="ep:circle-check" />
107+
选择 <Icon icon="ep:circle-check" />
118108
</el-button>
119109
</el-row>
120110
</div>
121111
</div>
122112
</div>
123113
<!-- 分页组件 -->
124-
<pagination
125-
v-show="total > 0"
114+
<Pagination
126115
:total="total"
127116
v-model:page="queryParams.pageNo"
128117
v-model:limit="queryParams.pageSize"
@@ -131,15 +120,14 @@
131120
</div>
132121
</div>
133122
</template>
134-
135123
<script lang="ts" name="WxMaterialSelect">
136124
import WxNews from '@/views/mp/components/wx-news/main.vue'
137125
import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue'
138126
import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue'
139127
import { getMaterialPage } from '@/api/mp/material'
140128
import { getFreePublishPage } from '@/api/mp/freePublish'
141129
import { getDraftPage } from '@/api/mp/draft'
142-
import { dateFormatter, formatDate } from '@/utils/formatTime'
130+
import { dateFormatter } from '@/utils/formatTime'
143131
import { defineComponent, PropType } from 'vue'
144132
145133
export default defineComponent({
@@ -243,7 +231,6 @@ export default defineComponent({
243231
selectMaterialFun,
244232
getMaterialPageFun,
245233
getPage,
246-
formatDate,
247234
newsTypeRef,
248235
queryParams,
249236
objDataRef,

src/views/mp/components/wx-reply/main.vue

Lines changed: 19 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<!-- 类型 1:文本 -->
1313
<el-tab-pane name="text">
1414
<template #label>
15-
<el-row align="middle">
16-
<icon icon="ep:document" />
17-
文本
18-
</el-row>
15+
<el-row align="middle"><Icon icon="ep:document" /> 文本</el-row>
1916
</template>
2017
<el-input
2118
type="textarea"
@@ -28,18 +25,15 @@
2825
<!-- 类型 2:图片 -->
2926
<el-tab-pane name="image">
3027
<template #label>
31-
<el-row align="middle">
32-
<icon icon="ep:picture" class="mr-5px" />
33-
图片
34-
</el-row>
28+
<el-row align="middle"><Icon icon="ep:picture" class="mr-5px" /> 图片</el-row>
3529
</template>
3630
<!-- 情况一:已经选择好素材、或者上传好图片 -->
3731
<div class="select-item" v-if="objDataRef.url">
3832
<img class="material-img" :src="objDataRef.url" />
3933
<p class="item-name" v-if="objDataRef.name">{{ objDataRef.name }}</p>
4034
<el-row class="ope-row" justify="center">
4135
<el-button type="danger" circle @click="deleteObj">
42-
<icon icon="ep:delete" />
36+
<Icon icon="ep:delete" />
4337
</el-button>
4438
</el-row>
4539
</div>
@@ -48,8 +42,7 @@
4842
<!-- 选择素材 -->
4943
<el-col :span="12" class="col-select">
5044
<el-button type="success" @click="openMaterial">
51-
素材库选择
52-
<icon icon="ep:circle-check" />
45+
素材库选择 <Icon icon="ep:circle-check" />
5346
</el-button>
5447
<el-dialog title="选择图片" v-model="dialogImageVisible" width="90%" append-to-body>
5548
<WxMaterialSelect :obj-data="objDataRef" @select-material="selectMaterial" />
@@ -70,10 +63,8 @@
7063
<el-button type="primary">上传图片</el-button>
7164
<template #tip>
7265
<span>
73-
<div class="el-upload__tip"
74-
>支持 bmp/png/jpeg/jpg/gif 格式,大小不超过 2M</div
75-
></span
76-
>
66+
<div class="el-upload__tip">支持 bmp/png/jpeg/jpg/gif 格式,大小不超过 2M</div>
67+
</span>
7768
</template>
7869
</el-upload>
7970
</el-col>
@@ -82,12 +73,8 @@
8273
<!-- 类型 3:语音 -->
8374
<el-tab-pane name="voice">
8475
<template #label>
85-
<el-row align="middle">
86-
<icon icon="ep:phone" />
87-
语音
88-
</el-row>
76+
<el-row align="middle"><Icon icon="ep:phone" /> 语音</el-row>
8977
</template>
90-
9178
<div class="select-item2" v-if="objDataRef.url">
9279
<p class="item-name">{{ objDataRef.name }}</p>
9380
<div class="item-infos">
@@ -121,8 +108,8 @@
121108
>
122109
<el-button type="primary">点击上传</el-button>
123110
<template #tip>
124-
<div class="el-upload__tip"
125-
>格式支持 mp3/wma/wav/amr,文件大小不超过 2M,播放长度不超过 60s
111+
<div class="el-upload__tip">
112+
格式支持 mp3/wma/wav/amr,文件大小不超过 2M,播放长度不超过 60s
126113
</div>
127114
</template>
128115
</el-upload>
@@ -132,10 +119,7 @@
132119
<!-- 类型 4:视频 -->
133120
<el-tab-pane name="video">
134121
<template #label>
135-
<el-row align="middle">
136-
<icon icon="ep:share" />
137-
视频
138-
</el-row>
122+
<el-row align="middle"><Icon icon="ep:share" /> 视频</el-row>
139123
</template>
140124
<el-row>
141125
<el-input
@@ -158,8 +142,7 @@
158142
<!-- 选择素材 -->
159143
<el-col :span="12">
160144
<el-button type="success" @click="openMaterial">
161-
素材库选择
162-
<icon icon="ep:circle-check" />
145+
素材库选择 <Icon icon="ep:circle-check" />
163146
</el-button>
164147
<el-dialog title="选择视频" v-model="dialogVideoVisible" width="90%" append-to-body>
165148
<WxMaterialSelect :objData="objDataRef" @select-material="selectMaterial" />
@@ -177,10 +160,7 @@
177160
:before-upload="beforeVideoUpload"
178161
:on-success="handleUploadSuccess"
179162
>
180-
<el-button type="primary"
181-
>新建视频
182-
<icon icon="ep:upload" />
183-
</el-button>
163+
<el-button type="primary">新建视频 <Icon icon="ep:upload" /></el-button>
184164
</el-upload>
185165
</el-col>
186166
</el-row>
@@ -190,26 +170,23 @@
190170
<!-- 类型 5:图文 -->
191171
<el-tab-pane name="news">
192172
<template #label>
193-
<el-row align="middle">
194-
<icon icon="ep:reading" />
195-
图文
196-
</el-row>
173+
<el-row align="middle"><Icon icon="ep:reading" /> 图文</el-row>
197174
</template>
198175
<el-row>
199176
<div class="select-item" v-if="objDataRef.articles?.length > 0">
200177
<WxNews :articles="objDataRef.articles" />
201178
<el-col class="ope-row">
202179
<el-button type="danger" circle @click="deleteObj">
203-
<icon icon="ep:delete" />
180+
<Icon icon="ep:delete" />
204181
</el-button>
205182
</el-col>
206183
</div>
207184
<!-- 选择素材 -->
208185
<el-col :span="24" v-if="!objDataRef.content">
209186
<el-row style="text-align: center" align="middle">
210187
<el-col :span="24">
211-
<el-button type="success" @click="openMaterial"
212-
>{{ newsType === '1' ? '选择已发布图文' : '选择草稿箱图文' }}
188+
<el-button type="success" @click="openMaterial">
189+
{{ newsType === '1' ? '选择已发布图文' : '选择草稿箱图文' }}
213190
<icon icon="ep:circle-check" />
214191
</el-button>
215192
</el-col>
@@ -227,10 +204,7 @@
227204
<!-- 类型 6:音乐 -->
228205
<el-tab-pane name="music">
229206
<template #label>
230-
<el-row align="middle">
231-
<icon icon="ep:service" />
232-
音乐
233-
</el-row>
207+
<el-row align="middle"><Icon icon="ep:service" />音乐</el-row>
234208
</template>
235209
<el-row align="middle" justify="center">
236210
<el-col :span="6">
@@ -259,8 +233,8 @@
259233
<template #trigger>
260234
<el-button type="text">本地上传</el-button>
261235
</template>
262-
<el-button type="text" @click="openMaterial" style="margin-left: 5px"
263-
>素材库选择
236+
<el-button type="text" @click="openMaterial" style="margin-left: 5px">
237+
素材库选择
264238
</el-button>
265239
</el-upload>
266240
</div>
@@ -295,7 +269,6 @@
295269
</el-tab-pane>
296270
</el-tabs>
297271
</template>
298-
299272
<script lang="ts" name="WxReplySelect">
300273
import WxNews from '@/views/mp/components/wx-news/main.vue'
301274
import WxMaterialSelect from '@/views/mp/components/wx-material-select/main.vue'

0 commit comments

Comments
 (0)