feat: 新增首页轮播支持配置

components/e-swiper/e-swiper.vue

@@ -43,7 +43,7 @@
 						</view>
 					</view>
 					<view class="right-hot-ttf">
-						<text class="text hot-text">{{ title }}</text>
+						<text class="text hot-text text-overflow-2">{{ title }}</text>
 					</view>
 				</view>
 			</view>
@@ -63,7 +63,7 @@
 						</view>
 						<!-- 标题 -->
 						<view class="Top-Title">
-							<text class="text title-text">{{ item.title }}</text>
+							<text class="text title-text text-overflow-2">{{ item.title }}</text>
 						</view>
 						<!-- 用户信息 -->
 						<view v-if="false" class="Bottom-UserInfo">

components/notify-dialog/notify-dialog.vue

@@ -0,0 +1,93 @@
+<template>
+    <tm-poup v-model="isShow" width="80vw" height="70vh" position="center" :round="6" @change="fnOnChange">
+        <view class="fulled pa-4">
+            <view  class="mt-24 fulled text-weight-b text-size-sm text-align-center text-overflow-2 pb-12">{{ title }}</view>
+            <view class="fulled mt-2">
+                <scroll-view class="fulled" scroll-y :style="{
+                    height: url? '52vh': '59vh'
+                }">
+                    <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="content" :markdown="true" :showLineNumber="true" :showLanguageName="true"
+                             :copyByLongPress="true"/>
+                </scroll-view>
+            </view>
+            <view v-if="url" class="fulled mt-12 flex flex-center">
+                <tm-button theme="bg-gradient-light-blue-accent" size="m" @click="fnToWebview()">
+                    点击跳转内容链接
+                </tm-button>
+            </view>
+        </view>
+    </tm-poup>
+</template>
+
+
+<script>
+import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
+import tmButton from '@/tm-vuetify/components/tm-button/tm-button.vue';
+import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
+
+import MarkdownConfig from '@/common/markdown/markdown.config.js';
+
+export default {
+    name: 'notify-dialog',
+    components: {
+        tmPoup,
+        tmButton,
+        mpHtml
+    },
+    props: {
+        show: {
+            type: Boolean,
+            default: false
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+        content: {
+            type: String,
+            default: ''
+        },
+        url: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            isShow: false,
+            markdownConfig: MarkdownConfig,
+        };
+    },
+    created() {
+        this.isShow = this.show;
+    },
+    methods: {
+        fnToWebview() {
+            if (this.$utils.checkIsUrl(this.url)) {
+                uni.navigateTo({
+                    url: '/pagesC/website/website?data=' +
+                        JSON.stringify({
+                            title: this.title,
+                            url: encodeURIComponent(this.url)
+                        }),
+                    success: () => {
+                        this.fnOnChange(false)
+                    }
+                });
+            }
+        },
+        fnOnChange(e) {
+            this.isShow = false;
+            this.$emit('on-change', e);
+        }
+    }
+}
+</script>
+
+
+<style scoped lang="scss">
+
+</style>

config/index.js

@@ -4,6 +4,7 @@ export const _AppMockJsonKey = 'APP_GLOBAL_MOCK_JSON';
 
 // 默认的应用设置
 export const DefaultAppConfigs = {
+    basicConfig: {},
     loveConfig: {},
     imagesConfig: {},
     authorConfig: {},
@@ -12,7 +13,28 @@ export const DefaultAppConfigs = {
         toolsPlugin: {},
         linksSubmitPlugin: {},
     },
-    pageConfig: {}
+    pageConfig: {
+        homeConfig: {
+            pageTitle: "首页",
+            useCategory: true,
+            bannerConfig: {
+                enabled: true,
+                showTitle: true,
+                showIndicator: true,
+                height: "400rpx",
+                dotPosition: "right",
+                type: "post",
+                list: []
+            }
+        }
+    },
+    auditConfig: {
+        auditModeEnabled: false,
+        auditModeData: {
+            jsonUrl: "",
+            jsonData: ""
+        }
+    }
 }
 
 /**

main.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 // 挂载全局工具类
 import utils from "./utils/index.js";
 Vue.prototype.$utils = utils;
+uni.$utils = utils;
 
 // 全局统一样式的对话框
 import Fy from '@/js_sdk/fy-showModal/index.js'

pages/index/index.vue

@@ -31,8 +31,15 @@ export default {
             // #endif
 
             // 获取mockjson
-            if (res.basicConfig.auditModeEnabled) {
+            if (res.auditConfig.auditModeEnabled) {
+                if (res.auditConfig.auditModeData.jsonUrl) {
                     await uni.$tm.vx.actions('config/fetchMockJson')
+                } else {
+                    const mockJson = uni.$utils.checkJsonAndParse(res.auditConfig.auditModeData.jsonData)
+                    if (mockJson.ok) {
+                        uni.$tm.vx.commit('config/setMockJson', mockJson.jsonData)
+                    }
+                }
             }
 
             // 进入检查

pages/tabbar/about/about.vue

@@ -152,7 +152,9 @@ export default {
         },
         copyrightConfig() {
             return this.haloConfigs.basicConfig.copyrightConfig;
-        }
+        }, calcAuditModeEnabled() {
+            return this.haloConfigs.auditConfig.auditModeEnabled
+        },
     },
     watch: {
         haloConfigs: {
@@ -180,10 +182,10 @@ export default {
             this.navList = [
                 {
                     key: 'archives',
-                    title: this.haloConfigs.basicConfig.auditModeEnabled ? '内容归档' : '文章归档',
+                    title: this.calcAuditModeEnabled ? '内容归档' : '文章归档',
                     leftIcon: 'halocoloricon-classify',
                     leftIconColor: 'red',
-                    rightText: this.haloConfigs.basicConfig.auditModeEnabled ? '已归档的内容' : '已归档的文章',
+                    rightText: this.calcAuditModeEnabled ? '已归档的内容' : '已归档的文章',
                     path: '/pagesA/archives/archives',
                     isAdmin: false,
                     type: 'page',
@@ -396,7 +398,7 @@ export default {
                     url: '/pagesC/website/website?data=' +
                         JSON.stringify({
                             title: item.text || this.$haloConfig.title,
-                            url: item.path
+                            url: encodeURIComponent(item.path)
                         })
                 });
                 return;

pages/tabbar/category/category.vue

@@ -19,7 +19,7 @@
                     <view class="catgory-card" :style="{backgroundImage:`url(${item.spec.cover})`}">
                         <view class="content" @click="handleToCategory(item)">
                             <view style="font-size: 32rpx;color: #ffffff;">{{ item.spec.displayName }}</view>
-                            <view v-if="!haloConfigs.basicConfig.auditModeEnabled" style="font-size: 24rpx;color: #ffffff;margin-top: 6rpx;">
+                            <view v-if="!calcAuditModeEnabled" style="font-size: 24rpx;color: #ffffff;margin-top: 6rpx;">
                                 共 {{ item.postCount }} 篇文章
                             </view>
                             <view v-else style="font-size: 24rpx;color: #ffffff;margin-top: 6rpx;">
@@ -73,6 +73,9 @@ export default {
         haloConfigs() {
             return this.$tm.vx.getters().getConfigs;
         },
+        calcAuditModeEnabled(){
+            return this.haloConfigs.auditConfig.auditModeEnabled
+        },
         mockJson() {
             return this.$tm.vx.getters().getMockJson;
         }
@@ -87,7 +90,7 @@ export default {
     },
 
     onReachBottom(e) {
-        if (this.haloConfigs.basicConfig.auditModeEnabled) {
+        if (this.calcAuditModeEnabled) {
             uni.showToast({
                 icon: 'none',
                 title: '没有更多数据了'
@@ -107,7 +110,7 @@ export default {
     },
     methods: {
         fnGetData() {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 this.dataList = this.mockJson.category.list.map((item) => {
                     return {
                         metadata: {
@@ -176,7 +179,7 @@ export default {
             })
         },
         handleToCategory(data) {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 return;
             }
             uni.navigateTo({

pages/tabbar/gallery/gallery.vue

@@ -100,7 +100,10 @@ export default {
         },
         mockJson() {
             return this.$tm.vx.getters().getMockJson;
-        }
+        },
+        calcAuditModeEnabled(){
+            return this.haloConfigs.auditConfig.auditModeEnabled
+        },
     },
     watch: {
         galleryConfig: {
@@ -120,7 +123,7 @@ export default {
         this.fnGetData(true);
     },
     onReachBottom(e) {
-        if (this.haloConfigs.basicConfig.auditModeEnabled) {
+        if (this.calcAuditModeEnabled) {
             uni.showToast({
                 icon: 'none',
                 title: '没有更多数据了'
@@ -148,7 +151,7 @@ export default {
             this.fnGetData(true);
         },
         fnGetCategory() {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 this.fnGetData(true);
                 return
             }
@@ -169,7 +172,7 @@ export default {
             });
         },
         fnGetData(isClearWaterfall = false) {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 this.dataList = this.mockJson.gallery.list.map(item => {
                     return {
                         metadata: {

pages/tabbar/home/home.vue

@@ -21,13 +21,15 @@
             <tm-skeleton model="listAvatr"></tm-skeleton>
         </view>
         <block v-else>
-            <view class="bg-white pb-24">
+            <view v-if="bannerConfig.enabled" 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
-						height="400rpx"
-						dotPosition="right"
+                        :height="bannerConfig.height"
+                        :dotPosition="bannerConfig.dotPosition"
                         :autoplay="true"
-                        :useDot="false"
+                        :useDot="bannerConfig.showIndicator"
+                        :showTitle="bannerConfig.showTitle"
+                        :type="bannerConfig.type"
                         :list="bannerList"
                         @on-click="fnOnBannerClick"
                     />
@@ -86,6 +88,11 @@
                                icon="icon-angle-up"></tm-flotbutton>
             </block>
         </block>
+
+
+        <!-- 弹窗 -->
+        <NotifyDialog v-if="notify.show" :show="notify.show" :title="notify.data.title" :content="notify.data.content"
+                      :url="notify.data.url" @on-change="fnOnNotifyChange"></NotifyDialog>
     </view>
 </template>
 
@@ -98,6 +105,7 @@ import tmIcons from '@/tm-vuetify/components/tm-icons/tm-icons.vue';
 import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
 
 import eSwiper from '@/components/e-swiper/e-swiper.vue';
+import NotifyDialog from "@/components/notify-dialog/notify-dialog.vue";
 import qs from 'qs'
 
 export default {
@@ -108,7 +116,8 @@ export default {
         tmFlotbutton,
         tmIcons,
         tmEmpty,
-        eSwiper
+        eSwiper,
+        NotifyDialog
     },
     data() {
         return {
@@ -126,6 +135,10 @@ export default {
             noticeList: [],
             articleList: [],
             categoryList: [],
+            notify: {
+                show: false,
+                data: {}
+            }
         };
     },
     computed: {
@@ -145,14 +158,20 @@ export default {
         mockJson() {
             return this.$tm.vx.getters().getMockJson;
         },
+        calcAuditModeEnabled() {
+            return this.haloConfigs.auditConfig.auditModeEnabled
+        },
         calcIsShowCategory() {
-            if (this.haloConfigs.basicConfig.auditModeEnabled && this.categoryList.length !== 0) {
+            if (this.calcAuditModeEnabled && this.categoryList.length !== 0) {
                 return false
             }
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 return false
             }
             return this.haloConfigs.pageConfig.homeConfig.useCategory
+        },
+        bannerConfig() {
+            return this.haloConfigs.pageConfig.homeConfig.bannerConfig
         }
     },
     onLoad() {
@@ -167,7 +186,7 @@ export default {
         this.fnQuery();
     },
     onReachBottom(e) {
-        if (this.haloConfigs.basicConfig.auditModeEnabled) {
+        if (this.calcAuditModeEnabled) {
             uni.showToast({
                 icon: 'none',
                 title: '没有更多数据了'
@@ -187,13 +206,12 @@ export default {
     },
     methods: {
         fnQuery() {
-            console.log('this.mockJson', this.mockJson)
             this.fnGetBanner();
             this.fnGetArticleList();
             this.fnGetCategoryList();
         },
         fnGetCategoryList() {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 this.categoryList = this.mockJson.home.categoryList.map((item) => {
                     return {
                         metadata: {
@@ -239,7 +257,7 @@ export default {
         },
         // 获取轮播图
         fnGetBanner() {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 this.bannerList = this.mockJson.home.bannerList.map((item) => {
                     return {
                         mp4: '',
@@ -250,27 +268,37 @@ export default {
                         createTime: item.time,
                         title: item.title,
                         src: this.$utils.checkThumbnailUrl(item.cover),
-                        image: this.$utils.checkThumbnailUrl(item.cover)
+                        image: this.$utils.checkThumbnailUrl(item.cover),
+                        type: "custom",
+                        content: "",
+                        url: ""
                     }
                 });
                 return;
             }
-            const _this = this;
-            const _format = function (list) {
-                return list.map((item, index) => {
+
+
+            if (!this.bannerConfig.enabled) return;
+
+            if (this.bannerConfig.type === 'custom') {
+                this.bannerList = this.bannerConfig.list.map((item) => {
                     return {
                         mp4: '',
-                        id: item.metadata.name,
-                        nickname: item.owner.displayName,
-                        avatar: _this.$utils.checkAvatarUrl(item.owner.avatar),
+                        id: Date.now() * Math.random(),
+                        nickname: this.haloConfigs.authorConfig.blogger.nickname,
+                        avatar: this.$utils.checkAvatarUrl(this.haloConfigs.authorConfig.blogger.avatar),
                         address: '',
-                        createTime: uni.$tm.dayjs(item.spec.publishTime).fromNow(),
-                        title: item.spec.title,
-                        src: _this.$utils.checkThumbnailUrl(item.spec.cover),
-                        image: _this.$utils.checkThumbnailUrl(item.spec.cover)
-                    };
-                });
-            };
+                        createTime: "",
+                        title: item.title,
+                        src: this.$utils.checkThumbnailUrl(item.cover),
+                        image: this.$utils.checkThumbnailUrl(item.cover),
+                        type: "custom",
+                        content: item.content,
+                        url: item.url
+                    }
+                })
+                return;
+            }
 
             const paramsStr = qs.stringify(this.queryParams, {
                 allowDots: true,
@@ -283,20 +311,53 @@ export default {
                 url: this.$baseApiUrl + '/apis/api.content.halo.run/v1alpha1/posts?' + paramsStr,
                 method: 'GET',
                 success: (res) => {
-                    this.bannerList = _format(res.data.items);
+                    this.bannerList = res.data.items.map((item, index) => {
+                        return {
+                            mp4: '',
+                            id: item.metadata.name,
+                            nickname: item.owner.displayName,
+                            avatar: this.$utils.checkAvatarUrl(item.owner.avatar),
+                            address: '',
+                            createTime: uni.$tm.dayjs(item.spec.publishTime).fromNow(),
+                            title: item.spec.title,
+                            src: this.$utils.checkThumbnailUrl(item.spec.cover),
+                            image: this.$utils.checkThumbnailUrl(item.spec.cover),
+                            type: "post",
+                            content: item.status.excerpt,
+                            url: ""
+                        };
+                    });
                 },
                 fail: (err) => {
                 }
             })
 
         },
-        fnOnBannerChange(e) {
-            this.bannerCurrent = e.current;
+        fnOnNotifyChange(e) {
+            this.notify.show = e;
         },
         fnOnBannerClick(item) {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 return;
             }
+            if (item.type === 'custom') {
+                if (item.content) {
+                    this.notify.data = item
+                    this.notify.show = true
+                    return;
+                }
+                if (uni.$utils.checkIsUrl(item.url)) {
+                    uni.navigateTo({
+                        url: '/pagesC/website/website?data=' +
+                            JSON.stringify({
+                                title: item.title || "加载中...",
+                                url: encodeURIComponent(item.url)
+                            })
+                    });
+                }
+                return;
+            }
+
             if (item.id === '') return;
             this.fnToArticleDetail({
                 metadata: {
@@ -306,7 +367,7 @@ export default {
         },
         // 文章列表
         fnGetArticleList() {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 this.articleList = this.mockJson.home.postList.map((item) => {
                     return {
                         metadata: {
@@ -371,7 +432,7 @@ export default {
         },
         //跳转文章详情
         fnToArticleDetail(article) {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 return;
             }
             uni.navigateTo({
@@ -409,7 +470,7 @@ export default {
 
         // 根据slug查询分类下的文章
         fnToCategoryBy(category) {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 return;
             }
             uni.navigateTo({

pages/tabbar/moments/moments.vue

@@ -107,7 +107,10 @@ export default {
         },
         mockJson() {
             return this.$tm.vx.getters().getMockJson;
-        }
+        },
+        calcAuditModeEnabled() {
+            return this.haloConfigs.auditConfig.auditModeEnabled
+        },
     },
 
     onLoad() {
@@ -120,7 +123,7 @@ export default {
     },
 
     onReachBottom(e) {
-        if (this.haloConfigs.basicConfig.auditModeEnabled) {
+        if (this.calcAuditModeEnabled) {
             uni.showToast({
                 icon: 'none',
                 title: '没有更多数据了'
@@ -140,7 +143,7 @@ export default {
     },
     methods: {
         fnGetData() {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 this.dataList = this.mockJson.moments.list.map((item) => {
                     return {
                         metadata: {

pagesA/archives/archives.vue

@@ -18,7 +18,7 @@
         <!-- 加载完成区域 -->
         <block v-else>
             <view v-if="dataList.length === 0" class="list-empty flex flex-center">
-                <tm-empty v-if="haloConfigs.basicConfig.auditModeEnabled" icon="icon-shiliangzhinengduixiang-" label="暂无归档的内容"></tm-empty>
+                <tm-empty v-if="calcAuditModeEnabled" icon="icon-shiliangzhinengduixiang-" label="暂无归档的内容"></tm-empty>
                 <tm-empty v-else icon="icon-shiliangzhinengduixiang-" label="暂无归档的文章"></tm-empty>
             </view>
             <view v-else class="e-timeline tm-timeline mt-24">
@@ -37,7 +37,7 @@
                                 <view class="flex time text-weight-b mb-24">
                                     <text>{{ item.year }}年</text>
                                     <text v-if="tab.activeIndex === 0">{{ item.month }}月</text>
-                                    <view v-if="haloConfigs.basicConfig.auditModeEnabled" class="text-size-s text-grey-darken-1 ml-12">
+                                    <view v-if="calcAuditModeEnabled" class="text-size-s text-grey-darken-1 ml-12">
                                         （共 {{ item.posts.length }} 篇内容）
                                     </view>
                                     <view v-else class="text-size-s text-grey-darken-1 ml-12">
@@ -128,7 +128,10 @@ export default {
         },
         mockJson() {
             return this.$tm.vx.getters().getMockJson;
-        }
+        },
+        calcAuditModeEnabled() {
+            return this.haloConfigs.auditConfig.auditModeEnabled
+        },
     },
     created() {
         this.fnGetData();
@@ -139,7 +142,7 @@ export default {
         this.fnGetData();
     },
     onReachBottom(e) {
-        if (this.haloConfigs.basicConfig.auditModeEnabled) {
+        if (this.calcAuditModeEnabled) {
             uni.showToast({
                 icon: 'none',
                 title: '没有更多数据了'
@@ -165,7 +168,7 @@ export default {
             this.fnToTopPage();
         },
         fnGetData() {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 const dataList = this.mockJson.archives.list.map(item => {
                     const date = new Date(item.time)
                     const year = date.getFullYear()
@@ -353,7 +356,7 @@ export default {
             });
         },
         fnToArticleDetail(article) {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 return;
             }
             uni.navigateTo({

pagesA/article-detail/article-detail.vue

@@ -1067,7 +1067,7 @@ export default {
                 url: '/pagesC/website/website?data=' +
                     JSON.stringify({
                         title: data.title,
-                        url: data.url
+                        url: encodeURIComponent(data.url)
                     })
             });
         },

pagesA/articles/articles.vue

@@ -88,6 +88,9 @@ export default {
         haloConfigs() {
             return this.$tm.vx.getters().getConfigs;
         },
+        calcAuditModeEnabled() {
+            return this.haloConfigs.auditConfig.auditModeEnabled
+        },
     },
     onLoad() {
         this.fnSetPageTitle('内容搜索');
@@ -130,7 +133,7 @@ export default {
             }
         },
         fnGetData() {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 return;
             }
             // 设置状态为加载中

pagesA/friend-links/friend-links.vue

@@ -166,7 +166,10 @@ export default {
                 }
                 return 'https://image.thum.io/get/width/1000/crop/800/' + val;
             };
-        }
+        },
+        calcAuditModeEnabled() {
+            return this.haloConfigs.auditConfig.auditModeEnabled
+        },
     },
     onLoad() {
         this.fnSetPageTitle('友情链接');
@@ -210,7 +213,7 @@ export default {
             return this.linkGroupList.find(item => item.metadata.name === groupName)?.spec?.displayName || groupName || "未分组"
         },
         fnGetData() {
-            if (this.haloConfigs.basicConfig.auditModeEnabled) {
+            if (this.calcAuditModeEnabled) {
                 return;
             }
             if (!this.isLoadMore) {

pagesC/website/website.vue

@@ -14,9 +14,11 @@ export default {
     },
     onLoad(e) {
         const {title, url} = JSON.parse(e.query.data);
-        this.webUrl = url;
+        this.webUrl = decodeURIComponent(url);
+        if (title) {
             this.fnSetPageTitle(title);
         }
+    }
 };
 </script>
 

utils/index.js

@@ -160,6 +160,24 @@ const utils = {
             urls: list,
             loop: true
         })
+    },
+    /**
+     * 检查是否为json字符串
+     * @param {Object} jsonStr 数据源
+     */
+    checkJsonAndParse(jsonStr) {
+        try {
+            const jsonResult = JSON.parse(jsonStr);
+            return {
+                ok: true,
+                jsonData: jsonResult,
+            }
+        } catch (e) {
+            return {
+                ok: false,
+                jsonData: {},
+            }
+        }
     }
 };