mirror of
https://github.com/ialley-workshop-open/uni-halo.git
synced 2026-06-10 11:59:28 +08:00
release: 发布 uni-halo beta-v2.0 版本
This commit is contained in:
小莫唐尼
+4
-1
@@ -1,6 +1,9 @@
|
||||
node_modules/
|
||||
unpackage/
|
||||
package-lock.json
|
||||
|
||||
|
||||
config/halo.config.js
|
||||
config/ad.config.js
|
||||
config/love.config.js
|
||||
package-lock.json
|
||||
config/token.config.js
|
||||
|
||||
+13
-12
@@ -1,28 +1,29 @@
|
||||
{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
|
||||
{
|
||||
// launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
|
||||
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
|
||||
"version": "0.0",
|
||||
"configurations": [{
|
||||
"app-plus" :
|
||||
"version" : "0.0",
|
||||
"configurations" : [
|
||||
{
|
||||
"app-plus" : {
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"default" :
|
||||
{
|
||||
"default" : {
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"h5" :
|
||||
{
|
||||
"h5" : {
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"mp-qq" :
|
||||
{
|
||||
"mp-qq" : {
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"mp-weixin" :
|
||||
{
|
||||
"mp-weixin" : {
|
||||
"launchtype" : "local"
|
||||
},
|
||||
"type" : "uniCloud"
|
||||
},
|
||||
{
|
||||
"playground" : "standard",
|
||||
"type" : "uni-app:app-android"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
<script>
|
||||
import HaloConfig from '@/config/halo.config.js';
|
||||
import HaloAdConfig from '@/config/ad.config.js';
|
||||
import HaloTokenConfig from '@/config/token.config.js';
|
||||
import HaloConfig from '@/config/halo.config.js';
|
||||
import HaloAdConfig from '@/config/ad.config.js';
|
||||
|
||||
// app升级检测（搭配：https://ext.dcloud.net.cn/plugin?id=4470 升级中心）
|
||||
import CheckAppUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
|
||||
import { CheckWxUpdate } from '@/utils/update.js';
|
||||
export default {
|
||||
// app升级检测（搭配：https://ext.dcloud.net.cn/plugin?id=4470 升级中心）
|
||||
import CheckAppUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
|
||||
import {
|
||||
CheckWxUpdate
|
||||
} from '@/utils/update.js';
|
||||
export default {
|
||||
globalData: {
|
||||
baseApiUrl: HaloConfig.apiUrl,
|
||||
baseApiUrl: HaloTokenConfig.BASE_API,
|
||||
...HaloConfig,
|
||||
haloAdConfig: HaloAdConfig
|
||||
},
|
||||
@@ -43,31 +46,31 @@ export default {
|
||||
onHide: function() {
|
||||
console.log('App Hide');
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
// 基础样式
|
||||
@import './common/styles/app.theme.scss';
|
||||
@import './common/styles/app.base.scss';
|
||||
// 基础样式
|
||||
@import './common/styles/app.theme.scss';
|
||||
@import './common/styles/app.base.scss';
|
||||
|
||||
// 引入tmUI2.x样式
|
||||
@import './tm-vuetify/mian.min.css';
|
||||
// 引入tmUI2.x主题包
|
||||
@import './tm-vuetify/scss/theme.css';
|
||||
// 引入tmUI2.x预置图标
|
||||
@import './tm-vuetify/scss/fonts/fontawesome_base64.css';
|
||||
// 引入tmUI2.x样式
|
||||
@import './tm-vuetify/mian.min.css';
|
||||
// 引入tmUI2.x主题包
|
||||
@import './tm-vuetify/scss/theme.css';
|
||||
// 引入tmUI2.x预置图标
|
||||
@import './tm-vuetify/scss/fonts/fontawesome_base64.css';
|
||||
|
||||
// 自定义图标
|
||||
@import './common/icons/halocoloriconfont.css';
|
||||
@import './common/icons/haloiconfont.css';
|
||||
@import './common/icons/mphtmliconfont.css';
|
||||
// 自定义图标
|
||||
@import './common/icons/halocoloriconfont.css';
|
||||
@import './common/icons/haloiconfont.css';
|
||||
@import './common/icons/mphtmliconfont.css';
|
||||
|
||||
/* #ifndef MP-WEIXIN */
|
||||
@import './common/markdown/markdown.scss';
|
||||
/* #endif */
|
||||
/* #ifndef MP-WEIXIN */
|
||||
@import './common/markdown/markdown.scss';
|
||||
/* #endif */
|
||||
|
||||
page {
|
||||
page {
|
||||
background-color: #fafafa;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -4,12 +4,12 @@
|
||||
</a>
|
||||
</p>
|
||||
|
||||
<p align="center"><b>【uni-halo】</b> 基于 uniapp + Halo API 开发的多端项目，值得一试。</p>
|
||||
<p align="center"><b>【uni-halo v2.0】</b> 基于 Halo API 多端项目，值得一试。</p>
|
||||
|
||||
<br />
|
||||
<p align="center">
|
||||
<a href="https://b.925i.cn">作者博客</a>
|
||||
<a href="https://uni-halo.925i.cn">文档地址</a>
|
||||
<a href="https://uni-halo.925i.cn">文档地址（等待更新v2版本说明）</a>
|
||||
<a href="https://gitee.com/ialley-workshop-open/uni-halo">Gitee仓库</a>
|
||||
<a href="https://github.com/ialley-workshop-open/uni-halo">Github仓库</a>
|
||||
</p>
|
||||
@@ -26,10 +26,9 @@
|
||||
|
||||
#### 🍻 基础功能
|
||||
|
||||
几乎实现PC端后台的全功能，让您在手机端也可以管理您的博客。
|
||||
`重要说明：2.0版本 暂时去掉后台管理功能。`
|
||||
|
||||
- 用户端：文章列表、文章分类、文章详情、图库、留言板、友链、个人日记等
|
||||
- 管理端：资料修改、密码修改、日记管理、文章管理、分类管理、标签管理、附件管理、友链管理、评论管理、日志管理等
|
||||
- 用户端：文章列表、文章分类、文章详情、图库、友链、瞬间等
|
||||
|
||||
<br/>
|
||||
|
||||
@@ -42,7 +41,7 @@
|
||||
## 😎 文档源码
|
||||
|
||||
- 作者博客：[https://b.925i.cn/](https://b.925i.cn/)
|
||||
- 官方文档：[https://uni-halo.925i.cn/](https://uni-halo.925i.cn/)
|
||||
- 官方文档（待更新v2版本说明）：[https://uni-halo.925i.cn/](https://uni-halo.925i.cn/)
|
||||
- Gitee ：[https://gitee.com/ialley-workshop-open/uni-halo](https://gitee.com/ialley-workshop-open/uni-halo)
|
||||
- Github ：[https://github.com/ialley-workshop-open/uni-halo](https://github.com/ialley-workshop-open/uni-halo)
|
||||
|
||||
@@ -70,21 +69,13 @@
|
||||
|:--:|:--:|:--:|:--:|
|
||||
|||||
|
||||
|
||||
##### 💻 管理端
|
||||
|
||||
说明：以下仅为部分截图
|
||||
|
||||
|后台首页|文章管理|
|
||||
|:--:|:--:|
|
||||
|||
|
||||
|
||||
##### 📱 恋爱日记
|
||||
|
||||
说明：以下仅为部分截图
|
||||
|
||||
|主页 |恋爱相册 |恋爱清单 |
|
||||
|:--: |:--: |-- |
|
||||
| | | |
|
||||
| 主页 | 恋爱清单 |
|
||||
|:-----------------------------------------------------------:|-- |
|
||||
| |  |
|
||||
|
||||
<br/>
|
||||
|
||||
|
||||
+3
-6
@@ -14,12 +14,9 @@ export default {
|
||||
|
||||
/**
|
||||
* 获取文章详情
|
||||
* @param {String} articleId 文章id
|
||||
* @param {String} name 文章 name
|
||||
*/
|
||||
getArticleDetail: (articleId) => {
|
||||
return HttpHandler.Get(`/api/content/posts/${articleId}`, {
|
||||
formatDisabled: false,
|
||||
sourceDisabled: true
|
||||
})
|
||||
getArticleDetail: (name) => {
|
||||
return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/posts/${name}`, {})
|
||||
},
|
||||
}
|
||||
+15
-6
@@ -11,17 +11,26 @@ export default {
|
||||
* @param {Object} params 查询参数
|
||||
*/
|
||||
getCategoryList: (params) => {
|
||||
return HttpHandler.Get('/api/content/categories', params)
|
||||
return HttpHandler.Get('/apis/api.content.halo.run/v1alpha1/categories', params)
|
||||
},
|
||||
|
||||
/**
|
||||
* 根据分类名称查询一个分类
|
||||
* @param {String} name 分类名称
|
||||
* @param {Object} params 查询参数
|
||||
*/
|
||||
getCategoryPostList: (name, params) => {
|
||||
return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/categories/${name}`, params)
|
||||
},
|
||||
|
||||
/**
|
||||
* 查询分类下的文章
|
||||
* @param {String} slug 分类名称
|
||||
* @param {String} name 分类名称
|
||||
* @param {Object} params 查询参数
|
||||
*/
|
||||
getCategoryPostList: (slug, params) => {
|
||||
// 从缓存中根据分类获取密码，如果获取到了说明本分类需要密码，避免多个分类需要密码在输入密码后刷新页面点错了分类
|
||||
params.password = getCache('APP_CATEGORY_PWD_' + slug)
|
||||
return HttpHandler.Get(`/api/content/categories/${slug}/posts`, params)
|
||||
getCategoryPostList: (name, params) => {
|
||||
return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/categories/${name}/posts`, params)
|
||||
},
|
||||
|
||||
|
||||
}
|
||||
+3
-3
@@ -16,11 +16,11 @@ export default {
|
||||
|
||||
/**
|
||||
* 获取评论列表接口（列表数据）
|
||||
* @param {String} postId 文章id
|
||||
* @param {String} name 文章id
|
||||
* @param {Object} params 查询参数
|
||||
*/
|
||||
getPostCommentList: (postId, params) => {
|
||||
return HttpHandler.Get(`/api/content/posts/${postId}/comments/list_view`, params)
|
||||
getPostCommentList: (name, params) => {
|
||||
return HttpHandler.Get(`/apis/content.halo.run/v1alpha1/comments${name}`, params)
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@@ -40,7 +40,11 @@ import admin_comments from './admin/comments.js'
|
||||
import admin_posts from './admin/posts.js'
|
||||
import admin_logs from './admin/logs.js'
|
||||
|
||||
// 2.0接口
|
||||
import v2 from './v2/all.api.js'
|
||||
|
||||
const ApiManager = {
|
||||
v2,
|
||||
...archive,
|
||||
...article,
|
||||
...blogger,
|
||||
|
||||
+9
-1
@@ -11,7 +11,15 @@ export default {
|
||||
* @param {Object} params 参数
|
||||
*/
|
||||
getPostList: (params) => {
|
||||
return HttpHandler.Get(`/api/content/posts`, params)
|
||||
return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/posts`, params)
|
||||
},
|
||||
|
||||
/**
|
||||
* 根据名称获取文章
|
||||
* @param {String} name 分类名称
|
||||
*/
|
||||
getPostByName: (name) => {
|
||||
return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/posts/${name}`, {})
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,143 @@
|
||||
/**
|
||||
* 所有的接口
|
||||
*/
|
||||
import HaloTokenConfig from '@/config/token.config.js'
|
||||
import HttpHandler from '@/common/http/request.js'
|
||||
import {
|
||||
getCache
|
||||
} from '@/utils/storage.js'
|
||||
export default {
|
||||
/**
|
||||
* 获取文章列表
|
||||
* @param {Object} params 参数
|
||||
*/
|
||||
getPostList: (params) => {
|
||||
return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/posts`, params)
|
||||
},
|
||||
|
||||
/**
|
||||
* 根据名称获取文章
|
||||
* @param {String} name 分类名称
|
||||
*/
|
||||
getPostByName: (name) => {
|
||||
return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/posts/${name}`, {})
|
||||
},
|
||||
|
||||
/**
|
||||
* 搜索文章
|
||||
* @param {Object} params 数据
|
||||
*/
|
||||
getPostListByKeyword: (params) => {
|
||||
return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/indices/post`, params)
|
||||
},
|
||||
|
||||
/**
|
||||
* 查询分类列表
|
||||
* @param {Object} params 查询参数
|
||||
*/
|
||||
getCategoryList: (params) => {
|
||||
return HttpHandler.Get('/apis/api.content.halo.run/v1alpha1/categories', params)
|
||||
},
|
||||
/**
|
||||
* 查询分类下的文章
|
||||
* @param {String} name 分类名称
|
||||
* @param {Object} params 查询参数
|
||||
*/
|
||||
getCategoryPostList: (name, params) => {
|
||||
return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/categories/${name}/posts`, params)
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* 获取评论列表接口（列表数据）
|
||||
* @param {Object} params 查询参数
|
||||
*/
|
||||
getPostCommentList: (params) => {
|
||||
return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/comments`, params)
|
||||
},
|
||||
|
||||
/**
|
||||
* 获取回复列表
|
||||
* @param {String} commentName 名称
|
||||
* @param {Object} params 查询参数
|
||||
*/
|
||||
getPostCommentReplyList: (commentName, params) => {
|
||||
return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/comments/${commentName}/reply`, params)
|
||||
},
|
||||
|
||||
// 提交评论
|
||||
addPostComment: (data) => {
|
||||
return HttpHandler.Post(`/apis/api.halo.run/v1alpha1/comments`, data)
|
||||
},
|
||||
// 提交回复
|
||||
addPostCommentReply: (commentName, data) => {
|
||||
return HttpHandler.Post(`/apis/api.halo.run/v1alpha1/comments/${commentName}/replay`, data)
|
||||
},
|
||||
|
||||
/**
|
||||
* 获取标签列表
|
||||
* @param {Object} params 查询参数
|
||||
*/
|
||||
getTagList: (params) => {
|
||||
return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/tags`, params)
|
||||
},
|
||||
|
||||
/**
|
||||
* 根据标签获取文章列表
|
||||
* @param {String} tagName 参数
|
||||
* @param {Object} params 查询参数
|
||||
*/
|
||||
getPostByTagName: (tagName, params) => {
|
||||
return HttpHandler.Get(`/apis/api.content.halo.run/v1alpha1/tags/${tagName}/posts`, params)
|
||||
},
|
||||
|
||||
/**
|
||||
* 获取瞬间列表
|
||||
*/
|
||||
getMomentList: (params) => {
|
||||
return HttpHandler.Get(`/apis/moment.halo.run/v1alpha1/moments`, params, {
|
||||
custom: {
|
||||
systemToken: HaloTokenConfig.systemToken
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 查询站点统计信息
|
||||
*/
|
||||
getBlogStatistics: () => {
|
||||
return HttpHandler.Get(`/apis/api.halo.run/v1alpha1/stats/-`, {})
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* 获取相册分组
|
||||
*/
|
||||
getPhotoGroupList: (params) => {
|
||||
return HttpHandler.Get(`/apis/core.halo.run/v1alpha1/photogroups`, params, {
|
||||
custom: {
|
||||
systemToken: HaloTokenConfig.systemToken
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* 根据分组获取相册
|
||||
*/
|
||||
getPhotoListByGroupName: (params) => {
|
||||
return HttpHandler.Get(`/apis/console.api.photo.halo.run/v1alpha1/photos`, params, {
|
||||
custom: {
|
||||
systemToken: HaloTokenConfig.systemToken
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* 获取友链
|
||||
*/
|
||||
getFriendLinkList: (params) => {
|
||||
return HttpHandler.Get(`/apis/api.plugin.halo.run/v1alpha1/plugins/PluginLinks/links`, params)
|
||||
},
|
||||
}
|
||||
@@ -11,6 +11,7 @@
|
||||
*/
|
||||
|
||||
import HaloConfig from '@/config/halo.config.js'
|
||||
import HaloTokenConfig from '@/config/token.config.js'
|
||||
import {
|
||||
setInterceptors
|
||||
} from "./interceptors.js";
|
||||
@@ -21,11 +22,10 @@ const http = new Request()
|
||||
http.setConfig((config) => {
|
||||
|
||||
// 如果是在外部浏览器调试或者编译为h5，请注释该行代码
|
||||
config.baseURL = HaloConfig.apiUrl;
|
||||
config.baseURL = HaloTokenConfig.BASE_API;
|
||||
|
||||
config.header = {
|
||||
...config.header,
|
||||
'api-authorization': HaloConfig.apiAuthorization,
|
||||
ContentType: 'application/json',
|
||||
dataType: 'json'
|
||||
}
|
||||
|
||||
@@ -64,13 +64,15 @@ const showCategoryInputPasswordModal = (response, category) => {
|
||||
export const setInterceptors = (http) => {
|
||||
http.interceptors.request.use(
|
||||
(config) => {
|
||||
console.log("config", config)
|
||||
|
||||
// 可使用async await 做异步操作
|
||||
config.header = {
|
||||
...config.header
|
||||
// ... 可以直接加参数
|
||||
};
|
||||
if (getAdminAccessToken()) {
|
||||
config.header['admin-authorization'] = getAdminAccessToken()
|
||||
if (config.custom.systemToken) {
|
||||
config.header['Authorization'] = `Bearer ${config.custom.systemToken}`
|
||||
}
|
||||
return config;
|
||||
},
|
||||
@@ -138,12 +140,14 @@ export const setInterceptors = (http) => {
|
||||
})
|
||||
})
|
||||
}
|
||||
return Promise.reject(response.data);
|
||||
} else if (response.data.status == 403) {
|
||||
// 如果报403是请求分类文章接口（您没有该分类的访问权限）的话说明是私密分类，需要输入密码请求
|
||||
if (response.config.url.indexOf('/api/content/categories') >= 0) {
|
||||
const category = getCategoryNameByUrl(response.config.url);
|
||||
showCategoryInputPasswordModal(response, category);
|
||||
}
|
||||
return Promise.reject(response.data);
|
||||
} else {
|
||||
return Promise.reject(response.data);
|
||||
}
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
*/
|
||||
|
||||
import HaloConfig from '@/config/halo.config.js'
|
||||
import HaloTokenConfig from '@/config/token.config.js'
|
||||
export default {
|
||||
domain: HaloConfig.apiUrl,
|
||||
domain: HaloTokenConfig.BASE_API,
|
||||
tagStyle: {
|
||||
table: `
|
||||
table-layout: fixed;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
// 微信分享配置
|
||||
import haloConfig from '@/config/halo.config.js'
|
||||
import HaloTokenConfig from '@/config/token.config.js'
|
||||
import { jsonToUrlParams2 } from '@/utils/url.params.js'
|
||||
export const haloWxShareMixin = {
|
||||
data() {
|
||||
@@ -55,7 +56,7 @@ export const haloWxShareMixin = {
|
||||
}
|
||||
let _config = Object.assign({}, {
|
||||
path: sharePath,
|
||||
copyLink: haloConfig.apiUrl,
|
||||
copyLink: HaloTokenConfig.BASE_API,
|
||||
query: {}
|
||||
}, config)
|
||||
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
<template>
|
||||
<view class="article-card " :class="cardType" @click="fnClickEvent('card')">
|
||||
<view class="left">
|
||||
<cache-image class="thumbnail" radius="6rpx" :url="$utils.checkThumbnailUrl(article.thumbnail)" :fileMd5="$utils.checkThumbnailUrl(article.thumbnail)" mode="aspectFill"></cache-image>
|
||||
<cache-image class="thumbnail" radius="6rpx" :url="$utils.checkThumbnailUrl(article.spec.cover)" :fileMd5="$utils.checkThumbnailUrl(article.spec.cover)" mode="aspectFill"></cache-image>
|
||||
<!-- <image class="thumbnail" lazy-load :src="$utils.checkThumbnailUrl(article.thumbnail)" mode="aspectFill"></image> -->
|
||||
</view>
|
||||
<view class="right">
|
||||
<view class="title">
|
||||
<text class="is-top bg-gradient-blue-accent" v-if="article.topped">置顶</text>
|
||||
<text class="title-text text-overflow">{{ article.title }}</text>
|
||||
<text class="is-top bg-gradient-blue-accent" v-if="article.spec.pinned">置顶</text>
|
||||
<text class="title-text text-overflow">{{ article.spec.title }}</text>
|
||||
</view>
|
||||
<view class="content text-overflow-2">{{ article.summary }}</view>
|
||||
<view class="content text-overflow-2">{{ article.status.excerpt }}</view>
|
||||
<view class="foot">
|
||||
<view class="create-time">
|
||||
<text class="time-label">发布时间：</text>
|
||||
{{ { d: article.createTime, f: 'yyyy-MM-dd' } | formatTime }}
|
||||
{{ { d: article.spec.publishTime, f: 'yyyy-MM-dd' } | formatTime }}
|
||||
</view>
|
||||
<view class="visits">
|
||||
<!-- <tm-icons :size="24" name="icon-filter-fill"></tm-icons> -->
|
||||
浏览
|
||||
<text class="number">{{ article.visits }}</text>
|
||||
<text class="number">{{ article.stats.visit }}</text>
|
||||
次
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -1,20 +1,16 @@
|
||||
<template>
|
||||
<view class="category-mini-card">
|
||||
<cache-image
|
||||
class="img"
|
||||
height="120rpx"
|
||||
:url="$utils.checkThumbnailUrl(category.thumbnail)"
|
||||
:fileMd5="$utils.checkThumbnailUrl(category.thumbnail)"
|
||||
mode="aspectFill"
|
||||
></cache-image>
|
||||
|
||||
<text class="label">{{ category.postCount }} 篇</text>
|
||||
<view class="name">{{ category.name }}</view>
|
||||
<cache-image class="img" height="180rpx" :url="$utils.checkThumbnailUrl(category.spec.cover,true)"
|
||||
:fileMd5="$utils.checkThumbnailUrl(category.spec.cover)" mode="aspectFill"></cache-image>
|
||||
<view class="content">
|
||||
<view class="name">{{ category.spec.displayName }}</view>
|
||||
<text class="label">共 {{ category.postCount }} 篇</text>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
export default {
|
||||
name: 'category-mini-card',
|
||||
props: {
|
||||
category: {
|
||||
@@ -22,11 +18,11 @@ export default {
|
||||
default: () => {}
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.category-mini-card {
|
||||
.category-mini-card {
|
||||
display: inline-block;
|
||||
width: 260rpx;
|
||||
height: 180rpx;
|
||||
@@ -36,32 +32,48 @@ export default {
|
||||
overflow: hidden;
|
||||
box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
|
||||
position: relative;
|
||||
text-align: center;
|
||||
color: #ffffff;
|
||||
|
||||
&:before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
z-index: 1;
|
||||
left: 0;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
backdrop-filter: blur(3rpx);
|
||||
}
|
||||
|
||||
.content {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
z-index: 3;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.img {
|
||||
width: 100%;
|
||||
height: 120rpx;
|
||||
border: 6rpx 6rpx 0 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
.label {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 86rpx;
|
||||
color: #03a9f4;
|
||||
font-size: 24rpx;
|
||||
background-color: rgba(255, 255, 255, 1);
|
||||
border-radius: 0rpx 24rpx 0 0;
|
||||
display: flex;
|
||||
padding: 2rpx 12rpx;
|
||||
padding-right: 24rpx;
|
||||
height: 100%;
|
||||
|
||||
}
|
||||
|
||||
.name {
|
||||
position: absolute;
|
||||
bottom: 16rpx;
|
||||
left: 0;
|
||||
right: 0;
|
||||
font-size: 24rpx;
|
||||
text-align: center;
|
||||
color: #333;
|
||||
font-weight: bold;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
.label {
|
||||
font-size: 24rpx;
|
||||
margin-top: 6rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,59 +1,41 @@
|
||||
<template>
|
||||
<view class=" comment-item flex flex-col mt-30 pt-24" :class="{ 'child-comment-item': isChild, 'no-solid': !useSolid, classItem }">
|
||||
<view v-if="comment" class=" comment-item flex flex-col mt-30 pt-24"
|
||||
:class="{ 'child-comment-item': isChild, 'no-solid': !useSolid, classItem }">
|
||||
<view class="comment-item_user flex">
|
||||
<image
|
||||
v-if="comment.isAdmin"
|
||||
class="user-avatar"
|
||||
:class="{ 'is-radius': globalAppSettings.isAvatarRadius }"
|
||||
:src="bloggerInfo.avatar"
|
||||
mode="aspectFill"
|
||||
@error="fnOnImageError(comment)"
|
||||
></image>
|
||||
<image
|
||||
v-else
|
||||
class="user-avatar"
|
||||
:class="{ 'is-radius': globalAppSettings.isAvatarRadius }"
|
||||
:src="comment.avatar"
|
||||
mode="aspectFill"
|
||||
@error="fnOnImageError(comment)"
|
||||
></image>
|
||||
<image class="user-avatar" :class="{ 'is-radius': globalAppSettings.isAvatarRadius }"
|
||||
:src="$utils.checkAvatarUrl(comment.owner.avatar, false)" mode="aspectFill" @error="fnOnImageError(comment)"></image>
|
||||
<view class="user-info pl-14">
|
||||
<view class="author">
|
||||
<text class="mr-6 text-grey-darken-1 text-size-m">{{ comment.author }}</text>
|
||||
<tm-tags v-if="comment.isAdmin" :dense="true" color="bg-gradient-amber-accent" size="xs" model="fill">博主</tm-tags>
|
||||
|
||||
<tm-tags v-else :dense="true" color="bg-gradient-light-blue-lighten " size="xs" model="fill">游客</tm-tags>
|
||||
<text class="mr-6 text-grey-darken-1 text-size-m">{{ comment.owner.displayName }}</text>
|
||||
</view>
|
||||
<view class="flex mt-4">
|
||||
<view v-if="false" class="text-size-s text-grey mr-12">IP属地：暂无信息</view>
|
||||
<view class="time text-size-xs text-grey">
|
||||
<text class="">{{ $tm.dayjs(comment.createTime).format('YYYY年MM月DD日') }}</text>
|
||||
<text class="ml-12">{{ $tm.dayjs(comment.createTime).fromNow(true) }}前</text>
|
||||
<text class="">{{ $tm.dayjs(comment.spec.creationTime).format('YYYY年MM月DD日') }}</text>
|
||||
<text class="ml-12">{{ $tm.dayjs(comment.spec.creationTime).fromNow(true) }}前</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="useActions" class="">
|
||||
<tm-button v-if="!disallowComment" size="s" text theme="blue" @click="$emit('on-comment', { type: 'user', comment: comment })">回复</tm-button>
|
||||
<tm-button size="s" text theme="grey" @click="$emit('on-copy', comment.content)">复制</tm-button>
|
||||
<tm-button v-if="!disallowComment" size="s" text theme="blue"
|
||||
@click="$emit('on-comment', { type: 'user', comment: comment })">回复</tm-button>
|
||||
<tm-button size="s" text theme="grey" @click="$emit('on-copy', comment.spec.raw)">复制</tm-button>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="comment-item_content mt-12" :class="{ 'has-bg': useContentBg, 'not-ml': isChild }" @click="$emit('on-detail', comment)" v-html="comment.content"></view>
|
||||
<!-- <view v-if="useActions" class="comment-item_info text-size-s text-grey">
|
||||
<text v-if="false" @click="$emit('on-todo')">点赞</text>
|
||||
<text @click="$emit('on-comment', { type: 'user', comment: comment })">回复</text>
|
||||
<text v-if="false" class="ml-24" @click="$emit('on-todo')">举报</text>
|
||||
<text class="ml-24" @click="$emit('on-copy', comment.content)">复制内容</text>
|
||||
</view> -->
|
||||
<view class="comment-item_content mt-12" :class="{ 'has-bg': useContentBg, 'not-ml': isChild }"
|
||||
@click="$emit('on-detail', comment)" v-html="comment.spec.raw"></view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
|
||||
import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
|
||||
export default {
|
||||
import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
|
||||
import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
|
||||
export default {
|
||||
name: 'comment-item',
|
||||
components: { tmTags, tmButton },
|
||||
components: {
|
||||
tmTags,
|
||||
tmButton
|
||||
},
|
||||
props: {
|
||||
classItem: {
|
||||
type: Array,
|
||||
@@ -79,13 +61,13 @@ export default {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
postId: {
|
||||
type: Number,
|
||||
default: null
|
||||
postName: {
|
||||
type: String,
|
||||
default: ""
|
||||
},
|
||||
comment: {
|
||||
type: Object,
|
||||
default: () => {}
|
||||
default: () => null
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -98,18 +80,17 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
fnOnImageError(data) {
|
||||
if (data.isAdmin) {
|
||||
data.avatar = this.$haloConfig.author.avatar;
|
||||
} else {
|
||||
data.avatar = `${this.$haloConfig.defaultAvatarUrl}&rt=${new Date().getTime()}`;
|
||||
}
|
||||
},
|
||||
created() {
|
||||
console.log("comment",this.comment)
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.comment-item {
|
||||
.comment-item {
|
||||
box-sizing: border-box;
|
||||
border-top: 2rpx solid #f5f5f5;
|
||||
|
||||
@@ -118,13 +99,16 @@ export default {
|
||||
margin-left: 80rpx;
|
||||
border: 0;
|
||||
}
|
||||
|
||||
&.no-solid {
|
||||
border: 0;
|
||||
margin-top: 0 !important;
|
||||
}
|
||||
|
||||
&_user {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.user-avatar {
|
||||
width: 70rpx;
|
||||
height: 70rpx;
|
||||
@@ -132,10 +116,12 @@ export default {
|
||||
box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.05);
|
||||
border: 4rpx solid #ffffff;
|
||||
border-radius: 12rpx;
|
||||
|
||||
&.is-radius {
|
||||
border-radius: 50%;
|
||||
}
|
||||
}
|
||||
|
||||
.user-info {
|
||||
width: 0;
|
||||
flex-grow: 1;
|
||||
@@ -149,19 +135,22 @@ export default {
|
||||
border-radius: 10rpx;
|
||||
line-height: 1.8;
|
||||
color: var(--main-text-color);
|
||||
|
||||
&.has-bg {
|
||||
background-color: #fafafa;
|
||||
padding: 6rpx 24rpx;
|
||||
}
|
||||
|
||||
&.not-ml {
|
||||
margin-left: 80rpx;
|
||||
}
|
||||
}
|
||||
|
||||
&_info {
|
||||
margin-top: 6rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-left: 80rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -3,13 +3,8 @@
|
||||
<!-- 顶部区域 -->
|
||||
<view class="comment-list_head">
|
||||
<view class="title">
|
||||
评论列表
|
||||
<text class="count">（{{ result.total || 0 }}条）</text>
|
||||
</view>
|
||||
<view class="filter">
|
||||
<text class="filter-item " :class="{ active: sort == 0 }" @click="fnOnSort(0)">默认</text>
|
||||
<text class="filter-item " :class="{ active: sort == 1 }" @click="fnOnSort(1)">热评</text>
|
||||
<!-- <text class="filter-item">全部</text> -->
|
||||
<text>评论列表</text>
|
||||
<text class="count">（{{ (result&& result.total) || 0 }}条）</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 内容区域 -->
|
||||
@@ -21,62 +16,44 @@
|
||||
</view>
|
||||
<view v-else-if="loading == 'error'" class="error">
|
||||
<tm-empty icon="icon-wind-cry" label="加载失败">
|
||||
<tm-button theme="bg-gradient-light-blue-accent" size="m" v-if="!disallowComment" @click="fnToComment()">刷新试试</tm-button>
|
||||
<tm-button theme="bg-gradient-light-blue-accent" size="m" v-if="!disallowComment"
|
||||
@click="fnToComment()">刷新试试</tm-button>
|
||||
</tm-empty>
|
||||
</view>
|
||||
</view>
|
||||
<block v-else>
|
||||
<tm-alerts
|
||||
v-if="disallowComment && dataList.length !== 0"
|
||||
color="red"
|
||||
text
|
||||
:margin="[0, 0]"
|
||||
:shadow="0"
|
||||
label="Ծ‸Ծ博主已设置该文章禁止评论!"
|
||||
:round="3"
|
||||
></tm-alerts>
|
||||
<tm-alerts v-if="disallowComment && dataList.length !== 0" color="red" text :margin="[0, 0]" :shadow="0"
|
||||
label="Ծ‸Ծ博主已设置该文章禁止评论!" :round="3"></tm-alerts>
|
||||
<view class="empty pt-50" v-if="dataList.length == 0">
|
||||
<tm-empty v-if="disallowComment" icon="icon-shiliangzhinengduixiang-" label="暂无评论">
|
||||
<text class="text-red text-size-s">- 文章已开启禁止评论 -</text>
|
||||
</tm-empty>
|
||||
<tm-empty v-else icon="icon-shiliangzhinengduixiang-" label="暂无评论">
|
||||
<tm-button theme="light-blue" :dense="true" :shadow="0" size="m" @click="fnToComment(null)">抢沙发</tm-button>
|
||||
<tm-button theme="light-blue" :dense="true" :shadow="0" size="m"
|
||||
@click="fnToComment(null)">抢沙发</tm-button>
|
||||
</tm-empty>
|
||||
</view>
|
||||
<block v-else>
|
||||
<!-- 评论内容 : 目前仅支持二级评论 -->
|
||||
<block v-for="(comment, index) in dataList" :key="comment.id">
|
||||
<comment-item
|
||||
:useContentBg="false"
|
||||
:isChild="false"
|
||||
:comment="comment"
|
||||
:postId="postId"
|
||||
:disallowComment="disallowComment"
|
||||
@on-copy="fnCopyContent"
|
||||
@on-comment="fnToComment"
|
||||
@on-todo="fnToDo"
|
||||
@on-detail="fnShowCommetnDetail"
|
||||
></comment-item>
|
||||
<block v-for="(comment, index) in dataList" :key="comment.metadata.name">
|
||||
<comment-item :useContentBg="false" :isChild="false" :comment="comment" :postName="postName"
|
||||
:disallowComment="disallowComment" @on-copy="fnCopyContent" @on-comment="fnToComment"
|
||||
@on-todo="fnToDo" @on-detail="fnShowCommetnDetail"></comment-item>
|
||||
|
||||
<!-- 二级评论 -->
|
||||
<block v-if="comment.children && comment.children.length != 0">
|
||||
<block v-for="(childComment, childIndex) in comment.children" :key="childComment.id">
|
||||
<comment-item
|
||||
:useContentBg="false"
|
||||
:isChild="true"
|
||||
:comment="childComment"
|
||||
:postId="postId"
|
||||
:disallowComment="disallowComment"
|
||||
@on-copy="fnCopyContent"
|
||||
@on-comment="fnToComment"
|
||||
@on-todo="fnToDo"
|
||||
@on-detail="fnShowCommetnDetail"
|
||||
></comment-item>
|
||||
<block v-if="comment.replies && comment.replies.items.length != 0">
|
||||
<block v-for="(childComment, childIndex) in comment.replies.items"
|
||||
:key="childComment.metadata.name">
|
||||
<comment-item :useContentBg="false" :isChild="true" :comment="childComment"
|
||||
:postName="postName" :disallowComment="disallowComment" @on-copy="fnCopyContent"
|
||||
@on-comment="fnToComment" @on-todo="fnToDo"
|
||||
@on-detail="fnShowCommetnDetail"></comment-item>
|
||||
</block>
|
||||
</block>
|
||||
</block>
|
||||
<view v-if="false" class="to-more-comment">
|
||||
<tm-button item-class="btn" :block="true" width="90vw" theme="bg-gradient-light-blue-lighten" size="m">点击查看全部评论</tm-button>
|
||||
<tm-button item-class="btn" :block="true" width="90vw" theme="bg-gradient-light-blue-lighten"
|
||||
size="m">点击查看全部评论</tm-button>
|
||||
</view>
|
||||
</block>
|
||||
</block>
|
||||
@@ -85,22 +62,26 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
|
||||
import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
|
||||
import tmAlerts from '@/tm-vuetify/components/tm-alerts/tm-alerts.vue';
|
||||
import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
|
||||
import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
|
||||
import tmAlerts from '@/tm-vuetify/components/tm-alerts/tm-alerts.vue';
|
||||
|
||||
export default {
|
||||
export default {
|
||||
name: 'comment-list',
|
||||
components: { tmEmpty, tmButton, tmAlerts },
|
||||
components: {
|
||||
tmEmpty,
|
||||
tmButton,
|
||||
tmAlerts
|
||||
},
|
||||
props: {
|
||||
// 是否禁用评论
|
||||
disallowComment: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
postId: {
|
||||
type: Number,
|
||||
default: null
|
||||
postName: {
|
||||
type: String,
|
||||
default: ""
|
||||
},
|
||||
post: {
|
||||
type: Object,
|
||||
@@ -110,42 +91,41 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
loading: 'loading',
|
||||
sort: 0,
|
||||
queryParams: {
|
||||
sort: '',
|
||||
more: true
|
||||
group: "content.halo.run",
|
||||
kind: "Post",
|
||||
version: "v1alpha1",
|
||||
name: "",
|
||||
page: 1,
|
||||
size: 50,
|
||||
withReplies: true,
|
||||
replySize: 10
|
||||
},
|
||||
api: 'getPostCommentTree',
|
||||
result: {},
|
||||
result: null,
|
||||
dataList: []
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.queryParams.name = this.postName;
|
||||
this.fnGetData();
|
||||
uni.$on('comment_list_refresh', () => {
|
||||
this.fnOnSort(this.sort, true);
|
||||
this.fnOnSort(true);
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
fnOnSort(type, refresh = false) {
|
||||
if (this.sort == type && refresh == false) return;
|
||||
const _api = ['getPostCommentTree', 'getPostTopCommentList'];
|
||||
this.sort = type;
|
||||
this.api = _api[type];
|
||||
fnOnSort(refresh = false) {
|
||||
if (refresh == false) return;
|
||||
this.fnGetData();
|
||||
},
|
||||
fnGetData() {
|
||||
this.loading = 'loading';
|
||||
this.$httpApi[this.api](this.postId, {})
|
||||
this.$httpApi.v2.getPostCommentList(this.queryParams)
|
||||
.then(res => {
|
||||
if (res.status == 200) {
|
||||
this.result = res.data;
|
||||
this.dataList = res.data.content;
|
||||
console.log("日志：", res)
|
||||
this.result = res;
|
||||
this.dataList = res.items;
|
||||
this.loading = 'success';
|
||||
this.$emit('on-loaded', this.dataList);
|
||||
} else {
|
||||
this.loading = 'error';
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
this.loading = 'error';
|
||||
@@ -161,15 +141,18 @@ export default {
|
||||
if (this.disallowComment) {
|
||||
return uni.$tm.toast('文章已禁止评论！');
|
||||
}
|
||||
console.log(data);
|
||||
console.log('data', data);
|
||||
let _comment = {};
|
||||
if (data) {
|
||||
let { type, comment } = data;
|
||||
let {
|
||||
type,
|
||||
comment
|
||||
} = data;
|
||||
// 来自用户
|
||||
_comment = {
|
||||
id: this.post.id,
|
||||
parentId: comment.id,
|
||||
title: comment.author,
|
||||
isComment: false,
|
||||
postName: comment.metadata.name,
|
||||
title: comment.owner.displayName,
|
||||
from: 'posts',
|
||||
formPage: 'comment_list',
|
||||
type: 'user'
|
||||
@@ -177,9 +160,9 @@ export default {
|
||||
} else {
|
||||
// 来自文章
|
||||
_comment = {
|
||||
id: this.post.id,
|
||||
parentId: 0,
|
||||
title: '评论文章：' + this.post.title,
|
||||
isComment: true,
|
||||
postName: this.post.metadata.name,
|
||||
title: '评论文章：' + this.post.spec.title,
|
||||
formPage: 'comment_list',
|
||||
from: 'posts',
|
||||
type: 'post'
|
||||
@@ -199,16 +182,16 @@ export default {
|
||||
|
||||
fnShowCommetnDetail(comment) {
|
||||
this.$emit('on-comment-detail', {
|
||||
postId: this.postId,
|
||||
postName: this.postName,
|
||||
comment: comment
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.comment-list {
|
||||
.comment-list {
|
||||
&_head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -229,12 +212,14 @@ export default {
|
||||
background-color: rgb(3, 174, 252);
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
|
||||
.title {
|
||||
.count {
|
||||
font-size: 28rpx;
|
||||
font-weight: normal;
|
||||
}
|
||||
}
|
||||
|
||||
.filter {
|
||||
font-size: 26rpx;
|
||||
font-weight: normal;
|
||||
@@ -242,6 +227,7 @@ export default {
|
||||
&-item {
|
||||
margin-left: 20rpx;
|
||||
color: #666;
|
||||
|
||||
&.active {
|
||||
font-weight: bold;
|
||||
color: rgb(255, 152, 0);
|
||||
@@ -250,14 +236,17 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&_content {
|
||||
margin-top: 24rpx;
|
||||
padding-bottom: 36rpx;
|
||||
}
|
||||
}
|
||||
.loading-wrap {
|
||||
}
|
||||
|
||||
.loading-wrap {
|
||||
width: 100%;
|
||||
height: 506rpx;
|
||||
|
||||
.loading {
|
||||
width: 100%;
|
||||
}
|
||||
@@ -265,18 +254,19 @@ export default {
|
||||
.e-loading-icon {
|
||||
font-size: 100rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.to-more-comment {
|
||||
.to-more-comment {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-top: 80rpx;
|
||||
|
||||
::v-deep {
|
||||
.tm-button .tm-button-btn uni-button {
|
||||
height: 70rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -2,20 +2,12 @@
|
||||
<!-- 轮播图 -->
|
||||
<view class="Swiper-mfw-index-box">
|
||||
<view class="Swiper-mfw-index Swiper-box" :class="[dotPosition]">
|
||||
<swiper
|
||||
class="Swiper-mfw"
|
||||
:style="{ height: height }"
|
||||
:circular="true"
|
||||
:indicator-dots="false"
|
||||
:autoplay="autoplay"
|
||||
:interval="3000"
|
||||
:duration="1000"
|
||||
:current="currentIndex"
|
||||
:disable-touch="disable_touch"
|
||||
@change="change"
|
||||
>
|
||||
<swiper class="Swiper-mfw" :style="{ height: height }" :circular="true" :indicator-dots="false"
|
||||
:autoplay="autoplay" :interval="3000" :duration="1000" :current="currentIndex"
|
||||
:disable-touch="disable_touch" @change="change">
|
||||
<!-- 只需要前5条数据 -->
|
||||
<swiper-item class="swiper-mfw-item" v-if="index <= (dotPosition == 'right' ? 3 : 4)" v-for="(item, index) in list" :key="index">
|
||||
<block v-for="(item, index) in list" :key="index">
|
||||
<swiper-item class="swiper-mfw-item" v-if="index <= 4">
|
||||
<!-- /*
|
||||
1. 这里不需要用api控制暂停视频
|
||||
2. 因为video标签上加了v-if="current==index"
|
||||
@@ -24,25 +16,17 @@
|
||||
*/ -->
|
||||
<!-- 如果有视频，则显示视频-->
|
||||
<template v-if="item.mp4 && current == index">
|
||||
<video
|
||||
class="ImageVideo"
|
||||
:id="'ImageVideo' + index"
|
||||
:ref="'ImageVideo' + index"
|
||||
:src="item.mp4"
|
||||
:loop="true"
|
||||
:muted="false"
|
||||
:autoplay="current == index ? true : false"
|
||||
:controls="false"
|
||||
:show-fullscreen-btn="false"
|
||||
:show-play-btn="false"
|
||||
:enable-progress-gesture="false"
|
||||
:play-strategy="0"
|
||||
:poster="item.image || item.src"
|
||||
></video>
|
||||
<video class="ImageVideo" :id="'ImageVideo' + index" :ref="'ImageVideo' + index"
|
||||
:src="item.mp4" :loop="true" :muted="false" :autoplay="current == index ? true : false"
|
||||
:controls="false" :show-fullscreen-btn="false" :show-play-btn="false"
|
||||
:enable-progress-gesture="false" :play-strategy="0"
|
||||
:poster="item.image || item.src"></video>
|
||||
</template>
|
||||
<!-- 否则显示图片 -->
|
||||
<image v-else :src="item.image || item.src" class="Image" mode="aspectFill" @click.stop="$emit('on-click', item)"></image>
|
||||
<image v-else :src="item.image || item.src" class="Image" mode="aspectFill"
|
||||
@click.stop="$emit('on-click', item)"></image>
|
||||
</swiper-item>
|
||||
</block>
|
||||
</swiper>
|
||||
<!-- 指示器 [Top] -->
|
||||
<view v-if="useTop" class="Swiper-indicator-box indicator-Top-box">
|
||||
@@ -84,12 +68,15 @@
|
||||
<!-- 用户信息 -->
|
||||
<view class="Bottom-UserInfo">
|
||||
<!-- 头像 -->
|
||||
<view class="UserImage-box"><image :src="item.avatar" class="Image" mode="aspectFill"></image></view>
|
||||
<view class="UserImage-box">
|
||||
<image :src="item.avatar" class="Image" mode="aspectFill"></image>
|
||||
</view>
|
||||
<!-- 用户名 -->
|
||||
<view class="textbox UserName-box">
|
||||
<text class="text UserInfo">{{ item.nickname }}</text>
|
||||
</view>
|
||||
<view v-if="item.createTime" class="jiange-box"><text class="text jiange-text"></text></view>
|
||||
<view v-if="item.createTime" class="jiange-box"><text class="text jiange-text"></text>
|
||||
</view>
|
||||
<view v-if="item.createTime" class="textbox UserGPS-box">
|
||||
<text class="text UserInfo">发布于 {{ item.createTime }}</text>
|
||||
</view>
|
||||
@@ -106,18 +93,14 @@
|
||||
<!-- 左边 -->
|
||||
<view class="Bottom-left-Imagelist">
|
||||
<block v-for="(item, index) in list" :key="index">
|
||||
<view
|
||||
class="Bottom-item"
|
||||
v-if="Number(index) <= (dotPosition == 'right' ? 3 : 4)"
|
||||
:class="currentIndex == index ? 'current' : 'no'"
|
||||
@click="SwiperIndTap(index)"
|
||||
>
|
||||
<view class="Bottom-item" v-if="Number(index) <= 4"
|
||||
:class="currentIndex == index ? 'current' : 'no'" @click="SwiperIndTap(index)">
|
||||
<image :src="item.image || item.src" class="Image" mode="aspectFill"></image>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
<!-- 右边 -->
|
||||
<view class="Bottom-right-lili-btn">
|
||||
<view v-if="false" class="Bottom-right-lili-btn">
|
||||
<view class="Bottom-item is-more">
|
||||
<view class="more" @click.stop="$emit('on-more')">
|
||||
MORE
|
||||
@@ -132,7 +115,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
export default {
|
||||
name: 'e-swiper',
|
||||
props: {
|
||||
title: {
|
||||
@@ -195,7 +178,8 @@ export default {
|
||||
this.currentIndex = this.current;
|
||||
const date = new Date();
|
||||
//将月份名称存储在数组中
|
||||
const monthArray = new Array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
|
||||
const monthArray = new Array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov',
|
||||
'Dec');
|
||||
|
||||
this.date.year = date.getFullYear();
|
||||
let month = date.getMonth() + 1;
|
||||
@@ -205,7 +189,10 @@ export default {
|
||||
methods: {
|
||||
// current 改变时会触发 change 事件，event.detail = {current: current, source: source}
|
||||
change(e) {
|
||||
let { current, source } = e.detail;
|
||||
let {
|
||||
current,
|
||||
source
|
||||
} = e.detail;
|
||||
//只有页面自动切换，手动切换时才轮播，其他不允许
|
||||
if (source === 'autoplay' || source === 'touch') {
|
||||
let event = {
|
||||
@@ -225,9 +212,9 @@ export default {
|
||||
this.$emit('change', event);
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import './e-swiper.scss';
|
||||
@import './e-swiper.scss';
|
||||
</style>
|
||||
@@ -2,29 +2,12 @@
|
||||
* 广告配置
|
||||
*/
|
||||
export default {
|
||||
adpid: '', // uni-AD App广告位id，在uni-AD官网申请广告位
|
||||
unitId: '', // 广告单元id，可在小程序管理后台的流量主模块新建 (非个人资质，小程序后台广告主开通申请)
|
||||
frequency: 8, // 列表中，广告出现的频率（8=每8条数据出现一次广告）
|
||||
// 首页广告
|
||||
home: {
|
||||
use: false,
|
||||
},
|
||||
// 文章列表广告
|
||||
articles: {
|
||||
use: false,
|
||||
},
|
||||
// 文章详情广告
|
||||
articleDetail: {
|
||||
// 微信广告/dclound申请的广告
|
||||
use: true,
|
||||
|
||||
// 自定义广告
|
||||
custom: {
|
||||
use: true,
|
||||
cover: 'https://b.925i.cn/uni_halo/uni_halo_ad_cover.png',
|
||||
title: 'uni-halo 正式开源啦，欢迎来使用和体验！',
|
||||
content: '基于 uni-app + halo1.x API 实现一款现代化的开源博客 / CMS 系统API开发的多端应用。功能包括：前台博客系统 和 后台管理系统，同时满足浏览和管理两端合一的需求，真正实现一个应用实现博客浏览和后台管理。',
|
||||
url: 'https://uni-halo.925i.cn'
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -14,9 +14,6 @@ export default {
|
||||
showAbout: true, // 显示关于项目入口
|
||||
uni_halo_logo: 'https://b.925i.cn/uni_halo/uni_halo_logo.png', // uni-halo的logo
|
||||
|
||||
apiUrl: '', // Api基础域名 [必填] ：你的Halo博客基础域名
|
||||
apiAuthorization: '', // Api认证key [必填]： Halo中-系统-博客设置-切换到高级选项-API设置-Access key
|
||||
|
||||
title: '', // 博客标题 [建议必填]：在某些页面没有设置具体的页面名称时候，使用该值显示
|
||||
miniCodeImageUrl: '', // 小程序的太阳码/二维码的图片地址 [建议必填]
|
||||
|
||||
@@ -25,12 +22,12 @@ export default {
|
||||
// 启动页面的配置（页面地址`/pagesA/start/start`）
|
||||
start: {
|
||||
use: true, // 是否使用首次启动页：用户第一次使用你的应用会显示否则不显示
|
||||
title: 'uni-halo', // 启动页面中的文字标题
|
||||
title: 'uni-halo2.0', // 标题
|
||||
bg: '', // 留空则使用默认 开屏首页背景，可以是颜色值或者图片图片地址
|
||||
logo: 'https://b.925i.cn/uni_halo/uni_halo_logo.png', // logo
|
||||
desc1: '全新UI，准备出发', // 描述信息1
|
||||
logo: 'https://b.925i.cn/uni_halo/uni_halo_logo.png', // 开屏首页图片
|
||||
desc1: '准备好了吗，即刻就出发', // 描述信息1
|
||||
desc2: '新触动 新感受 新体验', // 描述信息2
|
||||
btnText: '全新触发' // 按钮文字
|
||||
btnText: '立即体验'
|
||||
},
|
||||
|
||||
// 博主信息
|
||||
@@ -81,42 +78,6 @@ export default {
|
||||
list: [],
|
||||
},
|
||||
|
||||
quickNav: { // 快捷导航配置（如不需要恋爱日记，请注释或删除94-101行的代码）
|
||||
use: true, // 是否在个人中心显示以下页面的入口
|
||||
list: [{
|
||||
icon: 'halocoloricon-classify',
|
||||
text: '文章归档',
|
||||
iconSize: 60,
|
||||
color: 'blue',
|
||||
type: 'page',
|
||||
path: '/pagesA/archives/archives'
|
||||
},
|
||||
{
|
||||
icon: 'halocoloricon-attent',
|
||||
text: '恋爱日记',
|
||||
iconSize: 60,
|
||||
color: 'blue',
|
||||
type: 'page',
|
||||
path: '/pagesA/love/love'
|
||||
},
|
||||
{
|
||||
icon: 'halocoloricon-calendar',
|
||||
text: '个人日记',
|
||||
iconSize: 60,
|
||||
color: 'blue',
|
||||
type: 'page',
|
||||
path: '/pagesA/journal/journal'
|
||||
},
|
||||
{
|
||||
icon: 'halocoloricon-message',
|
||||
text: '留言板',
|
||||
iconSize: 60,
|
||||
color: 'blue',
|
||||
type: 'page',
|
||||
path: '/pagesA/leaving/leaving'
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
// 微信分享信息
|
||||
wxShareConfig: {
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
/**
|
||||
* 配置key
|
||||
*/
|
||||
|
||||
export default {
|
||||
SHEET_LEAVING: 'leaving', // 留言板
|
||||
}
|
||||
@@ -27,13 +27,13 @@ export default {
|
||||
title: '关于我们',
|
||||
desc: '我们一起度过的那些经历'
|
||||
},
|
||||
{
|
||||
key: 'album',
|
||||
use: true,
|
||||
iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
|
||||
title: '恋爱相册',
|
||||
desc: '定格了我们的那些小美好'
|
||||
},
|
||||
// {
|
||||
// key: 'album',
|
||||
// use: true,
|
||||
// iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
|
||||
// title: '恋爱相册',
|
||||
// desc: '定格了我们的那些小美好'
|
||||
// },
|
||||
{
|
||||
key: 'list',
|
||||
use: true,
|
||||
|
||||
@@ -29,13 +29,6 @@ export default {
|
||||
title: '关于我们',
|
||||
desc: '我们一起度过的那些经历'
|
||||
},
|
||||
{
|
||||
key: 'album',
|
||||
use: true,
|
||||
iconImageUrl: 'https://b.925i.cn/uni_halo_love/diandian.png',
|
||||
title: '恋爱相册',
|
||||
desc: '定格了我们的那些小美好'
|
||||
},
|
||||
{
|
||||
key: 'list',
|
||||
use: true,
|
||||
@@ -49,8 +42,7 @@ export default {
|
||||
journey: `
|
||||
<p>有一只马，它的邻居是一只驴。</p><p>有一天，马和驴都被主人牵到外面晒太阳，马和驴聊起了天。</p><p>马说：“我叫马，你呢？”</p><p>驴说：“我叫驴。（哄小宝贝睡觉的甜甜睡前故事）”</p><p>马说：“为什么我俩的名字不一样呢？”</p><p>驴说：“因为我和你不一样。”</p><p>马说：“我们俩什么地方不一样呢？”</p><p>驴说：“我身材小巧，而你却比较粗壮，不如我耐看。”马看了看比自已矮小很多的驴，认为驴说的话有点道理。</p><p>马说：“我们俩除了身材不一样，还有什么不同呢？”</p><p>驴说：“我们俩的声音不一样，我的声音多动听呀！”说着驴伸长脖子叫了两声。“不信，你也叫两声试试。”马也伸长脖子嘶鸣了两声，的确和驴的声音有点不同，马不好意思地低下了头。</p><p>过了一会儿，马又说：“我们俩除了身材和声音不一样外，还有什么不同呢？”</p><p>驴说：“我的步伐多么优雅呀。”说着，驴迈开蹄子走了两步，“而你呢，却昂首阔步，一点儿也不优雅，（如何哄女朋友睡觉的睡前故事爱情浪漫）不信你走两步试试。”</p><p>马听驴这么一说，就高昂着头走了两步，旋即，马飞奔了起来，转了一圈回来后，驴得意地说：“怎么样，我没说错罢，你就是急性子，和优雅不沾边。”马听了驴的话，有点感到惭愧。</p><p>最后，马又鼓起勇气说：“我们俩还有什么不同呢？”</p><p>驴说：“我的家庭意识比你强，主人抽我一鞭子，我就跟着主人回家，而你呢？恐怕不会吧……”</p><p>马还没有来得及回答，马和驴的主人同时来到了马和驴的身边。只见驴的主人抽了驴一鞭子后，驴乖乖地跟着主人回家了。马把这一切都看在了眼里，它为自已和驴的诸多不同而感到惭愧，只见马的主人也抽了马一鞭子，马犹豫了一下，终于象驴一样乖乖地跟着主人回了家。</p><p>一个伯乐站在远处看到了这一幕后，叹口气离开了。</p>
|
||||
`,
|
||||
// 恋爱相册
|
||||
albumKeyName: '恋爱相册', // 对应后台的图库分组名称
|
||||
|
||||
// 恋爱清单
|
||||
loveList: {
|
||||
useApi: false, // 是否启用api接口
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
/**
|
||||
* 页面配置
|
||||
*/
|
||||
import AppKeys from './keys.js'
|
||||
|
||||
export default {
|
||||
[AppKeys.SHEET_LEAVING]: 65, // 留言板页面ID
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
/** 配置后台管理员token */
|
||||
const HaloTokenConfig = Object.freeze({
|
||||
|
||||
/** 基础请求域名：你的Halo博客基础域名 */
|
||||
BASE_API: "https://demo.halo.run",
|
||||
// BASE_API: "https://blog.925i.cn",
|
||||
|
||||
|
||||
/** 管理员token */
|
||||
systemToken: ``,
|
||||
/** 匿名用户token */
|
||||
anonymousToken: ``
|
||||
})
|
||||
|
||||
|
||||
export default HaloTokenConfig;
|
||||
@@ -63,8 +63,9 @@ import ApiManager from '@/api/index.js'
|
||||
Vue.use(ApiManager);
|
||||
|
||||
import HaloConfig from '@/config/halo.config.js'
|
||||
import HaloTokenConfig from '@/config/token.config.js'
|
||||
Vue.prototype.$haloConfig = HaloConfig
|
||||
Vue.prototype.$baseApiUrl = HaloConfig.apiUrl
|
||||
Vue.prototype.$baseApiUrl = HaloTokenConfig.BASE_API
|
||||
|
||||
import HaloAdConfig from '@/config/ad.config.js'
|
||||
Vue.prototype.$haloAdConfig = HaloAdConfig
|
||||
|
||||
+3
-3
@@ -157,12 +157,12 @@
|
||||
"devServer" : {
|
||||
"disableHostCheck" : true,
|
||||
"proxy" : {
|
||||
"/api" : {
|
||||
"target" : "https://b.925i.cn",
|
||||
"/apis" : {
|
||||
"target" : "https://demo.halo.run",
|
||||
"changeOrigin" : true,
|
||||
"secure" : false,
|
||||
"pathRewrite" : {
|
||||
"^/api" : "/api"
|
||||
"^/apis" : "/apis"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+17
-18
@@ -24,7 +24,7 @@
|
||||
"path": "pages/tabbar/category/category",
|
||||
"style": {
|
||||
"navigationBarTitleText": "分类",
|
||||
"enablePullDownRefresh": false,
|
||||
"enablePullDownRefresh": true,
|
||||
"app-plus": {
|
||||
"pullToRefresh": {
|
||||
"color": "#03a9f4",
|
||||
@@ -45,9 +45,9 @@
|
||||
}
|
||||
}
|
||||
}, {
|
||||
"path": "pages/tabbar/links/links",
|
||||
"path": "pages/tabbar/moments/moments",
|
||||
"style": {
|
||||
"navigationBarTitleText": "友链",
|
||||
"navigationBarTitleText": "瞬间",
|
||||
"enablePullDownRefresh": true,
|
||||
"app-plus": {
|
||||
"pullToRefresh": {
|
||||
@@ -160,6 +160,18 @@
|
||||
}
|
||||
}
|
||||
|
||||
}, {
|
||||
"path": "friend-links/friend-links",
|
||||
"style": {
|
||||
"navigationBarTitleText": "友情链接",
|
||||
"enablePullDownRefresh": true,
|
||||
"app-plus": {
|
||||
"pullToRefresh": {
|
||||
"color": "#03a9f4",
|
||||
"style": "circle"
|
||||
}
|
||||
}
|
||||
}
|
||||
}, {
|
||||
"path": "journal/journal",
|
||||
"style": {
|
||||
@@ -172,19 +184,6 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}, {
|
||||
"path": "leaving/leaving",
|
||||
"style": {
|
||||
"navigationBarTitleText": "留言板",
|
||||
"enablePullDownRefresh": true,
|
||||
"app-plus": {
|
||||
"pullToRefresh": {
|
||||
"color": "#03a9f4",
|
||||
"style": "circle"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}, {
|
||||
"path": "articles/articles",
|
||||
"style": {
|
||||
@@ -572,8 +571,8 @@
|
||||
}, {
|
||||
"iconPath": "static/tabbar/select_links.png",
|
||||
"selectedIconPath": "static/tabbar/select_links_active.png",
|
||||
"pagePath": "pages/tabbar/links/links",
|
||||
"text": "友链"
|
||||
"pagePath": "pages/tabbar/moments/moments",
|
||||
"text": "瞬间"
|
||||
}, {
|
||||
"iconPath": "static/tabbar/select_mine.png",
|
||||
"selectedIconPath": "static/tabbar/select_mine_active.png",
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
export default {
|
||||
onLoad() {
|
||||
this.fnCheckShowStarted();
|
||||
},
|
||||
@@ -12,14 +12,19 @@ export default {
|
||||
fnCheckShowStarted() {
|
||||
if (!getApp().globalData.start.use) {
|
||||
uni.switchTab({
|
||||
url: '/pages/tabbar/home/home'
|
||||
// url: '/pages/tabbar/home/home'
|
||||
url: '/pages/tabbar/moments/moments'
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (uni.getStorageSync('APP_HAS_STARTED')) {
|
||||
uni.switchTab({
|
||||
url: '/pages/tabbar/home/home'
|
||||
// url: '/pages/tabbar/home/home'
|
||||
url: '/pages/tabbar/moments/moments'
|
||||
});
|
||||
// uni.navigateTo({
|
||||
// url: '/pagesA/friend-links/friend-links'
|
||||
// });
|
||||
} else {
|
||||
uni.redirectTo({
|
||||
url: '/pagesA/start/start'
|
||||
@@ -27,5 +32,5 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
+140
-159
@@ -19,103 +19,53 @@
|
||||
<view class="statistics flex pt-24 pb-24" :class="{ 'has-solid': statisticsShowMore }">
|
||||
<view class="item flex-1 text-align-center">
|
||||
<view class="number text-size-xl text-bg-gradient-orange-accent">
|
||||
<tm-flop
|
||||
:startVal="0"
|
||||
:decimals="0"
|
||||
:endVal="statistics.postCount"
|
||||
:duration="3000"
|
||||
></tm-flop>
|
||||
<tm-flop :startVal="0" :decimals="0" :endVal="statistics.post"
|
||||
:duration="3000"></tm-flop>
|
||||
</view>
|
||||
<view class="mt-6 text-align-center text-size-s text-grey-darken-1">文章总数</view>
|
||||
</view>
|
||||
<view class="item flex-1 text-align-center">
|
||||
<view class="number text-size-xl text-bg-gradient-blue-accent">
|
||||
<tm-flop
|
||||
:startVal="0"
|
||||
:decimals="0"
|
||||
:endVal="statistics.categoryCount"
|
||||
:duration="3000"
|
||||
></tm-flop>
|
||||
<view class="number text-size-xl text-bg-gradient-green-accent">
|
||||
<tm-flop :startVal="0" :decimals="0" :endVal="statistics.visit"
|
||||
:duration="3000"></tm-flop>
|
||||
</view>
|
||||
<view class="mt-6 text-align-center text-size-s text-grey-darken-1">分类总数</view>
|
||||
<view class="mt-6 text-size-s text-grey-darken-1">访客数量</view>
|
||||
</view>
|
||||
<view class="item flex-1 text-align-center">
|
||||
<view class="number text-size-xl text-bg-gradient-green-accent">
|
||||
<tm-flop
|
||||
:startVal="0"
|
||||
:decimals="0"
|
||||
:endVal="statistics.tagCount"
|
||||
:duration="3000"
|
||||
></tm-flop>
|
||||
<view class="number text-size-xl text-bg-gradient-blue-accent">
|
||||
<tm-flop :startVal="0" :decimals="0" :endVal="statistics.category"
|
||||
:duration="3000"></tm-flop>
|
||||
</view>
|
||||
<view class="mt-6 text-size-s text-grey-darken-1">标签总数</view>
|
||||
<view class="mt-6 text-align-center text-size-s text-grey-darken-1">分类总数</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="statistics solid-top has-solid flex pt-24 pb-24">
|
||||
<view class="item flex-1 text-align-center">
|
||||
<view class="number text-size-xl text-bg-gradient-orange-accent">
|
||||
<tm-flop
|
||||
:startVal="0"
|
||||
:decimals="0"
|
||||
:endVal="statistics.commentCount"
|
||||
:duration="3000"
|
||||
></tm-flop>
|
||||
<tm-flop :startVal="0" :decimals="0" :endVal="statistics.comment"
|
||||
:duration="3000"></tm-flop>
|
||||
</view>
|
||||
<view class="mt-6 text-align-center text-size-s text-grey-darken-1">评论数量</view>
|
||||
</view>
|
||||
|
||||
<view class="item flex-1 text-align-center">
|
||||
<view class="number text-size-xl text-bg-gradient-blue-accent">
|
||||
<tm-flop
|
||||
:startVal="0"
|
||||
:decimals="0"
|
||||
:endVal="statistics.linkCount"
|
||||
:duration="3000"
|
||||
></tm-flop>
|
||||
<tm-flop :startVal="0" :decimals="0" :endVal="statistics.upvote"
|
||||
:duration="3000"></tm-flop>
|
||||
</view>
|
||||
<view class="mt-6 text-align-center text-size-s text-grey-darken-1">点赞数量</view>
|
||||
</view>
|
||||
<view class="item flex-1 text-align-center">
|
||||
<view class="number text-size-xl text-bg-gradient-green-accent">
|
||||
<tm-flop
|
||||
:startVal="0"
|
||||
:decimals="0"
|
||||
:endVal="statistics.visitCount"
|
||||
:duration="3000"
|
||||
></tm-flop>
|
||||
</view>
|
||||
<view class="mt-6 text-size-s text-grey-darken-1">访客数量</view>
|
||||
<view class="mt-6 text-size-s text-grey-darken-1">点赞数量</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
</tm-more>
|
||||
</view>
|
||||
|
||||
<!-- 快捷导航 -->
|
||||
<view v-if="useQuickNav" class="quick-nav flex flex-between round-3 ma-24 pa-24 pl-40 pr-40">
|
||||
<view
|
||||
class="quick-nav-item flex flex-col flex-center"
|
||||
v-for="(nav, index) in quickNavList"
|
||||
:key="index"
|
||||
@click="fnToNavPage(nav)"
|
||||
>
|
||||
<view class="icon round-24 halocoloricon" :class="[nav.icon]"></view>
|
||||
<view class="name text-size-s mt-8">{{ nav.text }}</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 功能导航 -->
|
||||
<view class="nav-wrap ma-24 round-3">
|
||||
<tm-grouplist :shadow="0" :round="3" :margin="[0, 0]">
|
||||
<block v-for="(nav, index) in navList" :key="index">
|
||||
<tm-listitem
|
||||
v-if="nav.show"
|
||||
:title="nav.title"
|
||||
:left-icon="nav.leftIcon"
|
||||
show-left-icon
|
||||
:left-icon-color="nav.leftIconColor"
|
||||
:value="nav.rightText"
|
||||
@click="fnOnNav(nav)"
|
||||
>
|
||||
<tm-listitem v-if="nav.show" :title="nav.title" :left-icon="nav.leftIcon" show-left-icon
|
||||
:left-icon-color="nav.leftIconColor" :value="nav.rightText" @click="fnOnNav(nav)">
|
||||
<template slot="rightValue">
|
||||
<button class="right-value-btn" v-if="nav.openType" :open-type="nav.openType">
|
||||
{{ nav.rightText }}
|
||||
@@ -152,21 +102,12 @@
|
||||
</view>
|
||||
<view class="mt-12 text-size-m text-weight-b text-grey-darken-2">精选图片</view>
|
||||
<view class="photos mt-6 flex ">
|
||||
<image
|
||||
class="photos-img round-2"
|
||||
:src="$utils.checkAvatarUrl(bloggerInfo.avatar)"
|
||||
mode="aspectFill"
|
||||
></image>
|
||||
<image
|
||||
class="photos-img round-2"
|
||||
:src="$utils.checkAvatarUrl(bloggerInfo.avatar)"
|
||||
mode="aspectFill"
|
||||
></image>
|
||||
<image
|
||||
class="photos-img round-2"
|
||||
:src="$utils.checkAvatarUrl(bloggerInfo.avatar)"
|
||||
mode="aspectFill"
|
||||
></image>
|
||||
<image class="photos-img round-2" :src="$utils.checkAvatarUrl(bloggerInfo.avatar)"
|
||||
mode="aspectFill"></image>
|
||||
<image class="photos-img round-2" :src="$utils.checkAvatarUrl(bloggerInfo.avatar)"
|
||||
mode="aspectFill"></image>
|
||||
<image class="photos-img round-2" :src="$utils.checkAvatarUrl(bloggerInfo.avatar)"
|
||||
mode="aspectFill"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -175,21 +116,25 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { checkHasAdminLogin } from '@/utils/auth.js';
|
||||
import CheckAppUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
|
||||
import { CheckWxUpdate } from '@/utils/update.js';
|
||||
import {
|
||||
checkHasAdminLogin
|
||||
} from '@/utils/auth.js';
|
||||
import CheckAppUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
|
||||
import {
|
||||
CheckWxUpdate
|
||||
} from '@/utils/update.js';
|
||||
|
||||
import tmGrouplist from '@/tm-vuetify/components/tm-grouplist/tm-grouplist.vue';
|
||||
import tmListitem from '@/tm-vuetify/components/tm-listitem/tm-listitem.vue';
|
||||
import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
|
||||
import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
|
||||
import tmMore from '@/tm-vuetify/components/tm-more/tm-more.vue';
|
||||
import tmFlop from '@/tm-vuetify/components/tm-flop/tm-flop.vue';
|
||||
import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
|
||||
import tmIcons from '@/tm-vuetify/components/tm-icons/tm-icons.vue';
|
||||
import wave from '@/components/wave/wave.vue';
|
||||
import tmGrouplist from '@/tm-vuetify/components/tm-grouplist/tm-grouplist.vue';
|
||||
import tmListitem from '@/tm-vuetify/components/tm-listitem/tm-listitem.vue';
|
||||
import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
|
||||
import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
|
||||
import tmMore from '@/tm-vuetify/components/tm-more/tm-more.vue';
|
||||
import tmFlop from '@/tm-vuetify/components/tm-flop/tm-flop.vue';
|
||||
import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
|
||||
import tmIcons from '@/tm-vuetify/components/tm-icons/tm-icons.vue';
|
||||
import wave from '@/components/wave/wave.vue';
|
||||
|
||||
export default {
|
||||
export default {
|
||||
components: {
|
||||
tmGrouplist,
|
||||
tmListitem,
|
||||
@@ -206,20 +151,14 @@ export default {
|
||||
statisticsShowMore: false,
|
||||
// 统计信息
|
||||
statistics: {
|
||||
postCount: 0, // 文章数量
|
||||
commentCount: 0, // 评论数量
|
||||
categoryCount: 0, // 分类数量
|
||||
tagCount: 0, // 标签数量
|
||||
journalCount: 0, // 日记数量
|
||||
establishDays: 0, // 博客创建天数
|
||||
linkCount: 0, // 外链数量
|
||||
visitCount: 0, // 访客数量
|
||||
likeCount: 0 // 点赞数量
|
||||
post: 0, // 文章数量
|
||||
comment: 0, // 评论数量
|
||||
category: 0, // 分类数量
|
||||
visit: 0, // 访客数量
|
||||
upvote: 0 // 点赞数量
|
||||
},
|
||||
// 导航信息
|
||||
navList: [],
|
||||
useQuickNav: false,
|
||||
quickNavList: [],
|
||||
miniProfileCard: {
|
||||
show: false
|
||||
}
|
||||
@@ -259,7 +198,6 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.statisticsShowMore = this.globalAppSettings.about.showAllCount;
|
||||
this.fnGetQuickNavList();
|
||||
this.fnGetNavList();
|
||||
this.fnGetData();
|
||||
},
|
||||
@@ -267,21 +205,44 @@ export default {
|
||||
this.fnGetData();
|
||||
},
|
||||
methods: {
|
||||
fnGetQuickNavList() {
|
||||
this.useQuickNav = this.$haloConfig.quickNav.use;
|
||||
if (!this.$haloConfig.quickNav.use) return;
|
||||
const _quickNavList = this.$haloConfig.quickNav.list;
|
||||
this.quickNavList = _quickNavList.map(item => {
|
||||
return item;
|
||||
});
|
||||
},
|
||||
|
||||
fnGetNavList() {
|
||||
const systemInfo = uni.getSystemInfoSync();
|
||||
let _isWx = false;
|
||||
// #ifdef MP-WEIXIN
|
||||
_isWx = true;
|
||||
// #endif
|
||||
this.navList = [
|
||||
this.navList = [{
|
||||
key: 'archives',
|
||||
title: '文章归档',
|
||||
leftIcon: 'halocoloricon-classify',
|
||||
leftIconColor: 'red',
|
||||
rightText: '已归档的文章',
|
||||
path: '/pagesA/archives/archives',
|
||||
isAdmin: false,
|
||||
type: 'page',
|
||||
show: false
|
||||
}, {
|
||||
key: 'love',
|
||||
title: '恋爱日记',
|
||||
leftIcon: 'halocoloricon-attent',
|
||||
leftIconColor: 'red',
|
||||
rightText: '甜蜜恋人的专属',
|
||||
path: '/pagesA/love/love',
|
||||
isAdmin: false,
|
||||
type: 'page',
|
||||
show: true
|
||||
}, {
|
||||
key: 'disclaimers',
|
||||
title: '友情链接',
|
||||
leftIcon: 'icon-lianjie',
|
||||
leftIconColor: 'blue',
|
||||
rightText: '看看朋友们吧',
|
||||
path: '/pagesA/friend-links/friend-links',
|
||||
isAdmin: false,
|
||||
type: 'page',
|
||||
show: true
|
||||
},
|
||||
{
|
||||
key: 'disclaimers',
|
||||
title: '免责声明',
|
||||
@@ -332,29 +293,29 @@ export default {
|
||||
key: 'about',
|
||||
title: '关于项目',
|
||||
leftIcon: 'icon-exclamation-circle',
|
||||
leftIconColor: 'gray',
|
||||
leftIconColor: 'blue',
|
||||
rightText: '小莫唐尼开源项目',
|
||||
path: '/pagesA/about/about',
|
||||
isAdmin: false,
|
||||
type: 'page',
|
||||
show: getApp().globalData.showAbout
|
||||
},
|
||||
{
|
||||
key: 'cache',
|
||||
title: '清除缓存',
|
||||
leftIcon: 'icon-delete',
|
||||
leftIconColor: 'gray',
|
||||
rightText: uni.getStorageInfoSync().currentSize + 'KB',
|
||||
path: 'clear',
|
||||
isAdmin: false,
|
||||
type: 'poup',
|
||||
show: true
|
||||
},
|
||||
// {
|
||||
// key: 'cache',
|
||||
// title: '清除缓存',
|
||||
// leftIcon: 'icon-delete',
|
||||
// leftIconColor: 'gray',
|
||||
// rightText: uni.getStorageInfoSync().currentSize + 'KB',
|
||||
// path: 'clear',
|
||||
// isAdmin: false,
|
||||
// type: 'poup',
|
||||
// show: true
|
||||
// },
|
||||
{
|
||||
key: 'update',
|
||||
title: '版本更新',
|
||||
leftIcon: 'icon-clouddownload',
|
||||
leftIconColor: 'gray',
|
||||
leftIconColor: 'pink',
|
||||
rightText: `当前版本 v${systemInfo.appVersion}`,
|
||||
path: 'update',
|
||||
isAdmin: false,
|
||||
@@ -365,7 +326,7 @@ export default {
|
||||
key: 'setting',
|
||||
title: '应用设置',
|
||||
leftIcon: 'icon-cog',
|
||||
leftIconColor: 'gray',
|
||||
leftIconColor: 'indigo',
|
||||
rightText: `进入系统常用设置`,
|
||||
path: '/pagesA/setting/setting',
|
||||
isAdmin: false,
|
||||
@@ -386,14 +347,10 @@ export default {
|
||||
];
|
||||
},
|
||||
fnGetData() {
|
||||
this.$httpApi
|
||||
this.$httpApi.v2
|
||||
.getBlogStatistics()
|
||||
.then(res => {
|
||||
if (res.status == 200) {
|
||||
this.statistics = res.data;
|
||||
} else {
|
||||
this.$tm.toast('数据加载失败，请重试！');
|
||||
}
|
||||
this.statistics = res;
|
||||
})
|
||||
.catch(err => {
|
||||
this.$tm.toast('数据加载失败，请重试！');
|
||||
@@ -404,7 +361,12 @@ export default {
|
||||
},
|
||||
|
||||
fnOnNav(data) {
|
||||
const { type, path, isAdmin, openType } = data;
|
||||
const {
|
||||
type,
|
||||
path,
|
||||
isAdmin,
|
||||
openType
|
||||
} = data;
|
||||
if (openType) {
|
||||
// #ifndef MP-WEIXIN
|
||||
return uni.$tm.toast('仅支持微信小程序打开！');
|
||||
@@ -484,8 +446,7 @@ export default {
|
||||
// 判断是内置页面还是网页
|
||||
if (this.$utils.checkIsUrl(item.path)) {
|
||||
uni.navigateTo({
|
||||
url:
|
||||
'/pagesC/website/website?data=' +
|
||||
url: '/pagesC/website/website?data=' +
|
||||
JSON.stringify({
|
||||
title: item.text || this.$haloConfig.title,
|
||||
url: item.path
|
||||
@@ -512,21 +473,22 @@ export default {
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.app-page {
|
||||
.app-page {
|
||||
width: 100vw;
|
||||
min-height: 100vh;
|
||||
}
|
||||
}
|
||||
|
||||
.blogger-info {
|
||||
.blogger-info {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 600rpx;
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
&:before {
|
||||
content: '';
|
||||
width: 100%;
|
||||
@@ -536,6 +498,7 @@ export default {
|
||||
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAKUlEQVQImU3IMREAIAgAwJfNkQCEsH8cijjpMf6vnXlQaIiJFx+omEBfmqIEZLe2jzcAAAAASUVORK5CYII=);
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.avatar {
|
||||
position: absolute;
|
||||
top: 200rpx;
|
||||
@@ -546,6 +509,7 @@ export default {
|
||||
border-radius: 50%;
|
||||
border: 6rpx solid #ffffff;
|
||||
}
|
||||
|
||||
.profile {
|
||||
width: 100%;
|
||||
position: absolute;
|
||||
@@ -555,6 +519,7 @@ export default {
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.gif-wave {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
@@ -564,12 +529,13 @@ export default {
|
||||
mix-blend-mode: screen;
|
||||
height: 100rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.profile-card {
|
||||
.profile-card {
|
||||
position: relative;
|
||||
background-color: #fff;
|
||||
overflow: hidden;
|
||||
|
||||
&_label {
|
||||
width: 120rpx;
|
||||
position: absolute;
|
||||
@@ -579,14 +545,17 @@ export default {
|
||||
text-align: center;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.left {
|
||||
width: 260rpx;
|
||||
|
||||
.avatar {
|
||||
width: 130rpx;
|
||||
height: 130rpx;
|
||||
border-radius: 50%;
|
||||
}
|
||||
}
|
||||
|
||||
.right {
|
||||
width: 0;
|
||||
flex-grow: 1;
|
||||
@@ -597,23 +566,28 @@ export default {
|
||||
height: 130rpx;
|
||||
}
|
||||
}
|
||||
.photos-img + .photos-img {
|
||||
|
||||
.photos-img+.photos-img {
|
||||
margin-left: 12rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
.statistics-wrap {
|
||||
}
|
||||
|
||||
.statistics-wrap {
|
||||
box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
|
||||
border-radius: 0rpx 0rpx 24rpx 24rpx;
|
||||
overflow: hidden;
|
||||
|
||||
.statistics {
|
||||
&.has-solid {
|
||||
.item + .item {
|
||||
.item+.item {
|
||||
border-left: 2rpx solid #fafafa;
|
||||
}
|
||||
}
|
||||
|
||||
&.solid-top {
|
||||
position: relative;
|
||||
|
||||
&:before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
@@ -625,27 +599,33 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.quick-nav {
|
||||
}
|
||||
|
||||
.quick-nav {
|
||||
background-color: #fff;
|
||||
box-sizing: border-box;
|
||||
box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
|
||||
|
||||
.name {
|
||||
color: var(--main-text-color);
|
||||
}
|
||||
|
||||
.icon {
|
||||
border-radius: 50%;
|
||||
font-size: 80rpx;
|
||||
}
|
||||
}
|
||||
.nav-wrap {
|
||||
}
|
||||
|
||||
.nav-wrap {
|
||||
box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
|
||||
background-color: #fff;
|
||||
}
|
||||
.copyright {
|
||||
}
|
||||
|
||||
.copyright {
|
||||
color: #c0c4c7;
|
||||
}
|
||||
.right-value-btn {
|
||||
}
|
||||
|
||||
.right-value-btn {
|
||||
background-color: transparent;
|
||||
border: none;
|
||||
padding: 0;
|
||||
@@ -654,10 +634,11 @@ export default {
|
||||
color: #c0c4c7;
|
||||
border-radius: 0;
|
||||
line-height: initial;
|
||||
|
||||
&::after {
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
transform: initial;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
+124
-149
@@ -4,89 +4,86 @@
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
</view>
|
||||
<view v-else class="content flex">
|
||||
<view v-if="categoryList.length == 0" class="category-empty flex flex-center">
|
||||
<tm-empty icon="icon-shiliangzhinengduixiang-" label="博主还没有文章分类~"></tm-empty>
|
||||
<!-- 内容区域 -->
|
||||
<view v-else class="app-page-content">
|
||||
<view v-if="dataList.length == 0" class="content-empty flex flex-center">
|
||||
<!-- 空布局 -->
|
||||
<tm-empty icon="icon-shiliangzhinengduixiang-" label="暂无数据"></tm-empty>
|
||||
</view>
|
||||
<block v-else>
|
||||
<tm-sliderNav :list="categoryList" bg-color="white" color="light-blue" rang-key="name" @change="fnOnCategoryChange"></tm-sliderNav>
|
||||
<scroll-view class="right-content pt-12 pb-12" :scroll-y="true" :scroll-top="scrollTop" :scroll-with-animation="true" :refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="60" refresher-background="#fafafa" @refresherrefresh="fnGetData(true)" @scrolltolower="fnGetData(false)" @scroll="fnOnScroll" @touchmove.stop @touchstart="fnOnTouchStart" @touchend="fnOnTouchEnd" @touchcancel="fnOnTouchEnd">
|
||||
<view v-if="dataList.length == 0" class="article-empty flex flex-center">
|
||||
<tm-empty icon="icon-shiliangzhinengduixiang-" label="该分类下暂无文章~"></tm-empty>
|
||||
<block v-for="(item, index) in dataList" :key="index">
|
||||
<!-- 卡片 -->
|
||||
<tm-translate style="box-sizing: border-box;width: 50%;padding: 0 8rpx;" animation-name="fadeUp"
|
||||
:wait="calcAniWait()">
|
||||
<view class="catgory-card" :style="{backgroundImage:`url(${item.spec.cover})`}">
|
||||
<view class="content">
|
||||
<view style="font-size: 32rpx;color: #ffffff;">{{item.spec.displayName}}</view>
|
||||
<view style="font-size: 24rpx;color: #ffffff;margin-top: 6rpx;">共
|
||||
{{item.postCount}} 篇文章
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<block v-else>
|
||||
<block v-for="(article, index) in dataList" :key="article.createTime">
|
||||
<!-- 文章卡片 -->
|
||||
<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
|
||||
<article-min-card :article="article" @on-click="fnToArticleDetail"></article-min-card>
|
||||
</tm-translate>
|
||||
</block>
|
||||
<tm-flotbutton @click="fnToTopPage" size="m" color="light-blue" icon="icon-angle-up"></tm-flotbutton>
|
||||
<view class="load-text">{{ loadMoreText }}</view>
|
||||
</block>
|
||||
</scroll-view>
|
||||
</block>
|
||||
</view>
|
||||
<tm-flotbutton v-if="dataList.length > 10" color="light-blue" @click="fnToTopScroll" size="m" icon="icon-angle-up"></tm-flotbutton>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import throttle from '@/utils/throttle.js';
|
||||
import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
|
||||
import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
|
||||
import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
|
||||
import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
|
||||
import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
|
||||
import tmFlowLayout from '@/tm-vuetify/components/tm-flowLayout/tm-flowLayout.vue';
|
||||
import tmSliderNav from '@/tm-vuetify/components/tm-sliderNav/tm-sliderNav.vue';
|
||||
|
||||
import ArticleMinCard from '@/components/article-min-card/article-min-card.vue';
|
||||
import MarkdownConfig from '@/common/markdown/markdown.config.js';
|
||||
import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
|
||||
export default {
|
||||
components: {
|
||||
tmSkeleton,
|
||||
tmTranslate,
|
||||
tmFlotbutton,
|
||||
tmTranslate,
|
||||
tmEmpty,
|
||||
tmFlowLayout,
|
||||
tmSliderNav,
|
||||
ArticleMinCard
|
||||
mpHtml
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
markdownConfig: MarkdownConfig,
|
||||
loading: 'loading',
|
||||
queryParams: {
|
||||
size: 10,
|
||||
page: 0,
|
||||
slug: ''
|
||||
page: 1
|
||||
},
|
||||
categoryList: [],
|
||||
result: null,
|
||||
dataList: [],
|
||||
isLoadMore: false,
|
||||
loadMoreText: '',
|
||||
scrollTop: 0,
|
||||
tempScrollTop: 0,
|
||||
scrollTimeout: null,
|
||||
triggered: false
|
||||
loadMoreText: '加载中...'
|
||||
};
|
||||
},
|
||||
|
||||
onLoad() {
|
||||
this.fnSetPageTitle('文章分类');
|
||||
this.fnGetAllCategory();
|
||||
computed: {
|
||||
bloggerInfo() {
|
||||
return this.$tm.vx.getters().getBlogger;
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.queryParams.page = 0;
|
||||
this.isLoadMore = false;
|
||||
},
|
||||
|
||||
onLoad() {
|
||||
this.fnGetData();
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.isLoadMore = false;
|
||||
this.queryParams.page = 0;
|
||||
this.fnGetData();
|
||||
},
|
||||
|
||||
onReachBottom(e) {
|
||||
if (this.result.hasNext) {
|
||||
this.queryParams.page += 1;
|
||||
this.isLoadMore = true;
|
||||
this.fnGetData(false);
|
||||
this.fnGetData();
|
||||
} else {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
@@ -95,101 +92,55 @@
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
fnOnCategoryChange(e) {
|
||||
this.fnResetSetAniWaitIndex();
|
||||
this.queryParams.slug = this.categoryList[e].slug;
|
||||
this.fnToTopScroll();
|
||||
this.dataList = [];
|
||||
this.fnGetData();
|
||||
},
|
||||
|
||||
fnGetAllCategory() {
|
||||
fnGetData() {
|
||||
uni.showLoading({
|
||||
mask: true,
|
||||
title: '加载中...'
|
||||
});
|
||||
// 设置状态为加载中
|
||||
if (!this.isLoadMore) {
|
||||
this.loading = 'loading';
|
||||
// uni.showLoading({
|
||||
// mask: true,
|
||||
// title: '加载中...'
|
||||
// });
|
||||
this.$httpApi
|
||||
.getCategoryList({ more: true })
|
||||
}
|
||||
this.loadMoreText = '加载中...';
|
||||
this.$httpApi.v2
|
||||
.getCategoryList(this.queryParams)
|
||||
.then(res => {
|
||||
this.categoryList = res.data;
|
||||
if (res.data.length != 0) {
|
||||
this.queryParams.slug = res.data[0].slug;
|
||||
this.triggered = false;
|
||||
console.log('请求结果：');
|
||||
console.log(res);
|
||||
|
||||
this.loading = 'success';
|
||||
this.fnGetData(true, false);
|
||||
this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
// 处理数据
|
||||
this.result = res;
|
||||
|
||||
const tempItems = res.items.map(item => {
|
||||
item.spec.cover = this.$utils.checkThumbnailUrl(item.spec.cover, true)
|
||||
return item;
|
||||
})
|
||||
|
||||
if (this.isLoadMore) {
|
||||
this.dataList = this.dataList.concat(tempItems);
|
||||
} else {
|
||||
this.dataList = tempItems;
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
console.error(err);
|
||||
this.loading = 'error';
|
||||
this.loadMoreText = '加载失败，请下拉刷新！';
|
||||
})
|
||||
.finally(() => {
|
||||
setTimeout(() => {
|
||||
uni.hideLoading();
|
||||
uni.stopPullDownRefresh();
|
||||
});
|
||||
},
|
||||
fnGetData(isPulldownRefresh = true, triggered = true) {
|
||||
if (!isPulldownRefresh) {
|
||||
if (this.result.hasNext) {
|
||||
this.queryParams.page += 1;
|
||||
} else {
|
||||
return uni.showToast({
|
||||
icon: 'none',
|
||||
title: '没有更多数据了'
|
||||
});
|
||||
}
|
||||
} else {
|
||||
this.queryParams.page = 0;
|
||||
if (triggered) {
|
||||
this.triggered = true;
|
||||
}
|
||||
}
|
||||
|
||||
this.$httpApi
|
||||
.getCategoryPostList(this.queryParams.slug, this.queryParams)
|
||||
.then(res => {
|
||||
this.result = res.data;
|
||||
|
||||
if (!isPulldownRefresh) {
|
||||
this.dataList = this.dataList.concat(res.data.content);
|
||||
} else {
|
||||
this.dataList = res.data.content;
|
||||
}
|
||||
this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
})
|
||||
.catch(err => {
|
||||
this.loadMoreText = '加载失败！';
|
||||
})
|
||||
.finally(() => {
|
||||
this.triggered = false;
|
||||
});
|
||||
},
|
||||
//跳转文章详情
|
||||
fnToArticleDetail(article) {
|
||||
uni.navigateTo({
|
||||
url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
|
||||
animationType: 'slide-in-right'
|
||||
});
|
||||
},
|
||||
fnOnScroll(e) {
|
||||
this.tempScrollTop = e.detail.scrollTop;
|
||||
},
|
||||
fnToTopScroll() {
|
||||
uni.pageScrollTo({
|
||||
scrollTop: 0,
|
||||
duration: 500
|
||||
});
|
||||
this.scrollTop = 0;
|
||||
this.tempScrollTop = 0;
|
||||
},
|
||||
fnOnTouchStart() {
|
||||
clearTimeout(this.scrollTimeout);
|
||||
},
|
||||
fnOnTouchEnd() {
|
||||
this.scrollTimeout = setTimeout(() => {
|
||||
this.scrollTop = this.tempScrollTop;
|
||||
}, 500);
|
||||
});
|
||||
},
|
||||
handlePreview(index, list) {
|
||||
uni.previewImage({
|
||||
current: index,
|
||||
urls: list.map(item => item.url)
|
||||
})
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -198,37 +149,61 @@
|
||||
<style lang="scss" scoped>
|
||||
.app-page {
|
||||
width: 100vw;
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.content {
|
||||
height: 100vh;
|
||||
background-color: #fafafa;
|
||||
}
|
||||
|
||||
.category-empty {
|
||||
width: 100%;
|
||||
height: 70vh;
|
||||
}
|
||||
|
||||
.article-empty {
|
||||
width: 100%;
|
||||
height: 70vh;
|
||||
}
|
||||
|
||||
.right-content {
|
||||
// width: calc(100vw - 144rpx);
|
||||
width: calc(100vw - 190rpx);
|
||||
height: 100vh;
|
||||
background-color: #fff;
|
||||
white-space: nowrap;
|
||||
background-color: #fafafa;
|
||||
padding: 24rpx 0;
|
||||
}
|
||||
|
||||
.loading-wrap {
|
||||
padding: 24rpx;
|
||||
}
|
||||
|
||||
.app-page-content {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
padding: 0 12rpx;
|
||||
gap: 20rpx 0;
|
||||
}
|
||||
|
||||
.catgory-card {
|
||||
width: 100%;
|
||||
height: 200rpx;
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
box-sizing: border-box;
|
||||
border-radius: 12rpx;
|
||||
background-color: #ffff;
|
||||
box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
|
||||
overflow: hidden;
|
||||
background-repeat: no-repeat;
|
||||
background-size: cover;
|
||||
|
||||
&:before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-color: rgba(0, 0, 0, 0.15);
|
||||
z-index: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.content {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.load-text {
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
}
|
||||
</style>
|
||||
@@ -2,7 +2,8 @@
|
||||
<view class="app-page">
|
||||
<!-- 顶部切换 -->
|
||||
<view class="e-fixed" v-if="category.list.length > 2">
|
||||
<tm-tabs color="light-blue" v-model="category.activeIndex" :list="category.list" align="left" @change="fnOnCategoryChange"></tm-tabs>
|
||||
<tm-tabs color="light-blue" v-model="category.activeIndex" range-key="displayName" :list="category.list"
|
||||
align="left" @change="fnOnCategoryChange"></tm-tabs>
|
||||
</view>
|
||||
<!-- 占位区域 -->
|
||||
<view style="width: 100vw;height: 90rpx;"></view>
|
||||
@@ -24,50 +25,16 @@
|
||||
<template v-slot:left="{ hdata }">
|
||||
<tm-translate animation-name="fadeUp">
|
||||
<view class="card round-3 overflow white">
|
||||
<tm-images :previmage="false" :src="hdata.item.image" @click="fnPreview(hdata.item)"></tm-images>
|
||||
<view class="pa-10 text-size-s">
|
||||
<view class="text-overflow-2">
|
||||
<tm-tags color="bg-gradient-amber-accent" :shadow="0" :dense="true" size="s" model="fill">{{ hdata.item.team }}</tm-tags>
|
||||
<text class="pl-6">{{ hdata.item.name }}</text>
|
||||
</view>
|
||||
<view v-if="hdata.item.description" class="ma-10">{{ hdata.item.description }}</view>
|
||||
<view v-if="hdata.item.location" class="mt-10 text-grey-lighten-1">
|
||||
<tm-icons name="icon-position-fill"></tm-icons>
|
||||
<text class="pl-5">{{ hdata.item.location }}</text>
|
||||
</view>
|
||||
<view class="flex-between mt-12 flex-center">
|
||||
<view>
|
||||
<text class="text-size-xs text-red ml-5">{{ hdata.item.likes }}</text>
|
||||
<text class="text-size-xs text-red ml-5">喜欢</text>
|
||||
</view>
|
||||
<view class="pl-10 text-size-xs text-grey-lighten-1">{{ hdata.item.takeTime }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<tm-images :previmage="false" :src="hdata.item.spec.cover"
|
||||
@click="fnPreview(hdata.item)"></tm-images>
|
||||
</view>
|
||||
</tm-translate>
|
||||
</template>
|
||||
<template v-slot:right="{ hdata }">
|
||||
<tm-translate animation-name="fadeUp">
|
||||
<view class="card round-3 overflow white">
|
||||
<tm-images :previmage="false" :src="hdata.item.image" @click="fnPreview(hdata.item)"></tm-images>
|
||||
<view class="pa-10 text-size-s">
|
||||
<view class="text-overflow-2">
|
||||
<tm-tags :shadow="0" :dense="true" color="bg-gradient-amber-accent" size="s" model="fill">{{ hdata.item.team }}</tm-tags>
|
||||
<text class="pl-6">{{ hdata.item.name }}</text>
|
||||
</view>
|
||||
<view v-if="hdata.item.description" class="ma-10">{{ hdata.item.description }}</view>
|
||||
<view v-if="hdata.item.location" class="mt-10 text-grey-lighten-1">
|
||||
<tm-icons name="icon-position-fill"></tm-icons>
|
||||
<text class="pl-5">{{ hdata.item.location }}</text>
|
||||
</view>
|
||||
<view class="flex-between mt-12 flex-center">
|
||||
<view>
|
||||
<text class="text-size-xs text-red ml-5">{{ hdata.item.likes }}</text>
|
||||
<text class="text-size-xs text-red ml-5">喜欢</text>
|
||||
</view>
|
||||
<view class="pl-10 text-size-xs text-grey-lighten-1">{{ hdata.item.takeTime }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<tm-images :previmage="false" :src="hdata.item.spec.cover"
|
||||
@click="fnPreview(hdata.item)"></tm-images>
|
||||
</view>
|
||||
</tm-translate>
|
||||
</template>
|
||||
@@ -76,25 +43,8 @@
|
||||
<block v-for="(item, index) in dataList" :key="index">
|
||||
<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
|
||||
<view class="round-3 shadow-2 overflow white mb-24">
|
||||
<tm-images :previmage="false" :src="item.image" @click="fnPreview(item)"></tm-images>
|
||||
<view class="pa-24 text-size-m">
|
||||
<view class="text-overflow-2">
|
||||
<tm-tags :shadow="0" :dense="true" color="bg-gradient-amber-accent" size="s" model="fill">{{ item.team }}</tm-tags>
|
||||
<text class="pl-6">{{ item.name }}</text>
|
||||
</view>
|
||||
<view v-if="item.description" class="ma-10">{{ item.description }}</view>
|
||||
<view v-if="item.location" class="mt-10 text-grey-lighten-1">
|
||||
<tm-icons name="icon-position-fill"></tm-icons>
|
||||
<text class="pl-5">{{ item.location }}</text>
|
||||
</view>
|
||||
<view class="flex-between mt-12 flex-center">
|
||||
<view>
|
||||
<text class="text-size-m text-red ml-5">{{ item.likes }}</text>
|
||||
<text class="text-size-m text-red ml-5">喜欢</text>
|
||||
</view>
|
||||
<view class="pl-10 text-size-m text-grey-lighten-1">{{ item.takeTime }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<tm-images :previmage="false" :src="item.spec.cover"
|
||||
@click="fnPreview(item)"></tm-images>
|
||||
</view>
|
||||
</tm-translate>
|
||||
</block>
|
||||
@@ -140,9 +90,8 @@
|
||||
},
|
||||
queryParams: {
|
||||
size: 10,
|
||||
page: 0,
|
||||
team: null,
|
||||
keyword: ''
|
||||
page: 1,
|
||||
group: ""
|
||||
},
|
||||
cache: {
|
||||
dataList: [],
|
||||
@@ -159,28 +108,14 @@
|
||||
return uni.$tm.dayjs(val).format('DD/MM/YYYY');
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
globalAppSettings: {
|
||||
deep: true,
|
||||
handler() {
|
||||
// this.isLoadMore = false;
|
||||
// this.queryParams.page = 0;
|
||||
// this.dataList = [];
|
||||
// this.cache.list = [];
|
||||
// this.cache.total = 0;
|
||||
}
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
this.fnSetPageTitle('个人图库');
|
||||
this.fnGetCategory();
|
||||
},
|
||||
created() {
|
||||
this.fnGetData();
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.dataList = []
|
||||
this.isLoadMore = false;
|
||||
this.queryParams.page = 0;
|
||||
this.queryParams.page = 1;
|
||||
this.fnGetData();
|
||||
},
|
||||
onReachBottom(e) {
|
||||
@@ -199,41 +134,44 @@
|
||||
fnOnCategoryChange(index) {
|
||||
this.fnResetSetAniWaitIndex();
|
||||
this.dataList = [];
|
||||
if (index == 0) {
|
||||
this.queryParams.team = null;
|
||||
} else {
|
||||
this.queryParams.team = this.category.list[index];
|
||||
}
|
||||
this.queryParams.page = 0;
|
||||
this.queryParams.group = this.category.list[index].name;
|
||||
this.queryParams.page = 1;
|
||||
this.fnToTopPage();
|
||||
this.fnGetData();
|
||||
},
|
||||
fnGetCategory() {
|
||||
this.$httpApi.getPhotoTeams().then(res => {
|
||||
this.category.list = ['全部', ...res.data];
|
||||
this.$httpApi.v2.getPhotoGroupList({
|
||||
page: 1,
|
||||
size: 9999
|
||||
}).then(res => {
|
||||
this.category.list = res.items.map(item => {
|
||||
return {
|
||||
name: item.metadata.name,
|
||||
displayName: item.spec.displayName
|
||||
}
|
||||
});
|
||||
if (this.category.list.length !== 0) {
|
||||
this.queryParams.group = this.category.list[0].name;
|
||||
this.fnGetData();
|
||||
}
|
||||
|
||||
});
|
||||
},
|
||||
fnGetData() {
|
||||
// uni.showLoading({
|
||||
// mask: true,
|
||||
// title: '加载中...'
|
||||
// });
|
||||
// 设置状态为加载中
|
||||
if (!this.isLoadMore) {
|
||||
this.loading = 'loading';
|
||||
}
|
||||
this.loadMoreText = '';
|
||||
this.$httpApi
|
||||
.getPhotoListByPage(this.queryParams)
|
||||
this.$httpApi.v2
|
||||
.getPhotoListByGroupName(this.queryParams)
|
||||
.then(res => {
|
||||
if (res.status == 200) {
|
||||
console.log("相册 res", res)
|
||||
this.result = res;
|
||||
this.loading = 'success';
|
||||
this.result = res.data;
|
||||
if (res.data.content.length != 0) {
|
||||
const _list = res.data.content.map((item, index) => {
|
||||
item['image'] = this.$utils.checkImageUrl(item.thumbnail);
|
||||
item['model'] = 'text';
|
||||
item['takeTime'] = this.$tm.dayjs(item['takeTime']).format('DD/MM/YYYY');
|
||||
if (res.items.length != 0) {
|
||||
const _list = res.items.map((item, index) => {
|
||||
item.spec.cover = this.$utils.checkImageUrl(item.spec.cover);
|
||||
return item;
|
||||
});
|
||||
this.fnCacheDataList(_list);
|
||||
@@ -246,12 +184,8 @@
|
||||
this.dataList = this.dataList.concat(_list);
|
||||
}
|
||||
}
|
||||
this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
} else {
|
||||
this.loading = 'error';
|
||||
this.waterfall.loading = 'finish';
|
||||
this.loadMoreText = '';
|
||||
}
|
||||
this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
|
||||
})
|
||||
.catch(err => {
|
||||
console.error(err);
|
||||
@@ -268,7 +202,7 @@
|
||||
},
|
||||
// 缓存数据
|
||||
fnCacheDataList(dataList) {
|
||||
if (this.queryParams.page == 0) {
|
||||
if (this.queryParams.page == 1) {
|
||||
this.cache.dataList = dataList;
|
||||
} else {
|
||||
this.cache.dataList = [...this.cache.dataList, ...dataList];
|
||||
@@ -281,10 +215,10 @@
|
||||
},
|
||||
// 预览
|
||||
fnPreview(item) {
|
||||
const index = this.cache.dataList.findIndex(x => x.id == item.id);
|
||||
const index = this.cache.dataList.findIndex(x => x.spec.cover == x.spec.cover);
|
||||
uni.previewImage({
|
||||
current: index,
|
||||
urls: this.cache.dataList.map(x => x.image),
|
||||
urls: this.cache.dataList.map(x => x.spec.cover),
|
||||
indicator: 'number',
|
||||
loop: true
|
||||
});
|
||||
|
||||
+52
-51
@@ -1,7 +1,8 @@
|
||||
<template>
|
||||
<view class="app-page">
|
||||
<tm-menubars iconColor="white" color="white" :flat="true" :showback="false">
|
||||
<image slot="left" class="logo ml-24 round-24" :src="bloggerInfo.avatar" mode="scaleToFill" @click="$tm.toast('以后会放一个彩蛋~')"></image>
|
||||
<image slot="left" class="logo ml-24 round-24" :src="bloggerInfo.avatar" mode="scaleToFill"
|
||||
@click="$tm.toast('以后会放一个彩蛋~')"></image>
|
||||
<view class="search-input round-12 pt-12 pb-12 flex pl-24" @click="fnToSearch">
|
||||
<text class="search-input_icon iconfont text-size-m icon-search text-grey"></text>
|
||||
<view class="search-input_text pl-12 text-size-m text-grey">搜索文章...</view>
|
||||
@@ -22,15 +23,10 @@
|
||||
<view class="bg-white pb-24">
|
||||
<!-- 轮播图+广告 -->
|
||||
<view class="banner bg-white ml-24 mr-24 mt-12 round-3" v-if="bannerList.length != 0">
|
||||
<e-swiper :dotPosition="globalAppSettings.banner.dotPosition" :autoplay="true" :useDot="globalAppSettings.banner.useDot" :list="bannerList" @on-click="fnOnBannerClick"></e-swiper>
|
||||
<e-swiper :dotPosition="globalAppSettings.banner.dotPosition" :autoplay="true"
|
||||
:useDot="globalAppSettings.banner.useDot" :list="bannerList"
|
||||
@on-click="fnOnBannerClick"></e-swiper>
|
||||
</view>
|
||||
<!-- 快捷导航 -->
|
||||
<!-- <view v-if="useQuickNav" class="quick-nav flex-between round-3 flex mt-12 ml-12 mr-12 pa-24">
|
||||
<view class="quick-nav-item flex flex-col flex-center" v-for="(nav, index) in quickNavList" :key="index" @click="fnToNavPage(nav)">
|
||||
<tm-icons :size="120" :name="nav.icon"></tm-icons>
|
||||
<view class="name text-size-s mt-4">{{ nav.text }}</view>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<!-- 精品分类 -->
|
||||
<view class="flex flex-between mt-16 mb-24 pl-24 pr-24">
|
||||
@@ -44,9 +40,11 @@
|
||||
</view>
|
||||
</view>
|
||||
<scroll-view class="category" scroll-x="true">
|
||||
<view v-if="categoryList.length == 0" class="cate-empty round-3 mr-5 flex flex-center text-grey">还没有任何文章分类~</view>
|
||||
<view v-if="categoryList.length == 0" class="cate-empty round-3 mr-5 flex flex-center text-grey">
|
||||
还没有任何文章分类~</view>
|
||||
<block v-else>
|
||||
<view class="content" v-for="(category, index) in categoryList" :key="category.createTime" @click="fnToCategoryBy(category)">
|
||||
<view class="content" v-for="(category, index) in categoryList" :key="category.metadata.name"
|
||||
@click="fnToCategoryBy(category)">
|
||||
<category-mini-card :category="category"></category-mini-card>
|
||||
</view>
|
||||
</block>
|
||||
@@ -54,7 +52,7 @@
|
||||
|
||||
<!-- 最新文章 -->
|
||||
<view class="flex flex-between mt-24 mb-24 pl-24 pr-24">
|
||||
<view class="page-item_title text-weight-b">最新文章</view>
|
||||
<view class="page-item_title text-weight-b">文章列表</view>
|
||||
<view class="show-more flex flex-center bg-white round-3" @click="fnToArticlesPage">
|
||||
<text class="iconfont icon-angle-right text-size-s text-grey-darken-1"></text>
|
||||
</view>
|
||||
@@ -63,14 +61,16 @@
|
||||
<text class="iconfont icon-angle-right text-size-s "></text>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="articleList.length == 0" class="article-empty"><tm-empty icon="icon-shiliangzhinengduixiang-" label="博主还没有发表任何文章~"></tm-empty></view>
|
||||
<view v-if="articleList.length == 0" class="article-empty"><tm-empty icon="icon-shiliangzhinengduixiang-"
|
||||
label="博主还没有发表任何文章~"></tm-empty></view>
|
||||
<block v-else>
|
||||
<view :class="globalAppSettings.layout.home">
|
||||
<block v-for="(article, index) in articleList" :key="article.createTime">
|
||||
<block v-for="(article, index) in articleList" :key="article.spec.slug">
|
||||
<tm-translate class="ani-item" animation-name="fadeUp" :wait="calcAniWait(index)">
|
||||
<article-card from="home" :article="article" @on-click="fnToArticleDetail"></article-card>
|
||||
<!-- 广告区域 -->
|
||||
<view v-if="haloAdConfig.home.use && (index + 1) % haloAdConfig.frequency == 0" class="ad-wrap ma-24">
|
||||
<view v-if="haloAdConfig.home.use && (index + 1) % haloAdConfig.frequency == 0"
|
||||
class="ad-wrap ma-24">
|
||||
<!-- #ifdef MP-WEIXIN -->
|
||||
<ad v-if="haloAdConfig.unitId" :unit-id="haloAdConfig.unitId"></ad>
|
||||
<!-- #endif -->
|
||||
@@ -82,7 +82,8 @@
|
||||
</block>
|
||||
</view>
|
||||
<view class="load-text mt-12">{{ loadMoreText }}</view>
|
||||
<tm-flotbutton v-if="articleList.length > 10" color="light-blue" @click="fnToTopPage" size="m" icon="icon-angle-up"></tm-flotbutton>
|
||||
<tm-flotbutton v-if="articleList.length > 10" color="light-blue" @click="fnToTopPage" size="m"
|
||||
icon="icon-angle-up"></tm-flotbutton>
|
||||
</block>
|
||||
</block>
|
||||
<!-- <tm-flotbutton @click="fnChangeMode" size="m" color="light-blue" :icon="$tm.vx.state().tmVuetify.black ? 'icon-lightbulb' : 'icon-lightbulb-fill'"></tm-flotbutton> -->
|
||||
@@ -113,8 +114,8 @@
|
||||
return {
|
||||
loading: 'loading',
|
||||
queryParams: {
|
||||
size: 10,
|
||||
page: 0
|
||||
size: 5,
|
||||
page: 1
|
||||
},
|
||||
result: {},
|
||||
isLoadMore: false,
|
||||
@@ -124,8 +125,7 @@
|
||||
noticeList: [],
|
||||
articleList: [],
|
||||
categoryList: [],
|
||||
useQuickNav: false,
|
||||
quickNavList: []
|
||||
|
||||
};
|
||||
},
|
||||
|
||||
@@ -139,7 +139,6 @@
|
||||
},
|
||||
onLoad() {
|
||||
this.fnSetPageTitle();
|
||||
this.useQuickNav = this.$haloConfig.quickNav.use;
|
||||
},
|
||||
|
||||
created() {
|
||||
@@ -147,7 +146,7 @@
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.isLoadMore = false;
|
||||
this.queryParams.page = 0;
|
||||
this.queryParams.page = 1;
|
||||
this.fnQuery();
|
||||
},
|
||||
|
||||
@@ -168,21 +167,14 @@
|
||||
this.fnGetBanner();
|
||||
this.fnGetArticleList();
|
||||
this.fnGetCategoryList();
|
||||
this.fnGetQuickNavList();
|
||||
},
|
||||
fnGetQuickNavList() {
|
||||
this.useQuickNav = this.$haloConfig.quickNav.use;
|
||||
if (!this.$haloConfig.quickNav.use) return;
|
||||
const _quickNavList = this.$haloConfig.quickNav.list;
|
||||
this.quickNavList = _quickNavList.map(item => {
|
||||
return item;
|
||||
});
|
||||
},
|
||||
|
||||
fnGetCategoryList() {
|
||||
this.$httpApi
|
||||
.getCategoryList({ more: true })
|
||||
this.$httpApi.v2
|
||||
.getCategoryList({})
|
||||
.then(res => {
|
||||
this.categoryList = res.data.sort((a, b) => {
|
||||
console.log('查询分类成功：', res);
|
||||
this.categoryList = res.items.sort((a, b) => {
|
||||
return b.postCount - a.postCount;
|
||||
});
|
||||
|
||||
@@ -205,6 +197,7 @@
|
||||
fnGetBanner() {
|
||||
const _this = this;
|
||||
const _format = function(list, type) {
|
||||
console.log("list", list)
|
||||
return list.map((item, index) => {
|
||||
switch (type) {
|
||||
case 'list':
|
||||
@@ -219,14 +212,14 @@
|
||||
case 'article':
|
||||
return {
|
||||
mp4: '',
|
||||
id: item.id,
|
||||
nickname: _this.bloggerInfo.nickname,
|
||||
avatar: _this.bloggerInfo.avatar,
|
||||
id: item.metadata.name,
|
||||
nickname: item.owner.displayName,
|
||||
avatar: _this.$utils.checkImageUrl(item.owner.avatar),
|
||||
address: '',
|
||||
createTime: uni.$tm.dayjs(item.createTime).fromNow(),
|
||||
title: item.title,
|
||||
src: _this.$utils.checkImageUrl(item.thumbnail),
|
||||
image: _this.$utils.checkImageUrl(item.thumbnail)
|
||||
createTime: uni.$tm.dayjs(item.spec.publishTime).fromNow(),
|
||||
title: item.spec.title,
|
||||
src: _this.$utils.checkImageUrl(item.spec.cover),
|
||||
image: _this.$utils.checkImageUrl(item.spec.cover)
|
||||
};
|
||||
case 'banner':
|
||||
return {
|
||||
@@ -241,8 +234,11 @@
|
||||
this.bannerList = _format(this.$haloConfig.banner.list, 'list');
|
||||
break;
|
||||
case 'article': // 来自热门文章的封面
|
||||
this.$httpApi.getPostList({ page: 0, size: 6, sort: 'topPriority,visits,desc' }).then(res => {
|
||||
this.bannerList = _format(res.data.content, 'article');
|
||||
this.$httpApi.getPostList({
|
||||
page: 0,
|
||||
size: 6
|
||||
}).then(res => {
|
||||
this.bannerList = _format(res.items, 'article');
|
||||
if (this.bannerList.length == 0) {
|
||||
this.bannerList = _format(this.$haloConfig.banner.list, 'list');
|
||||
}
|
||||
@@ -258,7 +254,11 @@
|
||||
},
|
||||
fnOnBannerClick(item) {
|
||||
if (item.id == '') return;
|
||||
this.fnToArticleDetail(item);
|
||||
this.fnToArticleDetail({
|
||||
metadata: {
|
||||
name: item.id
|
||||
}
|
||||
});
|
||||
},
|
||||
// 文章列表
|
||||
fnGetArticleList() {
|
||||
@@ -271,16 +271,17 @@
|
||||
this.loading = 'loading';
|
||||
}
|
||||
this.loadMoreText = '加载中...';
|
||||
this.$httpApi
|
||||
this.$httpApi.v2
|
||||
.getPostList(this.queryParams)
|
||||
.then(res => {
|
||||
console.log('加载成功', res);
|
||||
this.loading = 'success';
|
||||
this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
this.result = res.data;
|
||||
this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
this.result = res;
|
||||
if (this.isLoadMore) {
|
||||
this.articleList = this.articleList.concat(res.data.content);
|
||||
this.articleList = this.articleList.concat(res.items);
|
||||
} else {
|
||||
this.articleList = res.data.content;
|
||||
this.articleList = res.items;
|
||||
}
|
||||
this.loading = 'success';
|
||||
})
|
||||
@@ -298,7 +299,7 @@
|
||||
//跳转文章详情
|
||||
fnToArticleDetail(article) {
|
||||
uni.navigateTo({
|
||||
url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
|
||||
url: '/pagesA/article-detail/article-detail?name=' + article.metadata.name,
|
||||
animationType: 'slide-in-right'
|
||||
});
|
||||
},
|
||||
@@ -333,7 +334,7 @@
|
||||
// 根据slug查询分类下的文章
|
||||
fnToCategoryBy(category) {
|
||||
uni.navigateTo({
|
||||
url: `/pagesA/category-detail/category-detail?slug=${category.slug}&name=${category.name}`
|
||||
url: `/pagesA/category-detail/category-detail?name=${category.metadata.name}&title=${category.spec.displayName}`
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
@@ -0,0 +1,237 @@
|
||||
<template>
|
||||
<view class="app-page">
|
||||
<view v-if="loading != 'success'" class="loading-wrap">
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
</view>
|
||||
<!-- 内容区域 -->
|
||||
<view v-else class="app-page-content">
|
||||
<view v-if="dataList.length == 0" class="content-empty flex flex-center">
|
||||
<!-- 空布局 -->
|
||||
<tm-empty icon="icon-shiliangzhinengduixiang-" label="暂无数据"></tm-empty>
|
||||
</view>
|
||||
<block v-else>
|
||||
<block v-for="(moment, index) in dataList" :key="index">
|
||||
<!-- 卡片 -->
|
||||
<tm-translate animation-name="fadeUp" :wait="calcAniWait()">
|
||||
<view class="moment-card">
|
||||
<view class="head" style="display: flex;align-items: center;">
|
||||
<view class="avatar" style="flex-shrink: 0;">
|
||||
<image style="width: 66rpx;height: 66rpx;border-radius: 50%;"
|
||||
:src="moment.spec.user.avatar" />
|
||||
</view>
|
||||
<view class="nickname" style="margin-left: 12rpx;">
|
||||
<view style="font-size: 30rpx;font-weight: bold;color: #333333;">
|
||||
{{moment.spec.user.displayName}}
|
||||
</view>
|
||||
<view style="margin-top: 6rpx;font-size: 24rpx;color: #666;">
|
||||
{{ { d: moment.spec.releaseTime, f: 'yyyy年MM月dd日 星期w' } | formatTime }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="content">
|
||||
<mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
|
||||
:loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
|
||||
:tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
|
||||
:content="moment.spec.content.html" :markdown="true" :showLineNumber="true"
|
||||
:showLanguageName="true" :copyByLongPress="true" />
|
||||
</view>
|
||||
<view v-if="moment.spec.content.medium.length!==0" class="images"
|
||||
:class="['images-'+moment.spec.content.medium.length]">
|
||||
<view class="image-item" v-for="(image,index) in moment.spec.content.medium"
|
||||
:key="index">
|
||||
<image mode="aspectFill" style="width: 100%;height: 100%;border-radius: 6rpx;"
|
||||
:src="image.url" @click="handlePreview(index,moment.spec.content.medium)" />
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</tm-translate>
|
||||
</block>
|
||||
<tm-flotbutton @click="fnToTopPage" size="m" color="light-blue" icon="icon-angle-up"></tm-flotbutton>
|
||||
<view class="load-text">{{ loadMoreText }}</view>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
|
||||
import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
|
||||
import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
|
||||
import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
|
||||
|
||||
import MarkdownConfig from '@/common/markdown/markdown.config.js';
|
||||
import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
|
||||
export default {
|
||||
components: {
|
||||
tmSkeleton,
|
||||
tmFlotbutton,
|
||||
tmTranslate,
|
||||
tmEmpty,
|
||||
mpHtml
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
markdownConfig: MarkdownConfig,
|
||||
loading: 'loading',
|
||||
queryParams: {
|
||||
size: 10,
|
||||
page: 1
|
||||
},
|
||||
result: null,
|
||||
dataList: [],
|
||||
isLoadMore: false,
|
||||
loadMoreText: '加载中...'
|
||||
};
|
||||
},
|
||||
|
||||
computed: {
|
||||
bloggerInfo() {
|
||||
return this.$tm.vx.getters().getBlogger;
|
||||
},
|
||||
},
|
||||
|
||||
onLoad() {
|
||||
this.fnGetData();
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.isLoadMore = false;
|
||||
this.queryParams.page = 0;
|
||||
this.fnGetData();
|
||||
},
|
||||
|
||||
onReachBottom(e) {
|
||||
if (this.result.hasNext) {
|
||||
this.queryParams.page += 1;
|
||||
this.isLoadMore = true;
|
||||
this.fnGetData();
|
||||
} else {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '没有更多数据了'
|
||||
});
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
fnGetData() {
|
||||
uni.showLoading({
|
||||
mask: true,
|
||||
title: '加载中...'
|
||||
});
|
||||
// 设置状态为加载中
|
||||
if (!this.isLoadMore) {
|
||||
this.loading = 'loading';
|
||||
}
|
||||
this.loadMoreText = '加载中...';
|
||||
this.$httpApi.v2
|
||||
.getMomentList(this.queryParams)
|
||||
.then(res => {
|
||||
console.log('请求结果：');
|
||||
console.log(res);
|
||||
|
||||
this.loading = 'success';
|
||||
this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
// 处理数据
|
||||
this.result = res;
|
||||
|
||||
const tempItems = res.items.map(item => {
|
||||
item.spec.user = {
|
||||
displayName: this.bloggerInfo.nickname,
|
||||
avatar: this.$utils.checkAvatarUrl(this.bloggerInfo.avatar)
|
||||
}
|
||||
item.spec.content.medium
|
||||
.filter(x => x.type === 'PHOTO')
|
||||
.map(medium => {
|
||||
medium.url = this.$utils.checkThumbnailUrl(medium.url, true)
|
||||
})
|
||||
return item;
|
||||
})
|
||||
|
||||
if (this.isLoadMore) {
|
||||
this.dataList = this.dataList.concat(tempItems);
|
||||
} else {
|
||||
this.dataList = tempItems;
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
console.error(err);
|
||||
this.loading = 'error';
|
||||
this.loadMoreText = '加载失败，请下拉刷新！';
|
||||
})
|
||||
.finally(() => {
|
||||
setTimeout(() => {
|
||||
uni.hideLoading();
|
||||
uni.stopPullDownRefresh();
|
||||
}, 500);
|
||||
});
|
||||
},
|
||||
handlePreview(index, list) {
|
||||
uni.previewImage({
|
||||
current: index,
|
||||
urls: list.map(item => item.url)
|
||||
})
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.app-page {
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 24rpx 0;
|
||||
}
|
||||
|
||||
.loading-wrap {
|
||||
padding: 24rpx;
|
||||
}
|
||||
|
||||
.moment-card {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
box-sizing: border-box;
|
||||
margin: 0 24rpx;
|
||||
border-radius: 12rpx;
|
||||
background-color: #ffff;
|
||||
box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
|
||||
overflow: hidden;
|
||||
margin-bottom: 24rpx;
|
||||
}
|
||||
|
||||
.head {
|
||||
padding: 24rpx;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
.images {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: flex-start;
|
||||
padding: 24rpx;
|
||||
padding-top: 0;
|
||||
|
||||
.image-item {
|
||||
box-sizing: border-box;
|
||||
border-radius: 24rpx;
|
||||
padding: 6rpx;
|
||||
width: 33%;
|
||||
height: 200rpx
|
||||
}
|
||||
|
||||
&-1 {
|
||||
>.image-item {
|
||||
width: 100%;
|
||||
height: 350rpx
|
||||
}
|
||||
}
|
||||
|
||||
&-2 {
|
||||
>.image-item {
|
||||
width: 50%;
|
||||
height: 250rpx
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -8,33 +8,33 @@
|
||||
<block v-else>
|
||||
<!-- 顶部信息 -->
|
||||
<view class="head ma-24">
|
||||
<view class="title">{{ result.title }}</view>
|
||||
<view class="title">{{ result.spec.title }}</view>
|
||||
<view class="detail">
|
||||
<view class="author">
|
||||
<text class="author-name">博主：{{ author.nickname }}</text>
|
||||
<text class="author-name">作者：{{ result.owner.displayName }}</text>
|
||||
<text class="author-time">
|
||||
时间：{{ { d: result.createTime, f: 'yyyy年MM月dd日 星期w' } | formatTime }}
|
||||
时间：{{ { d: result.spec.publishTime, f: 'yyyy年MM月dd日 星期w' } | formatTime }}
|
||||
</text>
|
||||
</view>
|
||||
|
||||
<view class="cover" v-if="result.thumbnail">
|
||||
<image class="cover-img" mode="aspectFill" :src="calcUrl(result.thumbnail)"></image>
|
||||
<view class="cover" v-if="result.spec.cover">
|
||||
<image class="cover-img" mode="aspectFill" :src="calcUrl(result.spec.cover)"></image>
|
||||
</view>
|
||||
<view class="count" :class="{ 'no-thumbnail': !result.thumbnail }">
|
||||
<view class="count" :class="{ 'no-thumbnail': !result.spec.cover }">
|
||||
<view class="count-item">
|
||||
<text class="value">{{ result.visits }}</text>
|
||||
<text class="value">{{ result.stats.visit }}</text>
|
||||
<text class="label">阅读</text>
|
||||
</view>
|
||||
<view class="count-item">
|
||||
<text class="value">{{ result.likes }}</text>
|
||||
<text class="value">{{ result.stats.upvote }}</text>
|
||||
<text class="label">喜欢</text>
|
||||
</view>
|
||||
<view class="count-item">
|
||||
<text class="value">{{ result.commentCount }}</text>
|
||||
<text class="value">{{ result.stats.comment }}</text>
|
||||
<text class="label">评论</text>
|
||||
</view>
|
||||
<view class="count-item">
|
||||
<text class="value">{{ result.wordCount }}</text>
|
||||
<text class="value">{{ result.content.raw.length }}</text>
|
||||
<text class="label">字数</text>
|
||||
</view>
|
||||
</view>
|
||||
@@ -46,8 +46,9 @@
|
||||
<text class="text-weight-b">分类：</text>
|
||||
<text v-if="result.categories.length == 0" class="category-tag is-empty">未选择分类</text>
|
||||
<block v-else>
|
||||
<text class="category-tag" v-for="(item, index) in result.categories" :key="index" @click="fnToCate(item)">
|
||||
{{ item.name }}
|
||||
<text class="category-tag" v-for="(item, index) in result.categories" :key="index"
|
||||
@click="fnToCate(item)">
|
||||
{{ item.spec.displayName }}
|
||||
</text>
|
||||
</block>
|
||||
</view>
|
||||
@@ -55,21 +56,25 @@
|
||||
<text class="text-weight-b">标签：</text>
|
||||
<text v-if="result.tags.length == 0" class="category-tag is-empty">未选择标签</text>
|
||||
<block v-else>
|
||||
<text class="category-tag" :style="{ backgroundColor: item.color }" v-for="(item, index) in result.tags" :key="index" @click="fnToTag(item)">
|
||||
{{ item.name }}
|
||||
<text class="category-tag" :style="{ backgroundColor: item.color }"
|
||||
v-for="(item, index) in result.tags" :key="index" @click="fnToTag(item)">
|
||||
{{ item.spec.displayName }}
|
||||
</text>
|
||||
</block>
|
||||
</view>
|
||||
<view v-if="originalURL" class="mt-18 category-type original-url">
|
||||
<view class="original-url_left text-weight-b">原文：</view>
|
||||
<view class="original-url_right text-grey">
|
||||
<text class="original-url_right__link" @click.stop="fnToOriginal(originalURL)">{{ originalURL }}</text>
|
||||
<text class="original-url_right__btn" @click.stop="fnToOriginal(originalURL)">阅读原文<text class="iconfont icon-angle-right ml-5 text-size-s"></text> </text>
|
||||
<text class="original-url_right__link"
|
||||
@click.stop="fnToOriginal(originalURL)">{{ originalURL }}</text>
|
||||
<text class="original-url_right__btn" @click.stop="fnToOriginal(originalURL)">阅读原文<text
|
||||
class="iconfont icon-angle-right ml-5 text-size-s"></text> </text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 广告区域 -->
|
||||
<view v-if="haloAdConfig.articleDetail.use && (haloAdConfig.unitId || haloAdConfig.adpid)" class="ad-wrap ma-24 mb-0">
|
||||
<view v-if="haloAdConfig.articleDetail.use && (haloAdConfig.unitId || haloAdConfig.adpid)"
|
||||
class="ad-wrap ma-24 mb-0">
|
||||
<!-- #ifdef MP-WEIXIN -->
|
||||
<ad v-if="haloAdConfig.unitId" :unit-id="haloAdConfig.unitId"></ad>
|
||||
<!-- #endif -->
|
||||
@@ -81,8 +86,13 @@
|
||||
<view class="content ml-24 mr-24">
|
||||
<!-- markdown渲染 -->
|
||||
<view class="markdown-wrap">
|
||||
<tm-more :disabled="true" :maxHeight="1500" :isRemovBar="true" :open="showValidVisitMore" @click="fnOnShowValidVisitMore">
|
||||
<mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain" :loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true" :tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle" :content="result.content || result.formatContent" :markdown="true" :showLineNumber="true" :showLanguageName="true" :copyByLongPress="true" />
|
||||
<tm-more :disabled="true" :maxHeight="1500" :isRemovBar="true" :open="showValidVisitMore"
|
||||
@click="fnOnShowValidVisitMore">
|
||||
<mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
|
||||
:loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
|
||||
:tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
|
||||
:content="result.content.raw" :markdown="true" :showLineNumber="true"
|
||||
:showLanguageName="true" :copyByLongPress="true" />
|
||||
<template v-slot:more="{ data }">
|
||||
<view class="">
|
||||
<text class="text-blue text-size-m text-weight-b">文章部分内容已加密点击解锁</text>
|
||||
@@ -92,7 +102,8 @@
|
||||
</tm-more>
|
||||
</view>
|
||||
<!-- 广告区域：微信/decloud申请 -->
|
||||
<view v-if="haloAdConfig.articleDetail.use && (haloAdConfig.unitId || haloAdConfig.adpid)" class="ad-wrap mt-24 mb-24 ">
|
||||
<view v-if="haloAdConfig.articleDetail.use && (haloAdConfig.unitId || haloAdConfig.adpid)"
|
||||
class="ad-wrap mt-24 mb-24 ">
|
||||
<!-- #ifdef MP-WEIXIN -->
|
||||
<ad v-if="haloAdConfig.unitId" :unit-id="haloAdConfig.unitId"></ad>
|
||||
<!-- #endif -->
|
||||
@@ -104,11 +115,13 @@
|
||||
<!-- 广告区域：自定义广告位 -->
|
||||
<view class="ad-card mt-24" v-if="haloAdConfig.articleDetail.custom.use">
|
||||
<text class="ad-card_tip">广告</text>
|
||||
<image class="ad-card_cover" :src="haloAdConfig.articleDetail.custom.cover" mode="scaleToFill"></image>
|
||||
<image class="ad-card_cover" :src="haloAdConfig.articleDetail.custom.cover" mode="scaleToFill">
|
||||
</image>
|
||||
<view class="ad-card_info">
|
||||
<view class="ad-card_info-title">{{ haloAdConfig.articleDetail.custom.title }}</view>
|
||||
<view class="ad-card_info-desc">{{ haloAdConfig.articleDetail.custom.content }}</view>
|
||||
<view v-if="haloAdConfig.articleDetail.custom.url" class="ad-card_info-link" @click="fnToWebview(haloAdConfig.articleDetail.custom)">
|
||||
<view v-if="haloAdConfig.articleDetail.custom.url" class="ad-card_info-link"
|
||||
@click="fnToWebview(haloAdConfig.articleDetail.custom)">
|
||||
立即查看
|
||||
</view>
|
||||
</view>
|
||||
@@ -117,7 +130,8 @@
|
||||
<!-- 版权声明 -->
|
||||
<view v-if="copyright.use" class="copyright-wrap bg-white mt-24 pa-24 round-4">
|
||||
<view class="copyright-title text-weight-b">版权声明</view>
|
||||
<view class="copyright-content mt-12 grey-lighten-5 text-grey-darken-2 round-4 pt-12 pb-12 pl-24 pr-24 ">
|
||||
<view
|
||||
class="copyright-content mt-12 grey-lighten-5 text-grey-darken-2 round-4 pt-12 pb-12 pl-24 pr-24 ">
|
||||
<view v-if="copyright.author" class="copyright-text text-size-s ">
|
||||
版权归属：{{ copyright.author }}
|
||||
</view>
|
||||
@@ -131,24 +145,29 @@
|
||||
</view>
|
||||
|
||||
<!-- 评论展示区域 -->
|
||||
<view class="comment-wrap bg-white mt-24 pa-24 round-4">
|
||||
<commentList :disallowComment="result.disallowComment" :postId="result.id" :post="result" @on-comment-detail="fnOnShowCommentDetail" @on-loaded="fnOnCommentLoaded"></commentList>
|
||||
<view v-if="result" class="comment-wrap bg-white mt-24 pa-24 round-4">
|
||||
<commentList :disallowComment="!result.spec.allowComment" :postName="result.metadata.name"
|
||||
:post="result" @on-comment-detail="fnOnShowCommentDetail" @on-loaded="fnOnCommentLoaded">
|
||||
</commentList>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 弹幕效果 -->
|
||||
<barrage ref="barrage" :maxTop="240" :type="globalAppSettings.barrage.type"></barrage>
|
||||
<!-- 返回顶部 -->
|
||||
<tm-flotbutton :offset="[16, 80]" icon="icon-angle-up" color="bg-gradient-light-blue-accent" @click="fnToTopPage()"></tm-flotbutton>
|
||||
<tm-flotbutton :actions="btnOption.actions" actions-pos="left" :show-text="true" color="bg-gradient-orange-accent" @change="fnOnFlotButtonChange"></tm-flotbutton>
|
||||
<tm-flotbutton :offset="[16, 80]" icon="icon-angle-up" color="bg-gradient-light-blue-accent"
|
||||
@click="fnToTopPage()"></tm-flotbutton>
|
||||
<tm-flotbutton :actions="btnOption.actions" actions-pos="left" :show-text="true"
|
||||
color="bg-gradient-orange-accent" @change="fnOnFlotButtonChange"></tm-flotbutton>
|
||||
</block>
|
||||
|
||||
<!-- 评论详情 -->
|
||||
<tm-poup v-model="commentDetail.show" height="auto" :round="6" :over-close="true" position="bottom">
|
||||
<view class="pa-24">
|
||||
<view v-if="result" class="pa-24">
|
||||
<view class="poup-head pb-24">
|
||||
<view class="poup-title text-align-center text-size-g text-weight-b mb-32">评论详情</view>
|
||||
<comment-item :useContentBg="false" :useActions="false" :isChild="false" :comment="commentDetail.comment" :postId="result.id"></comment-item>
|
||||
<comment-item :useContentBg="false" :useActions="false" :isChild="false"
|
||||
:comment="commentDetail.comment" :postName="result.metadata.name"></comment-item>
|
||||
</view>
|
||||
|
||||
<scroll-view :scroll-y="true" class="poup-body">
|
||||
@@ -159,7 +178,7 @@
|
||||
</view>
|
||||
<view v-else-if="commentDetail.loading == 'error'" class="error">
|
||||
<tm-empty icon="icon-wind-cry" label="加载失败">
|
||||
<tm-button theme="bg-gradient-light-blue-accent" size="m" v-if="!disallowComment" @click="fnGetChildComments()">
|
||||
<tm-button theme="bg-gradient-light-blue-accent" size="m" @click="fnGetChildComments()">
|
||||
刷新试试
|
||||
</tm-button>
|
||||
</tm-empty>
|
||||
@@ -171,7 +190,9 @@
|
||||
</view>
|
||||
|
||||
<block v-else>
|
||||
<comment-item v-for="(comment, index) in commentDetail.list" :useContentBg="false" :useSolid="false" :useActions="false" :key="index" :isChild="false" :comment="comment" :postId="result.id"></comment-item>
|
||||
<comment-item v-for="(comment, index) in commentDetail.list" :useContentBg="false"
|
||||
:useSolid="false" :useActions="false" :key="index" :isChild="false" :comment="comment"
|
||||
:postName="result.metadata.name"></comment-item>
|
||||
</block>
|
||||
</block>
|
||||
</scroll-view>
|
||||
@@ -203,7 +224,10 @@
|
||||
</tm-poup>
|
||||
|
||||
<!-- 密码访问解密弹窗 -->
|
||||
<tm-dialog :disabled="true" :input-val.sync="validVisitModal.value" title="验证提示" confirmText="立即验证" :showCancel="validVisitModal.useCancel" model="confirm" v-model="validVisitModal.show" content="博主设置了需要密码才能查看该文章内容,请输入文章密码进行验证" theme="split" confirmColor="blue shadow-blue-0" @cancel="fnOnValidVisitCancel" @confirm="fnOnValidVisitConfirm"></tm-dialog>
|
||||
<tm-dialog :disabled="true" :input-val.sync="validVisitModal.value" title="验证提示" confirmText="立即验证"
|
||||
:showCancel="validVisitModal.useCancel" model="confirm" v-model="validVisitModal.show"
|
||||
content="博主设置了需要密码才能查看该文章内容,请输入文章密码进行验证" theme="split" confirmColor="blue shadow-blue-0"
|
||||
@cancel="fnOnValidVisitCancel" @confirm="fnOnValidVisitConfirm"></tm-dialog>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
@@ -226,7 +250,9 @@
|
||||
import rCanvas from '@/components/r-canvas/r-canvas.vue';
|
||||
import barrage from '@/components/barrage/barrage.vue';
|
||||
|
||||
import { haloWxShareMixin } from '@/common/mixins/wxshare.mixin.js';
|
||||
import {
|
||||
haloWxShareMixin
|
||||
} from '@/common/mixins/wxshare.mixin.js';
|
||||
export default {
|
||||
components: {
|
||||
tmSkeleton,
|
||||
@@ -248,10 +274,11 @@
|
||||
loading: 'loading',
|
||||
markdownConfig: MarkdownConfig,
|
||||
btnOption: {
|
||||
actions: [{
|
||||
icon: 'icon-like',
|
||||
color: 'bg-gradient-orange-accent'
|
||||
},
|
||||
actions: [
|
||||
// {
|
||||
// icon: 'icon-like',
|
||||
// color: 'bg-gradient-orange-accent'
|
||||
// },
|
||||
{
|
||||
icon: 'icon-commentdots-fill',
|
||||
color: 'bg-gradient-green-accent'
|
||||
@@ -263,15 +290,15 @@
|
||||
]
|
||||
},
|
||||
queryParams: {
|
||||
articleId: null
|
||||
name: null
|
||||
},
|
||||
result: {},
|
||||
result: null,
|
||||
|
||||
commentDetail: {
|
||||
loading: 'loading',
|
||||
show: false,
|
||||
comment: {},
|
||||
postId: undefined,
|
||||
postName: undefined,
|
||||
list: []
|
||||
},
|
||||
poster: {
|
||||
@@ -354,7 +381,7 @@
|
||||
},
|
||||
onLoad(e) {
|
||||
this.fnSetPageTitle('文章加载中...');
|
||||
this.queryParams.articleId = e.articleId;
|
||||
this.queryParams.name = e.name;
|
||||
this.fnGetData();
|
||||
},
|
||||
|
||||
@@ -364,31 +391,27 @@
|
||||
methods: {
|
||||
fnGetData() {
|
||||
this.loading = 'loading';
|
||||
// uni.showLoading({
|
||||
// mask: true,
|
||||
// title: '加载中...'
|
||||
// });
|
||||
this.$httpApi
|
||||
.getArticleDetail(this.queryParams.articleId)
|
||||
this.$httpApi.v2
|
||||
.getPostByName(this.queryParams.name)
|
||||
.then(res => {
|
||||
if (res.status == 200) {
|
||||
this.result = res.data;
|
||||
this.metas = res.data.metas;
|
||||
console.log('详情', res);
|
||||
|
||||
this.result = res;
|
||||
this.metas = [];
|
||||
this.fnSetPageTitle('文章详情');
|
||||
this.loading = 'success';
|
||||
this.fnSetWxShareConfig({
|
||||
title: this.result.title,
|
||||
desc: this.result.summary,
|
||||
imageUrl: this.$utils.checkThumbnailUrl(this.result.thumbnail),
|
||||
path: `/pagesA/article-detail/article-detail?articleId=${this.queryParams.articleId}`,
|
||||
copyLink: this.$haloConfig.apiUrl,
|
||||
title: this.result.spec.title,
|
||||
desc: this.result.content.raw,
|
||||
imageUrl: this.$utils.checkThumbnailUrl(this.result.spec.cover),
|
||||
path: `/pagesA/article-detail/article-detail?name=${this.result.metadata.name}`,
|
||||
copyLink: this.$baseApiUrl,
|
||||
query: {}
|
||||
});
|
||||
} else {
|
||||
this.loading = 'error';
|
||||
}
|
||||
|
||||
})
|
||||
.catch(err => {
|
||||
console.log("错误", err)
|
||||
this.loading = 'error';
|
||||
})
|
||||
.finally(() => {
|
||||
@@ -400,28 +423,28 @@
|
||||
// 浮动按钮点击
|
||||
fnOnFlotButtonChange(index) {
|
||||
switch (index) {
|
||||
// case 0:
|
||||
// this.fnDoLikes();
|
||||
// break;
|
||||
case 0:
|
||||
this.fnDoLikes();
|
||||
break;
|
||||
case 1:
|
||||
this.fnToComment();
|
||||
break;
|
||||
case 2:
|
||||
case 1:
|
||||
this.fnShowShare();
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
||||
fnToComment() {
|
||||
if (this.result.disallowComment) {
|
||||
if (!this.result.spec.allowComment) {
|
||||
return uni.$tm.toast('文章已开启禁止评论！');
|
||||
}
|
||||
this.$Router.push({
|
||||
path: '/pagesA/comment/comment',
|
||||
query: {
|
||||
id: this.result.id,
|
||||
parentId: 0,
|
||||
title: this.result.title,
|
||||
isComment: true,
|
||||
postName: this.result.metadata.name,
|
||||
title: this.result.spec.title,
|
||||
from: 'posts',
|
||||
formPage: 'comment_list',
|
||||
type: 'post'
|
||||
@@ -474,7 +497,7 @@
|
||||
this.$nextTick(async () => {
|
||||
const systemInfo = await uni.getSystemInfoSync();
|
||||
const _bloggerAvatar = this.$utils.checkAvatarUrl(this.bloggerInfo.avatar, true);
|
||||
const _articleCover = this.$utils.checkThumbnailUrl(this.result.thumbnail, true);
|
||||
const _articleCover = this.$utils.checkThumbnailUrl(this.result.spec.cover, true);
|
||||
// 初始化
|
||||
await this.$refs.rCanvas.init({
|
||||
canvas_id: 'rCanvas',
|
||||
@@ -566,7 +589,7 @@
|
||||
// 文章标题
|
||||
await this.$refs.rCanvas
|
||||
.drawText({
|
||||
text: this.result.title,
|
||||
text: this.result.spec.title,
|
||||
max_width: 312,
|
||||
line_clamp: 1,
|
||||
x: 12,
|
||||
@@ -583,7 +606,7 @@
|
||||
});
|
||||
await this.$refs.rCanvas
|
||||
.drawText({
|
||||
text: this.result.summary,
|
||||
text: this.result.content.raw,
|
||||
max_width: 312,
|
||||
line_clamp: 2,
|
||||
x: 12,
|
||||
@@ -674,9 +697,9 @@
|
||||
provider: 'weixin',
|
||||
scene: 'WXSceneSession',
|
||||
type: 0,
|
||||
href: this.$haloConfig.apiUrl,
|
||||
title: this.result.title,
|
||||
summary: this.result.summary,
|
||||
href: this.$baseApiUrl,
|
||||
title: this.result.spec.title,
|
||||
summary: this.result.content.raw,
|
||||
imageUrl: this.poster.res.tempFilePath,
|
||||
success: function(res) {
|
||||
console.log('success:' + JSON.stringify(res));
|
||||
@@ -688,41 +711,45 @@
|
||||
// #endif
|
||||
},
|
||||
fnOnShowCommentDetail(data) {
|
||||
const { postId, comment } = data;
|
||||
const {
|
||||
postName,
|
||||
comment
|
||||
} = data;
|
||||
this.commentDetail.comment = comment;
|
||||
this.commentDetail.postId = postId;
|
||||
this.commentDetail.postName = postName;
|
||||
this.commentDetail.list = [];
|
||||
this.commentDetail.show = true;
|
||||
this.fnGetChildComments();
|
||||
},
|
||||
fnGetChildComments() {
|
||||
this.commentDetail.loading = 'loading';
|
||||
this.$httpApi
|
||||
.getPostChildrenCommentList(this.commentDetail.postId, this.commentDetail.comment.id, {})
|
||||
this.$httpApi.v2
|
||||
.getPostCommentReplyList(this.commentDetail.postName, {
|
||||
page: 1,
|
||||
size: 100
|
||||
})
|
||||
.then(res => {
|
||||
if (res.status == 200) {
|
||||
console.log('getPostChildrenCommentList res', res);
|
||||
this.commentDetail.loading = 'success';
|
||||
this.commentDetail.list = res.data;
|
||||
} else {
|
||||
this.commentDetail.loading = 'error';
|
||||
}
|
||||
console.log('getPostChildrenCommentList', res);
|
||||
this.commentDetail.list = res.items;
|
||||
})
|
||||
.catch(err => {
|
||||
console.log('getPostChildrenCommentList err', error);
|
||||
this.commentDetail.loading = 'error';
|
||||
});
|
||||
},
|
||||
fnToCate(category) {
|
||||
uni.navigateTo({
|
||||
url: `/pagesA/category-detail/category-detail?slug=${category.slug}&name=${category.name}`
|
||||
url: `/pagesA/category-detail/category-detail?name=${category.metadata.name}&title=${category.spec.displayName}`
|
||||
});
|
||||
},
|
||||
fnToTag(tag) {
|
||||
uni.navigateTo({
|
||||
url: `/pagesA/tag-detail/tag-detail?id=${tag.id}&slug=${tag.slug}&name=${tag.name}`
|
||||
url: `/pagesA/tag-detail/tag-detail?name=${tag.metadata.name}&title=${tag.spec.displayName}`
|
||||
});
|
||||
},
|
||||
async fnOnCommentLoaded(data) {
|
||||
console.log("data", data)
|
||||
const _list = [];
|
||||
const _handleData = list => {
|
||||
return new Promise(resolve => {
|
||||
@@ -731,8 +758,8 @@
|
||||
} else {
|
||||
list.forEach(item => {
|
||||
_list.push(item);
|
||||
if (item.children && item.children.length != 0) {
|
||||
_handleData(item.children);
|
||||
if (item.replies && item.replies.length != 0) {
|
||||
_handleData(item.replies.items);
|
||||
}
|
||||
resolve();
|
||||
});
|
||||
@@ -740,31 +767,31 @@
|
||||
});
|
||||
};
|
||||
await _handleData(data);
|
||||
if (this.globalAppSettings.barrage.use) {
|
||||
this.$nextTick(() => {
|
||||
if (_list.length != 0) {
|
||||
_handleAddBarrage();
|
||||
}
|
||||
});
|
||||
}
|
||||
const _handleRemove = () => {
|
||||
this.$refs['barrage'] && this.$refs['barrage'].remove({
|
||||
duration: 5000, // 延迟关闭的时间
|
||||
speed: 600 // 弹幕消失的速度
|
||||
});
|
||||
};
|
||||
let index = 0;
|
||||
const _handleAddBarrage = () => {
|
||||
setTimeout(() => {
|
||||
this.$refs['barrage'] && this.$refs['barrage'].add(_list[index]);
|
||||
index += 1;
|
||||
if (index < _list.length - 1) {
|
||||
_handleAddBarrage();
|
||||
} else {
|
||||
_handleRemove();
|
||||
}
|
||||
}, 1000);
|
||||
};
|
||||
// if (this.globalAppSettings.barrage.use) {
|
||||
// this.$nextTick(() => {
|
||||
// if (_list.length != 0) {
|
||||
// _handleAddBarrage();
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// const _handleRemove = () => {
|
||||
// this.$refs['barrage'] && this.$refs['barrage'].remove({
|
||||
// duration: 5000, // 延迟关闭的时间
|
||||
// speed: 600 // 弹幕消失的速度
|
||||
// });
|
||||
// };
|
||||
// let index = 0;
|
||||
// const _handleAddBarrage = () => {
|
||||
// setTimeout(() => {
|
||||
// this.$refs['barrage'] && this.$refs['barrage'].add(_list[index]);
|
||||
// index += 1;
|
||||
// if (index < _list.length - 1) {
|
||||
// _handleAddBarrage();
|
||||
// } else {
|
||||
// _handleRemove();
|
||||
// }
|
||||
// }, 1000);
|
||||
// };
|
||||
},
|
||||
fnToWebview(data) {
|
||||
uni.navigateTo({
|
||||
@@ -776,7 +803,10 @@
|
||||
});
|
||||
},
|
||||
fnToOriginal(originalURL) {
|
||||
this.fnToWebview({ title: this.result.title, url: originalURL });
|
||||
this.fnToWebview({
|
||||
title: this.result.title,
|
||||
url: originalURL
|
||||
});
|
||||
},
|
||||
// 查看密码验证确认
|
||||
fnOnValidVisitConfirm() {
|
||||
|
||||
@@ -2,11 +2,13 @@
|
||||
<view class="app-page" :class="{ 'is-balck grey-darken-6': isBlackTheme }">
|
||||
<!-- 顶部切换 -->
|
||||
<view class="e-fixed shadow-2">
|
||||
<tm-search v-model="queryParams.keyword" :round="24" :shadow="0" color="light-blue" insert-color="light-blue" :clear="true" @confirm="fnOnSearch"></tm-search>
|
||||
<tm-tabs color="light-blue" :shadow="0" v-model="tab.activeIndex" :list="tab.list" align="center" @change="fnOnTabChange"></tm-tabs>
|
||||
<tm-search v-model="queryParams.keyword" :round="24" :shadow="0" color="light-blue"
|
||||
insert-color="light-blue" :clear="true" @input="fnOnSearch" @confirm="fnOnSearch"></tm-search>
|
||||
<tm-tabs v-if="false" color="light-blue" :shadow="0" v-model="tab.activeIndex" :list="tab.list"
|
||||
align="center" @change="fnOnTabChange"></tm-tabs>
|
||||
</view>
|
||||
<!-- 占位区域 -->
|
||||
<view style="width: 100vw;height: 184rpx;"></view>
|
||||
<view style="width: 100vw;height: 100rpx;"></view>
|
||||
<!-- 加载区域 -->
|
||||
<view v-if="loading != 'success'" class="loading-wrap pa-24">
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
@@ -18,24 +20,23 @@
|
||||
<view v-else class="content">
|
||||
<view v-if="dataList.length == 0" class="content-empty flex flex-center">
|
||||
<!-- 空布局 -->
|
||||
<tm-empty icon="icon-shiliangzhinengduixiang-" label="该分类下暂无数据"></tm-empty>
|
||||
<tm-empty v-if="!queryParams.keyword" icon="icon-shiliangzhinengduixiang-" label="请输入关键词搜索"></tm-empty>
|
||||
<tm-empty v-else icon="icon-shiliangzhinengduixiang-"
|
||||
:label="`未搜到 ${queryParams.keyword} 相关文章`"></tm-empty>
|
||||
</view>
|
||||
<block v-else>
|
||||
<block v-for="(article, index) in dataList" :key="article.id">
|
||||
<!-- 文章卡片 -->
|
||||
<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
|
||||
<article-card :article="article" @on-click="fnToArticleDetail"></article-card>
|
||||
<!-- 广告区域 -->
|
||||
<view v-if="haloAdConfig.articles.use && (index + 1) % haloAdConfig.frequency == 0" class="ad-wrap ma-24">
|
||||
<!-- #ifdef MP-WEIXIN -->
|
||||
<ad v-if="haloAdConfig.unitId" :unit-id="haloAdConfig.unitId"></ad>
|
||||
<!-- #endif -->
|
||||
<!-- #ifndef MP-WEIXIN -->
|
||||
<ad v-if="haloAdConfig.adpid" :adpid="haloAdConfig.adpid"></ad>
|
||||
<!-- #endif -->
|
||||
<tm-translate v-for="(article, index) in dataList" :key="article.name" animation-name="fadeUp"
|
||||
:wait="calcAniWait(index)">
|
||||
<view class="article-card" @click="fnToArticleDetail(article)">
|
||||
<text style="font-size: 32rpx;font-weight: bold;color: #333;" v-html="article.title">{{article.title}}</text>
|
||||
<text style="font-size: 28rpx;margin-top: 16rpx;color: #555;" v-html="article.content">{{article.content}}
|
||||
</text>
|
||||
<text style="font-size: 24rpx;margin-top: 24rpx;color:#888">
|
||||
发布日期：{{ { d: article.publishTimestamp, f: 'yyyy年MM月dd日' } | formatTime }}
|
||||
</text>
|
||||
</view>
|
||||
</tm-translate>
|
||||
</block>
|
||||
|
||||
<tm-flotbutton @click="fnToTopPage" size="m" color="light-blue" icon="icon-angle-up"></tm-flotbutton>
|
||||
<view class="load-text">{{ loadMoreText }}</view>
|
||||
@@ -70,10 +71,10 @@
|
||||
list: ['全部', '最新文章', '热门文章', '最近更新', '最多点赞']
|
||||
},
|
||||
queryParams: {
|
||||
size: 10,
|
||||
page: 0,
|
||||
sort: 'topPriority,createTime,desc',
|
||||
keyword: ''
|
||||
keyword: "",
|
||||
limit: 5,
|
||||
highlightPreTag: "<text>",
|
||||
highlightPostTag: "</text>"
|
||||
},
|
||||
cache: {
|
||||
dataList: [],
|
||||
@@ -89,26 +90,18 @@
|
||||
this.fnSetPageTitle('文章列表');
|
||||
},
|
||||
created() {
|
||||
if (!this.queryParams.keyword) {
|
||||
this.loading = 'success'
|
||||
} else {
|
||||
this.fnGetData();
|
||||
}
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.fnResetSetAniWaitIndex();
|
||||
this.isLoadMore = false;
|
||||
this.queryParams.page = 0;
|
||||
this.fnGetData();
|
||||
},
|
||||
|
||||
onReachBottom(e) {
|
||||
if (this.result.hasNext) {
|
||||
this.queryParams.page += 1;
|
||||
this.isLoadMore = true;
|
||||
this.fnGetData();
|
||||
} else {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '没有更多数据了'
|
||||
});
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
fnOnTabChange(index) {
|
||||
this.fnResetSetAniWaitIndex();
|
||||
@@ -121,16 +114,18 @@
|
||||
4: 'topPriority,likes,desc'
|
||||
};
|
||||
this.queryParams.sort = _sorts[index];
|
||||
this.queryParams.page = 0;
|
||||
this.dataList = [];
|
||||
this.fnToTopPage();
|
||||
this.fnGetData();
|
||||
},
|
||||
fnOnSearch() {
|
||||
this.fnResetSetAniWaitIndex();
|
||||
this.queryParams.page = 0;
|
||||
this.isLoadMore = false;
|
||||
if (!this.queryParams.keyword) {
|
||||
this.dataList = []
|
||||
} else {
|
||||
this.fnGetData();
|
||||
}
|
||||
},
|
||||
fnGetData() {
|
||||
// uni.showLoading({
|
||||
@@ -142,20 +137,19 @@
|
||||
this.loading = 'loading';
|
||||
}
|
||||
this.loadMoreText = '加载中...';
|
||||
this.$httpApi
|
||||
.getPostList(this.queryParams)
|
||||
this.$httpApi.v2
|
||||
.getPostListByKeyword(this.queryParams)
|
||||
.then(res => {
|
||||
console.log('请求结果：');
|
||||
console.log(res);
|
||||
|
||||
this.loading = 'success';
|
||||
this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
// 处理数据
|
||||
this.result = res.data;
|
||||
this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
this.result = res;
|
||||
if (this.isLoadMore) {
|
||||
this.dataList = this.dataList.concat(res.data.content);
|
||||
this.dataList = this.dataList.concat(res.hits);
|
||||
} else {
|
||||
this.dataList = res.data.content;
|
||||
this.dataList = res.hits;
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
@@ -174,7 +168,7 @@
|
||||
//跳转文章详情
|
||||
fnToArticleDetail(article) {
|
||||
uni.navigateTo({
|
||||
url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
|
||||
url: '/pagesA/article-detail/article-detail?name=' + article.name,
|
||||
animationType: 'slide-in-right'
|
||||
});
|
||||
}
|
||||
@@ -203,4 +197,17 @@
|
||||
height: 60vh;
|
||||
}
|
||||
}
|
||||
|
||||
.article-card {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
box-sizing: border-box;
|
||||
margin: 0 24rpx;
|
||||
padding: 24rpx;
|
||||
border-radius: 12rpx;
|
||||
background-color: #ffff;
|
||||
box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.03);
|
||||
overflow: hidden;
|
||||
margin-bottom: 24rpx;
|
||||
}
|
||||
</style>
|
||||
@@ -42,7 +42,7 @@
|
||||
size: 10,
|
||||
page: 0
|
||||
},
|
||||
slug: '',
|
||||
name: '',
|
||||
pageTitle: '加载中...',
|
||||
result: null,
|
||||
dataList: [],
|
||||
@@ -52,8 +52,8 @@
|
||||
},
|
||||
|
||||
onLoad(e) {
|
||||
this.slug = e.slug;
|
||||
this.pageTitle = e.name;
|
||||
this.name = e.name;
|
||||
this.pageTitle = e.title;
|
||||
this.fnGetData();
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
@@ -85,16 +85,17 @@
|
||||
}
|
||||
this.loadMoreText = '加载中...';
|
||||
this.$httpApi
|
||||
.getCategoryPostList(this.slug, this.queryParams)
|
||||
.getCategoryPostList(this.name, this.queryParams)
|
||||
.then(res => {
|
||||
this.fnSetPageTitle(`分类：${this.pageTitle} （共${res.data.total}篇）`);
|
||||
this.result = res.data;
|
||||
console.log("请求成功：",res)
|
||||
this.fnSetPageTitle(`${this.pageTitle} （共${res.total}篇）`);
|
||||
this.result = res;
|
||||
if (this.isLoadMore) {
|
||||
this.dataList = this.dataList.concat(res.data.content);
|
||||
this.dataList = this.dataList.concat(res.items);
|
||||
} else {
|
||||
this.dataList = res.data.content;
|
||||
this.dataList = res.items;
|
||||
}
|
||||
this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
setTimeout(() => {
|
||||
this.loading = 'success';
|
||||
}, 500);
|
||||
@@ -114,7 +115,7 @@
|
||||
//跳转文章详情
|
||||
fnToArticleDetail(article) {
|
||||
uni.navigateTo({
|
||||
url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
|
||||
url: '/pagesA/article-detail/article-detail?name=' + article.metadata.name,
|
||||
animationType: 'slide-in-right'
|
||||
});
|
||||
}
|
||||
|
||||
+95
-51
@@ -3,15 +3,19 @@
|
||||
<view class="content pt-24 pb-24 round-4">
|
||||
<!-- 表单区域 -->
|
||||
<tm-form @submit="fnOnSubmit">
|
||||
<tm-input :auto-focus="true" name="content" :vertical="true" required :height="220" input-type="textarea" bg-color="grey-lighten-5" :maxlength="200" :borderBottom="false" placeholder="请输入内容,不超过200字符..." v-model="form.content"></tm-input>
|
||||
<tm-input name="author" align="right" required title="我的昵称" placeholder="请输入您的昵称..." v-model="form.author"></tm-input>
|
||||
<tm-input name="email" align="right" title="邮箱地址" placeholder="请输入您的邮箱..." v-model="form.email"></tm-input>
|
||||
<tm-input name="authorUrl" align="right" title="我的网站" placeholder="请输入您的网址..." v-model="form.authorUrl"></tm-input>
|
||||
<view class="mx-32 my-24 border-b-1 pb-24 flex-between">
|
||||
<text class="text-size-n ">接收提醒</text>
|
||||
<view><tm-switch :text="['是', '否']" v-model="form.allowNotification" color="bg-gradient-blue-accent"></tm-switch></view>
|
||||
</view>
|
||||
<view class="pa-24 pl-30 pr-30"><tm-button navtie-type="form" theme="bg-gradient-blue-accent" block>提交</tm-button></view>
|
||||
<tm-input :auto-focus="true" name="content" :vertical="true" required :height="220"
|
||||
input-type="textarea" bg-color="grey-lighten-5" :maxlength="200" :borderBottom="false"
|
||||
placeholder="请输入内容,不超过200字符..." v-model="form.content"></tm-input>
|
||||
<tm-input name="author" align="right" required title="我的昵称" placeholder="请输入您的昵称..."
|
||||
v-model="form.author"></tm-input>
|
||||
<tm-input name="avatar" align="right" required title="我的头像" placeholder="请输入您的头像..."
|
||||
v-model="form.avatar"></tm-input>
|
||||
<tm-input name="email" align="right" required title="邮箱地址" placeholder="请输入您的邮箱..."
|
||||
v-model="form.email"></tm-input>
|
||||
<tm-input name="authorUrl" align="right" required title="我的网站" placeholder="请输入您的网址..."
|
||||
v-model="form.authorUrl"></tm-input>
|
||||
<view class="pa-24 pl-30 pr-30"><tm-button navtie-type="form" theme="bg-gradient-blue-accent"
|
||||
block>提交</tm-button></view>
|
||||
</tm-form>
|
||||
</view>
|
||||
</view>
|
||||
@@ -32,9 +36,9 @@
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
isComment: true,
|
||||
params: {
|
||||
postId: '',
|
||||
parentId: '',
|
||||
postName: '',
|
||||
title: '', // 被回复的标题 type=user =用户名 否则为文章标题
|
||||
form: '',
|
||||
formPage: '', // 来自哪个页面
|
||||
@@ -47,39 +51,38 @@
|
||||
authorUrl: '', // 作者主页
|
||||
content: '', // 评论内容
|
||||
email: '', // 邮件
|
||||
parentId: 0,
|
||||
postId: 0
|
||||
postName: ""
|
||||
}
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
// 评论游客信息
|
||||
wxLoginVisitorUser() {
|
||||
return uni.$tm.vx.getters().getWxLoginInfo;
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
this.params = this.$Route.query;
|
||||
this.form.postId = this.params.id;
|
||||
if (this.params.type == 'user') {
|
||||
this.form.parentId = this.params.parentId;
|
||||
this.isComment = this.params.isComment;
|
||||
this.form.postName = this.params.postName;
|
||||
|
||||
if (!this.isComment) {
|
||||
this.fnSetPageTitle('回复用户：' + this.params.title);
|
||||
} else {
|
||||
this.form.parentId = 0;
|
||||
this.fnSetPageTitle(this.params.title);
|
||||
}
|
||||
this.form.author = this.wxLoginVisitorUser.nickName;
|
||||
this.form.avatar = this.wxLoginVisitorUser.avatarUrl;
|
||||
this.form.email = this.wxLoginVisitorUser.email;
|
||||
this.form.authorUrl = this.wxLoginVisitorUser.url;
|
||||
|
||||
try {
|
||||
let visitor = uni.getStorageSync('Visitor')
|
||||
if (visitor) {
|
||||
visitor = JSON.parse(visitor)
|
||||
this.form.author = visitor.author;
|
||||
this.form.avatar = visitor.avatar;
|
||||
this.form.email = visitor.email;
|
||||
this.form.authorUrl = visitor.authorUrl;
|
||||
}
|
||||
} catch (e) {}
|
||||
},
|
||||
methods: {
|
||||
fnOnSubmit(e) {
|
||||
console.log('提交评论');
|
||||
if (e === false) {
|
||||
return uni.$tm.toast('请检查所有的必填项是否填写完整！');
|
||||
}
|
||||
if (this.form.allowNotification && !this.form.email) {
|
||||
if (!this.form.email) {
|
||||
return uni.$tm.toast('未填写邮箱地址，将无法接收提醒！');
|
||||
}
|
||||
if (this.form.email && !uni.$tm.test.email(this.form.email)) {
|
||||
@@ -90,36 +93,77 @@
|
||||
}
|
||||
this.fnHandle();
|
||||
},
|
||||
|
||||
handleSetVisitor() {
|
||||
uni.setStorageSync('Visitor', JSON.stringify({
|
||||
author: this.form.author,
|
||||
avatar: this.form.avatar,
|
||||
email: this.form.email,
|
||||
authorUrl: this.form.authorUrl,
|
||||
}))
|
||||
},
|
||||
fnHandle() {
|
||||
uni.showLoading({
|
||||
title: '正在提交...'
|
||||
});
|
||||
const _api = {
|
||||
sheets: this.$httpApi.postSheetsComments,
|
||||
posts: this.$httpApi.postCommentPost
|
||||
};
|
||||
_api[this.params.from](this.form)
|
||||
.then(res => {
|
||||
if (res.status == 200) {
|
||||
uni.$tm.toast('提交成功，待博主审核通过后即可展示！');
|
||||
// 更新评论者信息
|
||||
uni.$tm.vx.commit('user/setWxLoginInfo', {
|
||||
avatarUrl: this.wxLoginVisitorUser.avatarUrl,
|
||||
nickName: this.form.author,
|
||||
|
||||
// 评论
|
||||
if (this.isComment) {
|
||||
const commentForm = {
|
||||
allowNotification: true,
|
||||
raw: this.form.content,
|
||||
content: this.form.content,
|
||||
owner: {
|
||||
avatar: this.form.avatarUrl,
|
||||
displayName: this.form.author,
|
||||
email: this.form.email,
|
||||
url: this.form.authorUrl
|
||||
});
|
||||
// 清空评论内容
|
||||
this.form.content = '';
|
||||
// 触发刷新评论（可能需要评论审核不会有改变）
|
||||
// uni.$emit(this.params.formPage + '_refresh');
|
||||
} else {
|
||||
uni.$tm.toast('操作失败，请重试！');
|
||||
website: this.form.authorUrl,
|
||||
},
|
||||
subjectRef: {
|
||||
group: "content.halo.run",
|
||||
kind: "Post",
|
||||
name: this.form.postName,
|
||||
version: "v1alpha1",
|
||||
}
|
||||
}
|
||||
this.$httpApi.v2.addPostComment(commentForm)
|
||||
.then(res => {
|
||||
uni.$tm.toast('日志：提交成功！');
|
||||
// 更新评论者信息
|
||||
this.handleSetVisitor();
|
||||
setTimeout(() => {
|
||||
uni.navigateBack()
|
||||
}, 1500)
|
||||
})
|
||||
.catch(err => {
|
||||
uni.$tm.toast(err.message);
|
||||
uni.$tm.toast("提示：评论失败");
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// 回复
|
||||
const replyForm = {
|
||||
allowNotification: true,
|
||||
raw: this.form.content,
|
||||
content: this.form.content,
|
||||
owner: {
|
||||
avatar: this.form.avatarUrl,
|
||||
displayName: this.form.author,
|
||||
email: this.form.email,
|
||||
website: this.form.authorUrl,
|
||||
},
|
||||
quoteReply: this.form.postName
|
||||
}
|
||||
this.$httpApi.v2.addPostCommentReply(this.form.postName, replyForm)
|
||||
.then(res => {
|
||||
uni.$tm.toast('提示：提交成功！');
|
||||
// 更新评论者信息
|
||||
this.handleSetVisitor();
|
||||
setTimeout(() => {
|
||||
uni.navigateBack()
|
||||
}, 1500)
|
||||
})
|
||||
.catch(err => {
|
||||
uni.$tm.toast("提示：回复失败");
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,45 +7,55 @@
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
</view>
|
||||
<view v-else class="content" :class="{ 'bg-white': result.length !== 0 }">
|
||||
<view v-else class="content" :class="{ 'bg-white': dataList.length !== 0 }">
|
||||
<!-- 空数据 -->
|
||||
<view v-if="result.length == 0" class="content-empty flex flex-center">
|
||||
<view v-if="dataList.length == 0" class="content-empty flex flex-center">
|
||||
<tm-empty icon="icon-shiliangzhinengduixiang-" label="啊偶,博主还没有朋友呢~"></tm-empty>
|
||||
</view>
|
||||
|
||||
<!-- 如果只有一个分组：使用列表的形式 result.length == 1 -->
|
||||
<view v-else-if="result.length == 1" class="flex flex-col pb-24">
|
||||
<block v-for="(link, index) in result[0].children" :key="index">
|
||||
<!-- 如果只有一个分组：使用列表的形式 dataList.length == 1 -->
|
||||
<view v-else class="flex flex-col pb-24">
|
||||
<block v-for="(link, index) in dataList" :key="index">
|
||||
<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
|
||||
<!-- 色彩版本 -->
|
||||
<view v-if="!globalAppSettings.links.useSimple" class="info flex pt-24 pb-24 pl-12 pr-12" :class="{ 'border-b-1': index != result[0].children.length - 1 }" @click="fnOnLinkEvent(link)">
|
||||
<view v-if="!globalAppSettings.links.useSimple" class="info flex pt-24 pb-24 pl-12 pr-12"
|
||||
:class="{ 'border-b-1': index != dataList.length - 1 }" @click="fnCopyLink(link)">
|
||||
<view class="link-logo">
|
||||
<cache-image class="link-logo_img" radius="12rpx" :url="link.logo" :fileMd5="link.logo" mode="aspectFill"></cache-image>
|
||||
<cache-image class="link-logo_img" radius="12rpx" :url="link.spec.logo"
|
||||
:fileMd5="link.spec.logo" mode="aspectFill"></cache-image>
|
||||
</view>
|
||||
<view class="flex flex-col pl-30 info-detail">
|
||||
<view class="link-card_name text-size-l text-weight-b text-red">{{ link.name }}</view>
|
||||
<view class="poup-tag ml--10 mt-6">
|
||||
<tm-tags color="bg-gradient-amber-accent" :shadow="0" size="s" model="fill">
|
||||
ID：{{ link.id }}
|
||||
<view class="link-card_name text-size-l text-weight-b text-red">
|
||||
<tm-tags style="margin-right: 12rpx;margin-left: -2rpx;" color="bg-gradient-light-blue-lighten"
|
||||
:shadow="0" size="s" model="fill">
|
||||
{{ link.spec.groupName || '暂未分组' }}
|
||||
</tm-tags>
|
||||
{{ link.spec.displayName }}
|
||||
</view>
|
||||
<view class="poup-tag mt-6" style="font-size: 28rpx;">
|
||||
站点地址：{{ link.spec.url }}
|
||||
<!-- <tm-tags color="bg-gradient-amber-accent" :shadow="0" size="s" model="fill">
|
||||
URL：{{ link.spec.url }}
|
||||
</tm-tags>
|
||||
<tm-tags color=" bg-gradient-light-blue-lighten" :shadow="0" size="s" model="fill">
|
||||
{{ link.team || '暂未分组' }}
|
||||
</tm-tags>
|
||||
{{ link.spec.groupName || '暂未分组' }}
|
||||
</tm-tags> -->
|
||||
</view>
|
||||
<view class="link-card_desc text-overflow text-size-s mt-4">
|
||||
博客简介：{{ link.description || '这个博主很懒，没写简介~' }}
|
||||
<view class="link-card_desc text-overflow mt-4" style="font-size: 28rpx;">
|
||||
博客简介：{{ link.spec.description || '这个博主很懒，没写简介~' }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 简洁版本 -->
|
||||
<view v-else class="link-card flex ml-24 mr-24 pt-24 pb-24" @click="fnOnLinkEvent(link)">
|
||||
<image class="logo shadow-6" :src="link.logo" mode="aspectFill"></image>
|
||||
<view v-else class="link-card flex ml-24 mr-24 pt-24 pb-24" @click="fnCopyLink(link)">
|
||||
<image class="logo shadow-6" :src="link.spec.logo" mode="aspectFill"></image>
|
||||
<view class="info pl-24">
|
||||
<view class="name text-size-g">{{ link.name }}</view>
|
||||
<view class="desc mt-12 text-size-s text-grey-darken-1">{{ link.description }}</view>
|
||||
<view class="name text-size-g">{{ link.spec.displayName }}</view>
|
||||
<view class="desc mt-12 text-size-s text-grey-darken-1">{{ link.spec.description }}
|
||||
</view>
|
||||
<view v-if="false" class="link mt-12 text-size-m text-grey-darken-1">
|
||||
<text class="iconfont icon-link mr-6 text-size-s"></text>
|
||||
{{ link.url }}
|
||||
{{ link.spec.url }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -53,49 +63,52 @@
|
||||
</block>
|
||||
</view>
|
||||
|
||||
<!-- 如果大于一个分组：使用联系人的索引形式 result.length > 1 -->
|
||||
<block v-else>
|
||||
<block v-for="(team, index) in result" :key="index">
|
||||
<!-- 如果大于一个分组：使用联系人的索引形式 dataList.length > 1 -->
|
||||
<block v-if="false">
|
||||
<block v-for="(team, index) in dataList" :key="index">
|
||||
<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
|
||||
<view class="grey-lighten-4 text text-size-s text-weight-b px-32 py-12">{{ team.title }}</view>
|
||||
<block v-for="(link, linkIndex) in team.children" :key="link.id">
|
||||
<block v-for="(link, linkIndex) in team.children" :key="link.metadata.name">
|
||||
<tm-translate animation-name="fadeUp" :wait="calcAniWait(linkIndex)">
|
||||
<!-- 色彩版本 -->
|
||||
<view v-if="!globalAppSettings.links.useSimple" class="info flex pt-24 pb-24 pl-12 pr-12" :class="{
|
||||
<view v-if="!globalAppSettings.links.useSimple"
|
||||
class="info flex pt-24 pb-24 pl-12 pr-12" :class="{
|
||||
'border-b-1':
|
||||
linkIndex != team.children.length - 1 || index == result.length - 1
|
||||
}" @click="fnOnLinkEvent(link)">
|
||||
linkIndex != team.children.length - 1 || index == dataList.length - 1
|
||||
}" @click="fnCopyLink(link)">
|
||||
<view class="link-logo">
|
||||
<cache-image class="link-logo_img" radius="12rpx" :url="link.logo" :fileMd5="link.logo" mode="aspectFill"></cache-image>
|
||||
<cache-image class="link-logo_img" radius="12rpx" :url="link.spec.logo"
|
||||
:fileMd5="link.spec.logo" mode="aspectFill"></cache-image>
|
||||
</view>
|
||||
<view class="flex flex-col pl-30 info-detail">
|
||||
<view class="link-card_name text-size-l text-weight-b text-red">
|
||||
{{ link.name }}
|
||||
{{ link.spec.displayName }}
|
||||
</view>
|
||||
<view class="poup-tag ml--10 mt-6">
|
||||
<tm-tags color="bg-gradient-amber-accent" :shadow="0" size="s" model="fill">
|
||||
ID：{{ link.id }}
|
||||
ID：{{ link.metadata.name }}
|
||||
</tm-tags>
|
||||
<tm-tags color=" bg-gradient-light-blue-lighten" :shadow="0" size="s" model="fill">
|
||||
{{ link.team || '暂未分组' }}
|
||||
<tm-tags color=" bg-gradient-light-blue-lighten" :shadow="0" size="s"
|
||||
model="fill">
|
||||
{{ link.spec.groupName || '暂未分组' }}
|
||||
</tm-tags>
|
||||
</view>
|
||||
<view class="link-card_desc text-overflow text-size-s mt-4">
|
||||
博客简介：{{ link.description || '这个博主很懒，没写简介~' }}
|
||||
博客简介：{{ link.spec.description || '这个博主很懒，没写简介~' }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 简洁版本 -->
|
||||
<view v-else class="link-card flex ml-24 mr-24 pt-24 pb-24" @click="fnOnLinkEvent(link)">
|
||||
<image class="logo shadow-6" :src="link.logo" mode="aspectFill"></image>
|
||||
<view v-else class="link-card flex ml-24 mr-24 pt-24 pb-24" @click="fnCopyLink(link)">
|
||||
<image class="logo shadow-6" :src="link.spec.logo" mode="aspectFill"></image>
|
||||
<view class="info pl-24">
|
||||
<view class="name text-size-g">{{ link.name }}</view>
|
||||
<view class="name text-size-g">{{ link.spec.displayName }}</view>
|
||||
<view class="desc mt-12 text-size-s text-grey-darken-1">
|
||||
{{ link.description }}
|
||||
{{ link.spec.description }}
|
||||
</view>
|
||||
<view v-if="false" class="link mt-12 text-size-m text-grey-darken-1">
|
||||
<text class="iconfont icon-link mr-6 text-size-s"></text>
|
||||
{{ link.url }}
|
||||
{{ link.spec.url }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -106,7 +119,7 @@
|
||||
</block>
|
||||
|
||||
<!-- 返回顶部 -->
|
||||
<tm-flotbutton v-if="linkTotal > 10" color="light-blue" @click="fnToTopPage" size="m" icon="icon-angle-up"></tm-flotbutton>
|
||||
<tm-flotbutton color="light-blue" @click="fnToTopPage" size="m" icon="icon-angle-up"></tm-flotbutton>
|
||||
|
||||
<!-- 详情弹窗 -->
|
||||
<tm-poup v-model="detail.show" :width="640" height="auto" position="center" :round="6">
|
||||
@@ -138,10 +151,13 @@
|
||||
|
||||
<!-- 博客预览图 -->
|
||||
<view class="mt-24">
|
||||
<tm-images :width="568" :round="2" :src="caclSiteThumbnail(detail.data.url)" mode="aspectFill"></tm-images>
|
||||
<tm-images :width="568" :round="2" :src="caclSiteThumbnail(detail.data.url)"
|
||||
mode="aspectFill"></tm-images>
|
||||
</view>
|
||||
</view>
|
||||
</tm-poup>
|
||||
|
||||
<view class="load-text">{{ loadMoreText }}</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -155,7 +171,9 @@
|
||||
import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
|
||||
import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
|
||||
|
||||
import { GetRandomNumberByRange } from '@/utils/random.js';
|
||||
import {
|
||||
GetRandomNumberByRange
|
||||
} from '@/utils/random.js';
|
||||
export default {
|
||||
components: {
|
||||
tmSkeleton,
|
||||
@@ -171,15 +189,17 @@
|
||||
loading: 'loading',
|
||||
queryParams: {
|
||||
size: 10,
|
||||
page: 0,
|
||||
sort: ''
|
||||
page: 1
|
||||
},
|
||||
result: [],
|
||||
result: {},
|
||||
detail: {
|
||||
show: false,
|
||||
data: {}
|
||||
},
|
||||
linkTotal: 0
|
||||
isLoadMore: false,
|
||||
loadMoreText: '',
|
||||
dataList: [],
|
||||
cacheDataList: []
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@@ -195,56 +215,62 @@
|
||||
},
|
||||
onLoad() {
|
||||
this.fnSetPageTitle('朋友圈');
|
||||
},
|
||||
created() {
|
||||
this.fnGetData();
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.isLoadMore = false;
|
||||
this.queryParams.page = 1;
|
||||
this.dataList = []
|
||||
this.cacheDataList = []
|
||||
this.fnGetData();
|
||||
},
|
||||
onReachBottom(e) {
|
||||
if (this.result.hasNext) {
|
||||
this.queryParams.page += 1;
|
||||
this.isLoadMore = true;
|
||||
this.fnGetData();
|
||||
} else {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '没有更多数据了'
|
||||
});
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
fnRandomColor() {
|
||||
const _r = GetRandomNumberByRange(0, this.$haloConfig.colors.length - 1);
|
||||
return this.$haloConfig.colors[_r];
|
||||
},
|
||||
fnGetData() {
|
||||
this.linkTotal = 0;
|
||||
if (!this.isLoadMore) {
|
||||
this.loading = 'loading';
|
||||
// uni.showLoading({
|
||||
// mask: true,
|
||||
// title: '加载中...'
|
||||
// });
|
||||
this.$httpApi
|
||||
.getLinkListByTeam()
|
||||
}
|
||||
this.loadMoreText = '';
|
||||
|
||||
this.$httpApi.v2
|
||||
.getFriendLinkList(this.queryParams)
|
||||
.then(res => {
|
||||
if (res.status == 200) {
|
||||
console.log('请求结果：');
|
||||
console.log(res);
|
||||
// 处理数据
|
||||
const _result = res.data.map(item => {
|
||||
const _team = item.team || '未分组';
|
||||
const _links = item.links.map(link => {
|
||||
this.linkTotal += 1;
|
||||
link.logo = this.$utils.checkAvatarUrl(link.logo);
|
||||
return link;
|
||||
});
|
||||
return {
|
||||
title: _team,
|
||||
children: _links
|
||||
};
|
||||
});
|
||||
this.result = res;
|
||||
const list = res.items.map(item => {
|
||||
item.spec.logo = this.$utils.checkAvatarUrl(item.spec.logo)
|
||||
return item;
|
||||
})
|
||||
this.dataList = this.dataList.concat(list);
|
||||
|
||||
this.result = _result.reverse();
|
||||
// this.cacheDataList = this.cacheDataList.concat(list);
|
||||
// this.dataList = this.handleGroup(this.cacheDataList).reverse();
|
||||
setTimeout(() => {
|
||||
this.loading = 'success';
|
||||
this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
}, 500);
|
||||
} else {
|
||||
this.loading = 'error';
|
||||
}
|
||||
|
||||
})
|
||||
.catch(err => {
|
||||
console.error(err);
|
||||
this.loading = 'error';
|
||||
this.loadMoreText = '加载失败，请下拉刷新！';
|
||||
})
|
||||
.finally(() => {
|
||||
setTimeout(() => {
|
||||
@@ -254,6 +280,30 @@
|
||||
});
|
||||
},
|
||||
|
||||
handleGroup(list) {
|
||||
const group = {}
|
||||
list.forEach(item => {
|
||||
if (group[item.spec.groupName]) {
|
||||
group[item.spec.groupName].children.push(item)
|
||||
} else {
|
||||
group[item.spec.groupName] = {
|
||||
title: item.spec.groupName,
|
||||
children: [item]
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
return Object.keys(group).map(key => {
|
||||
const {
|
||||
title,
|
||||
children = []
|
||||
} = group[key]
|
||||
return {
|
||||
title,
|
||||
children
|
||||
}
|
||||
})
|
||||
},
|
||||
fnOnLinkEvent(link) {
|
||||
this.detail.data = link;
|
||||
this.detail.show = true;
|
||||
@@ -1,257 +0,0 @@
|
||||
<template>
|
||||
<view class="app-page">
|
||||
<view v-if="loading != 'success'" class="loading-wrap pa-24">
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
</view>
|
||||
<!-- 内容区域 -->
|
||||
<view v-else class="app-page-content pa-24" :class="{ 'bg-white': dataList.length !== 0 }">
|
||||
<view v-if="dataList.length == 0" class="content-empty flex flex-center">
|
||||
<!-- 空布局 -->
|
||||
<tm-empty icon="icon-shiliangzhinengduixiang-" label="啊偶,博主还没有留言~"></tm-empty>
|
||||
</view>
|
||||
<block v-else>
|
||||
<block v-for="(item, index) in dataList" :key="index">
|
||||
<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
|
||||
<!-- 列表项 -->
|
||||
<comment-item class="mb-12" :isChild="false" :comment="item" :postId="sheetId" :useSolid="false" @on-copy="fnCopyContent" @on-comment="fnToComment" @on-detail="fnOnShowCommentDetail"></comment-item>
|
||||
</tm-translate>
|
||||
</block>
|
||||
<tm-flotbutton :offset="[16, 80]" @click="fnToTopPage" size="m" color="light-blue" icon="icon-angle-up"></tm-flotbutton>
|
||||
<view class="load-text">{{ loadMoreText }}</view>
|
||||
</block>
|
||||
<tm-flotbutton actions-pos="left" :show-text="true" color="bg-gradient-orange-accent" @click="fnToComment(null)"></tm-flotbutton>
|
||||
</view>
|
||||
|
||||
<!-- 评论详情 -->
|
||||
<tm-poup v-model="commentDetail.show" height="auto" :round="6" :over-close="true" position="bottom">
|
||||
<view class="pa-24">
|
||||
<view class="poup-head pb-24">
|
||||
<view class="poup-title text-align-center text-size-g text-weight-b mb-32">留言详情</view>
|
||||
<comment-item :useActions="false" :isChild="false" :comment="commentDetail.comment" :postId="sheetId"></comment-item>
|
||||
</view>
|
||||
|
||||
<scroll-view :scroll-y="true" class="poup-body">
|
||||
<view v-if="commentDetail.loading != 'success'" class="poup-loading-wrap flex flex-center">
|
||||
<view v-if="commentDetail.loading == 'loading'" class="loading flex flex-center flex-col">
|
||||
<text class="e-loading-icon iconfont icon-loading text-blue"></text>
|
||||
<view class="text-size-n text-grey-lighten-1 py-12 mt-12">加载中，请稍等...</view>
|
||||
</view>
|
||||
<view v-else-if="commentDetail.loading == 'error'" class="error">
|
||||
<tm-empty icon="icon-wind-cry" label="加载失败">
|
||||
<tm-button theme="bg-gradient-light-blue-accent" size="m" @click="fnGetChildComments()">刷新试试</tm-button>
|
||||
</tm-empty>
|
||||
</view>
|
||||
</view>
|
||||
<block v-else>
|
||||
<view v-if="commentDetail.list.length == 0" class="poup-empty flex flex-center">
|
||||
<tm-empty icon="icon-shiliangzhinengduixiang-" label="没有更多评论啦~"></tm-empty>
|
||||
</view>
|
||||
|
||||
<block v-else>
|
||||
<comment-item v-for="(comment, index) in commentDetail.list" :useSolid="false" :useActions="false" :key="index" :isChild="false" :comment="comment" :postId="sheetId"></comment-item>
|
||||
</block>
|
||||
</block>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</tm-poup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import AppKeys from '@/config/keys.js';
|
||||
import SheetConfig from '@/config/sheets.config.js';
|
||||
|
||||
import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
|
||||
import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
|
||||
import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
|
||||
import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
|
||||
import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
|
||||
import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
|
||||
import commentItem from '@/components/comment-item/comment-item.vue';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
tmSkeleton,
|
||||
tmFlotbutton,
|
||||
tmTranslate,
|
||||
tmEmpty,
|
||||
tmPoup,
|
||||
tmButton,
|
||||
commentItem
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
loading: 'loading',
|
||||
queryParams: {
|
||||
size: 10,
|
||||
page: 0
|
||||
},
|
||||
result: null,
|
||||
dataList: [],
|
||||
isLoadMore: false,
|
||||
loadMoreText: '加载中...',
|
||||
sheetId: SheetConfig[AppKeys.SHEET_LEAVING],
|
||||
commentDetail: {
|
||||
loading: 'loading',
|
||||
show: false,
|
||||
comment: {},
|
||||
postId: undefined,
|
||||
list: []
|
||||
}
|
||||
};
|
||||
},
|
||||
|
||||
onLoad() {
|
||||
this.fnSetPageTitle('留言板');
|
||||
},
|
||||
created() {
|
||||
this.fnGetData();
|
||||
uni.$on('leaving_refresh', () => {
|
||||
this.fnGetData();
|
||||
});
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.isLoadMore = false;
|
||||
this.queryParams.page = 0;
|
||||
this.fnGetData();
|
||||
},
|
||||
|
||||
onReachBottom(e) {
|
||||
if (this.result.hasNext) {
|
||||
this.queryParams.page += 1;
|
||||
this.isLoadMore = true;
|
||||
this.fnGetData();
|
||||
} else {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '没有更多数据了'
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
fnGetData() {
|
||||
// uni.showLoading({
|
||||
// mask: true,
|
||||
// title: '加载中...'
|
||||
// });
|
||||
// 设置状态为加载中
|
||||
if (!this.isLoadMore) {
|
||||
this.loading = 'loading';
|
||||
}
|
||||
this.loadMoreText = '加载中...';
|
||||
this.$httpApi
|
||||
.getSheetsCommentsTreeBySheetId(this.sheetId, this.queryParams)
|
||||
.then(res => {
|
||||
if (res.status == 200) {
|
||||
this.loading = 'success';
|
||||
// return;
|
||||
this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
// 处理数据
|
||||
this.result = res.data;
|
||||
if (this.isLoadMore) {
|
||||
this.dataList = this.dataList.concat(res.data.content);
|
||||
} else {
|
||||
this.dataList = res.data.content;
|
||||
}
|
||||
} else {
|
||||
this.loading = 'error';
|
||||
this.loadMoreText = '加载失败，请下拉刷新！';
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
console.error(err);
|
||||
this.loading = 'error';
|
||||
this.loadMoreText = '加载失败，请下拉刷新！';
|
||||
})
|
||||
.finally(() => {
|
||||
setTimeout(() => {
|
||||
uni.hideLoading();
|
||||
uni.stopPullDownRefresh();
|
||||
}, 500);
|
||||
});
|
||||
},
|
||||
fnToComment(data) {
|
||||
let _comment = {};
|
||||
if (data) {
|
||||
_comment = {
|
||||
id: this.sheetId,
|
||||
parentId: data.comment.id,
|
||||
title: data.comment.author,
|
||||
from: 'sheets',
|
||||
formPage: 'leaving',
|
||||
type: 'user'
|
||||
};
|
||||
} else {
|
||||
_comment = {
|
||||
id: this.sheetId,
|
||||
parentId: 0,
|
||||
title: '留言板留言',
|
||||
from: 'sheets',
|
||||
formPage: 'leaving',
|
||||
type: 'post'
|
||||
};
|
||||
}
|
||||
|
||||
uni.$tm.vx.commit('comment/setCommentInfo', _comment);
|
||||
this.$Router.push({
|
||||
path: '/pagesA/comment/comment',
|
||||
query: _comment
|
||||
});
|
||||
},
|
||||
fnCopyContent(content) {
|
||||
uni.$tm.u.setClipboardData(content);
|
||||
uni.$tm.toast('内容已复制成功！');
|
||||
},
|
||||
fnOnShowCommentDetail(comment) {
|
||||
this.commentDetail.comment = comment;
|
||||
this.commentDetail.list = [];
|
||||
this.commentDetail.show = true;
|
||||
this.fnGetChildComments();
|
||||
},
|
||||
fnGetChildComments() {
|
||||
this.commentDetail.loading = 'loading';
|
||||
this.$httpApi
|
||||
.getSheetsChildrenCommentList(this.sheetId, this.commentDetail.comment.id, {})
|
||||
.then(res => {
|
||||
if (res.status == 200) {
|
||||
this.commentDetail.loading = 'success';
|
||||
this.commentDetail.list = res.data;
|
||||
} else {
|
||||
this.commentDetail.loading = 'error';
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
this.commentDetail.loading = 'error';
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.app-page {
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background-color: #fafafd;
|
||||
}
|
||||
|
||||
.app-page-content {
|
||||
box-sizing: border-box;
|
||||
// box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
|
||||
}
|
||||
|
||||
.content-empty {
|
||||
width: 100%;
|
||||
height: 60vh;
|
||||
}
|
||||
|
||||
.loading-wrap {
|
||||
box-sizing: border-box;
|
||||
padding: 24rpx;
|
||||
}
|
||||
</style>
|
||||
+92
-81
@@ -14,43 +14,16 @@
|
||||
<text class="text-grey text-size-xs px-10 ml-12">应用以及文章列表布局设置</text>
|
||||
</view>
|
||||
<view class="sheet-content">
|
||||
<tm-pickers
|
||||
title="请选择首页布局"
|
||||
btn-color="light-blue"
|
||||
:default-value.sync="homeLayout.selectDefault"
|
||||
rang-key="name"
|
||||
:list="homeLayout.list"
|
||||
@confirm="fnOnHomeLayoutConfirm"
|
||||
>
|
||||
<tm-input
|
||||
name="status"
|
||||
required
|
||||
title="首页文章布局"
|
||||
placeholder="请选择首页文章布局"
|
||||
disabled
|
||||
align="right"
|
||||
:value="homeLayout.selectLabel"
|
||||
right-icon="icon-angle-right"
|
||||
></tm-input>
|
||||
<tm-pickers title="请选择首页布局" btn-color="light-blue" :default-value.sync="homeLayout.selectDefault"
|
||||
rang-key="name" :list="homeLayout.list" @confirm="fnOnHomeLayoutConfirm">
|
||||
<tm-input name="status" required title="首页文章布局" placeholder="请选择首页文章布局" disabled align="right"
|
||||
:value="homeLayout.selectLabel" right-icon="icon-angle-right"></tm-input>
|
||||
</tm-pickers>
|
||||
<tm-pickers
|
||||
title="请选择文章卡片样式"
|
||||
btn-color="light-blue"
|
||||
:default-value.sync="articleCardStyle.selectDefault"
|
||||
rang-key="name"
|
||||
:list="articleCardStyle.list"
|
||||
@confirm="fnOnArticleCardStyleConfirm"
|
||||
>
|
||||
<tm-input
|
||||
name="status"
|
||||
required
|
||||
title="文章卡片样式"
|
||||
placeholder="请选择文章卡片样式"
|
||||
disabled
|
||||
align="right"
|
||||
:value="articleCardStyle.selectLabel"
|
||||
right-icon="icon-angle-right"
|
||||
></tm-input>
|
||||
<tm-pickers title="请选择文章卡片样式" btn-color="light-blue"
|
||||
:default-value.sync="articleCardStyle.selectDefault" rang-key="name"
|
||||
:list="articleCardStyle.list" @confirm="fnOnArticleCardStyleConfirm">
|
||||
<tm-input name="status" required title="文章卡片样式" placeholder="请选择文章卡片样式" disabled align="right"
|
||||
:value="articleCardStyle.selectLabel" right-icon="icon-angle-right"></tm-input>
|
||||
</tm-pickers>
|
||||
</view>
|
||||
</tm-sheet>
|
||||
@@ -73,14 +46,16 @@
|
||||
</view>
|
||||
<view class="sheet-content">
|
||||
<view class="mx-32 my-24 border-b-1 pb-24 flex-between">
|
||||
<text class="text-size-m ">图库瀑布流模式</text>
|
||||
<tm-switch v-model="appSettings.gallery.useWaterfull" color="light-blue" :text="['是', '否']"></tm-switch>
|
||||
<text class="text-size-m">图库瀑布流模式</text>
|
||||
<tm-switch v-model="appSettings.gallery.useWaterfull" color="light-blue"
|
||||
:text="['是', '否']"></tm-switch>
|
||||
</view>
|
||||
<view class="mx-32 my-24 border-b-1 pb-24 flex-between">
|
||||
<text class="text-size-m ">友链简洁模式</text>
|
||||
<tm-switch v-model="appSettings.links.useSimple" color="light-blue" :text="['是', '否']"></tm-switch>
|
||||
<text class="text-size-m">友链简洁模式</text>
|
||||
<tm-switch v-model="appSettings.links.useSimple" color="light-blue"
|
||||
:text="['是', '否']"></tm-switch>
|
||||
</view>
|
||||
<view class="mx-32 mt-24 mb-0 border-b-1 pb-24 flex-between">
|
||||
<!-- <view class="mx-32 mt-24 mb-0 border-b-1 pb-24 flex-between">
|
||||
<text class="text-size-m">启用评论弹幕</text>
|
||||
<tm-switch v-model="appSettings.barrage.use" color="light-blue" :text="['是', '否']"></tm-switch>
|
||||
</view>
|
||||
@@ -102,31 +77,27 @@
|
||||
:value="barrage.selectLabel"
|
||||
right-icon="icon-angle-right"
|
||||
></tm-input>
|
||||
</tm-pickers>
|
||||
</tm-pickers> -->
|
||||
<view class="mx-32 my-24 border-b-1 pb-24 flex-between">
|
||||
<text class="text-size-m">是否圆形头像</text>
|
||||
<tm-switch v-model="appSettings.isAvatarRadius" color="light-blue" :text="['是', '否']"></tm-switch>
|
||||
<tm-switch v-model="appSettings.isAvatarRadius" color="light-blue"
|
||||
:text="['是', '否']"></tm-switch>
|
||||
</view>
|
||||
<view class="mx-32 my-24 border-b-1 pb-24 flex-between">
|
||||
<text class="text-size-m ">轮播图指示器</text>
|
||||
<tm-switch v-model="appSettings.banner.useDot" color="light-blue" :text="['是', '否']"></tm-switch>
|
||||
<tm-switch v-model="appSettings.banner.useDot" color="light-blue"
|
||||
:text="['是', '否']"></tm-switch>
|
||||
</view>
|
||||
<view v-if="appSettings.banner.useDot" class="mx-32 my-24 border-b-1 pb-24 flex-between">
|
||||
<text class="text-size-m ">轮播图指示器位置</text>
|
||||
<tm-groupradio name="dotPosition" @change="fnOnBannerDotChange">
|
||||
<tm-radio
|
||||
:name="item.name"
|
||||
:size="28"
|
||||
color="light-blue"
|
||||
v-for="(item, index) in dotPositionList"
|
||||
:key="index"
|
||||
v-model="item.checked"
|
||||
:label="item.name"
|
||||
></tm-radio>
|
||||
<tm-radio :name="item.name" :size="28" color="light-blue"
|
||||
v-for="(item, index) in dotPositionList" :key="index" v-model="item.checked"
|
||||
:label="item.name"></tm-radio>
|
||||
</tm-groupradio>
|
||||
</view>
|
||||
|
||||
<view class="mx-32 my-24 border-b-1 pb-24 flex-between">
|
||||
<!-- <view class="mx-32 my-24 border-b-1 pb-24 flex-between">
|
||||
<text class="text-size-m">显示完整统计</text>
|
||||
<tm-switch v-model="appSettings.about.showAllCount" color="light-blue" :text="['是', '否']"></tm-switch>
|
||||
</view>
|
||||
@@ -134,10 +105,10 @@
|
||||
<text class="text-size-m ">链接直接打开</text>
|
||||
<tm-switch v-model="appSettings.contact.isLinkCopy" color="light-blue" :text="['是', '否']"></tm-switch>
|
||||
</view>
|
||||
<view class="mx-32 my-24 border-b-1 pb-24 flex-between">
|
||||
<view v-if="false" class="mx-32 my-24 border-b-1 pb-24 flex-between">
|
||||
<text class="text-size-m ">显示后台入口</text>
|
||||
<tm-switch v-model="appSettings.about.showAdmin" color="light-blue" :text="['是', '否']"></tm-switch>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</tm-sheet>
|
||||
</tm-form>
|
||||
@@ -152,17 +123,19 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { _DefaultAppSettings } from '@/utils/app.js';
|
||||
import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
|
||||
import tmForm from '@/tm-vuetify/components/tm-form/tm-form.vue';
|
||||
import tmPickers from '@/tm-vuetify/components/tm-pickers/tm-pickers.vue';
|
||||
import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
|
||||
import tmSwitch from '@/tm-vuetify/components/tm-switch/tm-switch.vue';
|
||||
import tmSheet from '@/tm-vuetify/components/tm-sheet/tm-sheet.vue';
|
||||
import tmGroupradio from '@/tm-vuetify/components/tm-groupradio/tm-groupradio.vue';
|
||||
import tmRadio from '@/tm-vuetify/components/tm-radio/tm-radio.vue';
|
||||
import {
|
||||
_DefaultAppSettings
|
||||
} from '@/utils/app.js';
|
||||
import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
|
||||
import tmForm from '@/tm-vuetify/components/tm-form/tm-form.vue';
|
||||
import tmPickers from '@/tm-vuetify/components/tm-pickers/tm-pickers.vue';
|
||||
import tmInput from '@/tm-vuetify/components/tm-input/tm-input.vue';
|
||||
import tmSwitch from '@/tm-vuetify/components/tm-switch/tm-switch.vue';
|
||||
import tmSheet from '@/tm-vuetify/components/tm-sheet/tm-sheet.vue';
|
||||
import tmGroupradio from '@/tm-vuetify/components/tm-groupradio/tm-groupradio.vue';
|
||||
import tmRadio from '@/tm-vuetify/components/tm-radio/tm-radio.vue';
|
||||
|
||||
export default {
|
||||
export default {
|
||||
components: {
|
||||
tmButton,
|
||||
tmForm,
|
||||
@@ -181,26 +154,60 @@ export default {
|
||||
isSaved: true,
|
||||
firstLoad: true,
|
||||
homeLayout: {
|
||||
list: [{ name: '一行一列', value: 'h_row_col1' }, { name: '一行两列', value: 'h_row_col2' }],
|
||||
list: [{
|
||||
name: '一行一列',
|
||||
value: 'h_row_col1'
|
||||
}, {
|
||||
name: '一行两列',
|
||||
value: 'h_row_col2'
|
||||
}],
|
||||
selectDefault: ['一行一列'],
|
||||
selectLabel: '一行一列',
|
||||
selectValue: 'h_row_col1'
|
||||
},
|
||||
articleCardStyle: {
|
||||
list: [
|
||||
{ name: '左图右文', value: 'lr_image_text' },
|
||||
{ name: '左文右图', value: 'lr_text_image' },
|
||||
{ name: '上图下文', value: 'tb_image_text' },
|
||||
{ name: '上文下图', value: 'tb_text_image' },
|
||||
{ name: '只有文字', value: 'only_text' }
|
||||
list: [{
|
||||
name: '左图右文',
|
||||
value: 'lr_image_text'
|
||||
},
|
||||
{
|
||||
name: '左文右图',
|
||||
value: 'lr_text_image'
|
||||
},
|
||||
{
|
||||
name: '上图下文',
|
||||
value: 'tb_image_text'
|
||||
},
|
||||
{
|
||||
name: '上文下图',
|
||||
value: 'tb_text_image'
|
||||
},
|
||||
{
|
||||
name: '只有文字',
|
||||
value: 'only_text'
|
||||
}
|
||||
],
|
||||
selectDefault: ['左图右文'],
|
||||
selectLabel: '左图右文',
|
||||
selectValue: 'lr_image_text'
|
||||
},
|
||||
dotPositionList: [{ name: '右边', value: 'right', checked: true }, { name: '下边', value: 'bottom', checked: false }],
|
||||
dotPositionList: [{
|
||||
name: '右边',
|
||||
value: 'right',
|
||||
checked: true
|
||||
}, {
|
||||
name: '下边',
|
||||
value: 'bottom',
|
||||
checked: false
|
||||
}],
|
||||
barrage: {
|
||||
list: [{ name: '顶部', value: 'rightToLeft' }, { name: '左下', value: 'leftBottom' }],
|
||||
list: [{
|
||||
name: '顶部',
|
||||
value: 'rightToLeft'
|
||||
}, {
|
||||
name: '左下',
|
||||
value: 'leftBottom'
|
||||
}],
|
||||
selectDefault: ['顶部'],
|
||||
selectLabel: '顶部',
|
||||
selectValue: 'rightToLeft'
|
||||
@@ -246,7 +253,8 @@ export default {
|
||||
this.homeLayout.selectLabel = _homeLayout.name;
|
||||
this.homeLayout.selectValue = _homeLayout.value;
|
||||
|
||||
const _articleCardStyle = this.fnFindObjInList(this.articleCardStyle.list, 'value', this.appSettings.layout.cardType);
|
||||
const _articleCardStyle = this.fnFindObjInList(this.articleCardStyle.list, 'value', this.appSettings.layout
|
||||
.cardType);
|
||||
this.articleCardStyle.selectDefault = [_articleCardStyle.name];
|
||||
this.articleCardStyle.selectLabel = _articleCardStyle.name;
|
||||
this.articleCardStyle.selectValue = _articleCardStyle.value;
|
||||
@@ -338,13 +346,14 @@ export default {
|
||||
.catch(err => {});
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.app-page {
|
||||
.app-page {
|
||||
box-sizing: border-box;
|
||||
padding-bottom: 120rpx;
|
||||
|
||||
.btn-bar {
|
||||
width: 100vw;
|
||||
position: fixed;
|
||||
@@ -355,10 +364,12 @@ export default {
|
||||
gap: 0 24rpx;
|
||||
box-shadow: 0rpx -6rpx 24rpx rgba(0, 0, 0, 0.03);
|
||||
}
|
||||
}
|
||||
.required {
|
||||
}
|
||||
|
||||
.required {
|
||||
position: relative;
|
||||
padding-left: 18rpx;
|
||||
|
||||
&:before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
@@ -368,5 +379,5 @@ export default {
|
||||
font-size: 34rpx;
|
||||
color: rgba(244, 67, 54, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -7,11 +7,13 @@
|
||||
<tm-skeleton model="listAvatr"></tm-skeleton>
|
||||
</view>
|
||||
<block v-else>
|
||||
<view class="empty" v-if="dataList.length == 0"><tm-empty icon="icon-shiliangzhinengduixiang-" label="该标签下暂无文章"></tm-empty></view>
|
||||
<view class="empty" v-if="dataList.length == 0"><tm-empty icon="icon-shiliangzhinengduixiang-"
|
||||
label="该标签下暂无文章"></tm-empty></view>
|
||||
<block v-else>
|
||||
<block v-for="(article, index) in dataList" :key="article.createTime">
|
||||
<block v-for="(article, index) in dataList" :key="article.metadata.name">
|
||||
<!-- 文章卡片 -->
|
||||
<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)"><article-card :article="article" @on-click="fnToArticleDetail"></article-card></tm-translate>
|
||||
<tm-translate animation-name="fadeUp" :wait="calcAniWait(index)">
|
||||
<article-card :article="article" @on-click="fnToArticleDetail"></article-card></tm-translate>
|
||||
</block>
|
||||
<view class="load-text">{{ loadMoreText }}</view>
|
||||
</block>
|
||||
@@ -39,10 +41,11 @@
|
||||
return {
|
||||
loading: 'loading',
|
||||
queryParams: {
|
||||
name: "",
|
||||
size: 10,
|
||||
page: 0
|
||||
},
|
||||
slug: '',
|
||||
name: '',
|
||||
pageTitle: '加载中...',
|
||||
result: null,
|
||||
dataList: [],
|
||||
@@ -52,8 +55,9 @@
|
||||
},
|
||||
|
||||
onLoad(e) {
|
||||
this.slug = e.slug;
|
||||
this.pageTitle = e.name;
|
||||
this.name = e.name;
|
||||
this.queryParams.name = this.name;
|
||||
this.pageTitle = e.title;
|
||||
this.fnGetData();
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
@@ -62,7 +66,7 @@
|
||||
this.fnGetData();
|
||||
},
|
||||
onReachBottom(e) {
|
||||
if (this.result.hasNext) {
|
||||
if (this.result && this.result.hasNext) {
|
||||
this.queryParams.page += 1;
|
||||
this.isLoadMore = true;
|
||||
this.fnGetData();
|
||||
@@ -84,17 +88,17 @@
|
||||
this.loading = 'loading';
|
||||
}
|
||||
this.loadMoreText = '加载中...';
|
||||
this.$httpApi
|
||||
.getTagPostsList(this.slug, this.queryParams)
|
||||
this.$httpApi.v2
|
||||
.getPostByTagName(this.name, this.queryParams)
|
||||
.then(res => {
|
||||
this.fnSetPageTitle(`标签：${this.pageTitle} （共${res.data.total}篇）`);
|
||||
this.result = res.data;
|
||||
this.fnSetPageTitle(`${this.pageTitle} （共${res.total}篇）`);
|
||||
this.result = res;
|
||||
if (this.isLoadMore) {
|
||||
this.dataList = this.dataList.concat(res.data.content);
|
||||
this.dataList = this.dataList.concat(res.items);
|
||||
} else {
|
||||
this.dataList = res.data.content;
|
||||
this.dataList = res.items;
|
||||
}
|
||||
this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
|
||||
setTimeout(() => {
|
||||
this.loading = 'success';
|
||||
}, 500);
|
||||
@@ -114,7 +118,7 @@
|
||||
//跳转文章详情
|
||||
fnToArticleDetail(article) {
|
||||
uni.navigateTo({
|
||||
url: '/pagesA/article-detail/article-detail?articleId=' + article.id,
|
||||
url: '/pagesA/article-detail/article-detail?name=' + article.metadata.name,
|
||||
animationType: 'slide-in-right'
|
||||
});
|
||||
}
|
||||
|
||||
@@ -314,7 +314,7 @@
|
||||
// 回复评论
|
||||
fnReplySubmit() {
|
||||
this.reply.form.author = this.bloggerInfo.nickname;
|
||||
this.reply.form.authorUrl = this.$haloConfig.social.blog || this.$haloConfig.apiUrl;
|
||||
this.reply.form.authorUrl = this.$haloConfig.social.blog || this.$baseApiUrl;
|
||||
this.reply.form.email = this.bloggerInfo.email;
|
||||
|
||||
uni.showLoading({
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
/**
|
||||
* 功能：登录用户
|
||||
* 作者：小莫唐尼
|
||||
* 邮箱：studio@925i.cn
|
||||
* 时间：2022年07月21日 18:41:44
|
||||
* 版本：v0.1.0
|
||||
* 修改记录：
|
||||
* 修改内容：
|
||||
* 修改人员：
|
||||
* 修改时间：
|
||||
*/
|
||||
import User from '@/api/admin/user.js'
|
||||
import HaloConfig from '@/config/halo.config.js';
|
||||
import {
|
||||
getWxLoginInfo
|
||||
} from '@/utils/auth.js'
|
||||
import {
|
||||
setCache,
|
||||
getCache
|
||||
} from '@/utils/storage.js'
|
||||
export default {
|
||||
state: {
|
||||
// 超管登录
|
||||
adminToken: getCache('APP_ADMIN_LOGIN_TOKEN'),
|
||||
|
||||
// 微信登录的信息
|
||||
wxLoginInfo: getWxLoginInfo(),
|
||||
},
|
||||
getters: {
|
||||
getAdminToken(state) {
|
||||
return getCache('APP_ADMIN_LOGIN_TOKEN')
|
||||
},
|
||||
getWxLoginInfo(state) {
|
||||
return state.wxLoginInfo
|
||||
},
|
||||
},
|
||||
mutations: {
|
||||
setAdminToken(state, data) {
|
||||
state.adminToken = data
|
||||
setCache('APP_ADMIN_LOGIN_TOKEN', data, data?.expired_in)
|
||||
},
|
||||
setWxLoginInfo(state, data) {
|
||||
state.wxLoginInfo = data
|
||||
uni.setStorageSync('APP_WX_LOGIN_INFO', JSON.stringify(data))
|
||||
},
|
||||
},
|
||||
actions: {
|
||||
adminLogin(context, data) {
|
||||
return new Promise((resolve, reject) => {
|
||||
User.login(data).then((res) => {
|
||||
if (res.status == 200) {
|
||||
context.commit("setAdminToken", res.data);
|
||||
resolve(res)
|
||||
} else {
|
||||
reject(err)
|
||||
}
|
||||
}).catch((err) => {
|
||||
reject(err)
|
||||
});
|
||||
})
|
||||
},
|
||||
checkAndSetDefaultUser(context) {
|
||||
if (!context.state.wxLoginInfo) {
|
||||
context.commit('setWxLoginInfo', {
|
||||
avatarUrl: HaloConfig.defaultAvatarUrl,
|
||||
nickName: '匿名访客',
|
||||
email: '',
|
||||
url: ''
|
||||
})
|
||||
}
|
||||
},
|
||||
adminLogout(context) {
|
||||
context.commit("setAdminToken", null);
|
||||
}
|
||||
},
|
||||
};
|
||||
@@ -27,16 +27,7 @@ export default {
|
||||
},
|
||||
actions: {
|
||||
fnGetBlogger(context) {
|
||||
if (HaloConfig.author.use) {
|
||||
context.commit("setBlogger", HaloConfig.author);
|
||||
} else {
|
||||
Blogger.getBloggerInfo().then((res) => {
|
||||
context.commit("setBlogger", res.data);
|
||||
}).catch((err) => {
|
||||
// 如果失败，则加载默认配置信息
|
||||
context.commit("setBlogger", HaloConfig.author);
|
||||
});
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
+2
-2
@@ -37,7 +37,7 @@ export const _DefaultAppSettings = {
|
||||
},
|
||||
// 评论弹幕（文章详情）
|
||||
barrage: {
|
||||
use: true, // 是否启用
|
||||
use: false, // 是否启用
|
||||
type: 'leftBottom' // 弹幕位置（rightToLeft leftBottom）
|
||||
},
|
||||
gallery: {
|
||||
@@ -51,7 +51,7 @@ export const _DefaultAppSettings = {
|
||||
},
|
||||
about: {
|
||||
showAdmin: false, // 显示后台登录入口
|
||||
showAllCount: true, // 默认显示所有的统计信息（关于页面）
|
||||
showAllCount: false, // 默认显示所有的统计信息（关于页面）
|
||||
},
|
||||
// 文章配置
|
||||
article: {
|
||||
|
||||
+6
-11
@@ -11,6 +11,7 @@
|
||||
*/
|
||||
|
||||
import HaloConfig from '@/config/halo.config.js';
|
||||
import HaloTokenConfig from '@/config/token.config.js'
|
||||
import {
|
||||
logTypes,
|
||||
logUtils
|
||||
@@ -27,22 +28,16 @@ const utils = {
|
||||
// 检查链接
|
||||
checkUrl: function(url) {
|
||||
if (!url) return '';
|
||||
if (!this.checkIsUrl(url)) return HaloConfig.apiUrl + url;
|
||||
if (!this.checkIsUrl(url)) return HaloTokenConfig.BASE_API + url;
|
||||
return url
|
||||
},
|
||||
|
||||
// 检查封面图
|
||||
checkThumbnailUrl: function(thumbnail, mustRealUrl = false) {
|
||||
console.log("thumbnail",thumbnail)
|
||||
if (!thumbnail && mustRealUrl) {
|
||||
return HaloConfig.defaultStaticThumbnailUrl
|
||||
}
|
||||
if (!HaloConfig.defaultThumbnailUrl) {
|
||||
// logUtils.saveLog(logTypes.config, {
|
||||
// path: 'checkThumbnailUrl',
|
||||
// page: 'checkThumbnailUrl',
|
||||
// msg: '未配置默认的封面图，配置参数【HaloConfig.defaultThumbnailUrl】'
|
||||
// })
|
||||
}
|
||||
let _url = HaloConfig.defaultThumbnailUrl
|
||||
if (_url) {
|
||||
if (_url.indexOf('?') == -1) {
|
||||
@@ -52,7 +47,7 @@ const utils = {
|
||||
}
|
||||
}
|
||||
if (!thumbnail) return _url;
|
||||
if (!this.checkIsUrl(thumbnail)) return HaloConfig.apiUrl + thumbnail;
|
||||
if (!this.checkIsUrl(thumbnail)) return HaloTokenConfig.BASE_API + thumbnail;
|
||||
return thumbnail
|
||||
},
|
||||
|
||||
@@ -67,7 +62,7 @@ const utils = {
|
||||
}
|
||||
}
|
||||
if (!image) return _url;
|
||||
if (!this.checkIsUrl(image)) return HaloConfig.apiUrl + image;
|
||||
if (!this.checkIsUrl(image)) return HaloTokenConfig.BASE_API + image;
|
||||
return image
|
||||
},
|
||||
|
||||
@@ -85,7 +80,7 @@ const utils = {
|
||||
}
|
||||
return _url;
|
||||
}
|
||||
if (!this.checkIsUrl(avatar)) return HaloConfig.apiUrl + avatar;
|
||||
if (!this.checkIsUrl(avatar)) return HaloTokenConfig.BASE_API + avatar;
|
||||
return avatar
|
||||
},
|
||||
|
||||
|
||||
+3
-3
@@ -7,12 +7,12 @@ module.exports = {
|
||||
devServer: {
|
||||
disableHostCheck: true,
|
||||
proxy: {
|
||||
"/api": {
|
||||
target: 'https://b.925i.cn',
|
||||
"/apis": {
|
||||
target: 'https://demo.halo.run',
|
||||
changeOrigin: true,
|
||||
secure: true,
|
||||
pathRewrite: {
|
||||
"^/api": "/api"
|
||||
"^/apis": "/apis"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user