diff --git a/config/index.js b/config/index.js
index 3e6f40c..2f902da 100644
--- a/config/index.js
+++ b/config/index.js
@@ -8,6 +8,7 @@ export const DefaultAppConfigs = {
authorConfig: {},
appConfig: {},
pluginConfig: {},
+ pageConfig:{}
}
/**
diff --git a/pages/tabbar/about/about.vue b/pages/tabbar/about/about.vue
index f1c40ea..4ca2cb2 100644
--- a/pages/tabbar/about/about.vue
+++ b/pages/tabbar/about/about.vue
@@ -132,43 +132,36 @@ export default {
haloConfigs() {
return this.$tm.vx.getters().getConfigs
},
- calcDefaultImageConfig() {
- return this.haloConfigs.imagesConfig
+ pageConfig() {
+ return this.$tm.vx.getters().getConfigs?.pageConfig?.aboutConfig || {};
},
bloggerInfo() {
return this.haloConfigs.authorConfig.blogger;
},
calcProfileStyle() {
- const _imgUrlOr = this.calcDefaultImageConfig.aboutProfileImageUrl;
+ const _imgUrlOr = this.pageConfig.bgImageUrl;
return {
backgroundImage: `url(${this.$utils.checkImageUrl(_imgUrlOr)})`
}
},
calcWaveUrl() {
- return this.$utils.checkImageUrl(this.calcDefaultImageConfig.waveImageUrl);
+ return this.$utils.checkImageUrl(this.pageConfig.waveImageUrl);
},
copyrightConfig() {
return this.haloConfigs.basicConfig.copyrightConfig;
}
},
watch: {
- globalAppSettings: {
- deep: true,
- handler(val) {
- this.statisticsShowMore = val.about.showAllCount;
- this.fnGetNavList();
- }
- },
haloConfigs: {
+ handler(val) {
+ if (!val) return;
+ this.fnGetNavList();
+ },
deep: true,
immediate: true,
- handler(val) {
- this.fnGetNavList();
- }
}
},
created() {
- this.statisticsShowMore = this.globalAppSettings.about.showAllCount;
this.fnGetData();
},
onPullDownRefresh() {
diff --git a/pages/tabbar/gallery/gallery.vue b/pages/tabbar/gallery/gallery.vue
index 9e73e0b..ee2fbef 100644
--- a/pages/tabbar/gallery/gallery.vue
+++ b/pages/tabbar/gallery/gallery.vue
@@ -21,35 +21,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @click="fnPreview(item)"/>
- -->
+
{{ loadMoreText }}
@@ -96,24 +99,27 @@ export default {
page: 1,
group: ""
},
- cache: {
- dataList: [],
- total: 0
- },
isLoadMore: false,
loadMoreText: '',
hasNext: false,
dataList: []
};
},
- filters: {
- filterTakeTime(val) {
- return uni.$tm.dayjs(val).format('DD/MM/YYYY');
+ computed: {
+ galleryConfig() {
+ return this.$tm.vx.getters().getConfigs?.pageConfig?.galleryConfig || {useWaterfall: true, pageTitle: "图库"};
}
},
- onLoad() {
- this.fnSetPageTitle('个人图库');
- this.fnGetCategory();
+ watch: {
+ galleryConfig: {
+ handler(newValue, oldValue) {
+ if (!newValue) return;
+ this.fnSetPageTitle(newValue.pageTitle);
+ this.fnGetCategory();
+ },
+ deep: true,
+ immediate: true
+ }
},
onPullDownRefresh() {
this.dataList = []
@@ -136,15 +142,19 @@ export default {
methods: {
fnOnCategoryChange(index) {
this.fnResetSetAniWaitIndex();
- this.cache.dataList = []
- this.dataList = [];
this.queryParams.group = this.category.list[index].name;
this.queryParams.page = 1;
this.fnToTopPage();
- this.$nextTick(() => {
- this.$refs.wafll.clear();
+ if (this.galleryConfig.useWaterfall) {
+ this.$nextTick(() => {
+ this.$refs.wafll.clear();
+ this.dataList = [];
+ this.fnGetData();
+ })
+ } else {
+ this.dataList = [];
this.fnGetData();
- })
+ }
},
fnGetCategory() {
this.$httpApi.v2.getPhotoGroupList({
@@ -179,23 +189,23 @@ export default {
item.spec.cover = this.$utils.checkImageUrl(item.spec.cover);
return item;
});
- this.fnCacheDataList(_list);
if (this.isLoadMore) {
this.dataList = this.dataList.concat(_list);
} else {
this.dataList = _list;
}
- this.$nextTick(() => {
- this.$refs.wafll.pushData(_list)
- })
+ if (this.galleryConfig.useWaterfall) {
+ this.$nextTick(() => {
+ console.log('_list', _list)
+ this.$refs.wafll.pushData(_list)
+ })
+ }
}
this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
-
})
.catch(err => {
console.error(err);
this.loading = 'error';
- this.waterfall.loading = 'finish';
this.loadMoreText = '加载失败，请下拉刷新！';
})
.finally(() => {
@@ -205,14 +215,7 @@ export default {
}, 500);
});
},
- // 缓存数据
- fnCacheDataList(dataList) {
- if (this.queryParams.page == 1) {
- this.cache.dataList = dataList;
- } else {
- this.cache.dataList = [...this.cache.dataList, ...dataList];
- }
- },
+
// 预览
fnPreview(data) {
uni.previewImage({
diff --git a/pagesA/article-detail/article-detail.vue b/pagesA/article-detail/article-detail.vue
index ac7a54e..ad045a5 100644
--- a/pagesA/article-detail/article-detail.vue
+++ b/pagesA/article-detail/article-detail.vue
@@ -633,7 +633,7 @@ export default {
// 小程序信息
await this.$refs.rCanvas
.drawImage({
- url: this.$utils.checkImageUrl(this.haloConfig.imagesConfig.miniCodeImageUrl),
+ url: this.$utils.checkImageUrl(this.haloConfigs?.appConfig?.appInfo?.qrCodeImageUrl),
x: 20,
y: 360,
w: 80,