前端bug修复

components/common/u-dropdown-select/index.vue

@@ -238,7 +238,7 @@
 	.u-dropdown-label{
 		max-width: 100%;
 		@include text-ellipsis;
-		font-size: $fontSize1;
+		font-size: $fontSize2;
 	}
 	.u-dropdown-tabs{
 		--tabs-line-height: 44px;
@@ -264,7 +264,7 @@
 	.u-dropdown-option{
 		line-height: 50rpx;
 		@include display-flex-between;
-		font-size: $fontSize2;
+		font-size: $fontSize3;
 		&.active{
 			color: $buttonPrimaryColor;
 		}
@@ -275,11 +275,11 @@
 		.van-button{
 			border-radius: 0rpx;
 			height: 80rpx;
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 		}
 	}
 	.van-empty__description{
-		font-size: $fontSize2;
+		font-size: $fontSize3;
 		margin-top: 0rpx;
 	}
 	.button-info{

components/common/u-panel/index.vue

@@ -53,7 +53,7 @@
 		.u-panel-title{
 			position: relative;
 			padding-bottom: 20rpx;
-			font-size: $fontSize4;
+			font-size: $fontSize5;
 			font-weight: 500;
 			color: #000000;
 			&:after{
@@ -69,7 +69,7 @@
 			}
 		}
 		.u-panel-link{
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			color: #7D7D7D;
 		}
 	}

components/common/u-search/index.vue

@@ -67,7 +67,7 @@
 			overflow: hidden;
 
 			.van-field__placeholder {
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 			}
 
 			.van-cell__left-icon-wrap {
@@ -75,7 +75,7 @@
 			}
 
 			.van-field__control {
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 				height: 50rpx;
 			}
 		}
@@ -85,11 +85,11 @@
 			--search-input-height: 34rpx;
 			--search-background-color: #FFFFFF;
 			padding-right: 24rpx;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 		}
 
 		.u-search-text {
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 		}
 
 		.van-search__action {

components/common/u-swiper/index.vue

@@ -190,17 +190,19 @@
 	  justify-content: center;
 	  margin-top: 10rpx;
 		&.morphing {
-			margin: 0 4rpx;
+			.dot{
+				margin: 0 5rpx;
+			}
 			.dot.active{
 				 width: 26rpx;
-				 border-radius: 4rpx;
+				 border-radius: 8rpx;
 				 background-color: white;
 			}
 		}
 	}
 	.dot {
-	  width: 10rpx;
-	  height: 10rpx;
+	  width: 12rpx;
+	  height: 12rpx;
 	  border-radius: 50%;
 	  background-color: #D9D9D9;
 	  margin: 0 2.5rpx;

components/common/u-tabs/index.vue

@@ -85,6 +85,11 @@
 	}
 </script>
 <style lang="scss">
+	.u-tabs{
+		.van-tabs__scroll{
+			background-color: transparent;
+		}
+	}
 	.u-tabs.u-tabs-tag {
 		--tabs-line-height: 64rpx;
 		--tabs-card-height: 64rpx;
@@ -95,7 +100,7 @@
 		--tab-margin-right: 10rpx;
 		--tab-border-radius: 20rpx;
 		.van-tab{
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 			line-height: 50rpx;
 		}
 		.van-tabs--line{
@@ -118,7 +123,7 @@
 			padding: 0;
 		}
 		.van-tab{
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			border: 1rpx solid #7D7D7D;
 			height: 50rpx;
 			color: #7D7D7D;

components/layout/nav-bar.vue

@@ -87,7 +87,7 @@
 		.nav-bar-title-text{
 			flex: 1;
 			font-weight: 500;
-			font-size: $fontSize5;
+			font-size: $fontSize6;
 			line-height: 42rpx;
 			text-align: left;
 			text-transform: none;

components/layout/tab-bar.vue

@@ -87,17 +87,28 @@
 				this.$emit('change', active)
 			},
 			onClickCenter() {
-				uni.navigateTo({
-					url: '/pages/components/index'
-				})
+				this.showAlertDialog('功能未开通')
 			}
 		}
 	}
 </script>
 <style lang="scss">
 	.u-tabbar{
+		.van-tabbar{
+			height: 118rpx;
+		}
+		.van-tabbar-item{
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			padding-top: 16rpx;
+			padding-bottom: 16rpx;
+		}
+		.van-tabbar-item__icon{
+			margin-bottom: 0;
+		}
 		.van-tabbar-item__text {
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 			color: #7D7D7D;
 		}
 		
@@ -121,9 +132,9 @@
 		}
 		
 		.tabbar-center-text {
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 			color: #7D7D7D;
-			margin-top: 10rpx;
+			margin-top: 18rpx;
 			text-align: center;
 		}
 		
@@ -155,7 +166,7 @@
 		}
 		
 		.tabbar-icon-user {
-			font-size: 48rpx;
+			font-size: 46rpx;
 		}
 	}
 </style>

main.js

@@ -4,7 +4,9 @@ import App from './App'
 import Vue from 'vue'
 import store from './store'
 import { initLocale } from '@/locales/i18n'
-
+import loadCloudFontFace from '@/utils/font'
+import Dialog from '@/wxcomponents/vant/dialog/dialog'
+	
 import './uni.promisify.adaptor'
 Vue.config.productionTip = false
 Vue.prototype.$config = {
@@ -89,6 +91,33 @@ Vue.prototype.hideLoading = function() {
 	uni.hideLoading()
 }
 
+// 所在页面需放置元素
+// <van-dialog id="van-dialog" />
+Vue.prototype.showAlertDialog = function(message, title) {
+	return Dialog.alert({
+		title: title || '系统提示',
+		message: message
+	})
+}
+
+// 所在页面需放置元素
+// <van-dialog id="van-dialog" />
+Vue.prototype.showConfirmDialog = function(message, title) {
+	const options = {
+		title: title || '系统提示',
+		message: message
+	}
+	return Dialog.confirm(options)
+}
+
+Vue.prototype.loadFontFace = function(fontFamily) {
+	let fontUrl = ''
+	if (fontFamily === 'Poppins') {
+		fontUrl = 'https://oss.starify.cn/test/Poppins-SemiBold.ttf'
+	}
+	loadCloudFontFace(fontUrl, fontFamily + '.ttf', fontFamily)
+}
+
 App.mpType = 'app'
 const app = new Vue({
 	App,

pages.json

@@ -25,7 +25,6 @@
 		{ "path": "pages/user/favorites" },
 		{ "path": "pages/user/vote" },
 		// 组件页面
-		{ "path": "pages/components/index" },
 		{ "path": "pages/index/search" },
 		// WEBVIEW
 		{ "path": "pages/index/webview", "style": { "navigationStyle": "default", "navigationBarTitleText": "加载中...", "navigationBarBackgroundColor": "#332968" }}
@@ -39,7 +38,8 @@
 		"usingComponents": {
 			"van-icon": "/wxcomponents/vant/icon/index",
 			"van-empty": "/wxcomponents/vant/empty/index",
-			"van-button": "/wxcomponents/vant/button/index"
+			"van-button": "/wxcomponents/vant/button/index",
+			"van-dialog": "/wxcomponents/vant/dialog/index"
 		}
 	},
 	"uniIdRouter": {}

pages/activity/components/activity-item.vue

@@ -54,7 +54,4 @@
 	}
 </script>
 <style lang="scss">
-	a{
-		
-	}
 </style>

pages/activity/components/activity-recommend.vue

@@ -60,25 +60,25 @@
 		@include text-ellipsis-line;
 		font-family: Arial, Arial;
 		font-weight: bold;
-		font-size: $fontSize2;
+		font-size: $fontSize3;
 		line-height: 35rpx;
 	}
 	.activity-time{
-		font-size: $fontSize1;
+		font-size: $fontSize2;
 		color: #333333;
 		margin: 12rpx 0;
 	}
 	.activity-summary{
 		display: flex;
 		align-items: center;
-		font-size: 18rpx;
+		font-size: $fontSize1;
 		line-height: 25rpx;
 		.btn-to-detail{
 			flex-shrink: 0;
 			.van-button__text{
 				display: flex!important;
 				align-items: center;
-				font-size: 18rpx;
+				font-size: $fontSize0;
 			}
 		}
 		.text{

pages/activity/detail.vue

@@ -20,10 +20,12 @@
 						</view>
 					</view>
 					<view class="activity-action">
-						<view>
-							<view class="iconfont icon-zhuanfa"></view>
-							<view>分享</view>
-						</view>
+						<button open-type="share" :plain="true">
+							<view>
+								<view class="iconfont icon-zhuanfa"></view>
+								<view>分享</view>
+							</view>
+						</button>
 						<view>
 							<view class="iconfont icon-Favourites-Add-Large" :class="{ 'active': favorited }"></view>
 							<view>收藏</view>
@@ -116,10 +118,12 @@
 				<view class="activity-operation">
 					<view class="activity-views">浏览：30911</view>
 					<view class="activity-action">
-						<view>
-							<view class="iconfont icon-zhuanfa"></view>
-							<view>分享</view>
-						</view>
+						<button open-type="share" :plain="true">
+							<view>
+								<view class="iconfont icon-zhuanfa"></view>
+								<view>分享</view>
+							</view>
+						</button>
 						<view>
 							<view class="iconfont icon-Favourites-Add-Large" :class="{ 'active': favorited }"></view>
 							<view>收藏</view>
@@ -167,7 +171,7 @@
 		.activity-head{
 			position: relative;
 			font-weight: normal;
-			font-size: $fontSize5;
+			font-size: $fontSize6;
 			color: #333333;
 			.activity-title{
 				font-weight: bold;
@@ -183,14 +187,14 @@
 			margin-top: 32rpx;
 		}
 		.activity-views{
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			color: #555555;
 		}
 		.activity-action{
 			display: grid;
 			grid-template-columns: 1fr 1fr;
 			width: 210rpx;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			color: #555555;
 			&>view{
 				display: flex;
@@ -198,7 +202,7 @@
 				justify-content: flex-end;
 			}
 			.iconfont{
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 				margin-right: 4rpx;
 			}
 			.icon-Favourites-Add-Large{
@@ -209,6 +213,18 @@
 					color: $textActionColor;
 				}
 			}
+			button{
+				font-size: $fontSize2;
+				white-space: nowrap;
+				line-height: inherit;
+				background-color: transparent;
+				border: none;
+				view{
+					display: flex;
+					align-items: center;
+					font-size: $fontSize2;
+				}
+			}
 		}
 		.activity-props{
 			position: relative;
@@ -217,7 +233,7 @@
 			grid-row-gap: 12rpx;
 			margin-top: 32rpx;
 			padding-right: 210rpx;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			.activity-prop{
 				display: flex;
 				align-items: center;
@@ -236,14 +252,14 @@
 		.activity-desc{
 			margin-top: 47rpx;
 			.activity-desc-title{
-				font-size: $fontSize5;
+				font-size: $fontSize6;
 				color: #333333;
 				line-height: 38rpx;
 			}
 			.activity-desc-text{
 				display: block;
 				margin-top: 31rpx;
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 				line-height: 40rpx;
 			}
 		}
@@ -266,7 +282,7 @@
 			color: #333333;
 			.activity-agenda-title, .activity-agenda-guest-title{
 				font-weight: bold;
-				font-size: $fontSize2;
+				font-size: $fontSize3;
 				line-height: 35rpx;
 			}
 			.activity-agenda-list{
@@ -278,7 +294,7 @@
 			.activity-agenda-item{
 				display: flex;
 				align-items: flex-start;
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 			}
 			.activity-agenda-item-text{
 				margin-left: 4rpx;
@@ -286,17 +302,23 @@
 			.activity-agenda-guest-title,.activity-agenda-guest-link{
 				margin-top: 20rpx;
 			}
+			.activity-agenda-guest-link{
+				.van-button{
+					font-size: $fontSize0;
+					font-weight: bold;
+				}
+			}
 		}
 		.activity-schedule{
 			margin-top: 49rpx;
 			color: #333333;
 			.activity-schedule-title{
-				font-size: $fontSize5;
+				font-size: $fontSize6;
 				line-height: 38rpx;
 			}
 			.activity-schedule-desc{
 				margin-top: 20rpx;
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 				line-height: 40rpx;
 			}
 			.activity-schedule-image{
@@ -307,7 +329,7 @@
 			margin-top: 30rpx;
 			.iconfont{
 				color: #6A91CE;
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 			}
 			.thead{
 				.tr{
@@ -328,7 +350,7 @@
 			.tr{
 				display: flex;
 				margin-bottom: 8rpx;
-				font-size: 18rpx;
+				font-size: $fontSize1;
 				&>view:nth-child(1){
 					width: 40rpx;
 					margin-right: 8rpx;

pages/activity/guest.vue

@@ -122,14 +122,14 @@
 		.activity-head{
 			position: relative;
 			font-weight: normal;
-			font-size: $fontSize5;
+			font-size: $fontSize6;
 			color: #333333;
 			.activity-title{
 				font-weight: bold;
 			}
 			.activity-time{
 				margin-top: 25rpx;
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 			}
 			.activity-action{
 				position: absolute;
@@ -142,14 +142,14 @@
 			margin-top: 32rpx;
 		}
 		.activity-views{
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			color: #555555;
 		}
 		.activity-action{
 			display: grid;
 			grid-template-columns: 1fr 1fr;
 			width: 210rpx;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			color: #555555;
 			&>view{
 				display: flex;
@@ -157,7 +157,7 @@
 				justify-content: flex-end;
 			}
 			.iconfont{
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 				margin-right: 4rpx;
 			}
 			.icon-Favourites-Add-Large{
@@ -188,7 +188,7 @@
 				margin-top: 35rpx;
 			}
 			.van-icon-arrow{
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 			}
 			.van-collapse-item__title--expanded{
 				.van-cell__title{
@@ -197,7 +197,7 @@
 			}
 			.van-collapse-item__content{
 				padding: 0;
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 				background-color: transparent;
 			}
 			.van-cell__left-icon-wrap,.van-cell__right-icon-wrap{
@@ -206,7 +206,7 @@
 			.van-cell__title{
 				width: 0;
 				background-color: transparent;
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 				color: #333333;
 				@include text-ellipsis;
 			}
@@ -239,17 +239,17 @@
 				padding: 31rpx 28rpx;
 			}
 			.van-cell__title{
-				font-size: $fontSize2;
+				font-size: $fontSize3;
 			}
 			.van-collapse-item__content{
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 				color: #535353;
 				line-height: 30rpx;
 				padding: 31rpx 28rpx 23rpx 28rpx;
 			}
 		}
 		.activity-guest-title-1,.activity-guest-title-2 {
-			font-size: $fontSize3;
+			font-size: $fontSize4;
 			font-weight: bold;
 			color: #323232;
 		}
@@ -258,7 +258,7 @@
 		}
 		.activity-guest-time{
 			margin-top: 20rpx;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			color: #333333;
 		}
 		.activity-guest{
@@ -273,13 +273,13 @@
 			}
 			.activity-guest-name{
 				font-weight: bold;
-				font-size: $fontSize2;
+				font-size: $fontSize3;
 				color: #333333;
 				line-height: 35rpx;
 			}
 			.activity-guest-alias{
 				margin-top: 4rpx;
-				font-size: 18rpx;
+				font-size: $fontSize1;
 				color: #7D7D7D;
 				line-height: 24rpx;
 				letter-spacing: 2rpx;

pages/activity/index.vue

@@ -49,14 +49,17 @@
 		color: #333333;
 		.activity-head-title{
 			font-weight: bold;
-			font-size: $fontSize5;
+			font-size: $fontSize6;
 			line-height: 49rpx;
 		}
 		.activity-head-desc{
 			margin-top: 20rpx;
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 			line-height: 40rpx;
 		}
+		.activity-favourites-text{
+			white-space: nowrap;
+		}
 	}
 	.activity-list{
 		display: grid;

pages/components/index.vue

@@ -1,131 +0,0 @@
-<template>
-	<view>
-		<nav-bar>
-		</nav-bar>
-		<van-collapse :value="activeNames" @change="onCollapseChange">
-			<van-collapse-item title="轮播图" name="1">
-				<u-swiper :items="images"/>
-			</van-collapse-item>	
-		  <van-collapse-item title="分类下拉组件" name="2">
-				<u-dropdown-select v-model="categoryId" placeholder="产品分类" :options="categories" /> 
-				<view>选中的ID：{{ categoryId }}</view>
-				<view>事件：change</view>
-				<view>动态数据：data-api（Function 请求方法），data-params（Object 请求参数）</view>
-		  </van-collapse-item>
-			<van-collapse-item title="导航组件" name="3">
-				<nav-bar />
-			</van-collapse-item>	 
-		  <van-collapse-item title="环境变量" name="4">
-				 <view>通过 process.env.*，获取</view>
-				 <view>接口服务器：{{ apiUrl }}</view>
-		  </van-collapse-item>
-		  <van-collapse-item title="国际化" name="5">
-				<view>通过 $t(key（国际化key）, msg（默认消息）, params（替换参数）)</view>
-				<view>当前语言：{{ locale }}</view>
-				<view>国际化内容：{{ $t('common.close', '关闭') }}</view>
-				<van-button type="primary" @click="selectLanguage('zh-cn')">中文</van-button>
-				<van-button type="warning" @click="selectLanguage('en-us')">英文</van-button>
-		  </van-collapse-item>
-		</van-collapse>
-		<!-- <u-dropdown-select v-model="categoryId" placeholder="产品分类" :options="categories" /> {{ categoryId }} -->
-	</view>
-</template>
-
-<script>
-	import { getLocale, setLocale } from '../../locales/i18n'
-	import UDropdownSelect from '@/components/common/u-dropdown-select/index.vue'
-	import USwiper from '@/components/common/u-swiper/index.vue'
-	import NavBar from '@/components/layout/nav-bar.vue'
-
-	export default {
-		components: {
-			UDropdownSelect,
-			USwiper,
-			NavBar
-		},
-		data() {
-			return {
-				locale: '',
-				activeNames: ['1'],
-				apiUrl: '',
-				images: [{
-					src: 'https://matchexpo.obs.cn-north-1.myhuaweicloud.com/common/2023/1123/655ebb47a7b70.jpg?x-image-process=image/resize,m_lfit,h_214,w_380'
-				}, {
-					src: 'https://matchexpo.obs.cn-north-1.myhuaweicloud.com/common/2023/1123/655ec5b54c527.jpg?x-image-process=image/resize,m_lfit,h_214,w_380'
-				}, {
-					src: 'https://matchexpo.obs.cn-north-1.myhuaweicloud.com/common/2023/1123/655ec1b9d558f.jpg?x-image-process=image/resize,m_lfit,h_214,w_380'
-				}],
-				categoryId: 11,
-				categories: [{
-					label: '表面贴装',
-					value: 1,
-					children: [{
-						label: '表面贴装技术',
-						value: 11
-					}, {
-						label: 'PCB焊接和连接技术',
-						value: 12
-					}, {
-						label: '测试测量和质量保证',
-						value: 13
-					}, {
-						label: '电子组装自动化',
-						value: 14
-					}, {
-						label: '生产物流和物流技术',
-						value: 15
-					}, {
-						label: '清洗技术',
-						value: 16
-					}]
-				}, {
-					label: '线束加工',
-					value: 2
-				}, {
-					label: '工厂自动化',
-					value: 3
-				}, {
-					label: '点胶注胶',
-					value: 4
-				}, {
-					label: '电子制造服务',
-					value: 5
-				}, {
-					label: '未来服务',
-					value: 6
-				}]
-			}
-		},
-		created() {
-			this.locale = getLocale()
-			this.apiUrl = process.env.BASE_API
-			console.log('当前环境的API URL: ', this.apiUrl)
-		},
-		methods: {
-			onChange(e) {
-				this.active = e.detail
-			},
-			selectLanguage(language) {
-				setLocale(language)
-			},
-			onCollapseChange(e) {
-				console.log('onCollapseChange')
-				console.log(e.detail)
-				this.activeNames = e.detail
-			},
-			selectLanguage(language) {
-				setLocale(language)
-				this.locale = language
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		font-size: 24rpx;
-	}
-	.tab-class{
-		background-color: red!important;
-	}
-</style>

pages/exhibitor/components/exhibit-item.vue

@@ -18,7 +18,7 @@
 			<view class="exhibitor-views">浏览：30911</view>
 			<view class="exhibitor-action">
 				<view>
-					<button open-type="share" @click.stop="onShare(item)">
+					<button open-type="share" @click.stop="onShare(item)" :plain="true">
 						<view>
 							<view class="iconfont icon-zhuanfa"></view>
 							<view>分享</view>

pages/exhibitor/components/exhibit-recommend.vue

@@ -30,7 +30,7 @@
 		},
 		methods: {
 			onClickExhibit() {
-				this.navigateTo('/pages/exhibitor/detail')
+				this.navigateTo('/pages/exhibitor/exhibit-detail')
 			}
 		}
 	}

pages/exhibitor/components/exhibitor-item.vue

@@ -15,7 +15,7 @@
 			<view class="exhibitor-views">浏览：30911</view>
 			<view class="exhibitor-action">
 				<view>
-					<button open-type="share" @click.stop="onShare(item)">
+					<button open-type="share" :plain="true" @click.stop="onShare(item)">
 						<view>
 							<view class="iconfont icon-zhuanfa"></view>
 							<view>分享</view>

pages/exhibitor/detail.vue

@@ -52,7 +52,7 @@
 							<view>人气：11192</view>
 						</view>
 						<view>
-							<button open-type="share">
+							<button open-type="share" :plain="true">
 								<view>
 									<view class="iconfont icon-zhuanfa"></view>
 									<view>分享</view>
@@ -117,6 +117,7 @@
 			}
 		},
 		created() {
+			this.loadFontFace('Poppins')
 		},
 		methods: {
 			onShareAppMessage() {
@@ -178,13 +179,13 @@
 		.exhibitor-number-text{
 			font-family: Poppins, Poppins;
 			font-weight: bold;
-			font-size: $fontSize5;
+			font-size: $fontSize6;
 			color: #E57519;
 			letter-spacing: 2rpx;
 		}
 		.exhibitor-desc{
 			font-family: Poppins, Poppins;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			color: #333333;
 			line-height: 35rpx;
 			margin-top: 30rpx;
@@ -197,6 +198,7 @@
 			display: flex;
 			justify-content: center;
 			margin-top: 49rpx;
+			@include link-button;
 		}
 	}
 </style>

pages/exhibitor/exhibit-detail.vue

@@ -34,7 +34,7 @@
 							<view>人气：11192</view>
 						</view>
 						<view>
-							<button open-type="share">
+							<button open-type="share" :plain="true">
 								<view>
 									<view class="iconfont icon-zhuanfa"></view>
 									<view>分享</view>
@@ -101,6 +101,7 @@
 			return {}
 		},
 		created() {
+			this.loadFontFace('Poppins')
 		},
 		methods: {
 			onShareAppMessage() {
@@ -139,22 +140,20 @@
 			}
 		}
 		.exhibitor-detail-link{
-			.van-button__text{
-				font-size: 18rpx;
-			}
+			@include link-button;
 		}
 		.exhibit-name{
 			margin-top: 28rpx;
 			font-family: Poppins, Poppins;
 			font-weight: bold;
-			font-size: $fontSize5;
+			font-size: $fontSize6;
 			color: #000000;
 			line-height: 42rpx;
 		}
 		.exhibit-desc{
 			margin-top: 18rpx;
 			font-family: Poppins, Poppins;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			color: #555555;
 			line-height: 35rpx;
 		}
@@ -172,13 +171,13 @@
 			}
 			.exhibitor-name-cn,.exhibitor-name-en{
 				font-family: Poppins, Poppins;
-				font-size: $fontSize2;
+				font-size: $fontSize3;
 				color: #000000;
 				line-height: 28rpx;
 			}
 			.exhibitor-name-en{
 				margin-top: 10rpx;
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 			}
 			.exhibitor-number{
 				@include display-flex-center;
@@ -198,7 +197,7 @@
 			}
 			.exhibitor-number-label{
 				font-family: Poppins, Poppins;
-				font-size: $fontSize2;
+				font-size: $fontSize3;
 				line-height: 28rpx;
 				color: rgba(255, 255,  255, 0.74);
 			}

pages/exhibitor/exhibit.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="exhibit-index exhibitor-index">
 		<nav-bar title="展品信息" @init="onInitNavbar"></nav-bar>
+		
 		<u-scroll-view>
 			<view class="main-container">
 			<view class="exhibitor-filter">

pages/exhibitor/index.vue

@@ -94,7 +94,9 @@
 				}]
 			}
 		},
-		created() {},
+		created() {
+			this.loadFontFace('Poppins')
+		},
 		methods: {
 			onSelectDropdown(index) {
 				['select1', 'select2', 'select3'].forEach(v => {

pages/index/components/contact-us.vue

@@ -67,18 +67,18 @@
 		}
 		.contact-us-label-1{
 			margin-top: 30rpx;
-			font-size: $fontSize5;
+			font-size: $fontSize6;
 		}
 		.contact-us-label-2{
 			margin-top: 13rpx;
-			font-size: $fontSize5;
+			font-size: $fontSize6;
 		}
 		.contact-us-service-list{
 			display: grid;
 			grid-template-columns: 1fr;
 			grid-row-gap: 10rpx;
 			margin-top: 20rpx;
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 		}
 		.contact-us-close{
 			position: absolute;

pages/index/home.vue

@@ -24,61 +24,67 @@
 					</view>
 				</template>
 			</view>
-			<u-panel title="精彩视频" link="https://www.productronicachina.com.cn/for-journalists-impression-videos">
-				<u-swiper :items="videos" :height="360" :autoplay="false" :border-radius="10" :image-width="508" :image-height="286"
-					next-margin="100rpx" />
-			</u-panel>
-			<u-panel title="精彩图集" link="https://www.productronicachina.com.cn/for-journalists-impression-videos">
-				<view class="album">
-					<template v-for="(item, index) in albumPics">
-						<view class="album-pic" :key="index" @click="onClickAlbum(index)">
-							<image :src="item.src" mode="aspectFill" />
-						</view>
-					</template>
-				</view>
-			</u-panel>
-			<u-panel title="新闻" link="/pages/news/index">
-				<news-recommend />
-			</u-panel>
-			<u-panel title="战略合作方" link="https://www.productronicachina.com.cn/partners">
-				<u-swiper :items="partners" :height="250">
-					<template v-slot="{ scope }">
-						<view class="partners">
-							<template v-for="(item, index) in scope.children">
-								<view class="partner" :key="index">
-									<image :src="item.icon" />
-								</view>
-							</template>
-						</view>
-					</template>
-				</u-swiper>
-			</u-panel>
-			<u-panel title="推荐展商" link="https://www.productronicachina.com.cn/partners">
-				<u-swiper :items="partners" :height="250">
-					<template v-slot="{ scope }">
-						<view class="partners">
-							<template v-for="(item, index) in scope.children">
-								<view class="partner" :key="index">
-									<image :src="item.icon" />
-								</view>
-							</template>
-						</view>
-					</template>
-				</u-swiper>
-			</u-panel>
-			<u-panel title="合作媒体" link="https://www.productronicachina.com.cn/partners">
-				<u-swiper :items="partners" :autoplay="false" :height="250">
-					<template v-slot="{ scope }">
-						<view class="partners">
-							<template v-for="(item, index) in scope.children">
-								<view class="partner" :key="index">
-									<image :src="item.icon" />
-								</view>
-							</template>
-						</view>
-					</template>
-				</u-swiper>
-			</u-panel>
+			<view class="panel-group panel-group-1">
+				<u-panel title="精彩视频" link="https://www.productronicachina.com.cn/for-journalists-impression-videos">
+					<u-swiper :items="videos" :height="360" :autoplay="false" :border-radius="10" :image-width="508" :image-height="286"
+						next-margin="100rpx" />
+				</u-panel>
+				<u-panel title="精彩图集" link="https://www.productronicachina.com.cn/for-journalists-impression-videos">
+					<view class="album">
+						<template v-for="(item, index) in albumPics">
+							<view class="album-pic" :key="index" @click="onClickAlbum(index)">
+								<image :src="item.src" mode="aspectFill" />
+							</view>
+						</template>
+					</view>
+				</u-panel>
+			</view>
+			<view class="panel-group">
+				<u-panel title="新闻" link="/pages/news/index">
+					<news-recommend />
+				</u-panel>
+			</view>
+			<view class="panel-group">
+				<u-panel title="战略合作方" link="https://www.productronicachina.com.cn/partners">
+					<u-swiper :items="partners" :height="250">
+						<template v-slot="{ scope }">
+							<view class="partners">
+								<template v-for="(item, index) in scope.children">
+									<view class="partner" :key="index">
+										<image :src="item.icon" />
+									</view>
+								</template>
+							</view>
+						</template>
+					</u-swiper>
+				</u-panel>
+				<u-panel title="推荐展商" link="https://www.productronicachina.com.cn/partners">
+					<u-swiper :items="partners" :height="250">
+						<template v-slot="{ scope }">
+							<view class="partners">
+								<template v-for="(item, index) in scope.children">
+									<view class="partner" :key="index">
+										<image :src="item.icon" />
+									</view>
+								</template>
+							</view>
+						</template>
+					</u-swiper>
+				</u-panel>
+				<u-panel title="合作媒体" link="https://www.productronicachina.com.cn/partners">
+					<u-swiper :items="partners" :autoplay="false" :height="250">
+						<template v-slot="{ scope }">
+							<view class="partners">
+								<template v-for="(item, index) in scope.children">
+									<view class="partner" :key="index">
+										<image :src="item.icon" />
+									</view>
+								</template>
+							</view>
+						</template>
+					</u-swiper>
+				</u-panel>
+			</view>
 		</view>
 		<contact-us :show.sync="showContactUs" />
 		<popup-ad :show.sync="showPopupAd" />
@@ -229,8 +235,7 @@
 				}],
 			}
 		},
-		created() {
-		},
+		created() {},
 		methods: {
 			onClickNavIcon(item) {
 				if (item.link === '/pages/exhibitor/index') {
@@ -262,7 +267,13 @@
 		width: 150rpx;
 		height: 37rpx;
 	}
-
+	.panel-group{
+		margin-top: 43rpx;
+		background-color: #FFFFFF;
+		&.panel-group-1{
+			margin-top: 0;
+		}
+	}
 	.top-container {
 		display: flex;
 		align-items: center;
@@ -270,10 +281,10 @@
 			display: flex;
 			align-items: center;
 			margin-left: 27rpx;
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 			.days {
 				color: #F97316;
-				font-size: $fontSize5;
+				font-size: $fontSize6;
 				font-weight: bold;
 				padding: 0 4rpx;
 			}
@@ -290,13 +301,13 @@
 			padding: 4rpx;
 			overflow: hidden;
 			.van-field__placeholder{
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 			}
 			.van-cell__left-icon-wrap{
 				height: 50rpx;
 			}
 			.van-field__control{
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 				height: 50rpx;
 			}
 		}
@@ -306,10 +317,10 @@
 			--search-input-height: 34rpx;
 			--search-background-color: #FFFFFF;
 			padding-right: 24rpx;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 		}
 		.search-text{
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 		}
 
 		.van-search__action {
@@ -339,7 +350,7 @@
 
 		.nav-text {
 			margin-top: 20rpx;
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 			color: #555555;
 		}
 
@@ -447,10 +458,10 @@
 			border-radius: 50%;
 		}
 		.floating-button-label{
-			width: 64rpx;
-			margin-top: 6rpx;
+			margin-top: 4rpx;
 			font-size: $fontSize0;
 			color: #94A3B8;
+			white-space: nowrap;
 		}
 		.iconfont{
 			font-size: 44rpx;

pages/index/index.vue

@@ -4,6 +4,7 @@
 		<exhibitor v-if="tabbarActive === 'exhibitor'" />
 		<activity v-if="tabbarActive === 'activity'" />
 		<user v-if="tabbarActive === 'user'" />
+		<van-dialog id="van-dialog" />
 		<tab-bar :active.sync="tabbarActive"></tab-bar>
 	</view>
 </template>
@@ -32,20 +33,7 @@
 			}
 		},
 		created() {
-				uni.loadFontFace({
-					family: 'Poppins',
-					source: 'url("https://oss.starify.cn/test/Poppins-SemiBold.ttf")',
-					desc: {
-						fontPath: '', // 本地字体文件的路径
-					},
-					success: () => {
-						console.log('字体加载成功');
-					},
-					fail: (e) => {
-						console.log(e)
-						console.error('字体加载失败');
-					},
-				})
+			
 		},
 		methods: {
 			onClickSearch() {

pages/index/search.vue

@@ -11,27 +11,27 @@
 				<template v-else>
 					<u-tabs :active.sync="tabActive" :tabs="tabs" tab-style="default" @change="tabChange"/>
 					<view v-if="tabActive === 1" class="search-result-list exhibit-list">
-						<template v-for="(item, index) in [1, 2, 3]">
+						<template v-for="(item, index) in exhibitorList">
 							<exhibitor-item :item="item" :key="index" />
 						</template>
 					</view>
 					<view v-else-if="tabActive === 2" class="search-result-list exhibit-list">
-						<template v-for="(item, index) in [1, 2, 3]">
+						<template v-for="(item, index) in exhibitList">
 							<exhibit-item :item="item" :key="index" />
 						</template>
 					</view>
 					<view v-else-if="tabActive === 3" class="search-result-list exhibit-list">
-						<template v-for="(item, index) in [1, 2, 3, 4, 5]">
+						<template v-for="(item, index) in newsList">
 							<news-item :item="item" :key="index" />
 						</template>
 					</view>
 					<view v-else-if="tabActive === 4" class="search-result-list exhibit-list">
-						<template v-for="(item, index) in [1, 2, 3, 4, 5]">
+						<template v-for="(item, index) in activityList">
 							<activity-item :item="item" :key="index" />
 						</template>
 					</view>
 					<view v-else-if="tabActive === 5" class="search-result-list exhibit-list">
-						<template v-for="(item, index) in [1, 2, 3, 4, 5]">
+						<template v-for="(item, index) in activityList">
 							<activity-item :item="item" :key="index" />
 						</template>
 					</view>
@@ -85,7 +85,11 @@
 				}, {
 					label: '同期活动',
 					value: 5
-				}]
+				}],
+				exhibitorList: [{ favourited: true }, { liked: true }, { voted: true }, {}],
+				exhibitList: [{ favourited: true }, { liked: true }, { voted: true }],
+				newsList: [{}, {}, {}, {}],
+				activityList: [{ favourited: true }, {}, {}, {}, {}]
 			}
 		},
 		onLoad(options) {
@@ -109,7 +113,7 @@
 	.search-result-text{
 		margin: 33rpx 0;
 		display: block;
-		font-size: $fontSize2;
+		font-size: $fontSize3;
 		color: #000000;
 	}
 	.search-result-list{

pages/news/components/news-item.vue

@@ -49,7 +49,7 @@
 		@include text-ellipsis-line;
 		font-family: Arial, Arial;
 		font-weight: bold;
-		font-size: $fontSize2;
+		font-size: $fontSize3;
 		line-height: 35rpx;
 	}
 	.news-time{
@@ -58,7 +58,7 @@
 		margin: 12rpx 0;
 	}
 	.news-summary{
-		font-size: 18rpx;
+		font-size: $fontSize1;
 		line-height: 25rpx;
 		.text{
 			padding-right: 30rpx;

pages/user/favorites.vue

@@ -2,8 +2,10 @@
 	<view class="user-favorites user-like">
 		<nav-bar title="我的收藏" @init="onInitNavbar"></nav-bar>
 		<u-scroll-view>
-			<view class="user-favorites-tabs user-like-tabs">
-				<u-tabs :active.sync="tabActive" :tabs="tabs" @change="tabChange" />
+			<view class="user-favorites-tabs-wrapper user-like-tabs-wrapper">
+				<view class="user-favorites-tabs user-like-tabs">
+					<u-tabs :active.sync="tabActive" :tabs="tabs" @change="tabChange" />
+				</view>
 			</view>
 			<view class="main-container">
 				<view class="user-favorites-list user-like-list">
@@ -64,6 +66,7 @@
 		},
 		created() {
 			this.checkAuth('/pages/user/favorites')
+			this.loadFontFace('Poppins')
 		},
 		onShow() {
 		}, 

pages/user/index.vue

@@ -29,7 +29,7 @@
 						<view class="iconfont icon-xiaochengxu-toupiaoicon"></view>
 						<view>投票</view>
 					</view>
-					<view hover-class="active">
+					<view hover-class="active" @click="showAlertDialog('功能未开通')">
 						<view class="iconfont icon-xiaochengxu-guanzhongyudengjiicon"></view>
 						<view>预登记</view>
 					</view>
@@ -148,7 +148,7 @@
 				color: #333333;
 			}
 			.user-phone{
-				font-size: $fontSize2;
+				font-size: $fontSize3;
 				color: #7d7d7d;
 			}
 		}
@@ -161,7 +161,7 @@
 			&>view{
 				@include display-flex-center;
 				flex-direction: column;
-				font-size: $fontSize2;
+				font-size: $fontSize3;
 				color: #333333;
 				&.active{
 					background-color: rgba(0, 0, 0, 0.05)

pages/user/like.vue

@@ -2,8 +2,10 @@
 	<view class="user-like">
 		<nav-bar title="我的点赞" @init="onInitNavbar"></nav-bar>
 		<u-scroll-view>
-			<view class="user-like-tabs">
-				<u-tabs :active.sync="tabActive" :tabs="tabs" @change="tabChange"/>
+			<view class="user-like-tabs-wrapper">
+				<view class="user-like-tabs">
+					<u-tabs :active.sync="tabActive" :tabs="tabs" @change="tabChange"/>
+				</view>
 			</view>
 			<view class="main-container">
 				<view class="user-like-list">
@@ -56,6 +58,7 @@
 		},
 		created() {
 			this.checkAuth('/pages/user/like')
+			this.loadFontFace('Poppins')
 		},
 		onShow() {
 		}, 

pages/user/login.vue

@@ -285,7 +285,7 @@
 	}
 	.user-login-protocol-text{
 		margin-top: 39rpx;
-		font-size: $fontSize1;
+		font-size: $fontSize2;
 		color: #555555;
 		line-height: 30rpx;
 	}
@@ -301,7 +301,7 @@
 		background-color: #ffffff;
 		border-radius: 10rpx;
 		&>view:first-child{
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 			color: #333333;
 			text-align: center;
 		}
@@ -313,7 +313,7 @@
 		}
 		.input-phone-number,.input-check-code{
 			position: relative;
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 			.clear{
 				position: absolute;
 				right: 10rpx;

pages/user/vote.vue

@@ -2,9 +2,11 @@
 	<view class="user-vote user-like">
 		<nav-bar title="我的投票" @init="onInitNavbar"></nav-bar>
 		<u-scroll-view>
-			<view class="user-vote-tabs user-like-tabs">
-				<u-tabs :active.sync="tabActive" :tabs="tabs" @change="tabChange" />
-			</view>
+			<view class="user-vote-tabs-wrapper user-like-tabs-wrapper">
+				<view class="user-vote-tabs user-like-tabs">
+					<u-tabs :active.sync="tabActive" :tabs="tabs" @change="tabChange" />
+				</view>
+			</view>	
 			<view class="main-container">
 				<view class="user-vote-list user-like-list">
 					<template v-for="(item, index) in favoritesList">
@@ -55,6 +57,7 @@
 		},
 		created() {
 			this.checkAuth('/pages/user/vote')
+			this.loadFontFace('Poppins')
 		},
 		onShow() {
 		}, 

static/style/pages/activity-item.scss

@@ -12,28 +12,33 @@
 		}
 		.activity-favourites{
 			@include display-flex-center;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			&.active{
 				color: $textActionColor;
 			}
 			.iconfont{
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 				margin-right: 4rpx;
 			}
 		}
 		.activity-title{
-			@include display-flex-between;
+			display: flex;
+			align-items: flex-start;
+			justify-content: space-between;
 			flex: 1;
 			line-height: 38rpx;
 			&>view:first-child{
 				font-weight: bold;
-				font-size: $fontSize3;
+				font-size: $fontSize4;
+			}
+			.activity-favourites-text{
+				white-space: nowrap;
 			}
 		}
 		.activity-time{
 			margin-top: 15rpx;
 			font-family: Inter, Inter;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 		}
 		.activity-views{
 			margin-top: 15rpx;
@@ -49,15 +54,13 @@
 				@include text-ellipsis-line;
 				flex: 1;
 				margin-right: 51rpx;
-				font-size: 18rpx;
+				font-size: $fontSize1;
 				line-height: 30rpx;
 			}
 		}
 		.activity-detail-link{
 			flex-shrink: 0;
-			.van-button__text{
-				font-size: 18rpx;
-			}
+			@include link-button;
 		}
 	}
 	

static/style/pages/exhibit-item.scss

@@ -10,7 +10,7 @@
 		}
 		.exhibitor-name-cn,.exhibitor-name-en{
 			color: #7d7d7d;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			font-weight: normal;
 		}
 	}

static/style/pages/exhibitor-detail.scss

@@ -2,7 +2,7 @@
 	.exhibitor-tags{
 		display: flex;
 		align-items: flex-start;
-		font-size: 18rpx;
+		font-size: $fontSize1;
 		margin-top: 28rpx;
 		.exhibitor-tags-list{
 			display: flex;
@@ -46,6 +46,8 @@
 				font-size: $fontSize0;
 				white-space: nowrap;
 				line-height: inherit;
+				background-color: transparent;
+				border: none;
 				view{
 					display: flex;
 					align-items: center;

static/style/pages/exhibitor-item.scss

@@ -15,7 +15,7 @@
 			color: #333333;
 			font-weight: bold;
 			line-height: 38rpx;
-			font-size: $fontSize3;
+			font-size: $fontSize4;
 			margin-left: 12rpx;
 			margin-right: 28rpx;
 			&>view{
@@ -30,7 +30,7 @@
 		.exhibitor-name-en{
 			font-family: Poppins, Poppins;
 			font-weight: normal;
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 		}
 		.exhibitor-number{
 			flex-shrink: 0;
@@ -44,7 +44,7 @@
 		.exhibitor-number-text{
 			font-family: Poppins, Poppins;
 			font-weight: bold;
-			font-size: $fontSize4;
+			font-size: $fontSize5;
 			color: #E57519;
 			letter-spacing: 2rpx;
 		}
@@ -67,20 +67,22 @@
 			display: grid;
 			flex: 1;
 			grid-template-columns: repeat(4, 1fr);
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			color: #555555;
 			&>view, &>button{
 				display: flex;
 				align-items: center;
 			}
 			button{
-				font-size: $fontSize1;
+				font-size: $fontSize2;
 				white-space: nowrap;
 				line-height: inherit;
+				border: none;
+				background-color: transparent;
 				view{
 					display: flex;
 					align-items: center;
-					font-size: $fontSize1;
+					font-size: $fontSize2;
 				}
 			}
 			.iconfont{
@@ -91,7 +93,7 @@
 		
 		.exhibitor-views{
 			font-weight: 400;
-			font-size: $fontSize1;
+			font-size: $fontSize2;
 			color: #555555;
 			line-height: 20rpx;
 			margin-right: 57rpx;

static/style/pages/exhibitor.scss

@@ -3,11 +3,11 @@
 		display: grid;
 		grid-template-columns: repeat(3, minmax(0, 1fr));
 		grid-gap: 29rpx;
-		font-size: $fontSize2;
+		font-size: $fontSize3;
 		color: #333333;
 		.exhibitor-filter-label{
 			font-family: Arial, Arial;
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 			color: #333333;
 			margin-bottom: 8rpx;
 		}

static/style/pages/user-like.scss

@@ -1,4 +1,8 @@
 .user-like{
+	.user-like-tabs-wrapper {
+		border-bottom: 1rpx solid #DBDBDB;
+		padding-bottom: 10rpx;
+	}
 	.user-like-tabs{
 		width: 400rpx;
 		.van-tabs__line{
@@ -6,7 +10,7 @@
 		}
 		.van-tab{
 			color: #000000;
-			font-size: $fontSize2;
+			font-size: $fontSize3;
 		}
 	}
 	.user-like-list{

static/style/vant.scss

@@ -1,8 +1,9 @@
 .van-button{
-	font-size: $fontSize1!important;
+	font-size: $fontSize2!important;
+	line-height: inherit!important;
 }
 .van-empty__description{
-	font-size: $fontSize1!important;
+	font-size: $fontSize2!important;
 }
 @mixin van-button--base{
 	.van-button__text{
@@ -20,12 +21,13 @@
 	--button-large-height: 89rpx!important;
 	--button-border-radius: 50rpx!important;
 	.van-button__text{
-		font-size: $fontSize3;
+		font-size: $fontSize4;
 	}
 	
 }
 .van-button--normal{
 	@include van-button--base;
+	padding: 0 26rpx!important;
 }
 .van-button--primary {
 	background-color: $buttonPrimaryColor!important;
@@ -34,6 +36,11 @@
 	--button-border-radius: 6rpx;
 	--button-default-height: 50rpx;
 	--button-normal-font-size: 20rpx;
+	
+	&.van-button--plain{
+		background-color: transparent!important;
+		color: $buttonPrimaryColor!important;
+	}
 }
 .van-button--default {
 	--button-default-background-color: #FFFFFF;
@@ -62,7 +69,7 @@
 	grid-template-columns: 1fr;
 	grid-row-gap: 17rpx;
 	.van-cell__title{
-		font-size: $fontSize3;
+		font-size: $fontSize4;
 		color: #333333;
 		padding-left: 8rpx;
 	}
@@ -79,7 +86,7 @@
 		}
 	}
 	.van-cell__value{
-		font-size: $fontSize3;
+		font-size: $fontSize4;
 	}
 	.right-icon{
 		display: flex;

uni.scss

@@ -8,11 +8,20 @@ $borderLight: 2rpx solid #dddddd;
 $bgLightColor: #F5F5F5;
 
 $fontSize0: 16rpx;
-$fontSize1: 20rpx;
-$fontSize2: 24rpx;
-$fontSize3: 28rpx;
-$fontSize4: 32rpx;
-$fontSize5: 36rpx;
+$fontSize1: 18rpx;
+$fontSize2: 20rpx;
+$fontSize3: 24rpx;
+$fontSize4: 28rpx;
+$fontSize5: 32rpx;
+$fontSize6: 36rpx;
+
+// $fontSize0: 18rpx;
+// $fontSize1: 20rpx;
+// $fontSize2: 24rpx;
+// $fontSize3: 28rpx;
+// $fontSize4: 32rpx;
+// $fontSize5: 36rpx;
+// $fontSize6: 40rpx;
 
 @mixin display-flex-center {
 	display: flex;
@@ -46,4 +55,12 @@ $fontSize5: 36rpx;
 	display: block;
 	content: ' ';
 	z-index: 1;
+}
+
+@mixin link-button {
+	.van-button__text{
+		font-size: $fontSize0;
+		font-weight: bold;
+		white-space: nowrap;
+	}
 }

utils/font.js

@@ -0,0 +1,60 @@
+// 建议循环调用方法，而不是这个方法内循环下载
+// 下载字体文件，注意要把字体域名加到后台downloadFile白名单中
+function downloadFont(fontUrl, filePath, fontFamily) {
+	uni.downloadFile({
+		url: fontUrl,
+		success: res => {
+			uni.getFileSystemManager().saveFile({ // 下载成功后保存到本地
+				tempFilePath: res.tempFilePath,
+				filePath,
+				success: res => {
+					// 加载字体
+					loadFontFace(fontFamily, res.savedFilePath)
+				}
+			})
+		}
+	})
+}
+// 加载文件字体转 base64，load
+function loadFontFace(fontFamily, filePath) {
+	// 读文件
+	uni.getFileSystemManager().readFile({
+		filePath, // 本地文件地址
+		encoding: 'base64',
+		success: res => {
+			uni.loadFontFace({
+				global: true, // 是否全局生效
+				scopes: ['webview', 'native'], //native可能有点问题，超哥生个海报试一下
+				family: fontFamily, // 字体名称
+				source: `url("data:font/ttf;charset=utf-8;base64,${res.data}")`,
+				success(res) {
+					console.log(fontFamily + '加载成功：' + res.status)
+				},
+				fail: function(res) {
+					console.log(fontFamily + '加载失败' + res)
+				},
+			})
+		}
+	})
+
+
+}
+// fontUrl: 字体地址
+// filename: 存储文件路径
+// fontFamily: css 中字体的 family
+export const loadCloudFontFace = function(fontUrl, filename, fontFamily) {
+	const filePath = `${wx.env.USER_DATA_PATH}/${filename}`
+	uni.getFileSystemManager().access({
+		path: filePath,
+		success: () => {
+			loadFontFace(fontFamily, filePath)
+			console.log('从本地加载了字体');
+		},
+		fail: () => {
+			downloadFont(fontUrl, filePath, fontFamily)
+			console.log('从外部加载了字体', fontUrl);
+		}
+	})
+}
+
+export default loadCloudFontFace