From 6057c021189ee4c5ca0a179896851827320d5a1b Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Tue, 25 Mar 2025 20:58:10 +0800
Subject: [PATCH] this is lastest update 3.25

---
 api/request.ts                                |  2 +-
 common/globalFunction.js                      |  8 ++++++
 pages/Shopping-cart/component/addProduct.vue  |  6 ++---
 .../productmain/testproductmain.vue           |  9 +++----
 pages/book/component/bookingSelected.vue      | 12 ++++-----
 pages/book/component/bookingTips.vue          |  4 +--
 pages/book/component/cancelOrder.vue          |  8 +++---
 pages/book/component/confirmBookingInfo.vue   |  6 ++---
 pages/book/component/deleteOrder.vue          |  8 +++---
 pages/book/component/feeTips.vue              |  2 +-
 .../myPhotoProductDetail.vue                  |  2 +-
 .../myPhotoProductsOrderDetail.vue            |  6 +++--
 .../photoProductDetail/photoProductDetail.vue |  6 ++---
 pages/book/photoProducts/photoProducts.vue    |  6 ++---
 .../photoProductsOrder/photoProductsOrder.vue | 26 ++++++++++---------
 .../photoProductsOrderDetail.vue              |  8 +++---
 .../clotherRentOrderList.vue                  |  3 +++
 .../clothesRentOrderDetail.vue                | 11 +++-----
 .../component/clothesAttribute.vue            |  2 +-
 .../component/clothesAttributePlus.vue        |  2 +-
 pages/coupon/CouponMall/CouponMall.vue        |  8 +++---
 pages/coupon/CouponTips/CouponTips.vue        |  6 ++---
 pages/coupon/MyCoupon/MyCoupon.vue            |  8 +++---
 pages/coupon/OverDueCoupon/OverDueCoupon.vue  |  6 ++---
 pages/coupon/component/confirmPopup.vue       |  4 +--
 pages/coupon/component/couponPopup.vue        |  2 +-
 pages/home/home.vue                           | 14 +++++-----
 pages/login/login.vue                         |  2 +-
 pages/mine/Contact/testContact.vue            |  2 +-
 .../myGeneralOrderDetail.vue                  |  5 ++--
 pages/my-order/myOrderList/myOrderList.vue    |  7 +++--
 .../myServiceOrderDetail.vue                  |  5 ++--
 .../my-order/researchOrder/researchOrder.vue  |  2 +-
 .../order/product-waitpay/product-waitpay.vue |  2 +-
 pages/order/serviceWaitPay/serviceWaitPay.vue | 24 ++++++++---------
 .../order/singleGoodOrder/singleGoodOrder.vue |  4 +--
 .../singleServiceWait/singleServiceWait.vue   | 18 ++++++-------
 .../ProductDetails/ProductDetails.vue         |  8 +++---
 pages/store-home/main/testMain.vue            |  6 ++---
 pages/workshop/component/timeSelect.vue       |  2 +-
 pages/workshop/productmain/productmain.vue    | 11 +++++---
 pages/workshop/searchResult/searchResult.vue  |  2 +-
 42 files changed, 154 insertions(+), 131 deletions(-)

diff --git a/api/request.ts b/api/request.ts
index e4616ea..07f68f1 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 = domain
+export const baseUrl = Url
diff --git a/common/globalFunction.js b/common/globalFunction.js
index 1f14631..89e7e4d 100644
--- a/common/globalFunction.js
+++ b/common/globalFunction.js
@@ -20,6 +20,14 @@ export const dealResult = (res) => {
 }
 
 
+export const showTips = (msg) => {
+	uni.showToast({
+		title: msg,
+		icon: 'success'
+	})
+}
+
+
 export const JudgeIsNullity = (val) => {
 	if (val === null || val === undefined || val === '') return true
 	return false
diff --git a/pages/Shopping-cart/component/addProduct.vue b/pages/Shopping-cart/component/addProduct.vue
index 31a48b9..4eb9bdf 100644
--- a/pages/Shopping-cart/component/addProduct.vue
+++ b/pages/Shopping-cart/component/addProduct.vue
@@ -201,14 +201,14 @@
 	}
 
 	.text_3 {
-		color: #000000;
+		color: #323232;
 		font-size: 28.13rpx;
 		font-family: FangZhengFonts;
 		line-height: 26.21rpx;
 	}
 
 	.text_4 {
-		color: #000000;
+		color: #323232;
 		font-size: 26.25rpx;
 		font-family: FangZhengFonts;
 		line-height: 24.34rpx;
@@ -240,7 +240,7 @@
 	}
 
 	.text_5 {
-		color: #000000;
+		color: #323232;
 		font-size: 30rpx;
 		font-family: FangZhengFonts;
 		line-height: 21.41rpx;
diff --git a/pages/Shopping-cart/productmain/testproductmain.vue b/pages/Shopping-cart/productmain/testproductmain.vue
index effd5a2..5245484 100644
--- a/pages/Shopping-cart/productmain/testproductmain.vue
+++ b/pages/Shopping-cart/productmain/testproductmain.vue
@@ -101,11 +101,7 @@
 		</view>
 		<view class="flex-row justify-between items-center section_8">
 			<view class="flex-row items-center">
-				<checkbox class="shrink-0 image_8 round red" :checked="allCheck" @tap="allChecked" />
-				<!-- <image
-        class="shrink-0 image_8 image_13"
-        src="https://ide.code.fun/api/image?token=6779d8c1797f850011f55ea9&name=3f81d5886d1e216ce7cc53687e0c5499.png"
-      /> -->
+				<checkbox style="margin-top: -8rpx;" class="shrink-0 image_8 round red" :checked="allCheck" @tap="allChecked" />
 				<text class="font_2 text_11 ml-9">全选</text>
 			</view>
 			<view class="flex-row items-center">
@@ -130,7 +126,7 @@
 	import * as math from 'mathjs'
 	import { shoppingCartUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { publicPath } from '../../../common/globalImagesUrl';
-import { JudgeIsNullity } from '../../../common/globalFunction';
+	import { JudgeIsNullity } from '../../../common/globalFunction';
 	const products = ref([])
 	const tempProducts = ref([])
 	const isShowInput = ref(false)
@@ -652,6 +648,7 @@ import { JudgeIsNullity } from '../../../common/globalFunction';
 </script>
 
 <style lang="scss" scoped>
+
 	.overlay {
 	  position: fixed;
 	  top: 0;
diff --git a/pages/book/component/bookingSelected.vue b/pages/book/component/bookingSelected.vue
index 548aa2b..bd7599e 100644
--- a/pages/book/component/bookingSelected.vue
+++ b/pages/book/component/bookingSelected.vue
@@ -268,7 +268,7 @@
 	  font-size: 37.5rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 33.99rpx;
-	  color: #000000;
+	  color: #323232;
 	}
 	.text {
 	  margin: 3.75rpx 0;
@@ -295,7 +295,7 @@
 	  padding: 125.63rpx 0 86.25rpx;
 	  background-image: linear-gradient(180deg, #fdefef 0%, #fffcfa 100%);
 	  border-radius: 18.75rpx;
-	  box-shadow: 0rpx 7.5rpx 7.5rpx #00000040;
+	  box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
 	}
 	.image_5 {
 	  margin-left: 249.38rpx;
@@ -323,7 +323,7 @@
 	}
 	.text_3 {
 	  margin-left: 22.5rpx;
-	  color: #000000;
+	  color: #323232;
 	  font-size: 30rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 26.4rpx;
@@ -364,7 +364,7 @@
 	  padding: 18.75rpx 26.25rpx;
 	  background-color: #ffffff;
 	  border-radius: 18.75rpx;
-	  box-shadow: 0rpx 7.5rpx 7.5rpx #00000040;
+	  box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
 	  height: 157.5rpx;
 	}
 	.image_7 {
@@ -384,7 +384,7 @@
 	  font-size: 26.25rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 24.21rpx;
-	  color: #000000;
+	  color: #323232;
 	}
 	.text_6 {
 	  margin-left: 45rpx;
@@ -397,7 +397,7 @@
 	.group_4 {
 	  margin-top: 37.5rpx;
 	  padding: 30rpx 35.63rpx;
-	  border-top: solid 1.88rpx #0000001f;
+	  border-top: solid 1.88rpx #3232321f;
 	  position: fixed;
 	  bottom: 0;
 	  left: 0;
diff --git a/pages/book/component/bookingTips.vue b/pages/book/component/bookingTips.vue
index 980ccc0..3d4bc77 100644
--- a/pages/book/component/bookingTips.vue
+++ b/pages/book/component/bookingTips.vue
@@ -37,14 +37,14 @@ import { onLoad } from "@dcloudio/uni-app";
 	  padding: 41.67rpx 62.5rpx;
 	  background-color: #ffffff;
 	  border-radius: 41.1rpx;
-	  box-shadow: 0rpx 8.33rpx 8.33rpx #00000061;
+	  box-shadow: 0rpx 8.33rpx 8.33rpx #32323261;
 	  width: 100%;
 	  overflow-y: auto;
 	  overflow-x: hidden;
 	  height: 100%;
 	}
 	.text {
-	  color: #000000;
+	  color: #323232;
 	  font-size: 37.5rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 34.42rpx;
diff --git a/pages/book/component/cancelOrder.vue b/pages/book/component/cancelOrder.vue
index 3a1210c..c3b6476 100644
--- a/pages/book/component/cancelOrder.vue
+++ b/pages/book/component/cancelOrder.vue
@@ -14,6 +14,7 @@ import emitter from '../../../utils/emitter';
 import { baseUrl } from '../../../api/request';
 import { onLoad } from "@dcloudio/uni-app";
 	import { getFonts } from '../../../common/globalFont';
+import { showTips } from '../../../common/globalFunction';
 	
 	onLoad(() => {
 		getFonts()
@@ -53,6 +54,7 @@ import { onLoad } from "@dcloudio/uni-app";
 
 	const confirm = async () => {
 		await cancelBookingOrder()
+		showTips('取消成功')
 		emitter.emit('closeCancelOrderPopup')
 		emitter.emit('flushAdvanceOrderList')
 	}
@@ -72,8 +74,8 @@ import { onLoad } from "@dcloudio/uni-app";
 	  height: 100%;
 	}
 	.text {
-	  color: #000000;
-	  font-size: 37.32rpx;
+	  color: #323232;
+	  font-size: 33.32rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 41.66rpx;
 	}
@@ -91,7 +93,7 @@ import { onLoad } from "@dcloudio/uni-app";
 	  line-height: 35.41rpx;
 	}
 	.text_2 {
-	  color: #000000;
+	  color: #323232;
 	  font-size: 30rpx;
 	}
 	.text-wrapper_2 {
diff --git a/pages/book/component/confirmBookingInfo.vue b/pages/book/component/confirmBookingInfo.vue
index b4e00a5..48420f6 100644
--- a/pages/book/component/confirmBookingInfo.vue
+++ b/pages/book/component/confirmBookingInfo.vue
@@ -124,14 +124,14 @@ const cookie = wx.getStorageSync("cookie")  //请求头
 	  padding: 56.46rpx 59.18rpx;
 	  background-color: #ffffff;
 	  border-radius: 41.2rpx;
-	  box-shadow: 0rpx 9.49rpx 9.49rpx #00000061;
+	  box-shadow: 0rpx 9.49rpx 9.49rpx #32323261;
 	  width: 100%;
 	  overflow-y: auto;
 	  overflow-x: hidden;
 	  height: 100%;
 	}
 	.text {
-	  color: #000000;
+	  color: #323232;
 	  font-size: 37.72rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 41.72rpx;
@@ -140,7 +140,7 @@ const cookie = wx.getStorageSync("cookie")  //请求头
 	  font-size: 30.97rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 35.46rpx;
-	  color: #000000;
+	  color: #323232;
 	}
 	.text_2 {
 	  margin-top: 61.71rpx;
diff --git a/pages/book/component/deleteOrder.vue b/pages/book/component/deleteOrder.vue
index 40b13cf..0d30ddb 100644
--- a/pages/book/component/deleteOrder.vue
+++ b/pages/book/component/deleteOrder.vue
@@ -14,6 +14,7 @@ import emitter from '../../../utils/emitter';
 import { baseUrl } from '../../../api/request';
 import { onLoad } from "@dcloudio/uni-app";
 import { getFonts } from '../../../common/globalFont';
+import { showTips } from '../../../common/globalFunction';
 
 	onLoad(() => {
 		getFonts()
@@ -54,6 +55,7 @@ import { getFonts } from '../../../common/globalFont';
 
 	const confirm = async () => {
 		await deleteBookingOrder()
+		showTips('删除成功')
 		emitter.emit('closeDeleteOrderPopup')
 		emitter.emit('flushAdvanceOrderList')
 	}
@@ -73,8 +75,8 @@ import { getFonts } from '../../../common/globalFont';
 	  height: 100%;
 	}
 	.text {
-	  color: #000000;
-	  font-size: 37.32rpx;
+	  color: #323232;
+	  font-size: 33.32rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 41.66rpx;
 	}
@@ -92,7 +94,7 @@ import { getFonts } from '../../../common/globalFont';
 	  line-height: 35.41rpx;
 	}
 	.text_2 {
-	  color: #000000;
+	  color: #323232;
 	  font-size: 30rpx;
 	}
 	.text-wrapper_2 {
diff --git a/pages/book/component/feeTips.vue b/pages/book/component/feeTips.vue
index ca5e0b4..3e826dd 100644
--- a/pages/book/component/feeTips.vue
+++ b/pages/book/component/feeTips.vue
@@ -85,7 +85,7 @@ import { getFonts } from '../../../common/globalFont';
 	  height: 750rpx;
 	}
 	.text {
-	  color: #000000;
+	  color: #323232;
 	  font-size: 36.99rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 36.12rpx;
diff --git a/pages/book/myPhotoProductDetail/myPhotoProductDetail.vue b/pages/book/myPhotoProductDetail/myPhotoProductDetail.vue
index 16e3005..f515d47 100644
--- a/pages/book/myPhotoProductDetail/myPhotoProductDetail.vue
+++ b/pages/book/myPhotoProductDetail/myPhotoProductDetail.vue
@@ -198,7 +198,7 @@ button::after{
   padding: 37.5rpx 52.5rpx 45rpx;
   background-color: #ffffff;
   border-radius: 18.75rpx;
-  box-shadow: 11.25rpx 11.25rpx 11.25rpx #00000026;
+  box-shadow: 11.25rpx 11.25rpx 11.25rpx #32323226;
 }
 .pos_2 {
   position: absolute;
diff --git a/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue b/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue
index a6e740a..4ca5d56 100644
--- a/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue
+++ b/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue
@@ -105,6 +105,7 @@
 	import { onPullDownRefresh } from '@dcloudio/uni-app';
 	import { photoOrderMap } from '../../../common/global';
 	import emitter from '../../../utils/emitter';
+	import { showTips } from '../../../common/globalFunction';
 	
 	const id = ref(0)
 	const cookie = wx.getStorageSync('cookie')
@@ -249,6 +250,7 @@
 					await deleteOrder(val)
 					await emitter.emit('flushAdvanceOrderList')
 					routerJump('pages/book/photoProductsOrderDetail/photoProductsOrderDetail')
+					showTips('删除成功')
 				}
 			}
 		})
@@ -387,7 +389,7 @@ button::after{
   font-size: 28.13rpx;
   font-family: FangZhengFonts;
   line-height: 26.92rpx;
-  color: #000000;
+  color: #323232;
 }
 .text {
   color: #323233;
@@ -485,7 +487,7 @@ button::after{
   height: 45rpx;
 }
 .text_8 {
-  color: #000000;
+  color: #323232;
   font-size: 22.5rpx;
   font-family: FangZhengFonts;
   line-height: 21.09rpx;
diff --git a/pages/book/photoProductDetail/photoProductDetail.vue b/pages/book/photoProductDetail/photoProductDetail.vue
index a135a8c..15f2ae5 100644
--- a/pages/book/photoProductDetail/photoProductDetail.vue
+++ b/pages/book/photoProductDetail/photoProductDetail.vue
@@ -188,7 +188,7 @@
 .font {
   font-size: 45rpx;
   font-family: FangZhengFonts;
-  color: #000000;
+  color: #323232;
 }
 .text {
   line-height: 43.76rpx;
@@ -201,7 +201,7 @@
   font-size: 37.5rpx;
   font-family: FangZhengFonts;
   line-height: 36.34rpx;
-  color: #000000;
+  color: #323232;
 }
 .pos_3 {
   position: absolute;
@@ -222,7 +222,7 @@
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 27.3rpx;
-  color: #000000;
+  color: #323232;
 }
 .group {
   flex: 1 1 202.5rpx;
diff --git a/pages/book/photoProducts/photoProducts.vue b/pages/book/photoProducts/photoProducts.vue
index ed4f383..eda1982 100644
--- a/pages/book/photoProducts/photoProducts.vue
+++ b/pages/book/photoProducts/photoProducts.vue
@@ -239,7 +239,7 @@
   padding-bottom: 40rpx;
   // background-color: #ffffff96;
   border-radius: 18.75rpx 18.75rpx 0rpx 0rpx;
-  // box-shadow: 0rpx 7.5rpx 7.5rpx #00000040;
+  // box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
   width: 159.38rpx;
   height: 1140rpx;
   overflow-y: auto;
@@ -269,7 +269,7 @@
   font-size: 26.25rpx;
   font-family: FangZhengFonts;
   line-height: 25.16rpx;
-  color: #000000;
+  color: #323232;
 }
 .text_2 {
   line-height: 24rpx;
@@ -298,7 +298,7 @@
   padding: 31.88rpx 20.63rpx 27.58rpx;
   background-color: #ffffff96;
   border-radius: 18.75rpx;
-  box-shadow: 0rpx 7.5rpx 7.5rpx #00000040;
+  box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
 }
 .list-item_2:first-child {
   margin-top: 0;
diff --git a/pages/book/photoProductsOrder/photoProductsOrder.vue b/pages/book/photoProductsOrder/photoProductsOrder.vue
index 073676f..03703f4 100644
--- a/pages/book/photoProductsOrder/photoProductsOrder.vue
+++ b/pages/book/photoProductsOrder/photoProductsOrder.vue
@@ -512,7 +512,7 @@
   font-size: 37.5rpx;
   font-family: FangZhengFonts;
   line-height: 35.01rpx;
-  color: #000000;
+  color: #323232;
 }
 .text {
   line-height: 36.47rpx;
@@ -535,7 +535,7 @@
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 28.01rpx;
-  color: #000000;
+  color: #323232;
 }
 .text_2 {
   line-height: 27.54rpx;
@@ -557,8 +557,10 @@
   top: 110.63rpx;
 }
 .image_2 {
-  width: 65.63rpx;
-  height: 67.5rpx;
+  // width: 65.63rpx;
+  // height: 67.5rpx;
+  width: 50.88rpx;
+  height: 50.88rpx;
 }
 .text_3 {
   color: #818181;
@@ -590,19 +592,19 @@
 .pos_5 {
   position: absolute;
   left: 16.18rpx;
-  top: 255.53rpx;
+  top: 235.53rpx;
 }
 .section_3 {
   padding: 41.36rpx 26.25rpx 32.81rpx 28.13rpx;
   background-color: #ffffff;
   border-radius: 18.75rpx;
-  box-shadow: 0rpx 7.5rpx 7.5rpx #00000040;
+  box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
 }
 .pos_6 {
   position: absolute;
   left: 15rpx;
   right: 16.88rpx;
-  top: 316.88rpx;
+  top: 296.88rpx;
 }
 .text_6 {
   margin-left: 3.17rpx;
@@ -679,19 +681,19 @@
 .pos_7 {
   position: absolute;
   left: 24.11rpx;
-  top: 1020rpx;
+  top: 1000rpx;
 }
 .section_5 {
   padding: 25.43rpx 35.63rpx 34.01rpx;
   background-color: #ffffff;
   border-radius: 37.5rpx;
-  box-shadow: 0rpx 7.5rpx 7.5rpx #00000040;
+  box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
 }
 .pos_8 {
   position: absolute;
   left: 22.5rpx;
   right: 22.5rpx;
-  top: 1080.75rpx;
+  top: 1060.75rpx;
 }
 .image_4 {
   width: 120rpx;
@@ -704,7 +706,7 @@
   font-size: 26.25rpx;
   font-family: FangZhengFonts;
   line-height: 24.3rpx;
-  color: #000000;
+  color: #323232;
 }
 .text_9 {
   line-height: 23.79rpx;
@@ -719,7 +721,7 @@
   margin-right: 3.02rpx;
 }
 .text_11 {
-  color: #000000;
+  color: #323232;
   font-size: 22.5rpx;
   font-family: FangZhengFonts;
   line-height: 21.09rpx;
diff --git a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
index 8239d84..c202839 100644
--- a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
+++ b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
@@ -525,7 +525,7 @@ button::after{
 .font {
   font-size: 30rpx;
   font-family: FangZhengFonts;
-  color: #000000;
+  color: #323232;
 }
 .text {
   line-height: 48.48rpx;
@@ -641,7 +641,7 @@ button::after{
   font-size: 26.25rpx;
   font-family: FangZhengFonts;
   line-height: 25.84rpx;
-  color: #000000;
+  color: #323232;
 }
 .text_9 {
   font-size: 28.13rpx;
@@ -669,13 +669,13 @@ button::after{
   font-size: 26.25rpx;
   font-family: FangZhengFonts;
   line-height: 23.79rpx;
-  color: #000000;
+  color: #323232;
 }
 .font_10 {
   font-size: 22.5rpx;
   font-family: FangZhengFonts;
   line-height: 21.09rpx;
-  color: #000000;
+  color: #323232;
 }
 .text_12 {
   margin-right: 3.75rpx;
diff --git a/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue b/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue
index 7020a1b..3aa33dc 100644
--- a/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue
+++ b/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue
@@ -123,6 +123,7 @@
 	import { onPullDownRefresh } from '@dcloudio/uni-app';
 	import { getFonts } from '../../../common/globalFont';
 	import { onLoad } from "@dcloudio/uni-app";
+	import { showTips } from '../../../common/globalFunction';
 	const isShowUnderLine = ref([true, false, false, false, false])
 	let orderStatusList = ['全部', '待支付', '待发货', '待收货', '交易成功']
 	const color = ref(new Array(5).fill('#323232'))
@@ -218,6 +219,7 @@
 				if (res.confirm) {
 					await cancelRentOrder(val)
 					await getRentOrderList()
+					showTips('取消成功')
 				}
 			}
 		})
@@ -248,6 +250,7 @@
 				if (res.confirm) {
 					await deleteOrder(val)
 					await getRentOrderList() 
+					showTips('删除成功')
 				}
 			}
 		})
diff --git a/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
index f1d5371..dbe1c03 100644
--- a/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
+++ b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
@@ -26,7 +26,7 @@
 	        />
 	        <view class="ml-12 flex-col items-start group_2">
 	          <text class="font_2 text_4">{{ clothesSnapshot.name }}</text>
-	          <text class="font_3 text_6 mt-59">￥{{ clothesSnapshot.price }}</text>
+	          <text class="font_3 text_6 mt-59">￥{{ clothesSnapshot.price.toFixed(2) }}</text>
 	        </view>
 	      </view>
 	      <view class="flex-col items-center self-start" @click="nav">
@@ -108,6 +108,7 @@
 	import { getFonts } from '../../../common/globalFont';
 
 	import emitter from '../../../utils/emitter';
+	import { showTips } from '../../../common/globalFunction';
 	const cookie = wx.getStorageSync('cookie')
 	const rentOrderDetail = ref({})    //租赁订单详情
 	const contactsSnapshot = ref({})   //联系人快照
@@ -147,8 +148,6 @@
 				id: val
 			}
 		})
-		// console.log('订单详情--->',res.data.data);
-		console.log('订单状态---->',res.data.data.orderStatus);
 		rentOrderDetail.value = res.data.data
 		contactsSnapshot.value = res.data.data.contactsSnapshot
 		clothesSnapshot.value = res.data.data.clothesSnapshot
@@ -175,6 +174,7 @@
 					await deleteOrder(val)
 					await emitter.emit('flushClothesOrderList')
 					routerJump('pages/clothesRent/clotherRentOrderList/clotherRentOrderList')
+					showTips('删除成功')
 				}
 			}
 		})
@@ -313,9 +313,6 @@
 	}
 	
 	
-	onBeforeUnmount(() => {
-		routerJump('pages/clothesRent/clotherRentOrderList/clotherRentOrderList')
-	})
 
 </script>
 
@@ -547,7 +544,7 @@ button::after{
 	bottom: 0;
 }
 .text_16 {
-  color: #000000;
+  color: #323232;
   font-size: 30rpx;
   line-height: 27.43rpx;
 }
diff --git a/pages/clothesRent/component/clothesAttribute.vue b/pages/clothesRent/component/clothesAttribute.vue
index a692310..ca60444 100644
--- a/pages/clothesRent/component/clothesAttribute.vue
+++ b/pages/clothesRent/component/clothesAttribute.vue
@@ -207,7 +207,7 @@ import { dealResult } from '../../../common/globalFunction';
 	}
 	.divider {
 	  margin-top: 30rpx;
-	  background-color: #0000001f;
+	  background-color: #3232321f;
 	  height: 1.88rpx;
 	}
 	.view_3 {
diff --git a/pages/clothesRent/component/clothesAttributePlus.vue b/pages/clothesRent/component/clothesAttributePlus.vue
index 131a525..59be48e 100644
--- a/pages/clothesRent/component/clothesAttributePlus.vue
+++ b/pages/clothesRent/component/clothesAttributePlus.vue
@@ -207,7 +207,7 @@
 	}
 	.group {
 	  padding: 37.5rpx 22.5rpx;
-	  border-bottom: solid 1.88rpx #0000001f;
+	  border-bottom: solid 1.88rpx #3232321f;
 	}
 	.font {
 	  font-size: 37.5rpx;
diff --git a/pages/coupon/CouponMall/CouponMall.vue b/pages/coupon/CouponMall/CouponMall.vue
index 446cf70..cd78f2e 100644
--- a/pages/coupon/CouponMall/CouponMall.vue
+++ b/pages/coupon/CouponMall/CouponMall.vue
@@ -222,7 +222,7 @@
   color: #818181;
 }
 .text {
-  color: #000000;
+  color: #323232;
   line-height: 28.59rpx;
 }
 .section_2 {
@@ -236,7 +236,7 @@
   top: 114.38rpx;
 }
 .text_2 {
-  color: #000000;
+  color: #323232;
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 25.78rpx;
@@ -256,7 +256,7 @@
   height: 73.13rpx;
 }
 .text_4 {
-  color: #000000;
+  color: #323232;
   font-size: 24.38rpx;
   font-family: FangZhengFonts;
   line-height: 21.34rpx;
@@ -280,7 +280,7 @@
   font-size: 33.75rpx;
   font-family: FangZhengFonts;
   line-height: 32.83rpx;
-  color: #000000;
+  color: #323232;
 }
 .text_5 {
   line-height: 29.42rpx;
diff --git a/pages/coupon/CouponTips/CouponTips.vue b/pages/coupon/CouponTips/CouponTips.vue
index 2fcddf9..932a609 100644
--- a/pages/coupon/CouponTips/CouponTips.vue
+++ b/pages/coupon/CouponTips/CouponTips.vue
@@ -65,7 +65,7 @@
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 35.63rpx;
-  color: #000000;
+  color: #323232;
 }
 .text {
   line-height: 26.25rpx;
@@ -85,7 +85,7 @@
   font-size: 33.75rpx;
   font-family: FangZhengFonts;
   line-height: 32.44rpx;
-  color: #000000;
+  color: #323232;
 }
 .group {
   margin-top: 18.75rpx;
@@ -107,7 +107,7 @@
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 28.95rpx;
-  color: #000000;
+  color: #323232;
 }
 .text_5 {
   margin-left: 15rpx;
diff --git a/pages/coupon/MyCoupon/MyCoupon.vue b/pages/coupon/MyCoupon/MyCoupon.vue
index a316390..0dfdf01 100644
--- a/pages/coupon/MyCoupon/MyCoupon.vue
+++ b/pages/coupon/MyCoupon/MyCoupon.vue
@@ -115,7 +115,7 @@
   color: #c35c5c;
 }
 .text_2 {
-  color: #000000;
+  color: #323232;
   line-height: 36.47rpx;
 }
 .pos_2 {
@@ -143,7 +143,7 @@
   padding: 30rpx 22.5rpx 30rpx 48.75rpx;
   background-image: linear-gradient(90deg, #ffffff 28.8%, #faddde 96.8%);
   border-radius: 18.75rpx;
-  box-shadow: 0rpx 7.5rpx 7.5rpx #00000040;
+  box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
 }
 .list-item:first-child {
   margin-top: 0;
@@ -164,7 +164,7 @@
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 29.42rpx;
-  color: #000000;
+  color: #323232;
 }
 .text {
   line-height: 29.18rpx;
@@ -173,7 +173,7 @@
   font-size: 26.25rpx;
   font-family: FangZhengFonts;
   line-height: 24.62rpx;
-  color: #000000;
+  color: #323232;
 }
 .text_4 {
   margin-right: 11.25rpx;
diff --git a/pages/coupon/OverDueCoupon/OverDueCoupon.vue b/pages/coupon/OverDueCoupon/OverDueCoupon.vue
index 27f79f2..ad0f298 100644
--- a/pages/coupon/OverDueCoupon/OverDueCoupon.vue
+++ b/pages/coupon/OverDueCoupon/OverDueCoupon.vue
@@ -103,7 +103,7 @@
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 29.42rpx;
-  color: #000000;
+  color: #323232;
 }
 .text {
   line-height: 29.18rpx;
@@ -115,7 +115,7 @@
   color: #818181;
 }
 .text_2 {
-  color: #000000;
+  color: #323232;
   line-height: 36.47rpx;
 }
 .pos_2 {
@@ -142,7 +142,7 @@
   padding: 30rpx 22.5rpx 30rpx 48.75rpx;
   background-color: #ffffff;
   border-radius: 18.75rpx;
-  box-shadow: 0rpx 7.5rpx 7.5rpx #00000040;
+  box-shadow: 0rpx 7.5rpx 7.5rpx #32323240;
 }
 .list-item:first-child {
   margin-top: 0;
diff --git a/pages/coupon/component/confirmPopup.vue b/pages/coupon/component/confirmPopup.vue
index cae476d..f0c117a 100644
--- a/pages/coupon/component/confirmPopup.vue
+++ b/pages/coupon/component/confirmPopup.vue
@@ -38,7 +38,7 @@
 	  height: 100%;
 	}
 	.text {
-	  color: #000000;
+	  color: #323232;
 	  font-size: 42.32rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 41.17rpx;
@@ -57,7 +57,7 @@
 	  line-height: 35.41rpx;
 	}
 	.text_2 {
-	  color: #000000;
+	  color: #323232;
 	}
 	.text-wrapper_2 {
 	  padding: 23.51rpx 0;
diff --git a/pages/coupon/component/couponPopup.vue b/pages/coupon/component/couponPopup.vue
index f5f5e83..af41b10 100644
--- a/pages/coupon/component/couponPopup.vue
+++ b/pages/coupon/component/couponPopup.vue
@@ -362,7 +362,7 @@
 	  font-size: 26.25rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 30rpx;
-	  color: #000000;
+	  color: #323232;
 	}
 	.text_6 {
 	  font-size: 24.38rpx;
diff --git a/pages/home/home.vue b/pages/home/home.vue
index fd2e5eb..c2db894 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -2,7 +2,7 @@
 <view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
   <view class="section" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }"></view>
   <image class="image pos" :src="homeUrl + '/flower.png'" />
-  <text class="text pos_6">限定手制|非量售卖</text>
+  <text class="text pos_6">手作传艺|锦绣邀约</text>
   <text class="font pos_2">匠</text>
   <text class="font pos_3">承</text>
   <text class="font pos_4">非</text>
@@ -15,7 +15,7 @@
       />
       <view class="ml-4 flex-col items-center flex-1 self-start group">
         <text class="font_2 text_2">写真预约</text>
-        <text class="mt-14 font_3 text_3">伊人摸样，丹青绘画</text>
+        <text class="mt-14 font_3 text_3">锦绣华服，即刻预约</text>
       </view>
     </view>
     <view class="flex-row items-center grid-item_2" @click="jump_feiyi">
@@ -25,7 +25,7 @@
       />
       <view class="flex-col items-center flex-1 ml-7">
         <text class="font_2">技艺体验</text>
-        <text class="mt-14 font_3">朴物良社，匠心手作</text>
+        <text class="mt-14 font_3">古艺新学，手作体验</text>
       </view>
     </view>
     <view class="flex-row grid-item_3" @click="jump_store">
@@ -34,8 +34,8 @@
         :src="homeUrl + '/tjsp.png'"
       />
       <view class="flex-col items-center flex-1 self-start group_2 ml-7">
-        <text class="font_2 text_5">推荐商品</text>
-        <text class="mt-12 font_3 text_6">伊人摸样，丹青绘画</text>
+        <text class="font_2 text_5">手作商城</text>
+        <text class="mt-12 font_3 text_6">传统工艺，匠心好物</text>
       </view>
     </view>
     <view class="flex-row relative grid-item_4" @click="jumpToActivity">
@@ -43,8 +43,8 @@
         class="shrink-0 self-center image_4"
         :src="homeUrl + '/hdzx.png'"
       />
-      <text class="self-start font_2 text_4">活动咨询</text>
-      <text class="font_3 pos_8">朴物良社，匠心手作</text>
+      <text class="self-start font_2 text_4">活动日记</text>
+      <text class="font_3 pos_8">活动点滴，邀您共阅</text>
     </view>
   </view>
 </view>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 6c5939c..37c117e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -148,7 +148,7 @@ const loginUser = async ( code ) =>{
   top: 1348.13rpx;
 }
 .text {
-  color: #000000;
+  color: #323232;
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 28.01rpx;
diff --git a/pages/mine/Contact/testContact.vue b/pages/mine/Contact/testContact.vue
index a60ad03..3ead1f7 100644
--- a/pages/mine/Contact/testContact.vue
+++ b/pages/mine/Contact/testContact.vue
@@ -160,7 +160,7 @@
 	}
 
 	.text {
-		color: #000000;
+		color: #323232;
 		font-size: 37.5rpx;
 		font-family: FangZhengFonts;
 		line-height: 36.47rpx;
diff --git a/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue b/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue
index 300ae1b..1323686 100644
--- a/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue
+++ b/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue
@@ -131,7 +131,7 @@
 	import { stateList } from '../../../common/global.js'
 	import { onLoad } from "@dcloudio/uni-app";
 	import { baseUrl } from '../../../api/request';
-	import { JudgeIsNullity } from '../../../common/globalFunction';
+	import { JudgeIsNullity, showTips } from '../../../common/globalFunction';
 	import { getFonts } from '../../../common/globalFont';
 	import emitter from '../../../utils/emitter';
 	import { myOrderUrl } from '../../../common/globalImagesUrl.js';
@@ -306,6 +306,7 @@
 					await deleteOrder(val)
 					await emitter.emit('flushOrderList')
 					routerJump('pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail')
+					showTips('删除成功')
 				}
 			}
 		})
@@ -658,7 +659,7 @@ button::after{
   bottom: 0;
 }
 .text_21 {
-  color: #000000;
+  color: #323232;
   font-size: 30rpx;
   line-height: 27.43rpx;
 }
diff --git a/pages/my-order/myOrderList/myOrderList.vue b/pages/my-order/myOrderList/myOrderList.vue
index 6b6498a..ad175ae 100644
--- a/pages/my-order/myOrderList/myOrderList.vue
+++ b/pages/my-order/myOrderList/myOrderList.vue
@@ -134,6 +134,7 @@
 	import { myOrderUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
 	import { publicPath } from '../../../common/globalImagesUrl';
 	import { onPullDownRefresh } from '@dcloudio/uni-app';
+	import { showTips } from '../../../common/globalFunction';
 	const color = ref(new Array(5).fill('#323232'))
 	const point = ref(0)
 	const isShowUnderLine = ref([true, false, false, false, false])
@@ -405,6 +406,7 @@
 					else {
 						await cancelServiceOrder(val)
 					}
+					showTips('取消成功')
 					await getMyOrder()
 				}
 			}
@@ -420,6 +422,7 @@
 				if (res.confirm) {
 					await deleteOrder(val)
 					await getMyOrder() 
+					showTips('删除成功')
 				}
 			}
 		})
@@ -636,7 +639,7 @@
 	.section_2 {
 	  padding: 31.88rpx 35.63rpx 0;
 	  background-color: #ffffff;
-	  box-shadow: 0rpx 3.75rpx 3.75rpx #00000040;
+	  box-shadow: 0rpx 3.75rpx 3.75rpx #32323240;
 	  position: fixed;
 	  top: 0;
 	  left: 0;
@@ -793,7 +796,7 @@
 	  font-size: 30rpx;
 	  font-family: FangZhengFonts;
 	  line-height: 25.84rpx;
-	  color: #000000;
+	  color: #323232;
 	}
 	.text_14 {
 	  font-size: 28.13rpx;
diff --git a/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue b/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue
index 9108699..f4df803 100644
--- a/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue
+++ b/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue
@@ -112,7 +112,7 @@
 	import {onMounted, ref} from 'vue'
 	import { onLoad } from "@dcloudio/uni-app";
 	import { baseUrl } from '../../../api/request';
-	import { JudgeIsNullity } from '../../../common/globalFunction';
+	import { JudgeIsNullity, showTips } from '../../../common/globalFunction';
 	import { serviceStateList } from '../../../common/global.js'
 	import emitter from '../../../utils/emitter';
 	import { getFonts } from '../../../common/globalFont';
@@ -277,6 +277,7 @@
 					await deleteOrder(val)
 					await emitter.emit('flushOrderList')
 					routerJump('pages/my-order/myServiceOrderDetail/myServiceOrderDetail')
+					showTips('删除成功')
 				}
 			}
 		})
@@ -631,7 +632,7 @@ button::after{
   bottom: 0;
 }
 .text_22 {
-  color: #000000;
+  color: #323232;
   line-height: 27.43rpx;
 }
 .group_10 {
diff --git a/pages/my-order/researchOrder/researchOrder.vue b/pages/my-order/researchOrder/researchOrder.vue
index 8f956b7..12c28e2 100644
--- a/pages/my-order/researchOrder/researchOrder.vue
+++ b/pages/my-order/researchOrder/researchOrder.vue
@@ -52,7 +52,7 @@
 .section_2 {
   padding: 33.75rpx 0 35.63rpx;
   background-color: #fff;
-  box-shadow: 0rpx 3.75rpx 3.75rpx #00000040;
+  box-shadow: 0rpx 3.75rpx 3.75rpx #32323240;
 }
 .pos {
   position: fixed;
diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue
index 8989be9..4da473c 100644
--- a/pages/order/product-waitpay/product-waitpay.vue
+++ b/pages/order/product-waitpay/product-waitpay.vue
@@ -793,7 +793,7 @@ const wxPay = async( oid )=> {  //传入订单id
 }
 .text_21 {
   // margin-left: -119.06rpx;
-  color: #000000;
+  color: #323232;
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 26.49rpx;
diff --git a/pages/order/serviceWaitPay/serviceWaitPay.vue b/pages/order/serviceWaitPay/serviceWaitPay.vue
index 44fe1e7..adced91 100644
--- a/pages/order/serviceWaitPay/serviceWaitPay.vue
+++ b/pages/order/serviceWaitPay/serviceWaitPay.vue
@@ -1,7 +1,7 @@
 <template>
 	<!-- 批量服务类商品购买 -->
 	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgPubilcPath + ')' }">
-	  <view class="flex-row justify-between items-center section_2">
+	  <view class="flex-row justify-between items-center section_2" @click="loadPop">
 	    <view class="flex-row items-center">
 	      <image
 	        class="shrink-0 image"
@@ -9,12 +9,12 @@
 	      />
 	      <text class="text ml-10" style="font-size: 30rpx;">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text>
 	    </view>
-	    <view class="flex-row items-center group" @click="loadPop" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
+	    <view class="flex-row items-center group" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
+	      <text class="font text_2">更换联系人</text>
 	      <image
 	        class="image_2"
 	        :src="orderUrl + '/serviceWaitPay/yjt.png'"
 	      />
-	      <text class="font text_2">更换联系人</text>
 	    </view>
 	  </view>
 	  <view class="flex-col section_3">
@@ -582,8 +582,8 @@
   border-radius: 18.75rpx;
 }
 .image {
-  width: 65.63rpx;
-  height: 67.5rpx;
+  width: 50.63rpx;
+  height: 50.5rpx;
 }
 .text {
   color: #818181;
@@ -593,11 +593,12 @@
 }
 .group {
   width: 167.03rpx;
+  display: flex;
+  justify-content: space-around;
 }
 .image_2 {
-  margin-left: 129.53rpx;
-  width: 37.5rpx;
-  height: 37.5rpx;
+  width: 25.5rpx;
+  height: 25.5rpx;
 }
 .font {
   font-size: 26.25rpx;
@@ -606,7 +607,6 @@
   color: #323232;
 }
 .text_2 {
-  margin-left: -167.03rpx;
   color: #ffaaa5;
 }
 .section_3 {
@@ -690,7 +690,7 @@
   color: #ffffff;
 }
 .text_6 {
-  line-height: 17.23rpx;
+  line-height: 26.25rpx;
 }
 .image_5 {
   border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
@@ -775,7 +775,7 @@
   border-radius: 18.75rpx;
 }
 .text_15 {
-  color: #000000;
+  color: #323232;
   line-height: 29.53rpx;
 }
 .text-wrapper_2 {
@@ -805,7 +805,7 @@
 }
 .text_17 {
   // margin-left: -119.06rpx;
-  color: #000000;
+  color: #323232;
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 26.49rpx;
diff --git a/pages/order/singleGoodOrder/singleGoodOrder.vue b/pages/order/singleGoodOrder/singleGoodOrder.vue
index 847f22f..45b7e30 100644
--- a/pages/order/singleGoodOrder/singleGoodOrder.vue
+++ b/pages/order/singleGoodOrder/singleGoodOrder.vue
@@ -789,7 +789,7 @@ const wxPay = async ( oid )=> {  //传入订单id
   border-radius: 18.75rpx;
 }
 .text_19 {
-  color: #000000;
+  color: #323232;
   line-height: 29.53rpx;
 }
 .text-wrapper_2 {
@@ -820,7 +820,7 @@ const wxPay = async ( oid )=> {  //传入订单id
 }
 .text_21 {
   // margin-left: -119.06rpx;
-  color: #000000;
+  color: #323232;
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 26.49rpx;
diff --git a/pages/order/singleServiceWait/singleServiceWait.vue b/pages/order/singleServiceWait/singleServiceWait.vue
index 485a068..78f1ce6 100644
--- a/pages/order/singleServiceWait/singleServiceWait.vue
+++ b/pages/order/singleServiceWait/singleServiceWait.vue
@@ -10,11 +10,11 @@
 	      <text class="text ml-10" style="font-size: 30rpx;">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text>
 	    </view>
 	    <view class="flex-row items-center group" :style="{ pointerEvents: isLoading ? 'none' : 'auto' }">
+	      <text class="font text_2">更换联系人</text>
 	      <image
 	        class="image_2"
 	        :src="orderUrl + '/singleServiceWait/yjt.png'"
 	      />
-	      <text class="font text_2">更换联系人</text>
 	    </view>
 	  </view>
 	  <view class="flex-col section_3">
@@ -576,8 +576,8 @@
   border-radius: 18.75rpx;
 }
 .image {
-  width: 65.63rpx;
-  height: 67.5rpx;
+  width: 50.63rpx;
+  height: 50.5rpx;
 }
 .text {
   color: #818181;
@@ -587,11 +587,12 @@
 }
 .group {
   width: 167.03rpx;
+  display: flex;
+  justify-content: space-around;
 }
 .image_2 {
-  margin-left: 129.53rpx;
-  width: 37.5rpx;
-  height: 37.5rpx;
+  width: 25.5rpx;
+  height: 25.5rpx;
 }
 .font {
   font-size: 26.25rpx;
@@ -600,7 +601,6 @@
   color: #323232;
 }
 .text_2 {
-  margin-left: -167.03rpx;
   color: #ffaaa5;
 }
 .section_3 {
@@ -768,7 +768,7 @@
   border-radius: 18.75rpx;
 }
 .text_15 {
-  color: #000000;
+  color: #323232;
   line-height: 29.53rpx;
 }
 .text-wrapper_2 {
@@ -798,7 +798,7 @@
 }
 .text_17 {
   // margin-left: -119.06rpx;
-  color: #000000;
+  color: #323232;
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 26.49rpx;
diff --git a/pages/store-home/ProductDetails/ProductDetails.vue b/pages/store-home/ProductDetails/ProductDetails.vue
index 2969633..f531953 100644
--- a/pages/store-home/ProductDetails/ProductDetails.vue
+++ b/pages/store-home/ProductDetails/ProductDetails.vue
@@ -13,8 +13,8 @@
   <view class="flex-col self-stretch section_2">
     <view class="self-start group">
       <text class="font text_2">￥</text>
-      <text class="text">{{ goodObject.price }}</text> 
-			<text class="discountsText">限时优惠{{ coupon }}元</text>
+      <text class="text">{{ goodObject.price.toFixed(2) }}</text> 
+			<text class="discountsText">限时优惠{{ coupon.toFixed(2) }}元</text>
     </view>
     <view class="flex-row justify-between items-center self-stretch group_2">
       <text class="text_4">{{ goodObject.name }}</text>
@@ -326,7 +326,7 @@ button::after {
   padding: 16.88rpx 0 20.63rpx;
 }
 .text_5 {
-  color: #000000;
+  color: #323232;
   line-height: 24.62rpx;
 }
 .text-wrapper {
@@ -387,7 +387,7 @@ button::after {
   color: #ffffff;
 }
 .text_10 {
-  color: #000000;
+  color: #323232;
   line-height: 28.01rpx;
   text-decoration: underline;
 }
diff --git a/pages/store-home/main/testMain.vue b/pages/store-home/main/testMain.vue
index 6096a35..6bfe4a9 100644
--- a/pages/store-home/main/testMain.vue
+++ b/pages/store-home/main/testMain.vue
@@ -44,7 +44,7 @@
 	      <view class="flex-col items-start self-center group_1">
 	        <text class="font">{{ item.name }}</text>
 	        <text class="font_3 mt-9">{{ item.intro }}</text>
-	        <text class="font_4 text_5 text_1 mt-9">￥{{ item.price }}</text>
+	        <text class="font_4 text_5 text_1 mt-9">￥{{ item.price.toFixed(2) }}</text>
 	      </view> 
 	      <!-- <image
 	        class="self-start image_5"
@@ -268,7 +268,7 @@ input {
   top: 0;
 }
 .text {
-  color: #000000;
+  color: #323232;
   font-size: 35rpx;
   font-family: FangZhengFonts;
   line-height: 35.66rpx;
@@ -357,7 +357,7 @@ input {
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 30rpx;
-  color: #000000;
+  color: #323232;
 }
 .font_3 {
   font-size: 22.5rpx;
diff --git a/pages/workshop/component/timeSelect.vue b/pages/workshop/component/timeSelect.vue
index 6eac54d..f2b080a 100644
--- a/pages/workshop/component/timeSelect.vue
+++ b/pages/workshop/component/timeSelect.vue
@@ -423,7 +423,7 @@
   margin-right: 20.57rpx;
 }
 .text_4 {
-  color: #000000;
+  color: #323232;
   line-height: 24.23rpx;
 }
 .equal-division {
diff --git a/pages/workshop/productmain/productmain.vue b/pages/workshop/productmain/productmain.vue
index afe2119..42606a0 100644
--- a/pages/workshop/productmain/productmain.vue
+++ b/pages/workshop/productmain/productmain.vue
@@ -41,11 +41,13 @@
 	    </view>
 	    <view class="flex-row section_5">
 	      <view class="flex-col items-center shrink-0 self-start">
+			<button style="background-color: #ffffff;" class="flex-col" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
 	        <image
 	          class="image_4"
 	          :src="workshopUrl + '/productmain/lxkf.png'"
 	        />
 	        <text class="text_13 mt-3">客服</text>
+			</button>
 	      </view>
 	      <view class="flex-row flex-1 self-center ml-26">
 	        <view class="flex-col justify-start items-center text-wrapper" @click="loadPopCart">
@@ -188,6 +190,9 @@ const loadPopBook = ()=> {
 </script>
 
 <style lang="scss" scoped>
+button::after {
+	border: none;
+}
 .popup-content {
 	height: 85vh;
 }
@@ -235,7 +240,7 @@ const loadPopBook = ()=> {
   line-height: 29.7rpx;
 }
 .text {
-  color: #000000;
+  color: #323232;
   line-height: 28.37rpx;
 }
 .image {
@@ -292,7 +297,7 @@ const loadPopBook = ()=> {
   font-size: 26.25rpx;
   font-family: FangZhengFonts;
   line-height: 24.92rpx;
-  color: #000000;
+  color: #323232;
 }
 .section_4 {
   padding: 31.63rpx 18.04rpx 56.83rpx 26.76rpx;
@@ -366,7 +371,7 @@ const loadPopBook = ()=> {
 .text_14 {
   margin-left: 4.74rpx;
   margin-top: 32.87rpx;
-  color: #000000;
+  color: #323232;
   font-size: 30rpx;
   font-family: Open Sans;
   line-height: 27.71rpx;
diff --git a/pages/workshop/searchResult/searchResult.vue b/pages/workshop/searchResult/searchResult.vue
index e6c7639..415b5c1 100644
--- a/pages/workshop/searchResult/searchResult.vue
+++ b/pages/workshop/searchResult/searchResult.vue
@@ -244,7 +244,7 @@
   font-size: 30rpx;
   font-family: FangZhengFonts;
   line-height: 30rpx;
-  color: #000000;
+  color: #323232;
 }
 .text_3 {
   margin-left: 17.7rpx;