From 6ace5ba71d63ff5b044c2d6f12b38bdf3eb7b250 Mon Sep 17 00:00:00 2001
From: yuanteng0011 <1876787513@qq.com>
Date: Thu, 27 Mar 2025 20:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request.ts                                |  4 +-
 pages/book/component/bookingTips.vue          | 45 ++++++++++++++-----
 .../book/myPhotoProducts/myPhotoProducts.vue  |  8 +++-
 .../photoProductsOrderDetail.vue              | 11 ++++-
 pages/workshop/index/index.vue                |  2 +-
 5 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/api/request.ts b/api/request.ts
index e4616ea..c176e8f 100644
--- a/api/request.ts
+++ b/api/request.ts
@@ -1,7 +1,7 @@
 export const Url = 'http://localhost:9092/api' //后端接口文档
 export const testUrl = 'http://123.249.108.160:8888/api'  //自己组的服务器接口地址
-export const develop = 'http://154.8.193.216:9092/api'  //隋宇霏的接口地址（开发环境）
-export const test = 'http://154.8.193.216:9093/api'  //隋宇霏的接口地址（测试环境）
+export const develop = 'http://154.8.193.216:9092/api'  //隋雨霏的接口地址（开发环境）
+export const test = 'http://154.8.193.216:9093/api'  //隋雨霏的接口地址（测试环境）
 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'
diff --git a/pages/book/component/bookingTips.vue b/pages/book/component/bookingTips.vue
index 3d4bc77..12ea262 100644
--- a/pages/book/component/bookingTips.vue
+++ b/pages/book/component/bookingTips.vue
@@ -2,16 +2,7 @@
 	<view class="flex-col page">
 	  <text class="self-center text">预约须知</text>
 	  <view class="flex-col self-stretch group">
-	    <text class="font">
-	      1.成功预约的顾客需按照预定时间前往店内挑选相应级别的服装。为确保衣物在体验过程中的完好无损，顾客需根据所选服装的级别补缴尾款以及相应的押金。拍摄结束后，店铺将依据衣物的实际状况评估是否扣除押金。
-	    </text>
-	    <text class="mt-14 font">
-	      2.其中部分物品商家可提供，属于增值服务（如一次性隐形眼镜、
-	      一次性粉扑等属于服务费以外的赠送服务，买家可选择自带用品，不影响服务价格），需要买家自己准备的，客服需要提前告诉买家（如胸贴等贴身物品）
-	    </text>
-	    <text class="mt-14 font">
-	      3.用户可以在预约的试穿时间内到店试穿预定的服装。试穿时请小心爱护服装，避免弄脏或损坏。如果试穿后发现尺码不合适或者对服装不满意，可在符合规定的时间内联系客服进行更换或者取消订单。
-	    </text>
+			<rich-text :nodes="noticeRichText"></rich-text>
 	  </view>
 	  <view @click="closeBookingTips" class="flex-col justify-start items-center self-stretch text-wrapper">
 	    <text class="text_2">我知道了</text>
@@ -19,14 +10,44 @@
 	</view>
 </template>
 
-<script setup lang="ts">
+<script setup>
 import emitter from '../../../utils/emitter';
-import { onLoad } from "@dcloudio/uni-app";
+import { onLoad,onShow } from "@dcloudio/uni-app";
 	import { getFonts } from '../../../common/globalFont';
+import { baseUrl } from '../../../api/request';
+import { onMounted,ref } from 'vue';
+
+
+	const cookie = wx.getStorageSync('cookie')
+	const noticeRichText = ref('')
+	
+	onMounted(()=>{
+		getNotice()
+	})
+	
+	onShow(()=>{
+		getNotice()
+	})
 	
 	onLoad(() => {
 		getFonts()
+		
 	})
+	
+	const getNotice = async () => {
+		const res = await uni.request({
+			url: baseUrl + '/global/query/notice',
+			method: 'GET',
+			header: {
+				cookie
+			}
+		})
+		// console.log('富文本--->',res.data.data);
+		if(res.data.code === 1) {
+			noticeRichText.value = res.data.data
+		}
+	}
+	
 	const closeBookingTips = () => {
 		emitter.emit('closeBookingTips')
 	}
diff --git a/pages/book/myPhotoProducts/myPhotoProducts.vue b/pages/book/myPhotoProducts/myPhotoProducts.vue
index e226d3f..3a88470 100644
--- a/pages/book/myPhotoProducts/myPhotoProducts.vue
+++ b/pages/book/myPhotoProducts/myPhotoProducts.vue
@@ -37,7 +37,7 @@
 	        />
 	        <view class="flex-col items-start ml-7">
 	          <text class="font_2 text_9">{{ item.name }}</text>
-	          <text class="font_2 text_10 mt-50">{{ item.price.toFixed(2) }}元{{ isShow ? '起' : '/天' }}</text>
+	          <text class="font_22 text_10 mt-50" >{{ item.price.toFixed(2) }}元{{ isShow ? '起' : '/天' }}</text>
 	        </view>
 	      </view>
 	      <view class="flex-col justify-start items-center self-start text-wrapper_2">
@@ -270,6 +270,12 @@
   line-height: 25.16rpx;
   color: #323232;
 }
+.font_22 {
+  font-size: 26.25rpx;
+  font-family: FangZhengFonts;
+  line-height: 25.16rpx;
+  color: #ff0000;
+}
 .text_11 {
   line-height: 24rpx;
 }
diff --git a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
index c202839..d892dab 100644
--- a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
+++ b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
@@ -70,7 +70,7 @@
 	        </view>
 	        <view class="flex-row justify-end items-center group_8">
 	          <text class="font_2 text_14">实付款：</text>
-	          <text class="font_8">￥{{ item.totalAmount.toFixed(2) }}</text>
+	          <text class="font_88">￥{{ item.totalAmount.toFixed(2) }}</text>
 	        </view>
 	        <view class="flex-row justify-center group_9">
 				
@@ -629,8 +629,15 @@ button::after{
   font-size: 33.75rpx;
   font-family: FangZhengFonts;
   line-height: 22.54rpx;
-  color: #e79ea1;
+  color: #000;
 }
+.font_88 {
+  font-size: 33.75rpx;
+  font-family: FangZhengFonts;
+  line-height: 22.54rpx;
+  color: #c35c5d;;
+}
+
 .section_4 {
   margin: 0 12.5rpx;
   padding: 22.5rpx 18.75rpx;
diff --git a/pages/workshop/index/index.vue b/pages/workshop/index/index.vue
index 7f10110..0b0ce46 100644
--- a/pages/workshop/index/index.vue
+++ b/pages/workshop/index/index.vue
@@ -231,7 +231,7 @@ const jump_detail =(item,index)=>{
   height: 26.25rpx;
 }
 .font_2 {
-  color: #c35c5d;
+  color: #ff0000;
   font-size: 30rpx;
   line-height: 20.68rpx;
 }