diff --git a/config/index.js b/config/index.js
index 2f902da..2c3726b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,30 +1,50 @@
// 应用设置存储key值
export const _AppConfigKey = 'APP_GLOBAL_CONFIGS';
+export const _AppMockJsonKey = 'APP_GLOBAL_MOCK_JSON';
// 默认的应用设置
export const DefaultAppConfigs = {
- loveConfig: {},
- imagesConfig: {},
- authorConfig: {},
- appConfig: {},
- pluginConfig: {},
- pageConfig:{}
+ loveConfig: {},
+ imagesConfig: {},
+ authorConfig: {},
+ appConfig: {},
+ pluginConfig: {},
+ pageConfig: {}
}
/**
* 获取应用设置
*/
export const getAppConfigs = () => {
- let configs = uni.getStorageSync(_AppConfigKey)
- if (configs) return JSON.parse(configs)
+ let configs = uni.getStorageSync(_AppConfigKey)
+ if (configs) return JSON.parse(configs)
- uni.setStorageSync(_AppConfigKey, JSON.stringify(DefaultAppConfigs))
- return DefaultAppConfigs;
+ uni.setStorageSync(_AppConfigKey, JSON.stringify(DefaultAppConfigs))
+ return DefaultAppConfigs;
}
/**
* 保存应用设置
*/
export const setAppConfigs = (configs) => {
- uni.setStorageSync(_AppConfigKey, JSON.stringify(configs))
+ uni.setStorageSync(_AppConfigKey, JSON.stringify(configs))
+}
+
+
+/**
+ * 获取应用模拟数据
+ */
+export const getAppMockJson = () => {
+ let json = uni.getStorageSync(_AppMockJsonKey)
+ if (json) return JSON.parse(json)
+
+ uni.setStorageSync(_AppMockJsonKey, JSON.stringify({}))
+ return {};
+}
+
+/**
+ * 保存应用模拟数据
+ */
+export const setAppMockJson = (json) => {
+ uni.setStorageSync(_AppMockJsonKey, JSON.stringify(json))
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e174190..a7bc6c0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -29,6 +29,11 @@
// #ifdef MP-WEIXIN
// uni.$tm.vx.commit('setWxShare', res.shareConfig);
// #endif
+
+ // 获取mockjson
+ await uni.$tm.vx.actions('config/fetchMockJson')
+
+ // 进入检查
this.fnCheckShowStarted();
}).catch((err) => {
uni.switchTab({
diff --git a/pages/tabbar/about/about.vue b/pages/tabbar/about/about.vue
index 155abf4..28844bb 100644
--- a/pages/tabbar/about/about.vue
+++ b/pages/tabbar/about/about.vue
@@ -190,7 +190,8 @@
path: '/pagesA/archives/archives',
isAdmin: false,
type: 'page',
- show: !this.haloConfigs.basicConfig.auditModeEnabled
+ // show: !this.haloConfigs.basicConfig.auditModeEnabled
+ show: true
}, {
key: 'love',
title: '恋爱日记',
@@ -610,4 +611,4 @@
transform: initial;
}
}
-
\ No newline at end of file
+
diff --git a/pages/tabbar/category/category.vue b/pages/tabbar/category/category.vue
index 1e09772..bc99fef 100644
--- a/pages/tabbar/category/category.vue
+++ b/pages/tabbar/category/category.vue
@@ -1,235 +1,258 @@
-
-
- 你好呀,很开心认识你!
-
- {{haloConfigs.appConfig.appInfo.name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.spec.displayName }}
- 共
- {{ item.postCount }} 篇文章
-
-
-
-
-
- {{ loadMoreText }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.spec.displayName }}
+
+ 共 {{ item.postCount }} 篇文章
+
+
+ 共 {{ item.postCount }} 篇内容
+
+
+
+
+
+ {{ loadMoreText }}
+
+
+
+
\ No newline at end of file
+.load-text {
+ width: 100%;
+ text-align: center;
+}
+
diff --git a/pages/tabbar/gallery/gallery.vue b/pages/tabbar/gallery/gallery.vue
index 4c056b6..0a63398 100644
--- a/pages/tabbar/gallery/gallery.vue
+++ b/pages/tabbar/gallery/gallery.vue
@@ -94,6 +94,12 @@ export default {
computed: {
galleryConfig() {
return this.$tm.vx.getters().getConfigs.pageConfig.galleryConfig;
+ },
+ haloConfigs() {
+ return this.$tm.vx.getters().getConfigs;
+ },
+ mockJson() {
+ return this.$tm.vx.getters().getMockJson;
}
},
watch: {
@@ -114,6 +120,13 @@ export default {
this.fnGetData(true);
},
onReachBottom(e) {
+ if (this.haloConfigs.basicConfig.auditModeEnabled) {
+ uni.showToast({
+ icon: 'none',
+ title: '没有更多数据了'
+ });
+ return;
+ }
if (this.hasNext) {
this.queryParams.page += 1;
this.isLoadMore = true;
@@ -130,11 +143,15 @@ export default {
this.fnResetSetAniWaitIndex();
this.queryParams.group = this.category.list[index].name;
this.queryParams.page = 1;
- this.fnToTopPage();
+ this.fnToTopPage();
this.dataList = [];
- this.fnGetData(true);
+ this.fnGetData(true);
},
fnGetCategory() {
+ if (this.haloConfigs.basicConfig.auditModeEnabled) {
+ this.fnGetData(true);
+ return
+ }
this.$httpApi.v2.getPhotoGroupList({
page: 1,
size: 0
@@ -151,7 +168,37 @@ export default {
}
});
},
- fnGetData(isClearWallfull = false) {
+ fnGetData(isClearWaterfall = false) {
+ if (this.haloConfigs.basicConfig.auditModeEnabled) {
+ this.dataList = this.mockJson.gallery.list.map(item => {
+ return {
+ metadata: {
+ name: Date.now() * Math.random(),
+ },
+ spec: {
+ url: this.$utils.checkImageUrl(item)
+ }
+ }
+ })
+
+ this.loading = 'success';
+
+ if (this.galleryConfig.useWaterfall) {
+ this.$nextTick(() => {
+ if (isClearWaterfall) {
+ this.$refs.wafll.clear()
+ }
+ setTimeout(() => {
+ this.$refs.wafll.pushData(this.dataList)
+ }, 50)
+ })
+ }
+ this.loadMoreText = '呜呜,没有更多数据啦~';
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ return;
+ }
+
// 设置状态为加载中
if (!this.isLoadMore) {
this.loading = 'loading';
@@ -174,9 +221,9 @@ export default {
}
if (this.galleryConfig.useWaterfall) {
this.$nextTick(() => {
- if(isClearWallfull){
- this.$refs.wafll.clear()
- }
+ if (isClearWaterfall) {
+ this.$refs.wafll.clear()
+ }
this.$refs.wafll.pushData(_list)
})
}
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index af5f954..0c8f353 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -1,464 +1,549 @@
-
-
-
-
-
-
-
- 搜索内容...
-
-
- {{ appInfo.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 精品分类
-
-
-
-
- 查看更多
-
-
-
-
-
- 还没有任何分类~
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 搜索内容...
+
+
+ {{ appInfo.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 精品分类
+
+
+
+
+ 查看更多
+
+
+
+
+
+ 还没有任何分类~
+
+
+
+
+
+
+
+
-
-
- 最新列表
-
-
-
-
- 查看更多
-
-
-
-
-
-
-
-
-
-
-
-
- {{ loadMoreText }}
-
-
-
-
+
+
+ 最新列表
+
+
+
+
+ 查看更多
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ loadMoreText }}
+
+
+
+
\ No newline at end of file
+ .ani-item {
+ width: 50%;
+ }
+}
+
diff --git a/pages/tabbar/moments/moments.vue b/pages/tabbar/moments/moments.vue
index f3f1481..21340a8 100644
--- a/pages/tabbar/moments/moments.vue
+++ b/pages/tabbar/moments/moments.vue
@@ -1,13 +1,13 @@
-
+
-
+
@@ -101,6 +101,12 @@ export default {
let blogger = this.$tm.vx.getters().getConfigs.authorConfig.blogger;
blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true);
return blogger;
+ },
+ haloConfigs() {
+ return this.$tm.vx.getters().getConfigs;
+ },
+ mockJson() {
+ return this.$tm.vx.getters().getMockJson;
}
},
@@ -114,6 +120,13 @@ export default {
},
onReachBottom(e) {
+ if (this.haloConfigs.basicConfig.auditModeEnabled) {
+ uni.showToast({
+ icon: 'none',
+ title: '没有更多数据了'
+ });
+ return
+ }
if (this.hasNext) {
this.queryParams.page += 1;
this.isLoadMore = true;
@@ -127,6 +140,37 @@ export default {
},
methods: {
fnGetData() {
+ if (this.haloConfigs.basicConfig.auditModeEnabled) {
+ this.dataList = this.mockJson.moments.list.map((item) => {
+ return {
+ metadata: {
+ name: Date.now() * Math.random(),
+ },
+ spec: {
+ user: {
+ displayName: this.bloggerInfo.nickname,
+ avatar: this.$utils.checkAvatarUrl(this.bloggerInfo.avatar),
+ },
+ content: {
+ html: item.content
+ },
+ releaseTime: item.time
+ },
+ images: item.images.map((img) => {
+ return {
+ type: "PHOTO",
+ url: this.$utils.checkThumbnailUrl(img),
+ }
+ }),
+ videos: []
+ }
+ });
+ this.loading = 'success';
+ this.loadMoreText = '呜呜,没有更多数据啦~';
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ return;
+ }
uni.showLoading({
mask: true,
title: '加载中...'
@@ -139,9 +183,6 @@ export default {
this.$httpApi.v2
.getMomentList(this.queryParams)
.then(res => {
- console.log('请求结果:');
- console.log(res);
-
this.loading = 'success';
this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜,没有更多数据啦~';
this.hasNext = res.hasNext;
diff --git a/pagesA/archives/archives.vue b/pagesA/archives/archives.vue
index 0bdd80a..da1b940 100644
--- a/pagesA/archives/archives.vue
+++ b/pagesA/archives/archives.vue
@@ -1,553 +1,597 @@
-
-
- 你好呀,很开心认识你!
-
- {{haloConfigs.appConfig.appInfo.name}}
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.year }}年
- {{ item.month }}月
-
- (共 {{ item.posts.length }} 篇文章)
-
-
-
-
-
-
-
-
- {{ post.spec.title }}
-
-
- {{ post.status.excerpt }}
-
-
-
- 发布时间:
- {{ {d: post.spec.publishTime, f: 'yyyy年MM月dd日 星期w'} | formatTime }}
-
-
-
-
-
- 该日期下暂无归档文章!
-
-
-
-
-
- {{ loadMoreText }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.year }}年
+ {{ item.month }}月
+
+ (共 {{ item.posts.length }} 篇内容)
+
+
+ (共 {{ item.posts.length }} 篇文章)
+
+
+
+
+
+
+
+
+ {{ post.spec.title }}
+
+
+ {{ post.status.excerpt }}
+
+
+
+ 发布时间:
+ {{ {d: post.spec.publishTime, f: 'yyyy年MM月dd日 星期w'} | formatTime }}
+
+
+
+
+
+ 该日期下暂无归档文章!
+
+
+
+
+
+ {{ loadMoreText }}
+
+
+
+
\ No newline at end of file
+.time {
+ align-items: center;
+}
+
diff --git a/store/config.js b/store/config.js
index e2510e3..e178ce1 100644
--- a/store/config.js
+++ b/store/config.js
@@ -5,25 +5,34 @@
* 时间:2024年06月22日 12:00:44
* 版本:v0.1.0
*/
-import {DefaultAppConfigs, getAppConfigs, setAppConfigs} from '@/config/index.js'
+import {DefaultAppConfigs, getAppConfigs, setAppConfigs,setAppMockJson,getAppMockJson} from '@/config/index.js'
import v2Config from '@/api/v2/all.config.js'
export default {
namespaced: true,
state: {
configs: getAppConfigs(),
+ mockJson: getAppMockJson(),
},
getters: {
getConfigs(state) {
if (state.configs) return state.configs;
return getAppConfigs()
},
+ getMockJson(state) {
+ if(state.mockJson) return state.mockJson;
+ return getAppMockJson()
+ }
},
mutations: {
setConfigs(state, data) {
state.configs = data;
setAppConfigs(data)
},
+ setMockJson(state, data) {
+ setAppMockJson(data)
+ state.mockJson = data;
+ }
},
actions: {
fetchConfigs({commit, dispatch}) {
@@ -47,5 +56,30 @@ export default {
setDefaultAppSettings({commit}) {
commit('setConfigs', JSON.parse(JSON.stringify(DefaultAppConfigs)))
},
+ // 请求模拟数据
+ fetchMockJson({state, commit, dispatch}) {
+ return new Promise(async (resolve, reject) => {
+ // const mockJsonUrl = utils.checkUrl(state.configs.basicConfig.auditModeMock)
+ const mockJsonUrl = "https://uni-halo.925i.cn/unihalo.mock.json"
+ uni.request({
+ url: mockJsonUrl,
+ method: "GET",
+ success: (res) => {
+ console.log("mockJson", res.data)
+ commit('setMockJson', res.data)
+ resolve({
+ ok: true,
+ data: res.data
+ })
+ },
+ fail: (err) => {
+ resolve({
+ ok: false,
+ data: err
+ })
+ }
+ })
+ })
+ },
}
};