From 8c3b39326581a8e7ec48b7e922457b44bbc8306e Mon Sep 17 00:00:00 2001
From: yuanteng0011 <1876787513@qq.com>
Date: Tue, 4 Mar 2025 16:27:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=92=8C=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request.ts                                |   2 +-
 .../productmain/testproductmain.vue           |   3 +-
 pages/book/component/feeTips.vue              |  26 +-
 pages/book/photoProducts/photoProducts.vue    |  21 +-
 .../photoProductsOrder/photoProductsOrder.vue |  29 +-
 .../photoProductsOrderDetail.vue              |  41 +--
 pages/login/login.vue                         |   2 +-
 pages/mine/Contact/testContact.vue            |  22 +-
 pages/mine/addressList/addressList.vue        |  27 +-
 pages/mine/bookings/booking.vue               | 261 -----------------
 pages/mine/bookings/bookings.vue              | 275 ------------------
 pages/mine/component/contactPop.vue           |  20 +-
 pages/order/component/addressComponent.vue    |  15 +-
 .../service-paystatus/service-paystatus.vue   |  68 +++--
 pages/test/test.vue                           |   4 +-
 pages/workshop/component/timeSelect.vue       |  15 +-
 16 files changed, 213 insertions(+), 618 deletions(-)
 delete mode 100644 pages/mine/bookings/booking.vue
 delete mode 100644 pages/mine/bookings/bookings.vue

diff --git a/api/request.ts b/api/request.ts
index 391010b..aa8d37c 100644
--- a/api/request.ts
+++ b/api/request.ts
@@ -4,4 +4,4 @@ export const suiUrl = 'http://154.8.193.216:9092/api'  //隋宇霏的接口地
 export const domain = 'https://www.carboner.cn/api'
 export const myIp = 'http://8.130.119.119:9092/api'
 
-export const baseUrl = Url
+export const baseUrl = testUrl
diff --git a/pages/Shopping-cart/productmain/testproductmain.vue b/pages/Shopping-cart/productmain/testproductmain.vue
index c75911f..f8006b7 100644
--- a/pages/Shopping-cart/productmain/testproductmain.vue
+++ b/pages/Shopping-cart/productmain/testproductmain.vue
@@ -334,7 +334,8 @@
 			products.value.forEach((item) => {
 				item.checked = false //将全部都取消选择
 			})
-		}
+			checkedData.value = []
+		} 
 	}
 	//减少商品(适用于服务类和商品类)
 	const decrease = (index, item) => { //item用于监测是否选中
diff --git a/pages/book/component/feeTips.vue b/pages/book/component/feeTips.vue
index 63833e9..abebb6b 100644
--- a/pages/book/component/feeTips.vue
+++ b/pages/book/component/feeTips.vue
@@ -47,11 +47,27 @@
 </template>
 
 <script setup lang="ts">
+import { onMounted } from 'vue';
 import emitter from '../../../utils/emitter';
+onMounted(()=>{
+	getFonts()
+})
 	const closeFeeTips = () => {
 		emitter.emit('closeFeeTips')
 	}
-	
+	//获取字体
+	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">
@@ -79,7 +95,7 @@ import emitter from '../../../utils/emitter';
 	.text {
 	  color: #000000;
 	  font-size: 36.99rpx;
-	  font-family: FZSongKeBenXiuKaiS-R-GB;
+	  font-family: FangZhengFonts;
 	  line-height: 36.12rpx;
 	}
 	.group {
@@ -87,13 +103,13 @@ import emitter from '../../../utils/emitter';
 	}
 	.font {
 	  font-size: 32.88rpx;
-	  font-family: FZSongKeBenXiuKaiS-R-GB;
+	  font-family: FangZhengFonts;
 	  line-height: 39.04rpx;
 	  color: #323232;
 	}
 	.font_2 {
 	  font-size: 28.77rpx;
-	  font-family: FZSongKeBenXiuKaiS-R-GB;
+	  font-family: FangZhengFonts;
 	  line-height: 34.93rpx;
 	  color: #323232;
 	}
@@ -111,7 +127,7 @@ import emitter from '../../../utils/emitter';
 	}
 	.font_3 {
 	  font-size: 32.88rpx;
-	  font-family: FZSongKeBenXiuKaiS-R-GB;
+	  font-family: FangZhengFonts;
 	  line-height: 31.73rpx;
 	  color: #323232;
 	}
diff --git a/pages/book/photoProducts/photoProducts.vue b/pages/book/photoProducts/photoProducts.vue
index 253a026..d172783 100644
--- a/pages/book/photoProducts/photoProducts.vue
+++ b/pages/book/photoProducts/photoProducts.vue
@@ -73,6 +73,7 @@
 	const point = ref(0)
 	
 	onMounted( async () => {
+		getFonts()
 		await getAllCategory()
 		await getPhotoProductsByCategoryId(categoryName.value)
 		getSpecialIds()
@@ -166,7 +167,19 @@
 	}
 	
 	
-	
+	//获取字体
+	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">
@@ -206,7 +219,7 @@
 }
 .font {
   font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 28.71rpx;
   color: #323232;
 }
@@ -261,7 +274,7 @@
 }
 .font_2 {
   font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 25.16rpx;
   color: #000000;
 }
@@ -319,7 +332,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/photoProductsOrder/photoProductsOrder.vue b/pages/book/photoProductsOrder/photoProductsOrder.vue
index 34494a8..3bcbb3e 100644
--- a/pages/book/photoProductsOrder/photoProductsOrder.vue
+++ b/pages/book/photoProductsOrder/photoProductsOrder.vue
@@ -209,6 +209,7 @@
 	
 	
 	onMounted(() => {
+		getFonts()
 		getDefaultAddress()
 		getPhotoProductsById()
 		emitter.on('closeBookingTips', () => {
@@ -377,7 +378,19 @@
 
 	
 
-	
+	//获取字体
+	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">
@@ -450,7 +463,7 @@
 }
 .font {
   font-size: 37.5rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 35.01rpx;
   color: #000000;
 }
@@ -473,7 +486,7 @@
 }
 .font_2 {
   font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 28.01rpx;
   color: #000000;
 }
@@ -515,7 +528,7 @@
 }
 .font_3 {
   font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 24.3rpx;
   color: #8b8b8b;
 }
@@ -573,7 +586,7 @@
 }
 .font_4 {
   font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 20.04rpx;
   color: #8b8b8b;
 }
@@ -612,7 +625,7 @@
 }
 .font_5 {
   font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 20.04rpx;
   color: #323232;
 }
@@ -642,7 +655,7 @@
 }
 .font_6 {
   font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 24.3rpx;
   color: #000000;
 }
@@ -661,7 +674,7 @@
 .text_11 {
   color: #000000;
   font-size: 22.5rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 21.09rpx;
 }
 .section_6 {
diff --git a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
index b5b3cf1..fdda0ed 100644
--- a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
+++ b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
@@ -135,6 +135,7 @@ import { getFonts } from '../../../common/globalFont';
 	})
 	
 	onMounted( async () => {
+		getFonts()
 		await getAdvanceOrder()
 		emitter.on('closeCancelOrderPopup', () => {
 			nextTick(() => {
@@ -400,33 +401,19 @@ import { getFonts } from '../../../common/globalFont';
 	})
 	
 
-	
-	
-	
-	
-	
-	
-	 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+	//获取字体
+	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/login/login.vue b/pages/login/login.vue
index 144b436..cbb9aa7 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -98,7 +98,7 @@ const getFonts =()=>{  //获取字体
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  height: 100%;
+  height: 100vh;
 }
 .section_2 {
   margin-left: 256.88rpx;
diff --git a/pages/mine/Contact/testContact.vue b/pages/mine/Contact/testContact.vue
index d7a6059..71c9d29 100644
--- a/pages/mine/Contact/testContact.vue
+++ b/pages/mine/Contact/testContact.vue
@@ -44,6 +44,7 @@
 	const ContactArr = ref() //联系人数组
 	const popup = ref(null) //弹窗对象
 	onMounted(() => {
+		getFonts()
 		getContactInfo() //获取联系人信息
 		emitter.on('closeContactPop',()=>{
 			close()
@@ -114,6 +115,19 @@
 			}
 		})
 	}
+	//获取字体
+	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 lang="scss" scoped>
@@ -145,7 +159,7 @@
 	.text {
 		color: #000000;
 		font-size: 37.5rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 36.47rpx;
 	}
 
@@ -174,14 +188,14 @@
 
 	.font {
 		font-size: 30rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 25.89rpx;
 		color: #323232;
 	}
 
 	.font_2 {
 		font-size: 30rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 20.04rpx;
 		color: #323232;
 	}
@@ -196,7 +210,7 @@
 	.text_2 {
 		color: #c35c5d;
 		font-size: 22.5rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
+		font-family: FangZhengFonts;
 		line-height: 18.71rpx;
 		margin-top: 8rpx;
 	}
diff --git a/pages/mine/addressList/addressList.vue b/pages/mine/addressList/addressList.vue
index 28ed431..cb7b1fc 100644
--- a/pages/mine/addressList/addressList.vue
+++ b/pages/mine/addressList/addressList.vue
@@ -41,9 +41,9 @@ import { baseUrl } from '../../../api/request';
 import { onShow } from '@dcloudio/uni-app';
 const items = ref([null,null,null,null,null,null,null,null,null])
 const addressArr = ref([])  //地址数组
-// onMounted(()=>{
-// 	getAddress()
-// })
+onMounted(()=>{
+	getFonts()  //获取字体
+})
 onShow(()=>{
 	getAddress()
 })
@@ -101,6 +101,19 @@ const jump_newAddress =()=> {
 		url: '/pages/Shopping-cart/newaddress_Info/newaddress_Info'
 	})
 }
+//获取字体
+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 lang="scss" scoped>
@@ -131,13 +144,13 @@ const jump_newAddress =()=> {
 }
 .font {
   font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 25.89rpx;
   color: #323232;
 }
 .font_2 {
   font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 20.04rpx;
   color: #323232;
 }
@@ -155,7 +168,7 @@ const jump_newAddress =()=> {
 .text_2 {
   color: #c35c5d;
   font-size: 22.5rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   // line-height: 18.71rpx;
 }
 .image {
@@ -165,7 +178,7 @@ const jump_newAddress =()=> {
 }
 .font_3 {
   font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 31.88rpx;
   color: #818181;
 }
diff --git a/pages/mine/bookings/booking.vue b/pages/mine/bookings/booking.vue
deleted file mode 100644
index 3792d5b..0000000
--- a/pages/mine/bookings/booking.vue
+++ /dev/null
@@ -1,261 +0,0 @@
-<template>
-	<view class="flex-col page">
-		<view class="flex-col section">
-			<view class="flex-row justify-between self-stretch group">
-				<text class="font text">待消费</text>
-				<text class="font text_2" @click="goto()">已消费</text>
-			</view>
-			<view class="self-start section_2"></view>
-		</view>
-		<view class="flex-col section_3 mt-13" v-for="i in item">
-			<text class="self-end font_2 text_3">待消费</text>
-			<view class="flex-row items-baseline self-stretch group_2">
-				<text class="font_3 text_4">订单编号：</text>
-				<text class="font_3 text_5 ml-5">E20241005095840091406189</text>
-			</view>
-			<view class="flex-row self-stretch group_3">
-				<image class="shrink-0 image"
-					src="https://ide.code.fun/api/image?token=6736eddfc471750012df05d6&name=bc0e955304da0a2ccafe3a66ac1f3aca.png" />
-				<view class="flex-col flex-1 group_4">
-					<view class="flex-row justify-center self-stretch relative">
-						<text class="font_2 text_6 pos">整套约拍</text>
-						<text class="font_2 text_7">【时尚精选】</text>
-					</view>
-					<text class="self-start font_5 text_10">到店日期：2024-10-15</text>
-					<text class="self-start font_5 text_1">具体场次：上午场（09:30-12:00）</text>
-					<text class="self-stretch text_11">已选服务：妆发服务；摄影服务;室内；</text>
-				</view>
-				<view class="flex-row items-center shrink-0 self-start group_5">
-					<text class="text_8">138.</text>
-					<image class="shrink-0 image_2 image_3"
-						src="https://ide.code.fun/api/image?token=6736eddfc471750012df05d6&name=6c5700b3ac5fd83a23d838cb456bdd10.png" />
-					<text class="font_4 text_9">00</text>
-				</view>
-			</view>
-			<view class="flex-row justify-end items-center self-stretch group_6">
-				<text class="font_2 text_12">去支付：</text>
-				<image class="image_2"
-					src="https://ide.code.fun/api/image?token=6736eddfc471750012df05d6&name=ea05ec17023763edb8cfe919508e0459.png" />
-				<view class="group_7">
-					<text class="text_13">88</text>
-					<text class="font_4 text_14">.00</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
- import { ref } from 'vue'
- const item = ref([null,null,null])
- const goto=()=>{
-	 uni.navigateTo({
-	 	url:'/pages/mine/bookings/bookings'
-	 })
- }
-</script>
-
-<style lang="scss" scoped>
-	.mt-13 {
-		margin-top: 24.38rpx;
-	}
-
-	.ml-5 {
-		margin-left: 9.38rpx;
-	}
-
-	.page {
-		padding-bottom: 1185rpx;
-		background-color: #f8e8c1;
-		width: 100%;
-		overflow-y: auto;
-		overflow-x: hidden;
-		height: 100%;
-	}
-
-	.section {
-		padding: 0 121.88rpx;
-		background-color: #fffef8;
-	}
-
-	.group {
-		padding: 21.68rpx 4.71rpx 18.23rpx 10.22rpx;
-	}
-
-	.font {
-		font-size: 30rpx;
-		font-family: Open Sans;
-		line-height: 26.25rpx;
-		color: #323232;
-	}
-
-	.text {
-		line-height: 27.6rpx;
-	}
-
-	.text_2 {
-		line-height: 27.6rpx;
-	}
-
-	.section_2 {
-		background-color: #fb8b05;
-		width: 112.5rpx;
-		height: 5.63rpx;
-	}
-
-	.section_3 {
-		margin-left: 16.88rpx;
-		margin-right: 15rpx;
-		padding: 35.4rpx 19.89rpx 35.4rpx 24.38rpx;
-		background-color: #fffef8;
-		border-radius: 18.75rpx;
-	}
-
-	.font_2 {
-		font-size: 26.25rpx;
-		font-family: Open Sans;
-		line-height: 26.25rpx;
-		color: #323232;
-	}
-
-	.text_3 {
-		color: #fb8b05;
-		line-height: 24.15rpx;
-	}
-
-	.group_2 {
-		margin-top: 18.49rpx;
-	}
-
-	.font_3 {
-		font-size: 22.5rpx;
-		font-family: Open Sans;
-		color: #818181;
-	}
-
-	.text_4 {
-		line-height: 20.85rpx;
-	}
-
-	.text_5 {
-		line-height: 16.54rpx;
-	}
-
-	.group_3 {
-		margin-top: 29.81rpx;
-	}
-
-	.image {
-		border-radius: 9.38rpx;
-		width: 118.13rpx;
-		height: 151.88rpx;
-	}
-
-	.group_4 {
-		margin-left: 23.38rpx;
-		margin-top: 2.19rpx;
-	}
-
-	.text_6 {
-		line-height: 24.49rpx;
-	}
-
-	.pos {
-		position: absolute;
-		left: 0.15rpx;
-		top: 50%;
-		transform: translateY(-50%);
-	}
-
-	.text_7 {
-		line-height: 24.43rpx;
-	}
-
-	.font_5 {
-		font-size: 22.5rpx;
-		font-family: Open Sans;
-		line-height: 26.25rpx;
-		color: #323232;
-	}
-
-	.text_10 {
-		margin-top: 22.91rpx;
-	}
-
-	.text_1 {
-		margin-top: 3.39rpx;
-	}
-
-	.text_11 {
-		margin-top: 20.89rpx;
-		color: #939393;
-		font-size: 22.5rpx;
-		font-family: Inter;
-		line-height: 22.97rpx;
-	}
-
-	.group_5 {
-		margin-left: 3.52rpx;
-		margin-right: 14.59rpx;
-	}
-
-	.text_8 {
-		margin-left: 25.03rpx;
-		color: #323232;
-		font-size: 33.75rpx;
-		font-family: Open Sans;
-		font-weight: 600;
-		line-height: 24.88rpx;
-	}
-
-	.image_2 {
-		width: 30rpx;
-		height: 26.25rpx;
-	}
-
-	.image_3 {
-		margin-left: -90.66rpx;
-	}
-
-	.font_4 {
-		font-size: 26.25rpx;
-		font-family: Open Sans;
-		line-height: 19.29rpx;
-		font-weight: 600;
-	}
-
-	.text_9 {
-		margin-left: 61.14rpx;
-		color: #323232;
-	}
-
-	.group_6 {
-		margin-top: 26.68rpx;
-		padding: 0 9.54rpx;
-	}
-
-	.text_12 {
-		margin-right: -8.06rpx;
-		line-height: 24.23rpx;
-	}
-
-	.group_7 {
-		line-height: 21.99rpx;
-		height: 22.05rpx;
-	}
-
-	.text_13 {
-		color: #fb8b05;
-		font-size: 30rpx;
-		font-family: Open Sans;
-		font-weight: 600;
-		line-height: 21.99rpx;
-	}
-
-	.text_14 {
-		color: #fb8b05;
-		line-height: 19.39rpx;
-	}
-
-	@import url("../../../common/css/global.css");
-</style>
\ No newline at end of file
diff --git a/pages/mine/bookings/bookings.vue b/pages/mine/bookings/bookings.vue
deleted file mode 100644
index 2c0e762..0000000
--- a/pages/mine/bookings/bookings.vue
+++ /dev/null
@@ -1,275 +0,0 @@
-<template>
-	<view class="flex-col page">
-		<view class="flex-col section">
-			<view class="flex-row justify-between self-stretch group">
-				<text class="font text" @click="goto()">待消费</text>
-				<text class="font text_2">已消费</text>
-			</view>
-			<view class="self-end section_2"></view>
-		</view>
-		<view class="flex-col section_3 mt-16" v-for="i in item">
-			<text class="self-end font_2 text_3">已消费</text>
-			<view class="flex-row items-baseline self-stretch group_2">
-				<text class="font_3 text_4">订单编号：</text>
-				<text class="font_3 text_5 ml-5">E20241005095840091406189</text>
-			</view>
-			<view class="flex-row self-stretch group_3">
-				<image class="shrink-0 image"
-					src="https://ide.code.fun/api/image?token=6736eddfc471750012df05d6&name=bc0e955304da0a2ccafe3a66ac1f3aca.png" />
-				<view class="flex-col flex-1 group_4">
-					<view class="flex-row justify-center self-stretch relative">
-						<text class="font_2 text_6 pos">整套约拍</text>
-						<text class="font_2 text_7">【时尚精选】</text>
-					</view>
-					<text class="self-start font_5 text_10">到店日期：2024-10-15</text>
-					<text class="self-start font_5 text_1">具体场次：上午场（09:30-12:00）</text>
-					<text class="self-stretch text_11">已选服务：妆发服务；摄影服务;室内；</text>
-				</view>
-				<view class="flex-row items-center shrink-0 self-start group_5">
-					<text class="text_8">138.</text>
-					<image class="shrink-0 image_2 image_3"
-						src="https://ide.code.fun/api/image?token=6736eddfc471750012df05d6&name=6c5700b3ac5fd83a23d838cb456bdd10.png" />
-					<text class="font_4 text_9">00</text>
-				</view>
-			</view>
-			<view class="flex-row justify-end items-center self-stretch group_6">
-				<text class="font_2 text_12">已付款：</text>
-				<image class="image_2"
-					src="https://ide.code.fun/api/image?token=6736eddfc471750012df05d6&name=ea05ec17023763edb8cfe919508e0459.png" />
-				<view class="group_7">
-					<text class="text_13">88</text>
-					<text class="font_4 text_14">.00</text>
-				</view>
-			</view>
-			<view class="flex-col justify-start items-center self-end text-wrapper">
-				<text class="font_2 text_15">删除记录</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import {ref} from 'vue'
-	const goto = () => {
-		uni.navigateTo({
-			url: '/pages/mine/bookings/booking'
-		})
-	}
-	const item =ref([null,null,null])
-</script>
-
-<style lang="scss" scoped>
-	.ml-5 {
-		margin-left: 9.38rpx;
-	}
-
-	.page {
-		padding-bottom: 1085.63rpx;
-		background-color: #f8e8c1;
-		width: 100%;
-		overflow-y: auto;
-		overflow-x: hidden;
-		height: 100%;
-	}
-
-	.section {
-		padding-left: 132.09rpx;
-		padding-right: 116.25rpx;
-		background-color: #fffef8;
-	}
-
-	.group {
-		padding: 21.68rpx 0 19.16rpx;
-	}
-
-	.font {
-		font-size: 30rpx;
-		font-family: Open Sans;
-		line-height: 26.25rpx;
-		color: #323232;
-	}
-
-	.text {
-		line-height: 27.6rpx;
-	}
-
-	.text_2 {
-		margin-right: 10.33rpx;
-		line-height: 27.6rpx;
-	}
-
-	.section_2 {
-		background-color: #fb8b05;
-		width: 112.5rpx;
-		height: 5.63rpx;
-	}
-
-	.section_3 {
-		margin-left: 16.88rpx;
-		margin-right: 15rpx;
-		padding: 30rpx 20.06rpx 30rpx 24.38rpx;
-		background-color: #fffef8;
-		border-radius: 18.75rpx;
-	}
-
-	.font_2 {
-		font-size: 26.25rpx;
-		font-family: Open Sans;
-		line-height: 26.25rpx;
-		color: #323232;
-	}
-
-	.text_3 {
-		color: #fb8b05;
-		line-height: 24.15rpx;
-	}
-
-	.group_2 {
-		margin-top: 18.49rpx;
-	}
-
-	.font_3 {
-		font-size: 22.5rpx;
-		font-family: Open Sans;
-		color: #818181;
-	}
-
-	.text_4 {
-		line-height: 20.85rpx;
-	}
-
-	.text_5 {
-		line-height: 16.54rpx;
-	}
-
-	.group_3 {
-		margin-top: 29.81rpx;
-	}
-
-	.image {
-		border-radius: 9.38rpx;
-		width: 118.13rpx;
-		height: 151.88rpx;
-	}
-
-	.group_4 {
-		margin: 2.19rpx 0 5.38rpx 23.38rpx;
-	}
-
-	.text_6 {
-		line-height: 24.49rpx;
-	}
-
-	.pos {
-		position: absolute;
-		left: 0.15rpx;
-		top: 50%;
-		transform: translateY(-50%);
-	}
-
-	.text_7 {
-		line-height: 24.43rpx;
-	}
-
-	.font_5 {
-		font-size: 22.5rpx;
-		font-family: Open Sans;
-		line-height: 26.25rpx;
-		color: #323232;
-	}
-
-	.text_10 {
-		margin-top: 21.04rpx;
-	}
-
-	.text_1 {
-		margin-top: 3.39rpx;
-	}
-
-	.text_11 {
-		margin-top: 19.01rpx;
-		color: #939393;
-		font-size: 22.5rpx;
-		font-family: Inter;
-		line-height: 22.97rpx;
-	}
-
-	.group_5 {
-		margin-left: 3.52rpx;
-		margin-right: 14.42rpx;
-	}
-
-	.text_8 {
-		margin-left: 25.03rpx;
-		color: #323232;
-		font-size: 33.75rpx;
-		font-family: Open Sans;
-		font-weight: 600;
-		line-height: 24.88rpx;
-	}
-
-	.image_2 {
-		width: 30rpx;
-		height: 26.25rpx;
-	}
-
-	.image_3 {
-		margin-left: -90.66rpx;
-	}
-
-	.font_4 {
-		font-size: 26.25rpx;
-		font-family: Open Sans;
-		line-height: 19.29rpx;
-		font-weight: 600;
-	}
-
-	.text_9 {
-		margin-left: 61.14rpx;
-		color: #323232;
-	}
-
-	.group_6 {
-		margin-top: 37.93rpx;
-		padding: 0 9.38rpx;
-	}
-
-	.text_12 {
-		margin-right: -8.06rpx;
-		line-height: 24.23rpx;
-	}
-
-	.group_7 {
-		line-height: 21.99rpx;
-		height: 22.05rpx;
-	}
-
-	.text_13 {
-		color: #fb8b05;
-		font-size: 30rpx;
-		font-family: Open Sans;
-		font-weight: 600;
-		line-height: 21.99rpx;
-	}
-
-	.text_14 {
-		color: #fb8b05;
-		line-height: 19.39rpx;
-	}
-
-	.text-wrapper {
-		margin-right: 2.44rpx;
-		margin-top: 35.4rpx;
-		padding: 13.54rpx 0 14.83rpx;
-		background-color: #fffef8;
-		border-radius: 75rpx;
-		width: 155.63rpx;
-		border: solid 1.88rpx #cbcbcb;
-	}
-
-	.text_15 {
-		line-height: 24.13rpx;
-	}
-
-	@import url('../../../common/css/global.css')
-</style>
\ No newline at end of file
diff --git a/pages/mine/component/contactPop.vue b/pages/mine/component/contactPop.vue
index 79c94d5..6127740 100644
--- a/pages/mine/component/contactPop.vue
+++ b/pages/mine/component/contactPop.vue
@@ -39,6 +39,7 @@ onLoad(()=>{
 onShow(()=>{
 })
 onMounted(()=>{
+	getFonts()  //获取字体
 	emitter.on('contactInfo',(val)=>{  //编辑按钮传来的联系人信息
 		console.log('当前编辑的联系人信息',val);
 		if(val != null) {
@@ -118,6 +119,19 @@ const closePop = () =>{  //关闭弹窗方法
 	contactParam.value.isDefault = 0
  	emitter.emit('closeContactPop')
 }
+//获取字体
+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 lang="scss" scoped>
@@ -138,7 +152,7 @@ const closePop = () =>{  //关闭弹窗方法
 .text {
   color: #323232;
   font-size: 37.5rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 36.47rpx;
 }
 .pos_2 {
@@ -172,7 +186,7 @@ const closePop = () =>{  //关闭弹窗方法
 }
 .font_2 {
   font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 24.62rpx;
   color: #323232;
 }
@@ -217,7 +231,7 @@ const closePop = () =>{  //关闭弹窗方法
 .text_6 {
   color: #ffffff;
   font-size: 33.75rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 32.83rpx;
 }
 .radius {
diff --git a/pages/order/component/addressComponent.vue b/pages/order/component/addressComponent.vue
index a774ece..5a29039 100644
--- a/pages/order/component/addressComponent.vue
+++ b/pages/order/component/addressComponent.vue
@@ -49,6 +49,7 @@ const addressList = ref([])
 const userInfo = wx.getStorageSync('userInfo')
 //页面跳转回来之后，刷新一次地址列表  onShow就是在页面显示后执行
 onMounted(() => {
+	getFonts() //获取字体
 	getAddressList()
 })
 onShow(() => {
@@ -119,7 +120,19 @@ const deleteAddress = async( id ) =>{
 const closeWindow =()=> {
 	emitter.emit('closeAddress')
 }
-
+//获取字体
+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 lang="scss" scoped>
diff --git a/pages/order/service-paystatus/service-paystatus.vue b/pages/order/service-paystatus/service-paystatus.vue
index 826a0e0..2c65331 100644
--- a/pages/order/service-paystatus/service-paystatus.vue
+++ b/pages/order/service-paystatus/service-paystatus.vue
@@ -119,16 +119,24 @@
 	      <text class="text_33">￥{{ orderObject.totalAmount }}</text>
 	      <!-- <text class="font_6 text_36">00</text> -->
 	    </view>
-	    <view class="flex-row flex-1 ml-46">
-				<button class="text-wrapper_9"  open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
-					<text class="font_9 text_64">联系客服</text>
-				</button>
-	      <view class="flex-col justify-start items-center text-wrapper_3 ml-6" @click="stateSubmit(orderObject)" v-if="orderObject.orderStatus == '待支付' ">
+	    <view class="flex-row flexed ml-46" v-if="orderObject.orderStatus == '待支付' ">
+				<view>
+					<button class="text-wrapper_9"  open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
+						<text class="font_8 text_64">联系客服</text>
+					</button>
+				</view>
+	      <view class="flex-col justify-start items-center text-wrapper_3 ml-6" @click="stateSubmit(orderObject)" >
 	        <text class="font_8 text_35">{{ bottomBtn }}</text>
 	      </view>
 	    </view>
+			<view class="flex-row ml-47" v-if="orderObject.orderStatus != '待支付' ">
+					<button class="text-wrapper_9"  open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
+						<text class="font_8 text_64">联系客服</text>
+					</button>
+			</view>
 	  </view>
 	</view>
+	
 	<!-- 遮罩层 -->
 	    <view v-if="isShow" class="overlay"></view>
 </template>
@@ -146,6 +154,7 @@
 	const oid = ref(0) 
 	onMounted(()=>{
 		getOrderItem()
+		getFonts()
 	})
 	onLoad((options)=>{
 		oid.value = JSON.parse(options.oid)  //获取从上一个页面传来的值
@@ -283,6 +292,19 @@
 		isLoading.value = false
 	  }
 	}
+	//获取字体
+	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 lang="scss" scoped>
@@ -331,7 +353,7 @@
 }
 .font {
   font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 25.54rpx;
   color: #818181;
 }
@@ -343,7 +365,7 @@
 .text_2 {
   color: #6b6e72;
   font-size: 22.5rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 22.14rpx;
 }
 .section_3 {
@@ -359,7 +381,7 @@
 .text_3 {
   color: #818181;
   font-size: 37.5rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 32.38rpx;
 }
 .section_4 {
@@ -391,7 +413,7 @@
 }
 .font_2 {
   font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 25.54rpx;
   color: #323232;
 }
@@ -405,7 +427,7 @@
 }
 .font_3 {
   font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 17.53rpx;
   color: #818181;
 }
@@ -422,13 +444,13 @@
 }
 .font_4 {
   font-size: 33.75rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 22.54rpx;
   color: #323232;
 }
 .font_5 {
   font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 17.53rpx;
   color: #323232;
 }
@@ -588,7 +610,7 @@
 }
 .font_8 {
   font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
+  font-family: FangZhengFonts;
   line-height: 27.77rpx;
 }
 .text_32 {
@@ -624,10 +646,11 @@
 }
 .text-wrapper_3 {
   padding: 20.63rpx 0 22.86rpx;
-  flex: 1 1 204.38rpx;
+  // flex: 1 1 204.38rpx;
   background-color: #ffaaa5;
   border-radius: 75rpx;
   height: 71.25rpx;
+	width: 100px;
 }
 .text_35 {
   color: #ffffff;
@@ -635,17 +658,28 @@
 .text-wrapper_9 {
 	// position: relative;
 	// left: 326rpx;
-  background-color: #ffffff;
   border-radius: 75rpx;
-  width: 214rpx;
+  width: 200rpx;
   // height: 71rpx;
 	font-size: unset; 
+	background-color: #ffffff;
+	border-radius: 75rpx;
+	border-left: solid 1.88rpx #e79ea1;
+	border-right: solid 1.88rpx #e79ea1;
+	border-top: solid 1.88rpx #e79ea1;
+	border-bottom: solid 1.88rpx #e79ea1;
 }
 .ml-46 {
-	margin-left: 141.25rpx;
+	margin-left: 107.25rpx;
+}
+.ml-47 {
+	margin-left: 280rpx;
 }
 .text_64 {
 	color: #ffaaa5;
 }
+.flexed {
+	display: flex;
+}
 @import url(../../../common/css/global.css);
 </style>
diff --git a/pages/test/test.vue b/pages/test/test.vue
index f5b3dea..719ac27 100644
--- a/pages/test/test.vue
+++ b/pages/test/test.vue
@@ -1,5 +1,5 @@
 <template>
-	<view style="width: 100%; background-color: gold; text-align: center;">
+<!-- 	<view style="width: 100%; background-color: gold; text-align: center;">
 		<text style="font-size: 50rpx;">先登录再查看物流</text>
 	</view>
 	<button @click="login" type="primary">登录</button>
@@ -11,7 +11,7 @@
 	<button @click="testMap" type="primary">导航到师大</button>
 	<button @click="userLogin" type="primary">测试登录</button>
 	<button @click="getWxLoginCode" type="warn">获取微信登录code</button>
-	
+	 -->
 	
 	
 	
diff --git a/pages/workshop/component/timeSelect.vue b/pages/workshop/component/timeSelect.vue
index bebd7da..2a9c6e2 100644
--- a/pages/workshop/component/timeSelect.vue
+++ b/pages/workshop/component/timeSelect.vue
@@ -104,6 +104,7 @@
 	let countMap = new Map()
 
 	onMounted(() => {
+		getFonts()  //获取字体
 		closeyyxzTip()
 		emitter.on('getGoodData', (val) => {
 			productObject.value = val
@@ -298,7 +299,19 @@
 			 + '&appointmentDate=' + appointmentDate + '&timeSlot=' + timeSlot
 		})
 	}
-	 
+	//获取字体
+	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 lang="scss" scoped>