From c168ac523f891055ef57d24033be8c0453b0cc6f Mon Sep 17 00:00:00 2001 From: "DESKTOP-RQ919RC\\Pc" <1300399510@qq.com> Date: Wed, 9 Apr 2025 18:53:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=B8=AD=E5=85=88=E7=9F=A5?= =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E3=80=81=E5=BC=95=E5=85=A5aribl=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=8B=9B=E7=94=9F?= =?UTF-8?q?=E5=AE=98=E9=A6=96=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 + app.wxss | 4 +- common/common.less | 2 +- common/common.wxss | 1 - component/admission-box/admission-box.js | 5 + component/admission-box/admission-box.wxml | 6 +- component/rent-pop/rent-pop.js | 5 +- component/rent-pop/rent-pop.less | 275 --------------------- component/rent-pop/rent-pop.wxml | 53 +--- component/rent-pop/rent-pop.wxss | 228 ----------------- component/survey-box/survey-box.less | 4 +- component/survey-box/survey-box.wxml | 6 +- component/survey-box/survey-box.wxss | 4 +- pages/projectDetails/projectDetails.js | 13 +- pages/projectDetails/projectDetails.less | 2 +- pages/projectDetails/projectDetails.wxml | 15 +- pages/projectDetails/projectDetails.wxss | 1 - pages/projectLibrary/projectLibrary.js | 3 - project.private.config.json | 12 +- utils/loadFont.js | 61 +++++ 20 files changed, 108 insertions(+), 594 deletions(-) create mode 100644 utils/loadFont.js diff --git a/app.js b/app.js index 5814e77..b9827df 100644 --- a/app.js +++ b/app.js @@ -7,6 +7,7 @@ var initial_url = 'https://api.gter.net/xiaoapp_offer.init.json'; var __ = require('./utils/miucms.js'); import util from './utils/util' import './utils/xstat'; +var loadFont = require("./utils/loadFont") // // 保存原始的Page构造器 // const originPage = Page; @@ -91,6 +92,7 @@ App({ } } __.initial(this) + loadFont.loadCloudFontFace("https://app.gter.net/image/miniApp/offer/font/arial-black.ttf", "arial-black.ttf", "Arial") }, computeNavigateBarHeight: function () { diff --git a/app.wxss b/app.wxss index bdddf66..be313d7 100644 --- a/app.wxss +++ b/app.wxss @@ -84,7 +84,7 @@ } /* 字体 Arial-Black 只有0到9 */ -@font-face { +/* @font-face { font-family: 'Arial'; src: url('data:font/woff2;charset=utf-8;base64,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') format('woff2'), url('data:font/woff;charset=utf-8;base64,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') format('woff'), @@ -92,7 +92,7 @@ font-weight: 900; font-style: normal; font-display: swap; -} +} */ .organ-item.qs { background-color: #f7a602; diff --git a/common/common.less b/common/common.less index cac7e20..5f7836c 100644 --- a/common/common.less +++ b/common/common.less @@ -642,7 +642,7 @@ border-radius: 55.5rpx; font-size: 23rpx; color: #72DB86; - font-family: 'ArialMT', 'Arial', sans-serif; + // font-family: 'ArialMT', 'Arial', sans-serif; } } diff --git a/common/common.wxss b/common/common.wxss index 1f8349c..f750289 100644 --- a/common/common.wxss +++ b/common/common.wxss @@ -544,7 +544,6 @@ border-radius: 55.5rpx; font-size: 23rpx; color: #72DB86; - font-family: 'ArialMT', 'Arial', sans-serif; } .victory-offer-item .victory-offer-info-box .line-between { margin: 0 14rpx; diff --git a/component/admission-box/admission-box.js b/component/admission-box/admission-box.js index 0bbef21..8e16b23 100644 --- a/component/admission-box/admission-box.js +++ b/component/admission-box/admission-box.js @@ -99,6 +99,11 @@ Component({ timestamp: "", }) + urls.unshift({ + mold: 5, + timestamp: "", + }) + this.setData({ urls, }) diff --git a/component/admission-box/admission-box.wxml b/component/admission-box/admission-box.wxml index 62f0aea..7d63e3a 100644 --- a/component/admission-box/admission-box.wxml +++ b/component/admission-box/admission-box.wxml @@ -1,6 +1,6 @@ - + @@ -22,8 +22,8 @@ - - + + diff --git a/component/rent-pop/rent-pop.js b/component/rent-pop/rent-pop.js index 67e6389..a048553 100644 --- a/component/rent-pop/rent-pop.js +++ b/component/rent-pop/rent-pop.js @@ -44,10 +44,7 @@ Component({ appId: this.data.popup.applet.appid, path: this.data.popup.applet.path, }) - } else { - common.goPage("/pages/webview/webview?url=" + encodeURIComponent(this.data.popup.url || '')) - } - + } else common.goPage("/pages/webview/webview?url=" + encodeURIComponent(this.data.popup.url || '')) this.close() }, } diff --git a/component/rent-pop/rent-pop.less b/component/rent-pop/rent-pop.less index c28f347..782d7f2 100644 --- a/component/rent-pop/rent-pop.less +++ b/component/rent-pop/rent-pop.less @@ -1,33 +1,10 @@ /* template/rent-pop/rent-pop.wxss */ -view { - box-sizing: border-box; -} - -/* 公共的 css 样式 */ -.flexflex { - display: flex; -} - .flexcenter { display: flex; justify-content: center; align-items: center; } -.flexjcenter { - display: flex; - justify-content: center; -} - -.flexacenter { - display: flex; - align-items: center; -} - -.flex1 { - flex: 1; -} - .flexcolumn { display: flex; flex-direction: column; @@ -43,258 +20,6 @@ view { z-index: 100; } -.box { - width: 630rpx; - height: 990rpx; - position: relative; - z-index: 1; - margin-bottom: 49.5rpx; - - transform-style: preserve-3d; - // animation: rotateAnimation .3s; - - @keyframes rotateAnimation { - 0% { - transform: rotateY(180deg); - } - - 100% { - transform: rotateY(0deg); - } - } - - .star { - position: absolute; - } - - .star1 { - width: 60rpx; - height: 60rpx; - top: 649.5rpx; - left: -60rpx; - } - - .star2 { - width: 72rpx; - height: 72rpx; - top: -85.5rpx; - right: 66rpx; - } - - .star3 { - width: 78rpx; - height: 78rpx; - right: -30rpx; - bottom: -76.5rpx; - } - - .bj { - width: 630rpx; - height: 990rpx; - position: absolute; - top: 0; - left: 0; - z-index: -1; - } - - .city-bj { - width: 630rpx; - height: 517.5rpx; - position: absolute; - left: 0; - bottom: 0; - z-index: -1; - - } - - .head { - position: relative; - margin: 0 auto; - width: 300rpx; - display: flex; - - - .head-bj { - position: absolute; - left: -7.5rpx; - top: -7.5rpx; - width: 315rpx; - height: 228rpx; - transform: rotate(180deg); - z-index: -1; - } - - .head-box { - height: 84rpx; - position: relative; - z-index: 1; - width: 300rpx; - - .icon { - width: 30rpx; - height: 30rpx; - margin-right: 6rpx; - } - - .xg { - width: 67.5rpx; - height: 43.5rpx; - } - } - } - - .main { - width: 561rpx; - height: 843rpx; - background: linear-gradient(180deg, rgba(247, 247, 247, 1) 1%, rgba(242, 242, 242, 1) 100%); - border: 1rpx solid rgba(51, 51, 51, 1); - margin-left: 40.5rpx; - position: relative; - z-index: 1; - - .main-bj { - position: absolute; - top: 10.5rpx; - left: -10.5rpx; - width: 561rpx; - height: 843rpx; - background: linear-gradient(180deg, rgba(247, 247, 247, 1) 1%, rgba(242, 242, 242, 1) 100%); - border: 1rpx solid rgba(51, 51, 51, 1); - z-index: -10; - padding-top: 24rpx; - - .title { - width: 487.5rpx; - height: 75rpx; - margin-bottom: 18rpx; - } - - .title-line { - width: 481.5rpx; - height: 3rpx; - margin-bottom: 22.5rpx; - } - - .hint { - width: 387rpx; - height: 54rpx; - margin-bottom: 28.5rpx; - } - - .data { - position: relative; - width: 480rpx; - height: 136rpx; - z-index: 1; - margin-bottom: 35rpx; - - .data-bj { - width: 480rpx; - height: 136rpx; - position: absolute; - top: 0; - left: 0; - z-index: -1; - } - - .item { - text-align: center; - - .value { - font-family: 'Arial-Black', 'Arial Black', sans-serif; - font-weight: 900; - font-size: 42rpx; - color: #000000; - text-align: center; - } - - .text { - color: #333333; - font-size: 27rpx; - } - } - - .line { - width: 1rpx; - height: 94.5rpx; - border-right: 1rpx dotted #797979; - margin: 0 52.5rpx; - } - } - - .img-box { - width: 480rpx; - height: 376.5rpx; - position: relative; - z-index: 1; - margin-bottom: 10rpx; - - .img { - position: absolute; - left: -10.5rpx; - top: -10.5rpx; - width: 501rpx; - height: 397.5rpx; - z-index: -1; - } - - .text { - font-weight: 400; - font-style: normal; - font-size: 22.5rpx; - color: #555555; - text-align: center; - position: absolute; - width: 100%; - text-align: center; - bottom: 20rpx; - } - } - - .arrows { - .icon { - - &:nth-child(2) { - margin: 0 15rpx; - } - - width: 45rpx; - height: 45rpx; - } - } - } - } -} - -.btn { - position: relative; - width: 450rpx; - height: 96rpx; - background: -webkit-linear-gradient(270deg, rgba(252, 253, 206, 1) 0%, rgba(210, 213, 29, 1) 52%, rgba(251, 252, 203, 1) 100%); - background: -moz-linear-gradient(180deg, rgba(252, 253, 206, 1) 0%, rgba(210, 213, 29, 1) 52%, rgba(251, 252, 203, 1) 100%); - background: linear-gradient(180deg, rgba(252, 253, 206, 1) 0%, rgba(210, 213, 29, 1) 52%, rgba(251, 252, 203, 1) 100%); - border: none; - border-radius: 225rpx; - - .img { - width: 199.5rpx; - height: 70.5rpx; - margin-right: 18rpx; - } - - .arrows { - width: 45rpx; - height: 45rpx; - } -} - -.close { - width: 36rpx; - height: 36rpx; - position: absolute; - bottom: -100rpx; -} - .imgimg { width: 100vw; height: 500rpx; diff --git a/component/rent-pop/rent-pop.wxml b/component/rent-pop/rent-pop.wxml index febbbfd..0457548 100644 --- a/component/rent-pop/rent-pop.wxml +++ b/component/rent-pop/rent-pop.wxml @@ -1,55 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 40+ - 学生公寓 - - - - 5000+ - 真实房源 - - - - - @ 学生公寓实景照片 - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/component/rent-pop/rent-pop.wxss b/component/rent-pop/rent-pop.wxss index 276bfc9..475c681 100644 --- a/component/rent-pop/rent-pop.wxss +++ b/component/rent-pop/rent-pop.wxss @@ -1,27 +1,9 @@ /* template/rent-pop/rent-pop.wxss */ -view { - box-sizing: border-box; -} -/* 公共的 css 样式 */ -.flexflex { - display: flex; -} .flexcenter { display: flex; justify-content: center; align-items: center; } -.flexjcenter { - display: flex; - justify-content: center; -} -.flexacenter { - display: flex; - align-items: center; -} -.flex1 { - flex: 1; -} .flexcolumn { display: flex; flex-direction: column; @@ -35,216 +17,6 @@ view { background-color: rgba(0, 0, 0, 0.71764706); z-index: 100; } -.box { - width: 630rpx; - height: 990rpx; - position: relative; - z-index: 1; - margin-bottom: 49.5rpx; - transform-style: preserve-3d; -} -@keyframes rotateAnimation { - 0% { - transform: rotateY(180deg); - } - 100% { - transform: rotateY(0deg); - } -} -.box .star { - position: absolute; -} -.box .star1 { - width: 60rpx; - height: 60rpx; - top: 649.5rpx; - left: -60rpx; -} -.box .star2 { - width: 72rpx; - height: 72rpx; - top: -85.5rpx; - right: 66rpx; -} -.box .star3 { - width: 78rpx; - height: 78rpx; - right: -30rpx; - bottom: -76.5rpx; -} -.box .bj { - width: 630rpx; - height: 990rpx; - position: absolute; - top: 0; - left: 0; - z-index: -1; -} -.box .city-bj { - width: 630rpx; - height: 517.5rpx; - position: absolute; - left: 0; - bottom: 0; - z-index: -1; -} -.box .head { - position: relative; - margin: 0 auto; - width: 300rpx; - display: flex; -} -.box .head .head-bj { - position: absolute; - left: -7.5rpx; - top: -7.5rpx; - width: 315rpx; - height: 228rpx; - transform: rotate(180deg); - z-index: -1; -} -.box .head .head-box { - height: 84rpx; - position: relative; - z-index: 1; - width: 300rpx; -} -.box .head .head-box .icon { - width: 30rpx; - height: 30rpx; - margin-right: 6rpx; -} -.box .head .head-box .xg { - width: 67.5rpx; - height: 43.5rpx; -} -.box .main { - width: 561rpx; - height: 843rpx; - background: linear-gradient(180deg, #f7f7f7 1%, #f2f2f2 100%); - border: 1rpx solid #333333; - margin-left: 40.5rpx; - position: relative; - z-index: 1; -} -.box .main .main-bj { - position: absolute; - top: 10.5rpx; - left: -10.5rpx; - width: 561rpx; - height: 843rpx; - background: linear-gradient(180deg, #f7f7f7 1%, #f2f2f2 100%); - border: 1rpx solid #333333; - z-index: -10; - padding-top: 24rpx; -} -.box .main .main-bj .title { - width: 487.5rpx; - height: 75rpx; - margin-bottom: 18rpx; -} -.box .main .main-bj .title-line { - width: 481.5rpx; - height: 3rpx; - margin-bottom: 22.5rpx; -} -.box .main .main-bj .hint { - width: 387rpx; - height: 54rpx; - margin-bottom: 28.5rpx; -} -.box .main .main-bj .data { - position: relative; - width: 480rpx; - height: 136rpx; - z-index: 1; - margin-bottom: 35rpx; -} -.box .main .main-bj .data .data-bj { - width: 480rpx; - height: 136rpx; - position: absolute; - top: 0; - left: 0; - z-index: -1; -} -.box .main .main-bj .data .item { - text-align: center; -} -.box .main .main-bj .data .item .value { - font-family: 'Arial-Black', 'Arial Black', sans-serif; - font-weight: 900; - font-size: 42rpx; - color: #000000; - text-align: center; -} -.box .main .main-bj .data .item .text { - color: #333333; - font-size: 27rpx; -} -.box .main .main-bj .data .line { - width: 1rpx; - height: 94.5rpx; - border-right: 1rpx dotted #797979; - margin: 0 52.5rpx; -} -.box .main .main-bj .img-box { - width: 480rpx; - height: 376.5rpx; - position: relative; - z-index: 1; - margin-bottom: 10rpx; -} -.box .main .main-bj .img-box .img { - position: absolute; - left: -10.5rpx; - top: -10.5rpx; - width: 501rpx; - height: 397.5rpx; - z-index: -1; -} -.box .main .main-bj .img-box .text { - font-weight: 400; - font-style: normal; - font-size: 22.5rpx; - color: #555555; - position: absolute; - width: 100%; - text-align: center; - bottom: 20rpx; -} -.box .main .main-bj .arrows .icon { - width: 45rpx; - height: 45rpx; -} -.box .main .main-bj .arrows .icon:nth-child(2) { - margin: 0 15rpx; -} -.btn { - position: relative; - width: 450rpx; - height: 96rpx; - background: -webkit-linear-gradient(270deg, #fcfdce 0%, #d2d51d 52%, #fbfccb 100%); - background: -moz-linear-gradient(180deg, #fcfdce 0%, #d2d51d 52%, #fbfccb 100%); - background: linear-gradient(180deg, #fcfdce 0%, #d2d51d 52%, #fbfccb 100%); - border: none; - border-radius: 225rpx; -} -.btn .img { - width: 199.5rpx; - height: 70.5rpx; - margin-right: 18rpx; -} -.btn .arrows { - width: 45rpx; - height: 45rpx; -} -.close { - width: 36rpx; - height: 36rpx; - position: absolute; - bottom: -100rpx; -} .imgimg { width: 100vw; height: 500rpx; diff --git a/component/survey-box/survey-box.less b/component/survey-box/survey-box.less index 8c4570a..9671772 100644 --- a/component/survey-box/survey-box.less +++ b/component/survey-box/survey-box.less @@ -61,7 +61,7 @@ .title { text-align: center; color: #333333; - font-size: 21rpx; + font-size: 25rpx; margin: 0 auto 21rpx; height: 34.5rpx; @@ -122,7 +122,7 @@ line-height: 28.5rpx; .remark-ps { - font-family: 'Arial-Black', 'Arial Black', sans-serif; + font-family: 'Arial', 'Arial-Black', 'Arial Black', sans-serif; font-weight: 900; color: #000000; font-size: 21rpx; diff --git a/component/survey-box/survey-box.wxml b/component/survey-box/survey-box.wxml index a0c1480..133eeb2 100644 --- a/component/survey-box/survey-box.wxml +++ b/component/survey-box/survey-box.wxml @@ -22,15 +22,15 @@ - {{ duckProphet.studentcount || '-' }} + {{ duckProphet.studentcount || '0' }} 人数 - {{ duckProphet.offercount || '-' }} + {{ duckProphet.offercount || '0' }} Offer - {{ duckProphet.rejectcount || '-' }} + {{ duckProphet.rejectcount || '0' }} 拒信 diff --git a/component/survey-box/survey-box.wxss b/component/survey-box/survey-box.wxss index 68b742c..9d727c2 100644 --- a/component/survey-box/survey-box.wxss +++ b/component/survey-box/survey-box.wxss @@ -51,7 +51,7 @@ .survey .survey-box .title { text-align: center; color: #333333; - font-size: 21rpx; + font-size: 25rpx; margin: 0 auto 21rpx; height: 34.5rpx; } @@ -100,7 +100,7 @@ line-height: 28.5rpx; } .survey .remark .remark-ps { - font-family: 'Arial-Black', 'Arial Black', sans-serif; + font-family: 'Arial', 'Arial-Black', 'Arial Black', sans-serif; font-weight: 900; color: #000000; font-size: 21rpx; diff --git a/pages/projectDetails/projectDetails.js b/pages/projectDetails/projectDetails.js index 1a8ed89..1d88ee2 100644 --- a/pages/projectDetails/projectDetails.js +++ b/pages/projectDetails/projectDetails.js @@ -283,7 +283,7 @@ Page({ newest: data.newest || '', }) - const admissionsId = admissions[0].id + const admissionsId = admissions?.[0]?.id this.handleAmissionsData(admissionsId) this.handleRequirementData(admissionsId) this.getRecommendData() @@ -304,7 +304,14 @@ Page({ return } - const data = res.data + let data = res.data + // data = { + // earliestdate: "2025-06-09", + // latestdate: "2023-04-06", + // offercount: 0, + // rejectcount: 10, + // studentcount: 0, + // } const hasValidCount = data.studentcount || data.offercount || data.rejectcount; const shouldResetSide = !hasValidCount && this.data.offerShowList.length === 0 && this.data.offerPage !== 1; this.setData({ @@ -968,7 +975,7 @@ Page({ cutDemandState() { this.setData({ demandState: this.data.demandState == 1 ? 2 : 1 - }) + }, () => setTimeout(() => this.getHeadHeight(), 500)) }, // 获取 格式 2025Fall diff --git a/pages/projectDetails/projectDetails.less b/pages/projectDetails/projectDetails.less index 02d639e..1adf972 100644 --- a/pages/projectDetails/projectDetails.less +++ b/pages/projectDetails/projectDetails.less @@ -1757,7 +1757,7 @@ navigator { border-radius: 55.5rpx; font-size: 23rpx; color: #72DB86; - font-family: 'ArialMT', 'Arial', sans-serif; + // font-family: 'ArialMT', 'Arial', sans-serif; } } diff --git a/pages/projectDetails/projectDetails.wxml b/pages/projectDetails/projectDetails.wxml index 3998d06..e6c6d46 100644 --- a/pages/projectDetails/projectDetails.wxml +++ b/pages/projectDetails/projectDetails.wxml @@ -203,7 +203,7 @@ - P.S. + P.S. 某些学科属跨学科专业（如建筑师兼顾工学和艺术学），系统自动从排名分类里找到最接近的进行展示。 @@ -586,18 +586,19 @@ 打开文件 - + 研究生院申请页项目详情 - {{ info.website_en }} - + {{ admissionsObj.application_url }} + 复制链接 - + + 学院网站项目详情 - {{ admissionsObj.application_url }} - + {{ info.website_en }} + 复制链接 diff --git a/pages/projectDetails/projectDetails.wxss b/pages/projectDetails/projectDetails.wxss index 3a40fdf..033b5e1 100644 --- a/pages/projectDetails/projectDetails.wxss +++ b/pages/projectDetails/projectDetails.wxss @@ -1428,7 +1428,6 @@ navigator { border-radius: 55.5rpx; font-size: 23rpx; color: #72DB86; - font-family: 'ArialMT', 'Arial', sans-serif; } .details-box .consult-list .consult-item .info-xiaobox { width: 519rpx; diff --git a/pages/projectLibrary/projectLibrary.js b/pages/projectLibrary/projectLibrary.js index c6165a1..9baa74e 100644 --- a/pages/projectLibrary/projectLibrary.js +++ b/pages/projectLibrary/projectLibrary.js @@ -420,7 +420,6 @@ Page({ status: 1, ismanage: 1, } - console.log("listLeft", listLeft, index, "index"); this.setData({ listLeft, }) @@ -549,7 +548,6 @@ Page({ if (type == 'admission') { const admissionList = this.data.admissionList admissionList.forEach(element => { - console.log("element", element); element.forEach(ele => { ele['moreState'] = false }) @@ -802,7 +800,6 @@ Page({ data.forEach(element => { element['mechanism'] = this.rankingsObj[element.mechanism]?.name || element.mechanism }) - data[0].subject = "Anthropology Anthropology Anthropology Anthropology Anthropology" let arr = [data.slice(0, 5), data.slice(5, 10), data.slice(10, 15)] this.setData({ rankingList: arr diff --git a/project.private.config.json b/project.private.config.json index 18935d5..3fe104b 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -9,16 +9,16 @@ "miniprogram": { "list": [ { - "name": "pages/projectComparison/projectComparison", - "pathName": "pages/projectComparison/projectComparison", - "query": "ids=1%2C5", + "name": "pages/projectDetails/projectDetails", + "pathName": "pages/projectDetails/projectDetails", + "query": "uniqid=f0C0aKS1aKrb", "launchMode": "default", "scene": null }, { - "name": "pages/projectDetails/projectDetails", - "pathName": "pages/projectDetails/projectDetails", - "query": "uniqid=ayPLvLzbaf8K", + "name": "pages/projectComparison/projectComparison", + "pathName": "pages/projectComparison/projectComparison", + "query": "ids=1%2C5", "launchMode": "default", "scene": null }, diff --git a/utils/loadFont.js b/utils/loadFont.js new file mode 100644 index 0000000..c457b03 --- /dev/null +++ b/utils/loadFont.js @@ -0,0 +1,61 @@ +// 下载字体文件，注意要把字体域名加到后台downloadFile白名单中 +function _downloadFont(fontUrl, filePath, fontFamily) { + wx.downloadFile({ + url: fontUrl, + success: res => { + wx.getFileSystemManager().saveFile({ // 下载成功后保存到本地 + tempFilePath: res.tempFilePath, + filePath, + success: res => { + // 加载字体 + _loadFontFace(fontFamily, res.savedFilePath) + } + }) + } + }) +} +// 加载文件字体转 base64，load +function _loadFontFace(fontFamily, filePath) { + // 读文件 + wx.getFileSystemManager().readFile({ + filePath, // 本地文件地址 + encoding: 'base64', + success: res => { + wx.loadFontFace({ + global: true, // 是否全局生效 + scopes: ['webview', 'native'], // + family: fontFamily, // 字体名称 + source: `url("data:font/truetype;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 +function loadCloudFontFace(fontUrl, filename, fontFamily) { + const filePath = `${wx.env.USER_DATA_PATH}/${filename}` + wx.getFileSystemManager().access({ + path: filePath, + success: () => { + _loadFontFace(fontFamily, filePath) + console.log('从本地加载了字体', filePath); + }, + fail: () => { + _downloadFont(fontUrl, filePath, fontFamily) + console.log('从外部加载了字体', fontUrl); + } + }) +} + +module.exports = { + loadCloudFontFace +} \ No newline at end of file