From 30dbcdc6abfd00ff14e49de14aaea2fad7441a91 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Sun, 23 Mar 2025 07:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/request.ts | 2 +-
.../myPhotoProductDetail/myPhotoProductDetail.vue | 6 ++++--
pages/book/myPhotoProducts/myPhotoProducts.vue | 8 +++++---
.../myPhotoProductsOrderDetail.vue | 12 ++++++------
pages/book/photoProducts/photoProducts.vue | 14 +-------------
pages/clothesRent/component/clothesAttribute.vue | 8 +++++---
.../clothesRent/component/clothesAttributePlus.vue | 10 ++++++----
7 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/api/request.ts b/api/request.ts
index 07f68f1..e4616ea 100644
--- a/api/request.ts
+++ b/api/request.ts
@@ -6,4 +6,4 @@ export const domain = 'https://www.carboner.cn:8888/api'
export const myIp = 'http://8.130.119.119:9092/api'
export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api'
export const suiUrl = ''
-export const baseUrl = Url
+export const baseUrl = domain
diff --git a/pages/book/myPhotoProductDetail/myPhotoProductDetail.vue b/pages/book/myPhotoProductDetail/myPhotoProductDetail.vue
index 7909985..5ee0c72 100644
--- a/pages/book/myPhotoProductDetail/myPhotoProductDetail.vue
+++ b/pages/book/myPhotoProductDetail/myPhotoProductDetail.vue
@@ -40,6 +40,7 @@
import clothesAttributeVue from '../../clothesRent/component/clothesAttribute.vue';
import clothesAttributePlusVue from '../../clothesRent/component/clothesAttributePlus.vue';
import emitter from '../../../utils/emitter';
+ import { getFonts } from '../../../common/globalFont';
const book = ref(null)
const rent = ref(null)
@@ -69,6 +70,7 @@
onLoad((options) => {
+ getFonts()
id.value = JSON.parse(options.id)
isShow.value = JSON.parse(options.isShow)
})
@@ -186,7 +188,7 @@
}
.font {
font-size: 45rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
color: #323232;
}
.text {
@@ -224,7 +226,7 @@
.text_3 {
color: #ffffff;
font-size: 30rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 28.84rpx;
}
@import url(../../../common/css/global.css);
diff --git a/pages/book/myPhotoProducts/myPhotoProducts.vue b/pages/book/myPhotoProducts/myPhotoProducts.vue
index a33f281..696ce3d 100644
--- a/pages/book/myPhotoProducts/myPhotoProducts.vue
+++ b/pages/book/myPhotoProducts/myPhotoProducts.vue
@@ -53,6 +53,7 @@
import { bookUrl } from '../../../common/globalImagesUrl';
import { baseUrl } from '../../../api/request';
import { publicPath } from '../../../common/globalImagesUrl';
+ import { getFonts } from '../../../common/globalFont';
const cookie = wx.getStorageSync("cookie") //请求头
const bkgUrl = ref(bookUrl + '/myPhotoProducts/bkg.png')
@@ -75,6 +76,7 @@
const fzColor = ref({ color: '#323232', fontSize: '33.75rpx;', fontWeight: 'normal' })
onMounted(() => {
+ getFonts()
getAllData()
})
@@ -206,7 +208,7 @@
}
.font {
font-size: 33.75rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 32.83rpx;
}
.text {
@@ -256,7 +258,7 @@
}
.font_2 {
font-size: 26.25rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 25.16rpx;
color: #323232;
}
@@ -305,7 +307,7 @@
}
.font_3 {
font-size: 18.75rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 17.14rpx;
color: #ffffff;
}
diff --git a/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue b/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue
index 477d536..871fbac 100644
--- a/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue
+++ b/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue
@@ -387,7 +387,7 @@ button::after{
}
.font {
font-size: 28.13rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 26.92rpx;
color: #000000;
}
@@ -398,7 +398,7 @@ button::after{
.text_2 {
color: #6b6e72;
font-size: 24.38rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 24rpx;
}
.section_3 {
@@ -415,7 +415,7 @@ button::after{
}
.font_2 {
font-size: 28.13rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 26.92rpx;
color: #818181;
}
@@ -449,7 +449,7 @@ button::after{
}
.font_3 {
font-size: 28.13rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 26.92rpx;
color: #323232;
}
@@ -489,7 +489,7 @@ button::after{
.text_8 {
color: #000000;
font-size: 22.5rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 21.09rpx;
}
.text_9 {
@@ -511,7 +511,7 @@ button::after{
.text_11 {
color: #c35c5d;
font-size: 33.75rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 26.7rpx;
}
.view {
diff --git a/pages/book/photoProducts/photoProducts.vue b/pages/book/photoProducts/photoProducts.vue
index 0e86b40..49e6fab 100644
--- a/pages/book/photoProducts/photoProducts.vue
+++ b/pages/book/photoProducts/photoProducts.vue
@@ -175,19 +175,7 @@
}
- //获取字体
- const getFonts =()=>{
- uni.loadFontFace({
- family: 'FangZhengFonts',
- source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengFonts.TTF")`,
- success:(res) =>{
- console.log('success',res);
- },
- fail:(err) => {
- console.log('err',err);
- }
- })
- }
+
</script>
<style scoped lang="scss">
diff --git a/pages/clothesRent/component/clothesAttribute.vue b/pages/clothesRent/component/clothesAttribute.vue
index ee8b558..38255d9 100644
--- a/pages/clothesRent/component/clothesAttribute.vue
+++ b/pages/clothesRent/component/clothesAttribute.vue
@@ -53,6 +53,7 @@
import { clothesRentUrl } from '../../../common/globalImagesUrl';
import emitter from '../../../utils/emitter';
import { publicPath } from '../../../common/globalImagesUrl';
+ import { getFonts } from '../../../common/globalFont';
const clothesInfo = ref({})
const cnt = ref(1)
let singleAmount = 0
@@ -81,6 +82,7 @@
}
onMounted(() => {
+ getFonts()
emitter.on('getClothesInfo', getClothesInfoHandler)
})
@@ -110,7 +112,7 @@
}
.font {
font-size: 37.5rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 36.04rpx;
color: #323232;
}
@@ -132,7 +134,7 @@
}
.font_2 {
font-size: 33.75rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
color: #323232;
}
.text_2 {
@@ -227,7 +229,7 @@
.text_7 {
color: #ffffff;
font-size: 30rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 28.01rpx;
}
@import url(../../../common/css/global.css);
diff --git a/pages/clothesRent/component/clothesAttributePlus.vue b/pages/clothesRent/component/clothesAttributePlus.vue
index bb5a933..131a525 100644
--- a/pages/clothesRent/component/clothesAttributePlus.vue
+++ b/pages/clothesRent/component/clothesAttributePlus.vue
@@ -83,6 +83,7 @@
import { publicPath } from '../../../common/globalImagesUrl';
import { dealResult } from '../../../common/globalFunction';
import { baseUrl } from '../../../api/request';
+ import { getFonts } from '../../../common/globalFont';
let style1 = { borderColor: '#FFB6B9', backgroundColor: '#FBDEDF'}
let style2 = { borderColor: '#C3C3C3', backgroundColor: '#fff' }
@@ -145,6 +146,7 @@
}
onMounted(() => {
+ getFonts()
emitter.on('getPhotoProductsInfo', getPhotoProductsInfoHandler)
})
@@ -209,7 +211,7 @@
}
.font {
font-size: 37.5rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
color: #323232;
}
.text {
@@ -237,7 +239,7 @@
}
.font_2 {
font-size: 33.75rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 30.58rpx;
color: #323232;
}
@@ -275,7 +277,7 @@
}
.font_3 {
font-size: 26.25rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 24.21rpx;
color: #323232;
}
@@ -344,7 +346,7 @@
.text_11 {
color: #ffffff;
font-size: 30rpx;
- font-family: FZSongKeBenXiuKaiS-R-GB;
+ font-family: FangZhengFonts;
line-height: 28.01rpx;
}
@import url(../../../common/css/global.css);