update: 优化友链提交配置

.gitignore

@@ -7,3 +7,4 @@ config/halo.config.js
 config/ad.config.js
 config/love.config.js
 config/token.config.js
+config/plugins.config.js

config/plugins.config.js

@@ -0,0 +1,24 @@
+/** 插件相关配置 */
+const PluginsConfig = Object.freeze({
+    // 友链提交配置
+    autoSubmitLink: {
+        // 可以考虑配置一个插件id，检测是否开启了友链提交插件
+        pluginId:"",
+        // 是否开启（可能不启用插件）
+        enabled: false,
+        // 我的友链信息
+        blogDetail: {
+            // 博客名称
+            name: "uni-halo 博客",
+            // 博客地址
+            url: "https://uni-halo.925i.cn/",
+            // 博客logo
+            logo: "https://uni-halo.925i.cn/logo.png",
+            // 博客简介
+            description: "一个基于Halo2.0 API 的博客小程序开源项目。",
+        }
+    }
+})
+
+
+export default PluginsConfig;

config/plugins.config.template.js

@@ -0,0 +1,24 @@
+/** 插件相关配置 */
+const PluginsConfig = Object.freeze({
+	// 友链提交配置
+	autoSubmitLink: {
+		// 可以考虑配置一个插件id，检测是否开启了友链提交插件（暂未使用）
+		pluginId: "",
+		// 是否开启（可能后台没有安装或未不启用插件）
+		enabled: true,
+		// 我的友链信息
+		blogDetail: {
+			// 博客名称
+			name: "",
+			// 博客地址
+			url: "",
+			// 博客logo
+			logo: "",
+			// 博客简介
+			description: "",
+		}
+	}
+})
+
+
+export default PluginsConfig;

main.js

@@ -69,6 +69,11 @@ Vue.prototype.$baseApiUrl = HaloTokenConfig.BASE_API
 
 import HaloAdConfig from '@/config/ad.config.js'
 Vue.prototype.$haloAdConfig = HaloAdConfig
+
+import HaloPluginsConfig from '@/config/plugins.config.js'
+Vue.prototype.$haloPluginsConfig = HaloPluginsConfig
+
+
 // 由于微信小程序的运行机制问题，需声明如下一行，H5和APP非必填
 Vue.prototype._i18n = i18n;
 

pagesA/friend-links/friend-links.vue

@@ -120,8 +120,8 @@
 
             <!-- 返回顶部 -->
             <tm-flotbutton color="light-blue" @click="fnToTopPage" size="m" icon="icon-angle-up"></tm-flotbutton>
-      <tm-flotbutton :offset="[16,80]" label="申请" actions-pos="left" :show-text="true" color="bg-gradient-orange-accent" @click="toSubmitLinkPage"></tm-flotbutton>
+            <tm-flotbutton v-if="$haloPluginsConfig.autoSubmitLink.enabled" :offset="[16,80]" label="申请" actions-pos="left" :show-text="true" color="bg-gradient-orange-accent"
-
+                           @click="toSubmitLinkPage"></tm-flotbutton>
             <!-- 详情弹窗 -->
             <tm-poup v-model="detail.show" :width="640" height="auto" position="center" :round="6">
                 <view class="poup pa-36">
@@ -172,9 +172,9 @@
 import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
 import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
 
-	import {
+
-		GetRandomNumberByRange
+import {GetRandomNumberByRange} from '@/utils/random.js';
-	} from '@/utils/random.js';
+
 export default {
     components: {
         tmSkeleton,

pagesA/submit-link/submit-link.vue

@@ -1,80 +1,86 @@
 <template>
     <tm-fullView>
-		<view class="ma-32"><tm-coupon :hdata="d_3" color="blue" @click="blogDetailPoupShow=true"></tm-coupon></view>
+        <view class="ma-32">
+            <tm-coupon :hdata="calcBlogCoupon" color="blue" @click="blogDetailPoupShow=true"></tm-coupon>
+        </view>
         <view class="pb-50">
             <tm-form @submit="fnOnSubmit">
-				<tm-sheet color="blue" :shadow="24">
+                <tm-sheet :shadow="24" color="blue">
                     <view class="text-size-s text-weight-b mb-24">友链信息提交</view>
-					<tm-sheet :margin="[0,0]" :padding="[0,0]" classname="overflow" :shadow="24">
+                    <tm-sheet :margin="[0,0]" :padding="[0,0]" :shadow="24" classname="overflow">
-						<tm-input name="displayName" required title="名称" v-model="form.displayName" placeholder="请输入网站名称" align="right"></tm-input>
+                        <tm-input v-model="form.displayName" align="right" name="displayName" placeholder="请输入网站名称"
-						<tm-input name="url" required title="网址" v-model="form.url" placeholder="请输入网站地址" align="right"></tm-input>
+                                  required title="名称"></tm-input>
-            <tm-input name="logo" required title="Logo" v-model="form.logo" placeholder="请输入网站Logo" align="right"></tm-input>
+                        <tm-input v-model="form.url" align="right" name="url" placeholder="请输入网站地址" required
-            <tm-input name="email" required title="邮箱" v-model="form.email" placeholder="请输入邮箱" align="right"></tm-input>
+                                  title="网址"></tm-input>
-						<tm-input name="linkPageUrl" title="友链页面" v-model="form.linkPageUrl" placeholder="请输入友链页面地址" align="right"></tm-input>
+                        <tm-input v-model="form.logo" align="right" name="logo" placeholder="请输入网站Logo" required
+                                  title="Logo"></tm-input>
+                        <tm-input v-model="form.email" align="right" name="email" placeholder="请输入邮箱" required
+                                  title="邮箱"></tm-input>
+                        <tm-input v-model="form.linkPageUrl" align="right" name="linkPageUrl" placeholder="请输入友链页面地址"
+                                  title="友链页面"></tm-input>
                         <view class="py-12 px-24 mx-12 round-3 border-b-1 grey text">
                             <text class="text-grey text-size-xs px-10">
-                <tm-helpTips color="bg-gradient-blue-lighten-b"
+                                <tm-helpTips :show="true" color="bg-gradient-blue-lighten-b" direction="bottom"
-                             :show="true" direction="bottom" tip-direction="left"
+                                             label="展示本站链接的页面地址，用于校验是否添加本站友链" ment-direction="left" tip-direction="left">
-                             label="展示本站链接的页面地址，用于校验是否添加本站友链" ment-direction="left">
                                     <tm-icons :fllowTheme="true" name="icon-question-circle"></tm-icons>
                                 </tm-helpTips>
                                 （贵站友情链接页面地址，即包含本站链接也页面）
                             </text>
                         </view>
-            <tm-input name="rssUrl" title="RSS地址" v-model="form.rssUrl" placeholder="请输入RSS地址" align="right"></tm-input>
+                        <tm-input v-model="form.rssUrl" align="right" name="rssUrl" placeholder="请输入RSS地址"
+                                  title="RSS地址"></tm-input>
                         <view class="py-12 px-24 mx-12 round-3 border-b-1 grey text">
                             <text class="text-grey text-size-xs px-10">
-                <tm-helpTips color="bg-gradient-blue-lighten-b"
+                                <tm-helpTips :show="true" color="bg-gradient-blue-lighten-b" direction="bottom"
-                             :show="true" direction="bottom" tip-direction="left"
+                                             label="用于抓取文章" ment-direction="left" tip-direction="left">
-                             label="用于抓取文章" ment-direction="left">
                                     <tm-icons :fllowTheme="true" name="icon-question-circle"></tm-icons>
                                 </tm-helpTips>
                                 （用于抓取文章）
                             </text>
                         </view>
-						<tm-input name="description" :border-bottom="false" :vertical="true" required :height="100"
+                        <tm-input v-model="form.description" :border-bottom="false" :height="100" :maxlength="30"
-							input-type="textarea" bg-color="grey-lighten-5" :maxlength="30" title="网站描述"
+                                  :vertical="true" bg-color="grey-lighten-5" input-type="textarea" name="description"
-							placeholder="请输入网站描述,不超过30字符" v-model="form.description"></tm-input>
+                                  placeholder="请输入网站描述,不超过30字符" required title="网站描述"></tm-input>
                         <view class="px-24">
-							<tm-button navtie-type="form" theme="bg-gradient-blue-accent" block>提交数据</tm-button>
+                            <tm-button block navtie-type="form" theme="bg-gradient-blue-accent">提交数据</tm-button>
                             <view class="py-32 text-size-s text-grey text-align-center">友链申请</view>
                         </view>
                     </tm-sheet>
                 </tm-sheet>
             </tm-form>
 
-			<tm-poup v-model="blogDetailPoupShow" :width="640" height="auto" position="center" :round="6">
+            <tm-poup v-model="blogDetailPoupShow" :round="6" :width="640" height="auto" position="center">
-				<view class="poup pa-36">
+                <view class="poup pa-36" scroll-y="auto">
                     <view class="info flex">
-						<view class="poup-logo bg-gradient-amber-accent pa-4 shadow-24">
+                        <view class="poup-logo pa-4 shadow-24">
-							<image class="poup-logo_img" :src="blogDetail.logo" mode="aspectFill"></image>
+                            <image :src="blogDetail.logo" class="poup-logo_img" mode="aspectFill"></image>
                         </view>
                         <view class="pl-24 info-detail">
                             <view class="poup-name text-size-lg text-weight-b">{{ blogDetail.name }}</view>
-							<view class="poup-tag ml--10">
+                            <view class="poup-tag ml--10 text-size-n mt-10 text-grey">
-								<tm-tags color="bg-gradient-amber-accent" size="n"
+                                {{ blogDetail.description }}
-									model="fill">{{ blogDetail.description }}</tm-tags>
-							</view>
-							<view class="poup-link text-size-m" @click="fnCopyLink(blogDetail.url)">
-								<text class="text-orange">点击复制友链交换信息</text>
-								<text class="iconfont icon-copy text-size-s ml-6 text-grey"></text>
                             </view>
                         </view>
                     </view>
 
-					<view class="poup-desc mt-20">
+                    <view class="poup-desc">
-						<text>{{ blogDetail.content}}</text>
+                        <text>{{ calcBlogContent }}</text>
                     </view>
 
                     <!-- 博客预览图 -->
-					<view class="mt-24"><tm-images :width="568" :round="2" :src="caclSiteThumbnail(blogDetail.url)"
+                    <view class="mt-24">
-							mode="aspectFill"></tm-images></view>
+                        <tm-images :round="2" :src="caclSiteThumbnail(blogDetail.url)" :width="568"
+                                   mode="aspectFill"></tm-images>
+                    </view>
+                </view>
+                <view class="poup-link flex flex-center mb-24">
+                    <tm-button theme="light-blue" size="n" @click="fnCopyLink(blogDetail.url)">复制友链交换信息</tm-button>
+                    <tm-button text theme="white" @click="blogDetailPoupShow = false">关闭</tm-button>
                 </view>
             </tm-poup>
         </view>
     </tm-fullView>
 
-
 </template>
 
 <script>
@@ -91,6 +97,7 @@
 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'
+
 export default {
     components: {
         tmFullView,
@@ -110,13 +117,7 @@
     data() {
         return {
             blogDetailPoupShow: false,
-				blogDetail: {
+            blogDetail: this.$haloPluginsConfig.autoSubmitLink.blogDetail,
-					name: "柳意梧情博客",
-					url: "https://lywq.muyin.site",
-					logo: "https://lywq.muyin.site/logo.png",
-					description: "心在哪里收获就在哪里",
-					content: "博客名称：柳意梧情博客 \n博客地址：https://lywq.muyin.site \n博客logo：https://lywq.muyin.site/logo \n博客简介：柳意梧情博客-心在哪里收获就在哪里"
-				},
             form: {
                 url: '', // 网址
                 name: '', // 名称
@@ -124,12 +125,6 @@
                 linkPageUrl: '', // 友链页面
                 team: '自助提交', // 分组
                 description: '' // 描述
-				},
-				d_3: {
-					img: 'https://lywq.muyin.site/logo.png',
-					title: '柳意梧情博客',
-					time: '心在哪里收获就在哪里',
-					btnText: '友链详情'
             }
         };
     },
@@ -142,8 +137,23 @@
                 }
                 return 'https://image.thum.io/get/width/1000/crop/800/' + val;
             };
+        },
+        calcBlogContent() {
+            return `
+				   博客名称：${this.blogDetail.name}
+				   博客地址：${this.blogDetail.url}
+				   博客logo：${this.blogDetail.logo}
+				   博客简介：${this.blogDetail.description}
+				`
+        },
+        calcBlogCoupon() {
+            return {
+                img: this.blogDetail.logo,
+                title: this.blogDetail.name,
+                time: this.blogDetail.description,
+                btnText: '友链详情'
+            }
         }
-
     },
     onLoad() {
         this.fnSetPageTitle('友链申请');
@@ -176,7 +186,7 @@
             });
             this.$httpApi.v2.submitLink(this.form)
                 .then(res => {
-						if (res.code == 200) {
+                    if (res.code === 200) {
                         uni.$tm.toast('友链提交成功！');
                         setTimeout(() => {
                             uni.navigateTo({
@@ -198,7 +208,7 @@
         },
         fnCopyLink() {
             uni.setClipboardData({
-					data: this.blogDetail.content,
+                data: this.calcBlogContent,
                 showToast: false,
                 success: () => {
                     uni.showToast({
@@ -222,18 +232,19 @@
 .poup-logo {
     width: 140rpx;
     height: 140rpx;
-		border-radius: 50%;
+    border-radius: 24rpx;
+    overflow: hidden;
 
     &_img {
         width: 100%;
         height: 100%;
-			border-radius: 50%;
     }
 }
 
 .poup-desc {
+    margin-top: -20rpx;
     font-size: 28rpx;
-		line-height: 1.6;
+    line-height: 1.8;
     color: #555 !important;
 }