diff --git a/api/v2/all.api.js b/api/v2/all.api.js index b40494c..3d57f71 100644 --- a/api/v2/all.api.js +++ b/api/v2/all.api.js @@ -194,6 +194,7 @@ export default { return HttpHandler.Get(`/apis/tools.muyin.site/v1alpha1/restrict-read/create`, null, { header: { 'Authorization': getAppConfigs().pluginConfig.toolsPlugin?.Authorization, + 'Wechat-Session-Id': uni.getStorageSync('openid'), } }) }, diff --git a/config/index.js b/config/index.js index 2c3726b..b58ff4f 100644 --- a/config/index.js +++ b/config/index.js @@ -8,7 +8,10 @@ export const DefaultAppConfigs = { imagesConfig: {}, authorConfig: {}, appConfig: {}, - pluginConfig: {}, + pluginConfig: { + toolsPlugin: {}, + linksSubmitPlugin: {}, + }, pageConfig: {} } diff --git a/pagesA/article-detail/article-detail.vue b/pagesA/article-detail/article-detail.vue index 152cc76..e014d0b 100644 --- a/pagesA/article-detail/article-detail.vue +++ b/pagesA/article-detail/article-detail.vue @@ -483,7 +483,11 @@ export default { const restrictRead = checkPostRestrictRead(this.result); if (restrictRead && toolsPluginEnabled) { - const verifyCodeType = getAppConfigs().pluginConfig.toolsPlugin?.verifyCodeType; + let verifyCodeType = getAppConfigs().pluginConfig.toolsPlugin?.verifyCodeType; + const postVerifyCodeType = this.result?.metadata?.annotations?.verifyCodeType; + if (postVerifyCodeType) { + verifyCodeType = postVerifyCodeType; + } if (verifyCodeType === 'scan') { const scanCodeUrl = getAppConfigs().pluginConfig.toolsPlugin?.scanCodeUrl; this.verificationCodeModal.type = 'scan'; diff --git a/pagesA/friend-links/friend-links.vue b/pagesA/friend-links/friend-links.vue index 2cb0699..8893e0f 100644 --- a/pagesA/friend-links/friend-links.vue +++ b/pagesA/friend-links/friend-links.vue @@ -65,7 +65,7 @@ - diff --git a/pagesA/submit-link/submit-link.vue b/pagesA/submit-link/submit-link.vue index ecd548a..9dcaadf 100644 --- a/pagesA/submit-link/submit-link.vue +++ b/pagesA/submit-link/submit-link.vue @@ -53,7 +53,7 @@ {{ blogDetail.blogName }} @@ -97,6 +97,7 @@ import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue' import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue' import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue' import tmCoupon from '@/tm-vuetify/components/tm-coupon/tm-coupon.vue' +import $utils from "@/utils"; export default { components: { @@ -128,11 +129,14 @@ export default { }; }, computed: { + $utils() { + return $utils + }, haloPluginConfigs(){ return this.$tm.vx.getters().getConfigs.pluginConfig; }, blogDetail() { - return this.haloPluginConfigs.submitLink; + return this.haloPluginConfigs.linksSubmitPlugin; }, calcSiteThumbnail(val) { return val => { @@ -147,13 +151,13 @@ export default { return ` 博客名称:${this.blogDetail.blogName} 博客地址:${this.blogDetail.blogUrl} - 博客logo:${this.blogDetail.blogLogo} + 博客logo:${$utils.checkAvatarUrl(this.blogDetail.blogLogo)} 博客简介:${this.blogDetail.blogDesc} ` }, calcBlogCoupon() { return { - img: this.blogDetail.blogLogo, + img: $utils.checkAvatarUrl(this.blogDetail.blogLogo), title: this.blogDetail.blogName, time: this.blogDetail.blogDesc, btnText: '友链详情'