1
0
mirror of https://github.com/ialley-workshop-open/uni-halo.git synced 2026-06-11 12:49:30 +08:00

update: 优化代码格式

This commit is contained in:
小莫唐尼
2024-05-27 23:10:23 +08:00
parent f9fce7d0ed
commit 9721932c34
4 changed files with 2023 additions and 1967 deletions
+1
View File
@@ -6,6 +6,7 @@ import HttpHandler from '@/common/http/request.js'
import {
getCache
} from '@/utils/storage.js'
export default {
/**
* 获取文章列表
+109 -60
View File
@@ -1,5 +1,6 @@
{
"pages": [{
"pages": [
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "uni-halo",
@@ -20,7 +21,8 @@
}
}
}
}, {
},
{
"path": "pages/tabbar/category/category",
"style": {
"navigationBarTitleText": "分类",
@@ -32,7 +34,8 @@
}
}
}
}, {
},
{
"path": "pages/tabbar/gallery/gallery",
"style": {
"navigationBarTitleText": "图库",
@@ -44,7 +47,8 @@
}
}
}
}, {
},
{
"path": "pages/tabbar/moments/moments",
"style": {
"navigationBarTitleText": "瞬间",
@@ -56,7 +60,8 @@
}
}
}
}, {
},
{
"path": "pages/tabbar/about/about",
"style": {
"navigationBarTitleText": "关于",
@@ -69,7 +74,8 @@
}
}
}
}, {
},
{
"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
"style": {
"disableScroll": true,
@@ -86,16 +92,19 @@
}
],
//此配置为小程序的分包加载机制。在5+App里始终为整包。
"subPackages": [{
"subPackages": [
{
"root": "pagesA",
"pages": [{
"pages": [
{
"path": "start/start",
"style": {
"navigationBarTitleText": "uni-halo",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}, {
},
{
"path": "article-detail/article-detail",
"style": {
"navigationBarTitleText": "文章详情",
@@ -107,7 +116,8 @@
}
}
}
}, {
},
{
"path": "love/love",
"style": {
"navigationBarTitleText": "恋爱日记",
@@ -120,15 +130,16 @@
}
}
}
}, {
},
{
"path": "love/list",
"style": {
"navigationBarTitleText": "恋爱清单",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}, {
},
{
"path": "love/album",
"style": {
"navigationBarTitleText": "恋爱相册",
@@ -140,14 +151,16 @@
}
}
}
}, {
},
{
"path": "love/journey",
"style": {
"navigationBarTitleText": "我们的故事",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
}, {
},
{
"path": "archives/archives",
"style": {
"navigationBarTitleText": "文章归档",
@@ -159,8 +172,8 @@
}
}
}
}, {
},
{
"path": "friend-links/friend-links",
"style": {
"navigationBarTitleText": "友情链接",
@@ -172,7 +185,8 @@
}
}
}
}, {
},
{
"path": "journal/journal",
"style": {
"navigationBarTitleText": "个人日记",
@@ -184,7 +198,8 @@
}
}
}
}, {
},
{
"path": "articles/articles",
"style": {
"navigationBarTitleText": "文章列表",
@@ -196,7 +211,8 @@
}
}
}
}, {
},
{
"path": "category-detail/category-detail",
"style": {
"navigationBarTitleText": "分类详情",
@@ -208,7 +224,8 @@
}
}
}
}, {
},
{
"path": "comment/comment",
"style": {
"navigationBarTitleText": "",
@@ -217,37 +234,43 @@
"meta": {
"auth": "login"
}
}, {
},
{
"path": "disclaimers/disclaimers",
"style": {
"navigationBarTitleText": "免责声明",
"enablePullDownRefresh": false
}
}, {
},
{
"path": "contact/contact",
"style": {
"navigationBarTitleText": "联系博主",
"enablePullDownRefresh": false
}
}, {
},
{
"path": "about/about",
"style": {
"navigationBarTitleText": "关于博客",
"enablePullDownRefresh": false
}
}, {
},
{
"path": "setting/setting",
"style": {
"navigationBarTitleText": "设置",
"enablePullDownRefresh": false
}
}, {
},
{
"path": "tags/tags",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}, {
},
{
"path": "tag-detail/tag-detail",
"style": {
"navigationBarTitleText": "标签详情",
@@ -261,10 +284,9 @@
}
},
{
"path" : "test-page/test-page",
"style" :
{
"navigationBarTitleText" : ""
"path": "test-page/test-page",
"style": {
"navigationBarTitleText": ""
}
},
{
@@ -273,18 +295,21 @@
"navigationBarTitleText": "广告页面",
"enablePullDownRefresh": false
}
}]
}
]
},
{
"root": "pagesB",
"pages": [{
"pages": [
{
"path": "login/login",
"style": {
"navigationBarTitleText": "登录",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}, {
},
{
"path": "admin/admin",
"style": {
"navigationBarTitleText": "工作台",
@@ -299,7 +324,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "settings/settings",
"style": {
"navigationBarTitleText": "系统设置",
@@ -314,7 +340,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "journal/journal",
"style": {
"navigationBarTitleText": "日记管理",
@@ -329,7 +356,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "journal/journal-edit",
"style": {
"navigationBarTitleText": "",
@@ -344,7 +372,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "articles/articles",
"style": {
"navigationBarTitleText": "文章管理",
@@ -359,7 +388,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "articles/article-edit",
"style": {
"navigationBarTitleText": "写文章",
@@ -368,7 +398,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "articles/article-setting",
"style": {
"navigationBarTitleText": "文章设置",
@@ -383,7 +414,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "category/category",
"style": {
"navigationBarTitleText": "分类管理",
@@ -398,7 +430,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "tags/tags",
"style": {
"navigationBarTitleText": "标签管理",
@@ -413,7 +446,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "attachment/attachment",
"style": {
"navigationBarTitleText": "附件管理",
@@ -428,7 +462,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "links/links",
"style": {
"navigationBarTitleText": "友链管理",
@@ -443,7 +478,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "photos/photos",
"style": {
"navigationBarTitleText": "图库管理",
@@ -458,7 +494,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "photos/photos-edit",
"style": {
"navigationBarTitleText": "新增/编辑图片",
@@ -473,7 +510,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "comments/comments",
"style": {
"navigationBarTitleText": "评论管理",
@@ -488,7 +526,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "menus/menus",
"style": {
"navigationBarTitleText": "菜单管理",
@@ -503,7 +542,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "password/password",
"style": {
"navigationBarTitleText": "修改密码",
@@ -512,7 +552,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "profile/profile",
"style": {
"navigationBarTitleText": "个人信息",
@@ -527,7 +568,8 @@
"meta": {
"auth": "admin"
}
}, {
},
{
"path": "logs/logs",
"style": {
"navigationBarTitleText": "日志管理",
@@ -542,17 +584,20 @@
"meta": {
"auth": "admin"
}
}]
}, {
}
]
},
{
"root": "pagesC",
"pages": [{
"pages": [
{
"path": "website/website",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}]
}
]
}
],
"globalStyle": {
@@ -566,7 +611,8 @@
"borderStyle": "white",
"color": "#303133",
"selectedColor": "#03a9f4",
"list": [{
"list": [
{
"iconPath": "static/tabbar/select_home.png",
"selectedIconPath": "static/tabbar/select_home_active.png",
"pagePath": "pages/tabbar/home/home",
@@ -577,17 +623,20 @@
"selectedIconPath": "static/tabbar/select_category_active.png",
"pagePath": "pages/tabbar/category/category",
"text": "分类"
}, {
},
{
"iconPath": "static/tabbar/select_gallery.png",
"selectedIconPath": "static/tabbar/select_gallery_active.png",
"pagePath": "pages/tabbar/gallery/gallery",
"text": "图库"
}, {
},
{
"iconPath": "static/tabbar/select_links.png",
"selectedIconPath": "static/tabbar/select_links_active.png",
"pagePath": "pages/tabbar/moments/moments",
"text": "瞬间"
}, {
},
{
"iconPath": "static/tabbar/select_mine.png",
"selectedIconPath": "static/tabbar/select_mine_active.png",
"pagePath": "pages/tabbar/about/about",
+15 -13
View File
@@ -18,16 +18,17 @@
</template>
<script>
let videoAd = null;
import tmFullView from "@/tm-vuetify/components/tm-fullView/tm-fullView.vue"
import tmMenubars from "@/tm-vuetify/components/tm-menubars/tm-menubars.vue"
import tmSheet from "@/tm-vuetify/components/tm-sheet/tm-sheet.vue"
import tmAlerts from "@/tm-vuetify/components/tm-alerts/tm-alerts.vue"
import tmDivider from "@/tm-vuetify/components/tm-divider/tm-divider.vue"
import tmCoupon from '@/tm-vuetify/components/tm-coupon/tm-coupon.vue'
import tmButton from "@/tm-vuetify/components/tm-button/tm-button.vue"
import tmImages from "@/tm-vuetify/components/tm-images/tm-images.vue"
export default {
let videoAd = null;
import tmFullView from "@/tm-vuetify/components/tm-fullView/tm-fullView.vue"
import tmMenubars from "@/tm-vuetify/components/tm-menubars/tm-menubars.vue"
import tmSheet from "@/tm-vuetify/components/tm-sheet/tm-sheet.vue"
import tmAlerts from "@/tm-vuetify/components/tm-alerts/tm-alerts.vue"
import tmDivider from "@/tm-vuetify/components/tm-divider/tm-divider.vue"
import tmCoupon from '@/tm-vuetify/components/tm-coupon/tm-coupon.vue'
import tmButton from "@/tm-vuetify/components/tm-button/tm-button.vue"
import tmImages from "@/tm-vuetify/components/tm-images/tm-images.vue"
export default {
components: {
tmFullView,
tmMenubars,
@@ -72,7 +73,8 @@
videoAd = wx.createRewardedVideoAd({
adUnitId: haloAdConfig.rewardedVideoAd //你的广告key
})
videoAd.onError(err => {})
videoAd.onError(err => {
})
videoAd.onClose((status) => {
if (status && status.isEnded || status === undefined) {
//这里写广告播放完成后的事件
@@ -83,7 +85,7 @@
})
}
},
openVideoAd: function() {
openVideoAd: function () {
if (videoAd && haloAdConfig.rewardedVideoAd != '') {
videoAd.show().catch(err => {
// 失败重试
@@ -134,7 +136,7 @@
});
}
}
}
}
</script>
<style>
+81 -77
View File
@@ -13,7 +13,7 @@
<view class="author">
<text class="author-name">作者{{ result.owner.displayName }}</text>
<text class="author-time">
时间{{ { d: result.spec.publishTime, f: 'yyyy年MM月dd日 星期w' } | formatTime }}
时间{{ {d: result.spec.publishTime, f: 'yyyy年MM月dd日 星期w'} | formatTime }}
</text>
</view>
@@ -66,9 +66,12 @@
<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>
@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>
@@ -80,7 +83,7 @@
: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" />
:showLanguageName="true" :copyByLongPress="true"/>
<tm-more v-if="showValidVisitMore" :disabled="true" :maxHeight="1" :isRemovBar="true"
@click="showValidVisitMorePop()">
<view class="text-size-n pa-24">
@@ -95,15 +98,15 @@
</tm-more>
</view>
<!-- 广告区域自定义广告位 -->
<view class="ad-card mt-24" v-if="haloAdConfig.articleDetail.custom">
<view class="ad-card mt-24" v-if="haloAdConfig.articleDetail.use">
<text class="ad-card_tip">广告</text>
<image class="ad-card_cover" :src="haloAdConfig.articleDetail.custom.cover" mode="scaleToFill">
<image class="ad-card_cover" :src="haloAdConfig.articleDetail.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 class="ad-card_info-title">{{ haloAdConfig.articleDetail.title }}</view>
<view class="ad-card_info-desc">{{ haloAdConfig.articleDetail.content }}</view>
<view v-if="haloAdConfig.articleDetail.url" class="ad-card_info-link"
@click="fnToWebview(haloAdConfig.articleDetail)">
立即查看
</view>
</view>
@@ -211,33 +214,35 @@
content="博主设置了需要密码才能查看该文章内容,请输入文章密码进行验证" theme="split" confirmColor="blue shadow-blue-0"
@cancel="closeValidVisitPop" @confirm="fnValidVisitPwd"></tm-dialog>
<!-- 是否前往获取验证码 -->
<tm-dialog v-model="showGetPassword" title="免费获取验证码" content="是否前往获取验证码?" @confirm="toAdvertise" @cancel="closeAllPop"></tm-dialog>
<tm-dialog v-model="showGetPassword" title="免费获取验证码" content="是否前往获取验证码?" @confirm="toAdvertise"
@cancel="closeAllPop"></tm-dialog>
</view>
</template>
<script>
import MarkdownConfig from '@/common/markdown/markdown.config.js';
import MarkdownConfig from '@/common/markdown/markdown.config.js';
import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
import tmDialog from '@/tm-vuetify/components/tm-dialog/tm-dialog.vue';
import tmMore from '@/tm-vuetify/components/tm-more/tm-more.vue';
import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
import tmDialog from '@/tm-vuetify/components/tm-dialog/tm-dialog.vue';
import tmMore from '@/tm-vuetify/components/tm-more/tm-more.vue';
import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
import commentList from '@/components/comment-list/comment-list.vue';
import commentItem from '@/components/comment-item/comment-item.vue';
import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
import commentList from '@/components/comment-list/comment-list.vue';
import commentItem from '@/components/comment-item/comment-item.vue';
import rCanvas from '@/components/r-canvas/r-canvas.vue';
import barrage from '@/components/barrage/barrage.vue';
import rCanvas from '@/components/r-canvas/r-canvas.vue';
import barrage from '@/components/barrage/barrage.vue';
import {
import {
haloWxShareMixin
} from '@/common/mixins/wxshare.mixin.js';
export default {
} from '@/common/mixins/wxshare.mixin.js';
export default {
components: {
tmSkeleton,
tmPoup,
@@ -332,9 +337,7 @@
}
},
},
watch: {
},
watch: {},
onLoad(e) {
this.fnSetPageTitle('文章加载中...');
this.queryParams.name = e.name;
@@ -684,10 +687,10 @@
title: this.result.spec.title,
summary: this.result.content.raw,
imageUrl: this.poster.res.tempFilePath,
success: function(res) {
success: function (res) {
console.log('success:' + JSON.stringify(res));
},
fail: function(err) {
fail: function (err) {
console.log('fail:' + JSON.stringify(err));
}
});
@@ -896,11 +899,11 @@
}
},
}
};
};
</script>
<style lang="scss" scoped>
.app-page {
.app-page {
width: 100vw;
min-height: 100vh;
display: flex;
@@ -908,9 +911,9 @@
box-sizing: border-box;
background-color: #fafafd;
padding-bottom: 24rpx;
}
}
.bg-image {
.bg-image {
position: fixed;
left: 0;
top: 0;
@@ -919,15 +922,15 @@
width: 100vw;
height: 100vh;
z-index: 0;
}
}
.loading-wrap {
.loading-wrap {
padding: 0 24rpx;
height: inherit;
background-color: #fff;
}
}
.head {
.head {
display: flex;
flex-direction: column;
align-items: center;
@@ -954,7 +957,8 @@
font-size: 24rpx;
color: #666;
&-name {}
&-name {
}
&-time {
margin-left: 36rpx;
@@ -1021,9 +1025,9 @@
}
}
}
}
}
.category {
.category {
margin: 0 24rpx;
padding: 24rpx;
background-color: #ffffff;
@@ -1048,30 +1052,30 @@
background-color: #607d8b;
}
}
}
}
.category-tag+.category-tag {
.category-tag + .category-tag {
margin-left: 12rpx;
}
}
.content {
.content {
margin-top: 24rpx;
}
}
.markdown-wrap,
.evan-markdown,
.ad-wrap,
.copyright-wrap,
.comment-wrap {
.markdown-wrap,
.evan-markdown,
.ad-wrap,
.copyright-wrap,
.comment-wrap {
box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.03);
}
}
.markdown-wrap {
.markdown-wrap {
overflow: hidden;
border-radius: 12rpx;
}
}
.copyright-title {
.copyright-title {
position: relative;
box-sizing: border-box;
padding-left: 24rpx;
@@ -1087,41 +1091,41 @@
background-color: rgb(3, 174, 252);
border-radius: 6rpx;
}
}
}
.poup-head {
.poup-head {
border-bottom: 2rpx solid #f5f5f5;
}
}
.poup-body {
.poup-body {
height: 50vh;
}
}
.poup-empty {
.poup-empty {
width: 100%;
height: 40vh;
}
}
.poup-loading-wrap {
.poup-loading-wrap {
width: 100%;
height: 40vh;
.e-loading-icon {
font-size: 80rpx;
}
}
}
.poster-content {
.poster-content {
width: 100%;
min-height: 60vh;
overflow: hidden;
}
}
.copyright-text {
.copyright-text {
line-height: 1.7;
}
}
.poster-loading {
.poster-loading {
width: 100%;
position: absolute;
left: 0;
@@ -1130,14 +1134,14 @@
bottom: 0;
// background-color: rgba(0, 0, 0, 0.1);
z-index: 666;
}
}
.poster-save {
.poster-save {
box-sizing: border-box;
border-top: 2rpx dashed #eee;
}
}
.original-url {
.original-url {
display: flex;
&_left {
@@ -1165,5 +1169,5 @@
text-align: right;
}
}
}
}
</style>