diff --git a/App.vue b/App.vue
index e027018..ea791f2 100644
--- a/App.vue
+++ b/App.vue
@@ -9,6 +9,7 @@ onLaunch(()=>{
 	// console.log('onLaunch方法被触发');
 	// getFonts()   //更改全局字体
 })
+
 // const getFonts = () => { //导入字体
 // 	uni.loadFontFace({
 // 		family: 'FangZhengFonts',
diff --git a/api/request.ts b/api/request.ts
index 800524d..7230ec5 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.json b/pages.json
index 3981628..3f2dfde 100644
--- a/pages.json
+++ b/pages.json
@@ -21,6 +21,13 @@
 			"navigationBarTitleText" : ""
 		}
 	},
+	{
+		"path" : "pages/order/component/contactsComponent",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
 	{
 		"path" : "pages/coupon/CouponMall/CouponMall",
 		"style" : 
@@ -234,13 +241,6 @@
 			"enablePullDownRefresh":true   //开启下拉刷新
 		}
 	},
-	{
-		"path" : "pages/syy",
-		"style" :
-		{
-			"navigationBarTitleText" : ""
-		}
-	},
 	{
 		"path" : "pages/order/singleGoodOrder/singleGoodOrder",
 		"style" : 
@@ -283,6 +283,27 @@
 			"navigationBarTitleText" : ""
 		}
 	},
+	{
+		"path" : "pages/order/serviceWaitPay/serviceWaitPay",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
+	{
+		"path" : "pages/mine/Contact/testContact",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
+	{
+		"path" : "pages/mine/component/contactPop",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
 	{
 		"path" : "pages/coupon/OverDueCoupon/OverDueCoupon",
 		"style" : 
diff --git a/pages/Shopping-cart/component/addProduct.vue b/pages/Shopping-cart/component/addProduct.vue
index c1c58c7..c39c174 100644
--- a/pages/Shopping-cart/component/addProduct.vue
+++ b/pages/Shopping-cart/component/addProduct.vue
@@ -13,7 +13,6 @@
 					</view>
 					<view class="mt-14 flex-col items-start self-stretch">
 						<text class="text_3">{{productBrief.name}}</text>
-						<!-- <text class="text_4 mt-9">{{已选：蓝色发簪}}</text> -->
 					</view>
 				</view>
 				<view class="flex-col shrink-0 ml-5">
@@ -37,8 +36,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="flex-col justify-start items-center text-wrapper_2" @click="addCart"><text
-				class="text_6">加入购物车</text></view>
+		<view class="flex-col justify-start items-center text-wrapper_2" @click="addCart"><text class="text_6">加入购物车</text></view>
 	</view>
 </template>
 
@@ -53,9 +51,7 @@
 		onShow
 	} from "@dcloudio/uni-app";
 	import {
-		baseUrl,
-		testUrl,
-		suiUrl
+		baseUrl
 	} from '../../../api/request';
 	const productBrief = ref({}) //商品简要对象
 	const quantity = ref(1)
@@ -206,7 +202,7 @@
 
 	.image-wrapper_2 {
 		padding: 11.25rpx 0;
-		background-color: #f5f5dc;
+		background-color: #FBDEDF;
 		border-radius: 5.63rpx 0rpx 0rpx 5.63rpx;
 		width: 52.5rpx;
 		height: 52.5rpx;
@@ -219,7 +215,7 @@
 
 	.text-wrapper {
 		padding: 15rpx 0 11.25rpx;
-		background-color: #f5f5dc;
+		background-color: #FBDEDF;
 		width: 52.5rpx;
 		height: 52.5rpx;
 	}
@@ -233,7 +229,7 @@
 
 	.image-wrapper_3 {
 		padding: 11.25rpx 0;
-		background-color: #f5f5dc;
+		background-color: #FBDEDF;
 		border-radius: 0rpx 5.63rpx 5.63rpx 0rpx;
 		width: 52.5rpx;
 		height: 52.5rpx;
@@ -242,7 +238,7 @@
 	.text-wrapper_2 {
 		margin-right: 15rpx;
 		padding: 22.5rpx 0;
-		background-color: #ffd45a;
+		background-color: #E79EA1;
 		border-radius: 93.75rpx;
 	}
 
diff --git a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
index 3f17a83..6a5c9cb 100644
--- a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
+++ b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
@@ -1,7 +1,6 @@
 <template>
 <view class="flex-col page">
   <view class="flex-col group">
-    <text class="self-start font_2 text">收货信息</text>
     <view class="flex-col self-stretch section mt-15">
       <view class="flex-row items-center group_2">
         <text class="font_2">收货人</text>
@@ -22,25 +21,24 @@
 								:disabled="true"/>
 					</picker>
           <image
-            class="image pos"
-            src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FkYDyjpPh-dingwei.png"
+            class="pos tag"
+            src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FeIdxrdNN-dingwei.png"
 						@click="chooseLocation()"
           />
         </view>
       </view>
       <view class="flex-row items-center group_6">
         <text class="font_2 text_7">详细地址</text>
-        <textarea class="section_2 ml-12" v-model="addressParam.detailAddress" placeholder="输入详细地址" />
+        <textarea class="section_2 ml-12" v-model="addressParam.detailAddress" placeholder="输入详细地址" auto-height="true"/>
       </view>
-			<!-- 暂时用不了 -->
 				<view class="flex-row justify-between items-center group_7">
 					<checkbox-group @change="defaultAddress">
-					<text class="font_2">设为默认收货地址</text>
+					<text class="font_2" style="margin-right: 400rpx;">设为默认收货地址</text>
 					<!-- <image
 								class="image_2"
 								:src="selected"
 								/> -->
-					<checkbox value="1" />
+					<checkbox class="round red radius" value="1"  />
 					</checkbox-group>
 				</view>
     </view>
@@ -148,9 +146,6 @@ const chooseLocation = () => {  //定位获取地址
 	})
 }
 const bindTimeChange = (e) => {  //picker省市区选择
-	// console.log('省--->',e.detail.value[0]);
-	// console.log('市--->',e.detail.value[1]);
-	// console.log('区--->',e.detail.value[2]);
 	addressParam.value.region = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
 }
 </script>
@@ -170,11 +165,13 @@ const bindTimeChange = (e) => {  //picker省市区选择
 }
 .page {
   padding-top: 26.44rpx;
-  background-color: #fffaf0;
+  // background-color: #fffaf0;
+	background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
+	background-size: 100% 100%;
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  // height: 100vh;
+  height: 100vh;
   overflow: hidden;
 }
 .group {
@@ -194,9 +191,9 @@ const bindTimeChange = (e) => {  //picker省市区选择
   margin-right: 14.1rpx;
   padding-left: 20.49rpx;
   padding-right: 15.13rpx;
-  background-color: #fffef8;
+  background-color: #ffffff;
   border-radius: 9.38rpx;
-  border: solid 1.88rpx #818181;
+  // border: solid 1.88rpx #818181;
 }
 .group_2 {
   padding: 24.24rpx 4.65rpx 12.19rpx;
@@ -218,7 +215,7 @@ const bindTimeChange = (e) => {  //picker省市区选择
   margin-right: 28.71rpx;
 }
 .group_4 {
-  padding: 12.19rpx 4.29rpx 10.31rpx;
+  padding: 14.06rpx 5.04rpx 12.19rpx;
   border-bottom: solid 1.88rpx #efefef;
 }
 .text_5 {
@@ -248,12 +245,12 @@ const bindTimeChange = (e) => {  //picker省市区选择
 }
 .section_2 {
   width: 300rpx; 
-  height: 150rpx;
+  // height: 45rpx;
   flex: 1 1 0;
   margin-right: 19.57rpx;
 }
 .group_7 {
-  padding: 25.31rpx 4.88rpx 32.01rpx;
+  padding: 14.06rpx 5.04rpx 12.19rpx;
 }
 .image_2 {
   margin-right: 19.5rpx;
@@ -265,18 +262,18 @@ const bindTimeChange = (e) => {  //picker省市区选择
   left: 0;
   right: 0;
   bottom: 0;
-  margin-right: 13.13rpx;
+  // margin-right: 13.13rpx;
   padding: 16.88rpx 0;
   background-color: #fffef8;
 }
 .text-wrapper_4 {
   padding: 27.24rpx 0 23.61rpx;
-  background-color: #ffa948;
+  background-color: #FBDEDF;
   border-radius: 46.88rpx;
   width: 618.75rpx;
 }
 .text_8 {
-  color: #ffffff;
+  color: #C35C5D;
   font-size: 30rpx;
   font-family: Open Sans;
   line-height: 27.9rpx;
@@ -285,6 +282,15 @@ const bindTimeChange = (e) => {  //picker省市区选择
 	height: 100rpx;
 	width: 450rpx;
 	margin-left: 50rpx;
+}
+.tag {
+	width: 55.75rpx;
+	height: 55.75rpx;
+}
+.radius {
+	transform: scale(0.7);
+	width: 37.5rpx;
+	height: 37.5rpx;
 }
 	@import url(../../../common/css/global.css);
 </style>
\ No newline at end of file
diff --git a/pages/Shopping-cart/productmain/productmain.vue b/pages/Shopping-cart/productmain/productmain.vue
index f7d6ecc..95fb481 100644
--- a/pages/Shopping-cart/productmain/productmain.vue
+++ b/pages/Shopping-cart/productmain/productmain.vue
@@ -56,6 +56,7 @@
 	          </view>
 	        </view>
 					<!-- 服务类商品 -->
+					<view class="flex-col list-item mt-8" v-for="(item, index) in products" :key="index">
 	       <view class="flex-col list-item_2 mt-8" v-if="current == 2">
 	          <view class="flex-row">
 	            <image
@@ -105,6 +106,7 @@
 	          </view>
 	        </view>
 	      </view>
+				</view>
 				</checkbox-group>
 			</view>
 			
@@ -138,16 +140,19 @@ const current = ref(1)  //用于判断是实体类商品还是服务类商品
 const allCheck = ref(false)  //全选
 const checkedData = ref([])  //选择的暂存保存数组
 const totalPrice = ref(0)
-// const userInfo = wx.getStorageSync('userInfo')
 const stateText = ref({
 	topBtn: '编辑',
 	bottomBtn: '去结算'
 })
+//服务类商品
+const serviceProduct = ref([])
 onShow(()=>{
 	getProductCart() //获取商品类
+	getServiceCart() //获取服务类
 })
 onLoad(()=>{
 	getProductCart() //再获取一次实体类商品的列表
+	getServiceCart() //再获取一次
 })
 //小程序刷新根据用户id获取购物车信息
 const getProductCart = async ()=>{
@@ -185,7 +190,7 @@ const deleteProduct = async (idArr) =>{  //删除商品
 		totalPrice.value = 0
 	}
 }
-const getServiceCart =()=>{
+const getServiceCart = async () => {
 	console.log('获取服务类商品方法被触发');
 }
 //更改实体商品和服务类方法
diff --git a/pages/Shopping-cart/productmain/testproductmain.vue b/pages/Shopping-cart/productmain/testproductmain.vue
index a9f1c36..73e0bf0 100644
--- a/pages/Shopping-cart/productmain/testproductmain.vue
+++ b/pages/Shopping-cart/productmain/testproductmain.vue
@@ -1,683 +1,838 @@
 <template>
-<view class="flex-col page">
-  <view class="flex-row items-center section_2">
-    <text class="font text">购物车</text>
-    <view class="flex-row items-center flex-1 section_3 ml-17">
-      <image
-        class="shrink-0 image"
-        src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FANvSsQui-sousuo.png"
-      />
-      <input v-model="searchText" class="section_1 ml-4" placeholder="搜索购物车商品" />
-    </view>
-    <text class="font text_2 ml-17" @click="changeState">{{ stateText.topBtn }}</text>
-  </view>
-  <view class="flex-col section_5">
-    <view class="flex-row justify-between self-stretch group">
-      <text class="font_2 text_3" :style="getTextStyle(1)" @click="changeType(1)">商品类</text>
-      <text class="font_2 text_4" :style="getTextStyle(2)" @click="changeType(2)">服务类</text>
-    </view>
-  </view>
-  <view class="flex-col list">
-		<checkbox-group @change="checkBoxChange">
-    <view class="flex-col list-item mt-14" v-for="(item, index) in products" :key="index">
-      <!-- 实体类商品 -->
-			<view class="flex-row section_10" v-if="current == 1">
-				<!-- 多选框 -->
-				<checkbox class="shrink-0 self-center image_3 round red" :value="index" :checked="item.checked"/>
-        <view class="flex-row items-end flex-1 self-center ml-22">
-          <image
-            class="shrink-0 image_2"
-            :src="item.cartGoodVO.goodImg.split(';')[0]"
-						@click="jump_product(item.goodId)"
-          />
-          <view class="flex-col flex-1 group_2">
-            <view class="flex-row justify-center group_3">
-              <text class="font_3 text_5" @click="jump_product(item.goodId)">{{ item.cartGoodVO.name }}</text>
-              <text class="font_3" @click="jump_product(item.goodId)">【{{ item.cartGoodVO.type }}】</text>
-            </view>
-            <view class="flex-row justify-between items-center mt-46">
-              <view class="flex-row items-end">
-                <text class="font_4 text_6"  @click="jump_product(item.goodId)">￥{{ item.cartGoodVO.price }}</text>
-                <!-- <image
+	<view class="flex-col page">
+		<view class="flex-row items-center section_2">
+			<text class="font text">购物车</text>
+			<view class="flex-row items-center flex-1 section_3 ml-17">
+				<image class="shrink-0 image"
+					src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FANvSsQui-sousuo.png" />
+				<input v-model="searchText" class="section_1 ml-4" placeholder="搜索购物车商品" />
+			</view>
+			<text class="font text_2 ml-17" @click="changeState">{{ stateText.topBtn }}</text>
+		</view>
+		<view class="flex-col section_5">
+			<view class="flex-row justify-between self-stretch group">
+				<text class="font_2 text_3" :style="getTextStyle(1)" @click="changeType(1)">商品类</text>
+				<text class="font_2 text_4" :style="getTextStyle(2)" @click="changeType(2)">服务类</text>
+			</view>
+		</view>
+		<view class="flex-col list">
+			<checkbox-group @change="checkBoxChange">
+				<view class="flex-col list-item mt-14" v-for="(item, index) in products" :key="index">
+					<!-- 实体类商品 -->
+					<view class="flex-row section_10" v-if="current == 1">
+						<!-- 多选框 -->
+						<checkbox class="shrink-0 self-center image_3 round red" :value="index" :checked="item.checked" />
+						<view class="flex-row items-end flex-1 self-center ml-22">
+							<image class="shrink-0 image_2" :src="item.cartGoodVO.goodImg.split(';')[0]"
+								@click="jump_product(item.goodId)" />
+							<view class="flex-col flex-1 group_2">
+								<view class="flex-row justify-center group_3">
+									<text class="font_3 text_5" @click="jump_product(item.goodId)">{{ item.cartGoodVO.name }}</text>
+									<text class="font_3" @click="jump_product(item.goodId)">【{{ item.cartGoodVO.type }}】</text>
+								</view>
+								<view class="flex-row justify-between items-center mt-46">
+									<view class="flex-row items-end">
+										<text class="font_4 text_6" @click="jump_product(item.goodId)">￥{{ item.cartGoodVO.price }}</text>
+										<!-- <image
                   class="shrink-0 image_6"
                   src="https://ide.code.fun/api/image?token=6779d8c1797f850011f55ea9&name=babcf6110b7f4238c5be5c44afb0a800.png"
                 />
                 <text class="font_5 text_7">00</text> -->
-              </view>
-							<!-- 减少数量 -->
-              <image
-                class="image_4"
-								src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FVBaGfZxE-short.png"
-								@click="decrease(index , item.checked)"
-							/>
-            </view>
-          </view>
-          <view class="flex-row shrink-0 group_4">
-            <view class="flex-col justify-start items-center text-wrapper"><text class="font_6">{{ item.quantity }}</text></view>
-            <!-- 添加数量 -->
-						<image
-              class="image_5 ml-2"
-              src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FLsCJgzgf-add.png"
-							@click="increase(index , item.checked)"
-						/>
-          </view>
-        </view>
-      </view>
-			<!-- 服务类商品 -->
-      <view class="flex-col list-item_2 mt-14" v-if="current == 2">
-        <view class="flex-row">
-          <image
-            class="shrink-0 self-start image_8"
-            src="https://ide.code.fun/api/image?token=6779d8c1797f850011f55ea9&name=bbd3dd8989652c3ab7b9e5bd53d5db7d.png"
-          />
-          <image
-            class="shrink-0 image_7"
-            src="https://ide.code.fun/api/image?token=6779d8c1797f850011f55ea9&name=df47ebd42125801292be7272770f505a.png"
-          />
-          <view class="flex-col flex-1 group_5">
-            <text class="font_7">【非遗手工艺体验】纸笺加工技艺-流沙笺团扇制作体验</text>
-            <view class="flex-row justify-between items-center section_7 mt-14">
-              <view class="flex-col items-start">
-                <text class="font_8">仿真丝团扇;上午场(09:30-12:00)</text>
-                <text class="font_8 text_8 mt-6">预约日期：2024-10-15</text>
-              </view>
-              <image
-                class="image_9"
-                src="https://ide.code.fun/api/image?token=6779d8c1797f850011f55ea9&name=c86722cdfe0aafd70ce1bdc9227561d6.png"
-              />
-            </view>
-          </view>
-        </view>
-        <view class="flex-row justify-end items-center group_6 mt-16">
-          <view class="flex-row items-center">
-            <text class="font_9 text_9">138.</text>
-            <image
-              class="shrink-0 image_12"
-              src="https://ide.code.fun/api/image?token=6779d8c1797f850011f55ea9&name=0ea9293deedfe538187f9813efe15880.png"
-            />
-            <text class="font_10 text_10">00</text>
-          </view>
-          <view class="flex-row ml-83">
-            <image
-              class="image_10"
-              src="https://ide.code.fun/api/image?token=6779d8c1797f850011f55ea9&name=35c583f367baecfc803c6018dad7f951.png"
-            />
-            <view class="flex-col justify-start items-center text-wrapper_2 ml-2"><text class="font_6">1</text></view>
-            <image
-              class="image_11 ml-2"
-              src="https://ide.code.fun/api/image?token=6779d8c1797f850011f55ea9&name=db5f3531d9c85943afe86625bb8d6073.png"
-            />
-          </view>
-        </view>
-      </view>
-    </view>
-		</checkbox-group>
-  </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
+									</view>
+									<!-- 减少数量 -->
+									<image class="image_4"
+										src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FVBaGfZxE-short.png"
+										@click="decrease(index , item.checked)" />
+								</view>
+							</view>
+							<view class="flex-row shrink-0 group_4">
+								<view class="flex-col justify-start items-center text-wrapper"><text
+										class="font_6">{{ item.quantity }}</text></view>
+								<!-- 添加数量 -->
+								<image class="image_5 ml-2"
+									src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FLsCJgzgf-add.png"
+									@click="increase(index , item.checked)" />
+							</view>
+						</view>
+					</view>
+					<!-- 服务类商品 -->
+					<view class="flex-col list-item_2 mt-14" v-if="current == 2">
+						<view class="flex-row">
+							<!-- 按钮 -->
+							<checkbox class="shrink-0 self-center image_3 round red" :value="index" :checked="item.checked" />
+							<image class="shrink-0 image_7" :src="item.cartExperienceGoodVO.goodImg.split(';')[0]" />
+							<view class="flex_1">
+								<view class="flex-col flex-1 group_5">
+									<text class="font_7">{{ item.cartExperienceGoodVO.name }}</text>
+									<view class="flex-row justify-between items-center section_7 mt-14">
+										<view class="flex-col items-start">
+											<text class="font_8">{{ item.timeSlot }}</text>
+											<text class="font_8 text_8 mt-6">预约日期：{{ item.reservationDate }}</text>
+										</view>
+										<!-- 下拉菜单 -->
+										<!-- <image class="image_9"
+												src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FYAAYkKzi-pulldown.png" /> -->
+									</view>
+								</view>
+								<view class="flex-row justify-end items-center group_6">
+									<view class="flex-row items-center">
+										<text class="font_9 text_9">￥{{ item.cartExperienceGoodVO.price }}</text>
+									</view>
+									<view class="flex-row ml-83">
+										<image class="image_10"
+											src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FVBaGfZxE-short.png"
+											@click="decrease(index , item.checked)" />
+										<view class="flex-col justify-start items-center text-wrapper_2 ml-2"><text
+												class="font_6">{{ item.quantity }}</text>
+										</view>
+										<image class="image_11 ml-2"
+											src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FLsCJgzgf-add.png"
+											@click="increase(index , item.checked)" />
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</checkbox-group>
+		</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"
       /> -->
-      <text class="font_2 text_11 ml-9">全选</text>
-    </view>
-    <view class="flex-row items-center">
-      <text class="font_2 text_12">合计：{{ totalPrice }}元</text>
-      <view class="flex-col justify-start items-center shrink-0 text-wrapper_3 ml-7">
-        <text class="font_4 text_13" @click="editOrSettle">{{ stateText.bottomBtn }}</text>
-      </view>
-    </view>
-  </view>
-</view>
+				<text class="font_2 text_11 ml-9">全选</text>
+			</view>
+			<view class="flex-row items-center">
+				<text class="font_2 text_12">合计：{{ totalPrice }}元</text>
+				<view class="flex-col justify-start items-center shrink-0 text-wrapper_3 ml-7">
+					<text class="font_4 text_13" @click="editOrSettle">{{ stateText.bottomBtn }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-import { ref , onMounted , toRaw} from 'vue'
-import { onShow , onLoad } from "@dcloudio/uni-app";
-import { baseUrl , testUrl ,suiUrl} from '../../../api/request';
-import * as math from 'mathjs'
-const products = ref([])
-const current = ref(1)  //用于判断是实体类商品还是服务类商品
-const allCheck = ref(false)  //全选
-const checkedData = ref([])  //选择的暂存保存数组
-const totalPrice = ref(0) //总金额
-const searchText = ref('')
-const stateText = ref({
-	topBtn: '编辑',
-	bottomBtn: '去结算'
-})
-onShow(()=>{
-	getProductCart() //获取商品类
-})
-onLoad(()=>{
-	getProductCart() //再获取一次实体类商品的列表
-	getFonts()
-})
-//小程序刷新根据用户id获取购物车信息
-const getProductCart = async ()=>{
-	const res = await uni.request({
-		url: baseUrl + '/cart/list',
-		method: 'POST',
-		header: {
-			'cookie': wx.getStorageSync('cookie')
-		}
+	import { ref, onMounted, toRaw } from 'vue'
+	import { onShow, onLoad } from "@dcloudio/uni-app";
+	import { baseUrl, testUrl, suiUrl } from '../../../api/request';
+	import * as math from 'mathjs'
+	const products = ref([])
+	const current = ref(1) //用于判断是实体类商品还是服务类商品
+	const allCheck = ref(false) //全选
+	const checkedData = ref([]) //选择的暂存保存数组
+	const totalPrice = ref(0) //总金额
+	const searchText = ref('')
+	const stateText = ref({
+		topBtn: '编辑',
+		bottomBtn: '去结算'
 	})
-	console.log('res--->',res.data);
-	if(res.data.code === 1) {
-		products.value = res.data.data
-		products.value.forEach((item)=>{
-			item.checked = false
-		})
-	}
-	console.log('products-->',products.value);
-}
-const deleteProduct = async (idArr) =>{  //删除商品
-	const res = await uni.request({
-		url: baseUrl + '/cart/delete',
-		method: 'POST',
-		data:  idArr ,
-		header: {
-			'cookie': wx.getStorageSync('cookie')
-		}
+	//服务类商品
+	const serviceProduct = ref([])
+	const errorArr = ref([])  //检验错误的实体类商品id数组
+	onShow(() => {
+		getProductCart() //获取购物车所有商品信息
 	})
-	console.log(res.data);
-	if(res.data.code === 1) {
-		// getProductCart() //重新获取购物车信息
-		uni.reLaunch({
-			url: '/pages/Shopping-cart/testproductmain/testproductmain'
-		})
-		totalPrice.value = 0
-	}
-}
-const getServiceCart =()=>{
-	console.log('获取服务类商品方法被触发');
-}
-//更改实体商品和服务类方法
-const changeType = async (num)=>{
-	current.value = num;
-	if(num ===1 ) { //为一的时候就获取用户商品购物车
-		
-	}
-}
-//更改下划线
-const getTextStyle = (num) => ({
-		'border-bottom' : current.value === num ? '2px solid orange' : '2px solid  #ffffff'
-});
-//复选框绑定方法
-const checkBoxChange =(event)=>{
-	//如果选中的checkbox的value的数组长度和后端传过来的数组长度相等则为全选状态 allCheck为true
-	console.log('length---->',event.detail.value.length);
-	// console.log('product--->',products.value);
-	if(event.detail.value.length == products.value.length) {
-		allCheck.value = true
-	} else {
-		allCheck.value = false
-	}
-	checkedData.value = [] //每次都要重置一下
-	totalPrice.value = 0;
-	let count = 0; //用于记录checkedData不为null的个数
-	console.log('event--->',event.detail);
-	if(event.detail.value.length) {
-		products.value[parseInt(event.detail.value)].checked = true;  //勾选
-	} else {
-		products.value.forEach((item)=>{
-			item.checked = false
-		})
-	}
-	//计算一下总金额
-	for(let key in event.detail.value) {
-		let temp = parseInt(event.detail.value[parseInt(key)]) //相当于商品数组下标
-		computed(products.value[temp].cartGoodVO.price , products.value[temp].quantity)
-	}
-	event.detail.value.forEach((item)=>{
-		products.value[parseInt(item)].checked = true
+	onLoad(() => {
+		getProductCart() //再获取一次
+		getFonts()
 	})
-  //然后假如checkboxGroup传过来的 detail.value中有某个id则把这些元素的checked属性置为true(选中状态)
-	products.value.forEach((x)=>{
-		event.detail.value.forEach((y)=>{
-			if(x.value == y) {
-				x.checked = true
-			}
-		})
-	})
-	event.detail.value.forEach((item)=>{  //将选中的商品信息赋值给checkedData
-		console.log('products.value[parseInt(item)].goodId',products.value[parseInt(item)].goodId);
-		if(products.value[parseInt(item)] !== null) {
-			checkedData.value.push(products.value[parseInt(item)].id)
-			// console.log(products.value[parseInt(item)].goodId);
-			count += 1
-		}
-	})
-	console.log('checkedData--->',checkedData.value);
-	//将选中的数组保存在某一个ref中
-	// checkedData.value = event.detail.value
-	// console.log('checkedData--->',checkedData.value);
-}
-//全选方法
-const allChecked = ()=>{
-	allCheck.value = !allCheck.value
-	totalPrice.value = 0
-	if ( allCheck.value == true ) {
-		products.value.forEach((item)=>{
-			item.checked = true //将全部选项选上
-			computed(item.cartGoodVO.price , item.quantity)
-		})
-		checkedData.value = products.value.map((item)=>( item.id ))
-		console.log('checkedData--->',checkedData.value);
-	} else {
-		products.value.forEach((item)=>{
-			item.checked = false  //将全部都取消选择
-		})
-	}
-}
-//减少商品
-const decrease =(index , item)=>{  //item用于监测是否选中
-	console.log('decrease,index-->',index);
-	console.log('decrease,item-->',item);
-	if(products.value[index].quantity > 1) {
-		products.value[index].quantity -= 1
-		if(item && products.value[index].quantity >= 1) {
-			computed(-products.value[index].cartGoodVO.price, 1)
-		}
-	}
-}
-//增加商品的方法
-const increase =(index , item) =>{  //item用于监测是否选中
-	console.log('increase,index-->',index);
-	console.log('increase,item-->',item);
-	if(products.value[index].quantity < products.value[index].cartGoodVO.inventory) { 
-		if(item && products.value[index].quantity <= products.value[index].cartGoodVO.inventory) {
-			computed(products.value[index].cartGoodVO.price, 1)
-		}
-		products.value[index].quantity += 1
-	}
-}
-//计算方法
-const computed =( price , quantity )=>{
-	totalPrice.value = math.round(totalPrice.value+price * quantity,2)
-	return totalPrice.value
-}
-const jump_product =(gid)=>{
-	uni.navigateTo({
-		url:'../../../pages/store-home/ProductDetails/ProductDetails?gid=' + JSON.stringify(gid) 
-	})
-}
-const editOrSettle = async ()=>{   //去结算或者删除状态方法
-	// console.log('要传到订单详情页面的checked--->',checkedData.value);
-	if(stateText.value.bottomBtn === '去结算') {
-		if(checkedData.value.length === 0) {  //在没有勾选的时候禁止发请求
-			return;
-		}
+	//获取实体类商品信息
+	const getEntityPro = async () => {
 		const res = await uni.request({
-			url: baseUrl + '/cart/submit/error',
+			url: baseUrl + '/cart/list',
 			method: 'POST',
 			header: {
 				'cookie': wx.getStorageSync('cookie')
 			}
 		})
+		console.log('res--->', res.data);
+		if (res.data.code === 1) {
+			products.value = res.data.data
+			products.value.forEach((item) => {
+				item.checked = false
+			})
+		}
+		console.log('products-->', products.value);
+	}
+	//小程序刷新根据用户id获取购物车信息
+	const getProductCart = async () => {
+		allCheck.value = false //若全选，取消
+		if (current.value === 1) {
+			getEntityPro() //获取实体类商品
+		} else {
+			getServiceCart() //获取服务类商品
+		}
+	}
+	const deleteProduct = async (idArr) => { //删除实体类商品
+		const res = await uni.request({
+			url: baseUrl + '/cart/delete',
+			method: 'POST',
+			data: {
+				idList : idArr
+			},
+			header: {
+				'cookie': wx.getStorageSync('cookie')
+			}
+		})
 		console.log(res.data);
-		if(res.data.data.length != 0) {
-			uni.showModal({
-				title: '提示',
-				content: '购物车商品发生改变，点击移除变化商品',
-				showCancel: false,
-				success: (e)=>{
-					if(e.confirm) {
-						// getProductCart() //重新获取购物车信息
-						uni.reLaunch({
-							url: '/pages/Shopping-cart/productmain/productmain'
-						})
-					}
-				}
+		if (res.data.code === 1) {
+			uni.reLaunch({
+				url: '/pages/Shopping-cart/productmain/testproductmain'
+			})
+			totalPrice.value = 0
+		}
+	}
+	const getServiceCart = async () => {
+		const res = await uni.request({
+			url: baseUrl + '/cartExperience/list',
+			method: 'POST',
+			header: {
+				'cookie': wx.getStorageSync('cookie')
+			}
+		})
+		console.log('服务类商品--->', res);
+		if (res.data.code === 1) {
+			products.value = res.data.data
+			products.value.forEach((item)=>{   //添加多选框状态
+				item.checked = false
 			})
 		} else {
-			uni.navigateTo({
-				url: '/pages/order/product-waitpay/product-waitpay?cartInfo=' + JSON.stringify(checkedData.value)
+			uni.showToast({
+				icon: 'error',
+				title: "服务错误"
 			})
-			checkedData.value.splice(0,checkedData.value.length)
 		}
-	} else {
-		uni.showModal({
-			title: '提示',
-			content: '是否删除商品?',
-			success: (e) => {
-				if(e.confirm) {
-					deleteProduct(checkedData.value)
+	}
+	//更改实体商品和服务类方法
+	const changeType = async (num) => {
+		current.value = num;
+		console.log('current状态--->',current.value);
+		getProductCart()
+		totalPrice.value = 0
+	}
+	//更改下划线
+	const getTextStyle = (num) => ({
+		'border-bottom': current.value === num ? '2px solid orange' : '2px solid  #ffffff'
+	});
+	//复选框绑定方法
+	const checkBoxChange = (event) => {
+		console.log('服务类打印出来是---->', event); //选中后是数组下标
+		//如果选中的checkbox的value的数组长度和后端传过来的数组长度相等则为全选状态 allCheck为true
+		// console.log('length---->', event.detail.value.length);
+		// console.log('product--->',products.value);
+		if (event.detail.value.length == products.value.length) {
+			allCheck.value = true
+		} else {
+			allCheck.value = false
+		}
+		checkedData.value = [] //每次都要重置一下
+		totalPrice.value = 0;
+		let count = 0; //用于记录checkedData不为null的个数
+		console.log('event--->', event.detail);
+		if (event.detail.value.length) {
+			products.value[parseInt(event.detail.value)].checked = true; //勾选
+		} else {
+			products.value.forEach((item) => {
+				item.checked = false
+			})
+		}
+		//计算一下总金额
+		for (let key in event.detail.value) {
+			let temp = parseInt(event.detail.value[parseInt(key)]) //相当于商品数组下标
+			if (current.value === 1) { //当current = 1 时，计算实体类的
+				computed(products.value[temp].cartGoodVO.price, products.value[temp].quantity)
+			} else {
+				computed(products.value[temp].cartExperienceGoodVO.price, products.value[temp].quantity)
+			}
+		}
+		event.detail.value.forEach((item) => {
+			products.value[parseInt(item)].checked = true
+		})
+		//然后假如checkboxGroup传过来的 detail.value中有某个id则把这些元素的checked属性置为true(选中状态)
+		products.value.forEach((x) => {
+			event.detail.value.forEach((y) => {
+				if (x.value == y) {
+					x.checked = true
 				}
-				else if(e.cancel)
-					return;
+			})
+		})
+		event.detail.value.forEach((item) => { //将选中的商品信息赋值给checkedData
+			console.log('products.value[parseInt(item)].goodId', products.value[parseInt(item)].goodId);
+			if (products.value[parseInt(item)] !== null) {
+				checkedData.value.push(products.value[parseInt(item)].id)
+				// console.log(products.value[parseInt(item)].goodId);
+				count += 1
+			}
+		})
+		console.log('checkedData--->', checkedData.value);
+		//将选中的数组保存在某一个ref中
+		// checkedData.value = event.detail.value
+		// console.log('checkedData--->',checkedData.value);
+	}
+	//全选方法
+	const allChecked = () => {
+		allCheck.value = !allCheck.value
+		totalPrice.value = 0
+		if (allCheck.value == true) {
+			if (current.value === 1) {
+				products.value.forEach((item) => {
+					item.checked = true //将全部选项选上
+					computed(item.cartGoodVO.price, item.quantity)
+				})
+			} else {
+				products.value.forEach((item) => {
+					item.checked = true //将全部选项选上
+					computed(item.cartExperienceGoodVO.price, item.quantity)
+				})
+			}
+			checkedData.value = products.value.map((item) => (item.id))
+			console.log('checkedData--->', checkedData.value);
+		} else {
+			products.value.forEach((item) => {
+				item.checked = false //将全部都取消选择
+			})
+		}
+	}
+	//减少商品(适用于服务类和商品类)
+	const decrease = (index, item) => { //item用于监测是否选中
+		console.log('decrease,index-->', index);
+		console.log('decrease,item-->', item);
+		if (products.value[index].quantity > 1) {
+			products.value[index].quantity -= 1
+			if (item && products.value[index].quantity >= 1 && current.value === 1) {
+				computed(-products.value[index].cartGoodVO.price, 1)
+			} else if(item && products.value[index].quantity >= 1 && current.value === 2) {
+				computed(-products.value[index].cartExperienceGoodVO.price, 1)
+			}
+		}
+	}
+	//增加商品的方法(适用于服务类和商品类)
+	const increase = (index, item) => { //item用于监测是否选中
+		console.log('increase,index-->', index);
+		console.log('increase,item-->', item);
+		if ( current.value === 1) {
+			if (item && products.value[index].quantity <= products.value[index].cartGoodVO.inventory) {
+				computed(products.value[index].cartGoodVO.price, 1)
+				products.value[index].quantity += 1
+			}
+		} else if (current.value === 2) { //待修改
+			if(products.value[index].quantity < products.value[index].restNumber) {
+				products.value[index].quantity += 1
+			}
+		}
+	}
+	//计算方法
+	const computed = (price, quantity) => {
+		totalPrice.value = math.round(totalPrice.value + price * quantity, 2)
+		return totalPrice.value
+	}
+	const jump_product = (gid) => {
+		uni.navigateTo({
+			url: '../../../pages/store-home/ProductDetails/ProductDetails?gid=' + JSON.stringify(gid)
+		})
+	}
+	const editOrSettle = async () => { //去结算或者删除状态方法
+		// console.log('要传到订单详情页面的checked--->',checkedData.value);
+		if (stateText.value.bottomBtn === '去结算') {
+			if (checkedData.value.length === 0) { //在没有勾选的时候禁止发请求
+				return;
+			}
+			// 实体类商品的购买前检查请求
+			if (current.value === 1) {
+				const res = await uni.request({
+					url: baseUrl + '/cart/submit/error',
+					method: 'POST',
+					header: {
+						'cookie': wx.getStorageSync('cookie')
+					}
+				})
+				res.data.data.length > 0 ? errorArr.value = res.data.data : errorArr.value = null
+				console.log('错误商品id',res.data);
+				console.log('错误商品数组---->',errorArr.value);
+				if (res.data.data.length != 0) {
+					uni.showModal({
+						title: '提示',
+						content: '购物车商品发生改变，点击移除变化商品',
+						showCancel: false,
+						success: (e) => {
+							if (e.confirm) {
+								deleteProduct(errorArr.value)
+								uni.reLaunch({
+									url: '/pages/Shopping-cart/productmain/testproductmain'
+								})
+							}
+						}
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/order/product-waitpay/product-waitpay?cartInfo=' + JSON.stringify(checkedData.value)
+					})
+					checkedData.value.splice(0, checkedData.value.length)
+				}
+			} else if (current.value === 2) { //服务类商品购买前检查请求
+				const res = await uni.request({
+					url: baseUrl + '/cartExperience/submit/error',
+					method: 'POST',
+					header: {
+						'cookie': wx.getStorageSync('cookie')
+					}
+				})
+				res.data.data.length > 0 ? errorArr.value = res.data.data : errorArr.value = null
+				console.log(res.data);
+				if (res.data.data.length != 0) {
+					uni.showModal({
+						title: '提示',
+						content: '购物车商品发生改变，点击移除变化商品',
+						showCancel: false,
+						success: (e) => {
+							if (e.confirm) {
+								// getProductCart() //重新获取购物车信息
+								deleteServicePro(errorArr.value)
+								uni.reLaunch({
+									url: '/pages/Shopping-cart/productmain/testproductmain'
+								})
+							}
+						}
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/order/serviceWaitPay/serviceWaitPay?cartInfo=' + JSON.stringify(checkedData.value)
+					})
+					checkedData.value.splice(0, checkedData.value.length)
+				}
+			}
+
+		} else {
+			uni.showModal({
+				title: '提示',
+				content: '是否删除商品?',
+				success: (e) => {
+					if (e.confirm) {
+						deleteProduct(checkedData.value)
+					} else if (e.cancel)
+						return;
+				}
+			})
+		}
+	}
+	const changeState = () => { //修改购物车订单方法
+		if (stateText.value.topBtn === '编辑') {
+			stateText.value.topBtn = '完成',
+				stateText.value.bottomBtn = '删除'
+		} else {
+			stateText.value.topBtn = '编辑',
+				stateText.value.bottomBtn = '去结算'
+		}
+	}
+	const productSearch = () => { //搜索框方法
+		var arr = []
+		products.value.forEach((item) => arr.push(item))
+		console.log(123);
+	}
+	const deleteServicePro = async ( idArr )=>{
+		const res = await uni.request({
+			url: baseUrl + '/cartExperience/delete',
+			method: 'POST',
+			header: {
+				'cookie': wx.getStorageSync('cookie')
+			},
+			data: {
+				idList: idArr
+			}
+		})
+		if (res.data.code === 1) {
+			uni.reLaunch({
+				url: '/pages/Shopping-cart/productmain/testproductmain'
+			})
+			totalPrice.value = 0
+		}
+	}
+	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);
 			}
 		})
 	}
-}
-const changeState =()=>{   //修改购物车订单方法
-	if(stateText.value.topBtn === '编辑') {
-		stateText.value.topBtn = '完成',
-		stateText.value.bottomBtn = '删除'
-	} else {
-		stateText.value.topBtn = '编辑',
-		stateText.value.bottomBtn = '去结算'
-	}
-}
-const productSearch = () =>{   //搜索框方法
-	var arr = []
-	products.value.forEach((item) => arr.push(item))
-	console.log(123);
-}
-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>
-.ml-17 {
-  margin-left: 31.88rpx;
-}
-.ml-83 {
-  margin-left: 155.63rpx;
-}
-.ml-9 {
-  margin-left: 16.88rpx;
-}
-.ml-7 {
-  margin-left: 13.13rpx;
-}
-.page {
-  background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  // height: 100%;
-	height: 100vh;
-}
-.section_2 {
-	position: fixed;
-	left: 0;
-	right: 0;
-	top: 0;
-  padding: 28.13rpx 30.69rpx 18.75rpx;
-  background-color: #fbdedf;
-	z-index: 99;
-}
-.font {
-  font-size: 30rpx;
-  font-family: FangZhengFonts;
-  line-height: 27.77rpx;
-  color: #c35c5d;
-}
-.text {
-  line-height: 28.24rpx;
-}
-.section_3 {
-  padding: 0 15rpx;
-  background-color: #ffffff;
-  border-radius: 9.38rpx;
-  height: 56.25rpx;
-}
-.image {
-  width: 54.38rpx;
-  height: 52.5rpx;
-}
-.section_1 {
-  flex: 1 1 0;
-  margin-right: 7.5rpx;
-}
-.text_2 {
-  margin-right: 4.46rpx;
-}
-.section_5 {
-	position: fixed;
-	left: 0;
-	right: 0;
-	top: 102rpx;
-  padding: 0 121.88rpx;
-  background-color: #ffffff;
-	z-index: 99;
-}
-.group {
-  padding: 27.06rpx 4.33rpx 23.08rpx 10.89rpx;
-	z-index: 1;
-}
-.font_2 {
-  font-size: 30rpx;
-  font-family: FangZhengFonts;
-  line-height: 27.77rpx;
-  color: #323232;
-}
-.text_3 {
-  line-height: 27.9rpx;
-}
-.text_4 {
-  line-height: 28.71rpx;
-}
-.section_6 {
-  background-color: #fb8b05;
-  width: 112.5rpx;
-  height: 5.63rpx;
-}
-.list {
-  margin: 192rpx 24rpx 120rpx 24rpx;
-}
-.list-item:first-child {
-  margin-top: 0;
-}
-.mt-14 {
-	margin-top: 16rpx;
-}
-.section_10 {
-  padding: 38.1rpx 31.52rpx 30.07rpx 27.31rpx;
-  background-color: #ffffff;
-  border-radius: 18.75rpx;
-}
-.image_3 {
-	transform: scale(0.7);
-  width: 37.5rpx;
-  height: 37.5rpx;
-}
-.image_2 {
-  // margin-bottom: 8.7rpx;
-  border-radius: 9.38rpx;
-  width: 127.5rpx;
-  height: 170.00rpx;
-}
-.group_2 {
-  margin-left: 23.31rpx;
-  margin-top: 2.33rpx;
-}
-.group_3 {
-  padding: 0 9.49rpx;
-}
-.font_3 {
-  font-size: 26.25rpx;
-  font-family: FangZhengFonts;
-  line-height: 25.01rpx;
-  color: #323232;
-}
-.text_5 {
-  line-height: 25.54rpx;
-}
-.font_4 {
-  font-size: 33.75rpx;
-  font-family: FangZhengFonts;
-  line-height: 22.07rpx;
-  color: #e79ea1;
-}
-.text_6 {
-  margin-left: 24.19rpx;
-  margin-bottom: 7.78rpx;
-  line-height: 22.54rpx;
-}
-.image_6 {
-  margin-left: -76.69rpx;
-  width: 30rpx;
-  height: 28.13rpx;
-}
-.font_5 {
-  font-size: 26.25rpx;
-  font-family: FangZhengFonts;
-  line-height: 18.73rpx;
-  color: #e79ea1;
-}
-.text_7 {
-  margin-left: 61.44rpx;
-  margin-bottom: 6.15rpx;
-  line-height: 17.53rpx;
-}
-.image_4 {
-  border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
-  width: 45.21rpx;
-  height: 48.13rpx;
-}
-.group_4 {
-  margin-left: 3.77rpx;
-}
-.text-wrapper {
-  padding: 14.74rpx 0 14.66rpx;
-  background-color: #fbdedf;
-  width: 58.41rpx;
-  height: 48.13rpx;
-}
-.font_6 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 18.73rpx;
-  color: #323232;
-}
-.image_5 {
-  border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
-  width: 45.21rpx;
-  height: 48.13rpx;
-}
-.list-item_2 {
-  padding: 22.01rpx 18.84rpx 33.75rpx;
-  background-color: #ffffff;
-  border-radius: 18.75rpx;
-}
-.image_8 {
-	transform: scale(0.7);
-  width: 37.5rpx;
-  height: 37.5rpx;
-}
-.image_7 {
-  margin-left: 39.79rpx;
-  margin-top: 2.36rpx;
-  width: 121.88rpx;
-  height: 172.5rpx;
-}
-.group_5 {
-  margin: 0 13.99rpx 7.5rpx 23.25rpx;
-}
-.font_7 {
-  font-size: 26.25rpx;
-  font-family: FangZhengFonts;
-  line-height: 31.88rpx;
-  color: #323233;
-}
-.section_7 {
-  margin-right: 8.63rpx;
-  padding: 11.1rpx 10.14rpx 14.25rpx;
-  background-color: #fbdedf;
-  border-radius: 9.38rpx;
-}
-.font_8 {
-  font-size: 22.5rpx;
-  font-family: FangZhengFonts;
-  line-height: 22.07rpx;
-  color: #6b6e72;
-}
-.text_8 {
-  line-height: 20.83rpx;
-}
-.image_9 {
-  margin-right: 5.06rpx;
-  width: 22.5rpx;
-  height: 22.5rpx;
-}
-.group_6 {
-  padding: 0 22.61rpx;
-}
-.font_9 {
-  font-size: 33.75rpx;
-  font-family: Open Sans;
-  line-height: 25.01rpx;
-  font-weight: 600;
-  color: #e79ea1;
-}
-.text_9 {
-  margin-left: 25.14rpx;
-  line-height: 24.88rpx;
-}
-.image_12 {
-  margin-left: -90.77rpx;
-  width: 30rpx;
-  height: 26.25rpx;
-}
-.font_10 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 18.73rpx;
-  font-weight: 600;
-  color: #e79ea1;
-}
-.text_10 {
-  margin-left: 61.61rpx;
-  line-height: 19.29rpx;
-}
-.image_10 {
-  border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
-  width: 45.24rpx;
-  height: 45rpx;
-}
-.text-wrapper_2 {
-  padding: 12.39rpx 0 13.88rpx;
-  background-color: #fbdedf;
-  width: 58.42rpx;
-  height: 45rpx;
-}
-.image_11 {
-  border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
-  width: 45.24rpx;
-  height: 45rpx;
-}
-.section_8 {
-	position: fixed;
-	left: 0;
-	right: 0;
-	bottom: 0;
-  padding: 20.63rpx 20.63rpx 15rpx;
-  background-color: #ffffff;
-}
-.image_13 {
-  margin-top: 0;
-}
-.text_11 {
-  line-height: 27.3rpx;
-}
-.text_12 {
-  color: #000000;
-}
-.text-wrapper_3 {
-  padding: 20.93rpx 0 25.24rpx;
-  background-color: #e79ea1;
-  border-radius: 75rpx;
-  width: 219.38rpx;
-  height: 76.88rpx;
-}
-.text_13 {
-  color: #ffffff;
-  line-height: 30.71rpx;
-}
-@import url(../../../common/css/global.css);
-</style>
+	.ml-17 {
+		margin-left: 31.88rpx;
+	}
+
+	.ml-83 {
+		margin-left: 155.63rpx;
+	}
+
+	.ml-9 {
+		margin-left: 16.88rpx;
+	}
+
+	.ml-7 {
+		margin-left: 13.13rpx;
+	}
+
+	.page {
+		background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		width: 100%;
+		overflow-y: auto;
+		overflow-x: hidden;
+		// height: 100%;
+		height: 100vh;
+	}
+
+	.section_2 {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		padding: 28.13rpx 30.69rpx 18.75rpx;
+		background-color: #fbdedf;
+		z-index: 99;
+	}
+
+	.font {
+		font-size: 30rpx;
+		font-family: FangZhengFonts;
+		line-height: 27.77rpx;
+		color: #c35c5d;
+	}
+
+	.text {
+		line-height: 28.24rpx;
+	}
+
+	.section_3 {
+		padding: 0 15rpx;
+		background-color: #ffffff;
+		border-radius: 9.38rpx;
+		height: 56.25rpx;
+	}
+
+	.image {
+		width: 54.38rpx;
+		height: 52.5rpx;
+	}
+
+	.section_1 {
+		flex: 1 1 0;
+		margin-right: 7.5rpx;
+	}
+
+	.text_2 {
+		margin-right: 4.46rpx;
+	}
+
+	.section_5 {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 102rpx;
+		padding: 0 121.88rpx;
+		background-color: #ffffff;
+		z-index: 99;
+	}
+
+	.group {
+		padding: 27.06rpx 4.33rpx 23.08rpx 10.89rpx;
+		z-index: 1;
+	}
+
+	.font_2 {
+		font-size: 30rpx;
+		font-family: FangZhengFonts;
+		line-height: 27.77rpx;
+		color: #323232;
+	}
+
+	.text_3 {
+		line-height: 27.9rpx;
+	}
+
+	.text_4 {
+		line-height: 28.71rpx;
+	}
+
+	.section_6 {
+		background-color: #fb8b05;
+		width: 112.5rpx;
+		height: 5.63rpx;
+	}
+
+	.list {
+		margin: 192rpx 24rpx 120rpx 24rpx;
+	}
+
+	.list-item:first-child {
+		margin-top: 0;
+	}
+
+	.mt-14 {
+		margin-top: 9rpx;
+	}
+
+	.section_10 {
+		padding: 38.1rpx 31.52rpx 30.07rpx 27.31rpx;
+		background-color: #ffffff;
+		border-radius: 18.75rpx;
+	}
+
+	.image_3 {
+		transform: scale(0.7);
+		width: 37.5rpx;
+		height: 37.5rpx;
+	}
+
+	.image_2 {
+		// margin-bottom: 8.7rpx;
+		border-radius: 9.38rpx;
+		width: 127.5rpx;
+		height: 170.00rpx;
+	}
+
+	.group_2 {
+		margin-left: 23.31rpx;
+		margin-top: 2.33rpx;
+	}
+
+	.group_3 {
+		padding: 0 9.49rpx;
+	}
+
+	.font_3 {
+		font-size: 26.25rpx;
+		font-family: FangZhengFonts;
+		line-height: 25.01rpx;
+		color: #323232;
+	}
+
+	.text_5 {
+		line-height: 25.54rpx;
+	}
+
+	.font_4 {
+		font-size: 33.75rpx;
+		font-family: FangZhengFonts;
+		line-height: 22.07rpx;
+		color: #e79ea1;
+	}
+
+	.text_6 {
+		margin-left: 24.19rpx;
+		margin-bottom: 7.78rpx;
+		line-height: 22.54rpx;
+	}
+
+	.image_6 {
+		margin-left: -76.69rpx;
+		width: 30rpx;
+		height: 28.13rpx;
+	}
+
+	.font_5 {
+		font-size: 26.25rpx;
+		font-family: FangZhengFonts;
+		line-height: 18.73rpx;
+		color: #e79ea1;
+	}
+
+	.text_7 {
+		margin-left: 61.44rpx;
+		margin-bottom: 6.15rpx;
+		line-height: 17.53rpx;
+	}
+
+	.image_4 {
+		border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
+		width: 45.21rpx;
+		height: 48.13rpx;
+	}
+
+	.group_4 {
+		margin-left: 3.77rpx;
+	}
+
+	.text-wrapper {
+		padding: 14.74rpx 0 14.66rpx;
+		background-color: #fbdedf;
+		width: 58.41rpx;
+		height: 48.13rpx;
+	}
+
+	.font_6 {
+		font-size: 26.25rpx;
+		font-family: Open Sans;
+		line-height: 18.73rpx;
+		color: #323232;
+	}
+
+	.image_5 {
+		border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
+		width: 45.21rpx;
+		height: 48.13rpx;
+	}
+
+	.list-item_2 {
+		padding: 22.01rpx 18.84rpx 33.75rpx;
+		background-color: #ffffff;
+		border-radius: 18.75rpx;
+	}
+
+	.image_8 {
+		transform: scale(0.7);
+		width: 37.5rpx;
+		height: 37.5rpx;
+	}
+
+	.image_7 {
+		border-radius: 9.38rpx;
+		margin-left: 39.79rpx;
+		margin-top: 2.36rpx;
+		width: 127.5rpx;
+		height: 170rpx;
+	}
+
+	.group_5 {
+		margin: 0 13.99rpx 7.5rpx 23.25rpx;
+	}
+
+	.font_7 {
+		font-size: 26.25rpx;
+		font-family: FangZhengFonts;
+		line-height: 31.88rpx;
+		color: #323233;
+	}
+
+	.section_7 {
+		margin-right: 8.63rpx;
+		padding: 11.1rpx 10.14rpx 14.25rpx;
+		background-color: #fbdedf;
+		border-radius: 9.38rpx;
+	}
+
+	.font_8 {
+		font-size: 22.5rpx;
+		font-family: FangZhengFonts;
+		line-height: 22.07rpx;
+		color: #6b6e72;
+	}
+
+	.text_8 {
+		line-height: 20.83rpx;
+	}
+
+	.image_9 {
+		margin-right: 5.06rpx;
+		width: 22.5rpx;
+		height: 22.5rpx;
+	}
+
+	.group_6 {
+		padding: 0 22.61rpx;
+	}
+
+	.font_9 {
+		font-size: 33.75rpx;
+		font-family: FangZhengFonts;
+		line-height: 25.01rpx;
+		font-weight: 600;
+		color: #e79ea1;
+	}
+
+	.text_9 {
+		// margin-left: 25.14rpx;
+		line-height: 24.88rpx;
+		margin-right: 56rpx;
+	}
+
+	.image_12 {
+		margin-left: -90.77rpx;
+		width: 30rpx;
+		height: 26.25rpx;
+	}
+
+	.font_10 {
+		font-size: 26.25rpx;
+		font-family: FangZhengFonts;
+		line-height: 18.73rpx;
+		font-weight: 600;
+		color: #e79ea1;
+	}
+
+	.text_10 {
+		margin-left: 61.61rpx;
+		line-height: 19.29rpx;
+	}
+
+	.image_10 {
+		border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
+		width: 45.24rpx;
+		height: 45rpx;
+	}
+
+	.text-wrapper_2 {
+		padding: 12.39rpx 0 13.88rpx;
+		background-color: #fbdedf;
+		width: 58.42rpx;
+		height: 45rpx;
+	}
+
+	.image_11 {
+		border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
+		width: 45.24rpx;
+		height: 45rpx;
+	}
+
+	.section_8 {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		padding: 20.63rpx 20.63rpx 15rpx;
+		background-color: #ffffff;
+	}
+
+	.image_13 {
+		margin-top: 0;
+	}
+
+	.text_11 {
+		line-height: 27.3rpx;
+	}
+
+	.text_12 {
+		color: #000000;
+	}
+
+	.text-wrapper_3 {
+		padding: 20.93rpx 0 25.24rpx;
+		background-color: #e79ea1;
+		border-radius: 75rpx;
+		width: 219.38rpx;
+		height: 76.88rpx;
+	}
+
+	.text_13 {
+		color: #ffffff;
+		line-height: 30.71rpx;
+	}
+
+	.flex_1 {
+		// display: flex
+		width: 480rpx;
+	}
+
+	@import url(../../../common/css/global.css);
+</style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 777e098..144b436 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -3,7 +3,7 @@
 		  <view class="section_2"></view>
 		  <image
 		    class="image"
-		    src="https://ide.code.fun/api/image?token=6784b7164ae84d0012235720&name=4f57dc3a50dc99c58860b6ef6a6aafb0.png"
+		    src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FRAQucIRR-flower.png"
 		  />
 		  <text class="font pos_2">泠</text>
 		  <text class="font pos_4">珑</text>
@@ -92,7 +92,7 @@ const getFonts =()=>{  //获取字体
 <style lang="scss" scoped>
 .page {
   padding-left: 118.13rpx;
-  background-image: url('https://ide.code.fun/api/image?token=6784b7164ae84d0012235720&name=748c723c0b3ea17eb04647d0879f9b81.png');
+  background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
   background-size: 100% 100%;
   background-repeat: no-repeat;
   width: 100%;
diff --git a/pages/mine/Contact/Contact.vue b/pages/mine/Contact/Contact.vue
index 1011718..cb77cab 100644
--- a/pages/mine/Contact/Contact.vue
+++ b/pages/mine/Contact/Contact.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch, set } from 'vue'
+import { ref, onMounted, watch } from 'vue'
 import { baseUrl } from '../../../api/request'
 
 onMounted(() => {
@@ -437,5 +437,5 @@ const close1 = () => {
    //      background-color: #ccc;
    //      color: #333;
    //  }
-	@import url(/common/css/global.css)
+	@import url(/common/css/global.css);
 </style>
diff --git a/pages/mine/Contact/testContact.vue b/pages/mine/Contact/testContact.vue
new file mode 100644
index 0000000..a4e8f1d
--- /dev/null
+++ b/pages/mine/Contact/testContact.vue
@@ -0,0 +1,242 @@
+<template>
+	<view class="flex-col page">
+		<view class="flex-col section">
+			<view class="flex-col justify-start items-center text-wrapper"><text class="text">联系人列表</text></view>
+			<view class="mt-10 flex-col list">
+				<view class="flex-row justify-center items-center relative mt-10 list-item" v-for="(item, index) in ContactArr"
+					:key="index">
+					<view class="flex-row items-baseline pos_2">
+						<text class="font">{{ item.name }}</text>
+						<text class="ml-10 font_2">{{ item.phone }}</text>
+					</view>
+					<view class="flex-col justify-start items-center text-wrapper_2" v-if="item.isDefault == 1"><text
+							class="text_2">默认</text></view>
+					<view class="flex-row pos">
+						<image class="image"
+							src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFeFCTttf-edit.png" 
+							@click="editContact(item)"
+							/>
+						<image class="ml-12 image"
+							src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FpTAxfBXp-delete.png"
+							@click="showModal(item.id)" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="flex-col justify-start items-center relative section_2">
+			<view class="flex-col justify-start items-center text-wrapper_3" @click="loadPop()"><text
+					class="font text_3">新增联系人</text></view>
+		</view>
+	</view>
+	<uni-popup ref="popup" background-color="#fff" :mask-click="false">
+		<view class="popup-content">
+			<contactPopVue></contactPopVue>
+		</view>
+	</uni-popup>
+</template>
+
+<script setup>
+	import { ref, onMounted, nextTick } from 'vue'
+	import { baseUrl } from '../../../api/request'
+	import { onShow, onLoad } from "@dcloudio/uni-app";
+	import emitter from '../../../utils/emitter';
+	import contactPopVue from '../component/contactPop.vue'; //导入联系人弹窗
+	const ContactArr = ref() //联系人数组
+	const popup = ref(null) //弹窗对象
+	onMounted(() => {
+		getContactInfo() //获取联系人信息
+		emitter.on('close',()=>{
+			close()
+		})
+		emitter.on('updateInfo',()=>{  //更新联系人信息
+			getContactInfo()
+		})
+	})
+	onShow(()=>{
+		getContactInfo() //获取联系人信息
+	})
+	const getContactInfo = async () => {
+		const res = await uni.request({
+			url: baseUrl + '/contacts/list',
+			method: 'POST',
+			header: {
+				cookie: wx.getStorageSync('cookie')
+			}
+		})
+		// console.log('联系人信息---->', res.data.data);
+		if (res.data.code === 1) {
+			ContactArr.value = res.data.data
+		} else {
+			uni.showToast({
+				icon: 'error',
+				title: "服务错误"
+			})
+		}
+	}
+	const deleteContact = async (cid) => {  //删除联系人
+		const res = await uni.request({
+			url: baseUrl + '/contacts/delete',
+			method: 'POST',
+			header: {
+				cookie: wx.getStorageSync('cookie')
+			},
+			data: { id: cid }
+		})
+		if (res.data.code === 1) {
+			getContactInfo()
+		}
+	}
+	const showModal = (cid) => { //提示弹窗
+		uni.showModal({
+			title: '提示',
+			content: '是否删除该联系人',
+			success: (e) => {
+				if (e.confirm) {
+					deleteContact(cid)
+				} else if (e.cancel)
+					return;
+			}
+		})
+	}
+	const loadPop =() => {  //联系人弹窗
+		popup.value.open('bottom')  //从底部弹出
+	}
+	//编辑联系人方法
+	const editContact =(value)=>{
+		console.log('联系人信息--->',value);
+		emitter.emit('contactInfo',value)   //把联系人信息传入组件中
+		loadPop()  //弹出联系人弹窗
+	}
+	const close =()=> {
+		nextTick(()=>{
+			if(popup.value) {
+				popup.value.close()
+			}
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		height: 100vh;
+		width: 100%;
+		background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
+		background-size: 100% 100%;
+		overflow-y: auto;
+		overflow-x: hidden;
+	}
+
+	.section {
+		padding-bottom: 20rpx;
+		
+		background-repeat: no-repeat;
+	}
+
+	.text-wrapper {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		padding: 22.5rpx 0;
+		background-color: #ffffff;
+		z-index: 1;
+	}
+
+	.text {
+		color: #000000;
+		font-size: 37.5rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 36.47rpx;
+	}
+
+	.list {
+		padding: 0 18.75rpx;
+		margin-bottom: 100rpx;
+	}
+
+	.list-item {
+		padding: 45.75rpx 18.75rpx 45.75rpx 26.25rpx;
+		background-color: #ffffff;
+		border-radius: 9.38rpx;
+		height: 90rpx;
+	}
+
+	.list-item:first-child {
+		margin-top: 40px;
+	}
+
+	.pos_2 {
+		position: absolute;
+		left: 25.11rpx;
+		top: 50%;
+		transform: translateY(-50%);
+	}
+
+	.font {
+		font-size: 30rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 25.89rpx;
+		color: #323232;
+	}
+
+	.font_2 {
+		font-size: 30rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 20.04rpx;
+		color: #323232;
+	}
+
+	.text-wrapper_2 {
+		padding-bottom: 7.5rpx;
+		background-color: #ffbe55;
+		border-radius: 9.38rpx;
+		width: 71.06rpx;
+	}
+
+	.text_2 {
+		color: #ffffff;
+		font-size: 22.5rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 18.71rpx;
+		margin-top: 8rpx;
+	}
+
+	.pos {
+		position: absolute;
+		right: 18.28rpx;
+		top: 50%;
+		transform: translateY(-50%);
+	}
+
+	.image {
+		border-radius: 9.38rpx;
+		width: 41.25rpx;
+		height: 39.38rpx;
+	}
+
+	.section_2 {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		// margin-top: -35.63rpx;
+		padding: 16.88rpx 0;
+		background-color: #ffffff;
+	}
+
+	.text-wrapper_3 {
+		padding: 26.25rpx 0;
+		background-color: #fbdedf;
+		border-radius: 46.88rpx;
+		width: 639.23rpx;
+	}
+
+	.text_3 {
+		color: #c35c5d;
+		line-height: 29.18rpx;
+	}
+	.popup-content {
+		height: 500rpx;
+	}
+	@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
new file mode 100644
index 0000000..e5ab6a7
--- /dev/null
+++ b/pages/mine/component/contactPop.vue
@@ -0,0 +1,225 @@
+<template>
+	<!-- 添加联系人页面 -->
+<view class="flex-row relative page">
+  <text class="text pos_2">添加联系人</text>
+  <image class="image pos" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FNWbQGniG-closed.png" @click="closePop()"/>
+  <view class="flex-col section_2 pos_3">
+    <view class="flex-row items-center group">
+      <text class="font_2 text_2">姓名</text>
+      <input class="section_1 ml-44" placeholder="请输入姓名" v-model="contactParam.name"/>
+    </view>
+    <view class="flex-row items-center group_1">
+      <text class="font_2">手机号码</text>
+      <input class="view_2 ml-13" placeholder="输入手机号码" v-model="contactParam.phone"/>
+    </view>
+    <view class="flex-row justify-between items-center group_2">
+			<checkbox-group @change="defaultAddress">
+			<text class="font_2 text_5" style="margin-right: 400rpx;">设为默认联系人</text>
+			<checkbox class="round red radius" value="1"  />
+			</checkbox-group>
+    </view>
+  </view>
+  <view class="flex-col justify-start items-center text-wrapper_2 pos_4" @click="newContact"><text class="text_6">保存联系人</text></view>
+</view>
+</template>
+
+<script setup>
+import {ref , onMounted} from 'vue'
+import { testUrl , baseUrl , suiUrl } from '../../../api/request';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import emitter from '../../../utils/emitter';
+const contactParam = ref({
+	name: "",
+	phone: "",
+	isDefault: 0
+})
+//接受编辑按钮传来的地址信息
+onLoad(()=>{
+})
+onShow(()=>{
+})
+onMounted(()=>{
+	emitter.on('contactInfo',(val)=>{
+		console.log('当前编辑的联系人信息',val);
+		if(val != null) {
+			contactParam.value.id = val.id
+			contactParam.value.name = val.name
+			contactParam.value.phone = val.phone
+			contactParam.value.isDefault = val.isDefault
+		} 
+	})
+})
+//勾选默认联系人的选项
+const defaultAddress =(event)=>{
+	event.detail.value[0] ? contactParam.value.isDefault = 1 : contactParam.value.isDefault = 0
+}
+//发送添加新增联系人的请求
+const newContact = async ()  =>{
+	console.log('按钮联系人信息--->',contactParam.value);
+	if(contactParam.value.id === "") 
+		delete contactParam.value.id
+	const values =  Object.values(contactParam.value);
+	// 使用some()方法来检查是否有任何值为空
+	if (values.some(value => value === null || value === undefined || value === '')) {
+		await uni.showToast({
+			icon: 'error',
+			title: "字段不能为空"
+		})
+		return;
+	}
+	console.log(contactParam.value);
+	if(contactParam.value.id != undefined) {
+		const res = await uni.request({
+			url: baseUrl + '/contacts/update',
+			method: 'POST',
+			header: {
+				'cookie': wx.getStorageSync('cookie')
+			},
+			data: { ...contactParam.value }
+		})
+		console.log('res1==>',res.data);
+		sucRes(res.data.code)
+	} else {
+		const res = await uni.request({
+			url: baseUrl + '/contacts/add',
+			method: 'POST',
+			header: {
+				'cookie': wx.getStorageSync('cookie')
+			},
+			data: {
+				name: contactParam.value.name,
+				phone: contactParam.value.phone,
+				isDefault: contactParam.value.isDefault
+			}
+		})
+		console.log('res2==>',res.data);
+		sucRes(res.data.code)
+	}
+}
+const sucRes =(res)=>{  //请求成功执行的方法
+	if(res === 1) {
+		emitter.emit('updateInfo')
+		closePop()
+	} else {
+		uni.showToast({
+			icon: 'error',
+			title: '新增联系人失败'
+		})
+		return;
+	}
+}
+const closePop = () =>{  //关闭弹窗方法
+	contactParam.value.name = ""
+	contactParam.value.phone = ""
+	contactParam.value.isDefault = 0
+ 	emitter.emit('closeContactPop')
+}
+</script>
+
+<style lang="scss" scoped>
+.ml-13 {
+  margin-left: 24.38rpx;
+}
+.page {
+  padding: 18.75rpx 24.38rpx 30rpx 31.88rpx;
+  background-color: #ffffff;
+  background-image: url('https://ide.code.fun/api/image?token=67be64de4ae84d0012274ced&name=44b4c9443569fdae44bb581d89efdadd.png');
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  height: 100vh;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+.text {
+  color: #323232;
+  font-size: 37.5rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 36.47rpx;
+}
+.pos_2 {
+  position: absolute;
+  right: 274.86rpx;
+  top: 28.5rpx;
+}
+.image {
+  width: 52.5rpx;
+  height: 52.5rpx;
+}
+.pos {
+  position: absolute;
+  right: 24.38rpx;
+  top: 18.75rpx;
+}
+.section_2 {
+  padding: 12.19rpx 16.88rpx 0;
+  background-color: #ffffff;
+  border-radius: 9.38rpx;
+}
+.pos_3 {
+  position: absolute;
+  left: 31.88rpx;
+  right: 31.88rpx;
+  top: 101.25rpx;
+}
+.group {
+  padding: 14.06rpx 4.58rpx 12.19rpx;
+  border-bottom: solid 1.88rpx #efefef;
+}
+.font_2 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 24.62rpx;
+  color: #323232;
+}
+.text_2 {
+  line-height: 23.17rpx;
+}
+.section_1 {
+  flex: 1 1 0;
+  margin-right: 34.8rpx;
+}
+.group_1 {
+  padding: 14.06rpx 4.26rpx 12.19rpx;
+  border-bottom: solid 1.88rpx #efefef;
+}
+.view_2 {
+  flex: 1 1 0;
+  margin-right: 35.12rpx;
+}
+.group_2 {
+  padding: 15.47rpx 5.29rpx 22.03rpx;
+}
+.text_5 {
+  line-height: 25.54rpx;
+}
+.image_2 {
+  margin-right: 17.63rpx;
+  width: 33.75rpx;
+  height: 33.75rpx;
+}
+.text-wrapper_2 {
+  padding: 26.03rpx 0 29.27rpx;
+  background-color: #ffb6b9;
+  border-radius: 75rpx;
+  width: 639.38rpx;
+}
+.pos_4 {
+  position: absolute;
+  left: 50%;
+  top: 370.63rpx;
+  transform: translateX(-50%);
+}
+.text_6 {
+  color: #ffffff;
+  font-size: 33.75rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 32.83rpx;
+}
+.radius {
+	transform: scale(0.7);
+	width: 37.5rpx;
+	height: 37.5rpx;
+}
+	@import url(../../../common/css/global.css);
+</style>
\ No newline at end of file
diff --git a/pages/mine/main/main.vue b/pages/mine/main/main.vue
index a5c7649..f198c87 100644
--- a/pages/mine/main/main.vue
+++ b/pages/mine/main/main.vue
@@ -113,7 +113,7 @@ onMounted(() => {
 // }
 const goToText = () => { //跳转到联系人信息
 	uni.navigateTo({
-		url: '/pages/mine/Contact/Contact'
+		url: '/pages/mine/Contact/testContact'
 	})
 }
 const goTo = ()=>{  //跳转到预约
diff --git a/pages/order/component/addressComponent.vue b/pages/order/component/addressComponent.vue
index ed19e2d..dd54c00 100644
--- a/pages/order/component/addressComponent.vue
+++ b/pages/order/component/addressComponent.vue
@@ -2,7 +2,7 @@
 	<view class="flex-col page">
 		<view class="flex-row justify-center items-center relative group">
 			<text class="text">收货地址</text>
-			<image class="image pos" @click="close"
+			<image class="image pos" @click="closeWindow"
 				src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FxSHTnKhk-close.png" />
 		</view>
 		<view class="flex-col list">
@@ -10,10 +10,6 @@
 				<view class="flex-col list-item_1" v-for="(item, index) in addressList" :key="index">
 					<view class="flex-row justify-between items-center self-stretch">
 						<view class="flex-row items-center">
-							<!-- <image
-	            class="shrink-0 image_2"
-	            src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=77acc0c7f94beb4408728eee129ffe97.png"
-	          /> -->
 							<radio color="#00ba9c" :value="index" :checked="index === current"></radio>
 							<text class="font ml-9">{{ item.name }}</text>
 							<text class="font_2 ml-9">{{ item.phone }}</text>
@@ -38,7 +34,7 @@
 </template>
 
 <script setup>
-import { onMounted , ref } from 'vue'
+import {nextTick, onMounted , ref } from 'vue'
 import  emitter  from '../../../utils/emitter'
 import { testUrl , baseUrl , suiUrl } from '../../../api/request';
 import { onShow } from "@dcloudio/uni-app";
@@ -46,7 +42,6 @@ const items = ref([null, null])
 const addressList = ref([])
 const userInfo = wx.getStorageSync('userInfo')
 //页面跳转回来之后，刷新一次地址列表  onShow就是在页面显示后执行
-
 onMounted(() => {
 	getAddressList()
 })
@@ -65,17 +60,13 @@ const getAddressList = async () =>{
 	console.log('组件的地址信息---->',res.data);
 	addressList.value = res.data.data
 }
-//关闭弹窗
-const close = () => {
-	emitter.emit('closeAddress')
-}
 //当选项发生改变时
 const radioChange = ( event ) => {
 	const index = event.detail.value
 	const temp = addressList.value[index] //通过emitter传入暂时的地址信息
 	// console.log('temp',temp);
-	emitter.emit('addressInfo', temp )
-	emitter.emit('closeAddress')
+	emitter.emit('addressInfo', temp)
+	emitter.emit('close')
 }
 //跳转到新建地址页面
 const toNewAddress =()=>{
@@ -106,6 +97,11 @@ const deleteAddress = async( id ) =>{
 		// console.log("删除地址成功");
 	}
 }
+//关闭按钮
+const closeWindow =()=> {
+	emitter.emit('close')
+}
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/order/component/contactsComponent.vue b/pages/order/component/contactsComponent.vue
new file mode 100644
index 0000000..5e763b2
--- /dev/null
+++ b/pages/order/component/contactsComponent.vue
@@ -0,0 +1,246 @@
+<template>
+	<!-- 订单的联系人选择页面 -->
+<view class="flex-col page">
+  <view class="flex-row justify-between self-end group">
+    <text class="text">联系人信息</text>
+    <image
+      class="image"
+      src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FMoAZrjKE-close.png"
+			@click="closeWindow()"
+    />
+  </view>
+  <view class="flex-col self-stretch mt-22">
+		<radio-group @change="radioChange">
+    <view
+      class="flex-row justify-between items-center section list-item mt-8"
+      v-for="(item, index) in ContactArr"
+      :key="index"
+    >
+      <view class="flex-row items-center">
+				<radio color="#E79EA1" :value="index" :checked="index === current"></radio>
+        <text class="font ml-9">{{ item.name }}</text>
+        <text class="font_2 ml-9">{{ item.phone }}</text>
+      </view>
+      <view class="flex-row group_2">
+        <image
+          class="image_2"
+          src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFeFCTttf-edit.png"
+					@click="editContact(item)"
+        />
+        <image
+          class="image_2 ml-12"
+          src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FpTAxfBXp-delete.png"
+					@click="showModal(item.id)"
+        />
+      </view>
+    </view>
+		</radio-group>
+  </view>
+  <view class="flex-col justify-start items-center self-stretch text-wrapper mt-22">
+    <text class="text_2" @click="loadPop()">添加联系人</text>
+  </view>
+</view>
+<uni-popup ref="popup" background-color="#fff" :mask-click="false">
+		<view class="popup-content">
+			<contactPopVue></contactPopVue>
+		</view>
+	</uni-popup>
+</template>
+
+<script setup>
+	import { ref, onMounted, nextTick } from 'vue'
+	import { baseUrl } from '../../../api/request'
+	import { onShow, onLoad } from "@dcloudio/uni-app";
+	import emitter from '../../../utils/emitter';
+	import contactPopVue from '../../mine/component/contactPop.vue'; //导入联系人弹窗
+	const ContactArr = ref() //联系人数组
+	const popup = ref(null) //弹窗对象
+	onMounted(() => {
+		getContactInfo() //获取联系人信息
+		emitter.on('closeContactPop',()=>{
+			closeContactPop()
+		})
+		emitter.on('updateInfo',()=>{
+			getContactInfo()
+		})
+	})
+	onShow(()=>{
+		getContactInfo() //获取联系人信息
+	})
+	onLoad(()=>{
+		getContactInfo()
+	})
+	const getContactInfo = async () => {
+		const res = await uni.request({
+			url: baseUrl + '/contacts/list',
+			method: 'POST',
+			header: {
+				cookie: wx.getStorageSync('cookie')
+			}
+		})
+		// console.log('联系人信息---->', res.data.data);
+		if (res.data.code === 1) {
+			ContactArr.value = res.data.data
+		} else {
+			uni.showToast({
+				icon: 'error',
+				title: "服务错误"
+			})
+		}
+	}
+	const deleteContact = async (cid) => {  //删除联系人
+		const res = await uni.request({
+			url: baseUrl + '/contacts/delete',
+			method: 'POST',
+			header: {
+				cookie: wx.getStorageSync('cookie')
+			},
+			data: { id: cid }
+		})
+		if (res.data.code === 1) {
+			getContactInfo()
+		}
+	}
+	const showModal = (cid) => { //提示弹窗
+		uni.showModal({
+			title: '提示',
+			content: '是否删除该联系人',
+			success: (e) => {
+				if (e.confirm) {
+					deleteContact(cid)
+				} else if (e.cancel)
+					return;
+			}
+		})
+	}
+	const loadPop =() => {  //联系人弹窗
+		popup.value.open('bottom')  //从底部弹出
+	}
+	//编辑联系人方法
+	const editContact =(value)=>{
+		console.log('联系人信息--->',value);
+		emitter.emit('contactInfo',value)   //把联系人信息传入组件中
+		loadPop()  //弹出联系人弹窗
+	}
+	//选项改变时
+	const radioChange = ( event ) => {
+		console.log('选中---->',event);
+		const index = event.detail.value
+		const temp = ContactArr.value[index]
+		console.log('联系人是---->',ContactArr.value[index]);
+		emitter.emit('contactsNowInfo',temp)  //传出联系人信息
+		emitter.emit('close')
+	}
+	//关闭弹窗---这是非弹窗页面编写
+	const closeContactPop = () => {
+		nextTick(() => {
+			if (popup.value) {
+				popup.value.close()
+			}
+		})
+	}
+	const closeWindow =()=> {
+		emitter.emit('close')
+	}
+</script>
+
+<style lang="scss" scoped>
+.ml-9 {
+  margin-left: 16.88rpx;
+}
+.page {
+  padding: 24.75rpx 12.84rpx 33.75rpx 13.13rpx;
+  background-color: #f5f5dc;
+  border-radius: 28.13rpx 28.13rpx 0rpx 0rpx;
+  background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100vh;
+}
+.group {
+	position: fixed;
+	left: 0;
+	right: 0;
+	top: 0;
+  // margin-right: 17.16rpx;
+  width: 100%;
+	background-color: white;
+	z-index: 1;
+	padding: 20rpx 20rpx 20rpx 270rpx;
+}
+.text {
+  margin-bottom: 2.53rpx;
+  color: #323232;
+  font-size: 37.5rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 36.47rpx;
+}
+.image {
+  width: 37.5rpx;
+  height: 37.5rpx;
+}
+.section {
+  padding: 54.38rpx 16.22rpx 52.5rpx;
+  background-color: #ffffff;
+  border-radius: 26.25rpx;
+  border-bottom: solid 1.88rpx #c8c8c8;
+}
+.list-item:first-child {
+  margin-top: 14px;
+}
+.list-item:last-child {
+	margin-bottom: 700rpx;
+}
+.image_3 {
+  width: 31.88rpx;
+  height: 33.75rpx;
+}
+.font {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.89rpx;
+  color: #323232;
+}
+.font_2 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 20.04rpx;
+  color: #323232;
+}
+.group_2 {
+  margin-right: 11.12rpx;
+}
+.image_2 {
+  width: 37.5rpx;
+  height: 39.38rpx;
+}
+.text-wrapper {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 20px;
+  margin-left: 39.38rpx;
+  margin-right: 45.28rpx;
+  padding: 26.03rpx 0 29.27rpx;
+  background-color: #ffb6b9;
+  border-radius: 75rpx;
+}
+.text_2 {
+  color: #ffffff;
+  font-size: 33.75rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 32.83rpx;
+}
+.radius {
+	transform: scale(0.7);
+	width: 37.5rpx;
+	height: 37.5rpx;
+}
+	.popup-content {
+		height: 500rpx;
+	}
+@import url(../../../common/css/global.css);
+</style>
diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue
index bb76570..22edfa7 100644
--- a/pages/order/product-waitpay/product-waitpay.vue
+++ b/pages/order/product-waitpay/product-waitpay.vue
@@ -156,7 +156,7 @@
 </template>
 
 <script setup>
-import {onMounted, ref, toRaw} from 'vue'
+import {nextTick, onMounted, ref, toRaw} from 'vue'
 import  emitter  from '../../../utils/emitter'
 import { onLoad , onShow } from  "@dcloudio/uni-app"; 
 import { baseUrl } from '../../../api/request';
@@ -184,7 +184,7 @@ onMounted(() => {
 		close()
 	})
 	//获取地址信息
-	emitter.on('FangZhengFonts', (val) =>{
+	emitter.on('addressInfo', (val) =>{
 		addressRealInfo.value = val 
 	})
 })
@@ -201,7 +201,11 @@ onShow(()=>{
 })
 //关闭弹窗
 const close = () => {
-	popup.value.close()
+	nextTick(() => {
+			if (popup.value) {
+				popup.value.close()
+			}
+		})
 }
 //加载弹窗。默认从底部弹出
 const loadPop =() =>{
diff --git a/pages/order/serviceWaitPay/serviceWaitPay.vue b/pages/order/serviceWaitPay/serviceWaitPay.vue
new file mode 100644
index 0000000..b2ad1c9
--- /dev/null
+++ b/pages/order/serviceWaitPay/serviceWaitPay.vue
@@ -0,0 +1,638 @@
+<template>
+	<!-- 批量服务类商品购买 -->
+	<view class="flex-col page">
+	  <view class="flex-row justify-between items-center section_2">
+	    <view class="flex-row items-center">
+	      <image
+	        class="shrink-0 image"
+	        src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXymRmdOc-lianxiren.png"
+	      />
+	      <text class="text ml-10">{{ contactRealInfo.name }} {{ contactRealInfo.phone }}</text>
+	    </view>
+	    <view class="flex-row items-center group" @click="loadPop()">
+	      <image
+	        class="image_2"
+	        src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FKgDGnwlb-right.png"
+	      />
+	      <text class="font text_2">更换联系人</text>
+	    </view>
+	  </view>
+	  <view class="flex-col section_3">
+	    <view class="flex-col">
+	      <view class="flex-row items-end list-item mt-13" v-for="(item, index) in productArr" :key="index">
+	        <image
+	          class="shrink-0 image_3"
+	          :src="item.cartExperienceGoodVO.goodImg"
+	        />
+	        <view class="flex-col flex-1 group_5">
+	          <view class="flex-row self-stretch group_3">
+	            <!-- <text class="font">{{ item.cartExperienceGoodVO }}</text> -->
+	            <text class="font text_3">【{{ item.cartExperienceGoodVO.type }}】 {{item.cartExperienceGoodVO.name}} </text>
+	          </view>
+	          <text class="self-start font_2 text_7 mt-9">已选时间：{{ item.reservationDate }}星期二</text>
+	          <text class="self-start font_3 text_8 mt-9">{{ item.timeSlot }}</text>
+	          <view class="flex-row justify-between items-end self-stretch mt-9">
+	            <view class="flex-row items-center">
+	              <!-- <image
+	                class="shrink-0 image_6"
+	                src="https://ide.code.fun/api/image?token=67be64de4ae84d0012274ced&name=4a3c5c3a5c83be7a7b0551c598ed6037.png"
+	              /> -->
+	              <text class="font_5 ml-3">￥{{ item.cartExperienceGoodVO.price }}</text>
+	              <!-- <text class="font_6 ml-3">00</text> -->
+	            </view>
+	            <image
+	              class="image_4"
+	              src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FDuKxtYum-short.png"
+								@click="shortNum(index)"
+	            />
+	          </view>
+	        </view>
+	        <view class="flex-row shrink-0 group_4">
+	          <view class="flex-col justify-start items-center text-wrapper"><text class="font_4 text_6">{{ item.quantity }}</text></view>
+	          <image
+	            class="image_5 ml-2"
+	            src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FIOMGjSNx-add.png"
+							@click="addNum(index)"
+	          />
+	        </view>
+	      </view>
+	    </view>
+	    <view class="flex-row justify-center items-center group_9 mt-15">
+	      <view class="group_10">
+	        <text class="font_7 text_11">注：购买商品均视为同意</text>
+	        <text class="font_7 text_12">用户须知</text>
+	      </view>
+	      <image
+	        class="image_7 ml-2"
+	        src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FcoxrJLJf-quesrion.png"
+	      />
+	    </view>
+	  </view>
+	  <view class="flex-col section_4">
+	    <view class="flex-row justify-between items-center">
+	      <view class="flex-row">
+	        <text class="font_8 text_13">商品总价</text>
+	        <text class="font_9 ml-7">共{{ productArr.length }}件商品</text>
+	      </view>
+	      <view class="flex-row items-center group_11">
+	        <!-- <image
+	          class="shrink-0 image_8"
+	          src="https://ide.code.fun/api/image?token=67be64de4ae84d0012274ced&name=eb4f44af1db8b709d9d4b2aecf5159be.png"
+	        /> -->
+	        <text class="font_10">￥{{ sumprice.toFixed(2) }}</text>
+	      </view>
+	    </view>
+	    <view class="flex-row justify-between mt-34">
+	      <text class="font_8">优惠券</text>
+	      <view class="flex-row group_12">
+	        <text class="font_9">0张优惠券可用</text>
+	        <image
+	          class="shrink-0 image_9 ml-3"
+	          src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FHomvnulG-rightblack.png"
+	        />
+	      </view>
+	    </view>
+	    <view class="flex-row justify-between items-center mt-34">
+	      <text class="font_8 text_14">合计</text>
+	      <view class="flex-row items-center group_13">
+	        <!-- <image
+	          class="shrink-0 image_8"
+	          src="https://ide.code.fun/api/image?token=67be64de4ae84d0012274ced&name=0f3f4f80197a7b3647f307901f6a3bea.png"
+	        /> -->
+	        <text class="font_10">￥{{ sumprice.toFixed(2) }}</text>
+	      </view>
+	    </view>
+	  </view>
+	  <view class="flex-col section_5">
+	    <text class="self-start font_8 text_15">订单备注</text>
+	    <view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
+	      <text class="font_7 text_16">备注建议提前协商（250字以内）</text>
+	    </view>
+	  </view>
+	  <view class="flex-row justify-between items-center section_6">
+	    <view class="flex-row items-center">
+	      <image
+	        class="shrink-0 image_8 image_10"
+	        src="https://ide.code.fun/api/image?token=67be64de4ae84d0012274ced&name=549b29459342a9a09d24834be40eb53b.png"
+	      />
+	      <text class="text_17">应付：</text>
+	      <text class="text_18">{{ sumprice.toFixed(2) }}</text>
+	      <!-- <text class="text_20">00</text> -->
+	    </view>
+	    <view class="flex-col justify-start items-center text-wrapper_3"><text class="font_8 text_19">微信支付</text></view>
+	  </view>
+	</view>
+	<uni-popup ref="popup" background-color="#fff" :mask-click="false">
+		<view class="popup-content">
+			<contactsComponentVue></contactsComponentVue>
+		</view>
+	</uni-popup>
+</template>
+
+<script setup>
+	import {nextTick, onMounted, ref, toRaw} from 'vue'
+	import  emitter  from '../../../utils/emitter'
+	import { onLoad , onShow } from  "@dcloudio/uni-app"; 
+	import { baseUrl } from '../../../api/request';
+	import { stateMap } from '../../../common/global';
+	import { sum } from 'mathjs';
+	import contactsComponentVue from '../component/contactsComponent.vue';  //联系人弹窗
+	//一些暂时变量
+	const sumprice = ref(0) //总价格
+	const popup = ref(null) //弹窗对象
+	const contactRealInfo = ref({
+		name: '请选择联系人'
+	}) //地址页  选择地址传过来的值  进入页面首先是默认地址，若无默认地址，则为空
+	const productArr = ref([])  //商品对象
+	const labelList = ref([])  //老套路，商品标签
+	const userInfo = wx.getStorageSync('userInfo')  //用户信息
+	const orderItemList = ref({})
+	const totalInfo = ref([]) //购物车传过来的批量商品
+	const note = ref('')
+	const postCartArr = ref([])
+	onMounted(() => {
+		getFonts()
+		//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
+		emitter.on('close', () => {
+			close()
+		})
+		//获取地址信息
+		emitter.on('contactsNowInfo', (val) =>{
+			contactRealInfo.value = val 
+		})
+	})
+	onLoad((options)=>{
+		totalInfo.value = JSON.parse(options.cartInfo)
+		console.log('options.cartInfo-->',JSON.parse(options.cartInfo));
+		console.log('totalInfo.value-->',toRaw(totalInfo.value) );
+		getProduct() //获取商品列表
+	})
+	onShow(()=>{
+		userInfo.value = wx.getStorageSync('userInfo') //从微信缓存中获取用户信息
+		getDefaultAddress()
+		// computed()
+	})
+	//关闭弹窗
+	const close = () => {
+		nextTick(() => {
+				if (popup.value) {
+					popup.value.close()
+				}
+			})
+	}
+	//加载弹窗。默认从底部弹出
+	const loadPop =() =>{
+		popup.value.open('bottom')
+	}
+	//获取用户默认联系人
+	// const getDefaultAddress = async () =>{
+	// 	const res = await uni.request({
+	// 		url: baseUrl + '/address/list',
+	// 		method: 'POST',
+	// 		header: {
+	// 			cookie: wx.getStorageSync('cookie')
+	// 		}
+	// 	})
+	// 	//根据for循环遍历默认地址
+	// 	for(let key in res.data.data) {
+	// 		if(res.data.data[key].isDefault === 1) {
+	// 			contactRealInfo.value = res.data.data[key]
+	// 		}
+	// 	}
+	// }
+	const createOrder = async () => {  //服务类购物车的购买方法
+		console.log('地址信息-->',contactRealInfo.value);
+		formatArr()
+		console.log('postCartArr--->',postCartArr.value);
+		const resOrder = await uni.request({   //向后端发送生成订单请求
+			url: baseUrl + '/order/add/cart',
+			method: 'POST',
+			header: {
+				cookie: wx.getStorageSync('cookie')
+			},
+			data: {
+				orderType: productArr.value[0].cartExperienceGoodVO.type === '服务类' ? 'service' : 'product',
+				userName: userInfo.userName,
+				addressId: addressRealInfo.value.id, //地址信息id
+				// contactsId: null, //联系人信息id
+				couponId: null, //优惠卷id
+				note: note.value,
+				cartOrderItemAddRequestList: toRaw(postCartArr.value)
+			}
+		})
+		console.log('后台返回订单响应==>',resOrder.data);
+		if(resOrder.data.code === 1) {
+			wxPay(resOrder.data.data)
+		}
+	}
+	//根据商品id数组获取商品信息
+	const getProduct = async ()=> {
+		const res = await uni.request({
+			url: baseUrl + '/cartExperience/submit/list',
+			method: 'POST',
+			header: {
+				cookie: wx.getStorageSync('cookie')
+			},
+			data: {
+				idList: totalInfo.value
+			}
+		})
+		console.log('展示订单页面的商品信息-->',res.data);
+		if( res.data.code === 1 ) {
+			dealRes(res)
+		}
+	}
+	
+	const dealRes =(res)=> {  //处理来自后端的数据
+		productArr.value = res.data.data
+		console.log('productArr--->',productArr.value);
+		productArr.value.forEach((item)=>{
+			sumprice.value += item.cartExperienceGoodVO.price * item.quantity  //计算总金额
+		})
+	}
+	//减少当前商品数量
+	const shortNum = (index)=>{
+		if(productArr.value[index].quantity > 1) {
+			productArr.value[index].quantity -= 1
+			//计算商品价格
+			sumprice.value -= productArr.value[index].cartExperienceGoodVO.price * 1
+		}
+	}
+	//增加当前商品数量
+	const addNum = (index)=>{
+		 if( productArr.value[index].quantity < productArr.value[index].cartExperienceGoodVO.inventory ) { //数量肯定不能大于库存
+			 productArr.value[index].quantity += 1
+			 sumprice.value += productArr.value[index].cartExperienceGoodVO.price * 1  //计算商品价格
+		 }
+	}
+	const formatArr = () =>{
+		postCartArr.value.splice(0,postCartArr.value.length)
+		productArr.value.forEach((item,index)=>{
+			postCartArr.value.push({
+				cartRecordId: totalInfo.value[index],
+				quantity: item.quantity
+			})
+		})
+	}
+	const wxPay = async( oid )=> {  //传入订单id
+		console.log('oid--->',oid);
+		try {
+			const res = await uni.request({
+				url: baseUrl + '/wechat/payment/create',
+				method: 'POST',
+				header: {
+					'cookie': wx.getStorageSync("cookie")
+				},
+				data: { id: oid }
+			})
+			const paymentData = res.data.data
+			wx.requestPayment({
+				appid: paymentData.appId,
+				nonceStr: paymentData.nonceStr,
+				package: paymentData.packageVal,
+				paySign: paymentData.paySign,
+				timeStamp: paymentData.timeStamp,
+				signType: paymentData.signType,
+				success(res) {
+					uni.showModal({
+						content: '支付成功',
+						showCancel: false
+					})
+					uni.redirectTo({
+						url: '/pages/order/product-paysuccess/product-paysuccess?oid=' + JSON.stringify(oid)
+					})
+					console.log('支付成功res--->',res);
+				},
+				fail(e) {
+					// uni.showModal({
+					// 	content: '支付失败，原因为:' + e.errMsg,
+					// 	showCancel: false
+					// })
+					uni.redirectTo({
+						url: '/pages/order/product-paysuccess/product-paysuccess?oid=' + JSON.stringify(oid)
+					})
+					console.log('e.errMsg--->',e.errMsg);
+				}
+			})
+		}catch(error) {
+			console.error('支付请求失败',error);
+			uni.showModal({
+				content: '支付请求失败,请重试。',
+				showCancel: false
+			})
+		}
+	}
+	const textAssign = (e) => {  //文本输入框赋值方法
+		note.value = e.detail.value
+		// console.log('note--->',note.value);
+	}
+	//获取字体
+	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>
+.mt-13 {
+  margin-top: 24.38rpx;
+}
+.mt-9 {
+  margin-top: 16.88rpx;
+}
+.mt-15 {
+  margin-top: 28.13rpx;
+}
+.ml-7 {
+  margin-left: 13.13rpx;
+}
+.ml-3 {
+  margin-left: 5.63rpx;
+}
+.mt-11 {
+  margin-top: 20.63rpx;
+}
+.page {
+  padding-top: 24.38rpx;
+  background-color: #f8e8c1;
+  background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100vh;
+}
+.section_2 {
+  margin-left: 24.38rpx;
+  margin-right: 22.5rpx;
+  padding: 20.63rpx 23.08rpx 24.98rpx 27.54rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.image {
+  width: 65.63rpx;
+  height: 67.5rpx;
+}
+.text {
+  color: #818181;
+  font-size: 37.5rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 32.38rpx;
+}
+.group {
+  width: 167.03rpx;
+}
+.image_2 {
+  margin-left: 129.53rpx;
+  width: 37.5rpx;
+  height: 37.5rpx;
+}
+.font {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.54rpx;
+  color: #323232;
+}
+.text_2 {
+  margin-left: -167.03rpx;
+  color: #ffaaa5;
+}
+.section_3 {
+  margin: 31.27rpx 15rpx 0 16.88rpx;
+  padding: 20.63rpx 18.75rpx 24.38rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.list-item:first-child {
+  margin-top: 0;
+}
+.image_3 {
+  border-radius: 9.38rpx;
+  width: 142.5rpx;
+  height: 166.88rpx;
+}
+.group_5 {
+  margin-left: 30.04rpx;
+  margin-top: 4.2rpx;
+}
+.group_3 {
+  padding: 0 3.83rpx;
+}
+.text_3 {
+  line-height: 25.01rpx;
+}
+.font_2 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.54rpx;
+  color: #818181;
+}
+.text_7 {
+  margin-left: 8.01rpx;
+  line-height: 24.62rpx;
+}
+.font_3 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 17.53rpx;
+  color: #818181;
+}
+.text_8 {
+  margin-left: 9.21rpx;
+}
+.image_6 {
+  width: 35.63rpx;
+  height: 30rpx;
+}
+.font_5 {
+  font-size: 33.75rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 22.54rpx;
+  color: #323232;
+}
+.font_6 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 17.53rpx;
+  color: #323232;
+}
+.image_4 {
+  border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
+  width: 45rpx;
+  height: 45rpx;
+}
+.group_4 {
+  margin-left: 3.75rpx;
+  margin-right: 5.63rpx;
+}
+.text-wrapper {
+  padding: 11.31rpx 0 16.46rpx;
+  background-color: #ffaaa5;
+  width: 58.13rpx;
+  height: 45rpx;
+}
+.font_4 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 17.53rpx;
+  color: #ffffff;
+}
+.text_6 {
+  line-height: 17.23rpx;
+}
+.image_5 {
+  border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
+  width: 45rpx;
+  height: 45rpx;
+}
+.group_9 {
+  padding: 0 138.81rpx;
+}
+.group_10 {
+  line-height: 21.71rpx;
+  height: 21.71rpx;
+}
+.font_7 {
+  font-size: 22.5rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 22.54rpx;
+  color: #818181;
+}
+.text_11 {
+  line-height: 21.71rpx;
+}
+.text_12 {
+  color: #ed4845;
+  line-height: 21rpx;
+}
+.image_7 {
+  width: 26.25rpx;
+  height: 26.25rpx;
+}
+.section_4 {
+  margin: 30rpx 16.88rpx 0 16.88rpx;
+  padding: 30rpx 19.22rpx 20.63rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.font_8 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 29.18rpx;
+  color: #323232;
+}
+.text_13 {
+  line-height: 28.13rpx;
+}
+.font_9 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 29.18rpx;
+  color: #818181;
+}
+.group_11 {
+  margin-right: 9.38rpx;
+}
+.image_8 {
+  width: 33.75rpx;
+  height: 33.75rpx;
+}
+.font_10 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 20.04rpx;
+  color: #323232;
+}
+.group_12 {
+  margin-right: 5.16rpx;
+}
+.image_9 {
+  width: 30rpx;
+  height: 30rpx;
+}
+.text_14 {
+  line-height: 27.77rpx;
+}
+.group_13 {
+  margin-right: 13.37rpx;
+}
+.section_5 {
+  margin: 28.13rpx 15rpx 110rpx 18.75rpx;
+  padding: 17.81rpx 24.13rpx 22.5rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.text_15 {
+  color: #000000;
+  line-height: 29.53rpx;
+}
+.text-wrapper_2 {
+  margin-left: 3.99rpx;
+  margin-right: 3.99rpx;
+  padding: 22.35rpx 0 115.22rpx;
+  background-color: #ffefef;
+  border-radius: 9.38rpx;
+}
+.text_16 {
+  margin-left: 21.15rpx;
+  line-height: 21.81rpx;
+}
+.section_6 {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+  // margin-top: 333.75rpx;
+  padding: 16.88rpx 25.31rpx 15rpx;
+  background-color: #ffffff;
+}
+.image_10 {
+  margin-left: 85.31rpx;
+}
+.text_17 {
+  margin-left: -119.06rpx;
+  color: #000000;
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 26.49rpx;
+}
+.text_18 {
+  margin-left: 28.5rpx;
+  color: #ffaaa5;
+  font-size: 37.5rpx;
+  font-family: Open Sans;
+  font-weight: 700;
+  line-height: 27.62rpx;
+}
+.text_20 {
+  color: #ffaaa5;
+  font-size: 30rpx;
+  font-family: Open Sans;
+  font-weight: 700;
+  line-height: 22.05rpx;
+}
+.text-wrapper_3 {
+  padding: 20.51rpx 0 22.97rpx;
+  background-color: #ffaaa5;
+  border-radius: 75rpx;
+  width: 204.38rpx;
+  height: 71.25rpx;
+}
+.text_19 {
+  color: #ffffff;
+  line-height: 27.77rpx;
+}
+  .popup-content {
+		height: 800rpx;
+	}
+@import url(../../../common/css/global.css);
+</style>
diff --git a/pages/store-home/ProductDetails/ProductDetails.vue b/pages/store-home/ProductDetails/ProductDetails.vue
index b6fb5cb..607bba7 100644
--- a/pages/store-home/ProductDetails/ProductDetails.vue
+++ b/pages/store-home/ProductDetails/ProductDetails.vue
@@ -82,7 +82,7 @@
 </template>
 
 <script setup >
-import {onMounted, ref} from 'vue'
+import {nextTick, onMounted, ref} from 'vue'
 import { onLoad , onShow } from "@dcloudio/uni-app";
 import { baseUrl } from '../../../api/request';
 import  emitter from '../../../utils/emitter'
@@ -134,7 +134,11 @@ const loadPop =()=>{
 }
 //关闭弹窗
 const close =()=>{
-	popup.value.close()
+	nextTick(() => {
+			if (popup.value) {
+				popup.value.close()
+			}
+		})
 }
 //将商品对象发送到下一个页面
 const jump_buy =()=> {
diff --git a/pages/syy.vue b/pages/syy.vue
deleted file mode 100644
index 3a41d1d..0000000
--- a/pages/syy.vue
+++ /dev/null
@@ -1,570 +0,0 @@
-<template>
-	<view class="flex-row relative page">
-		<view class="flex-row justify-center items-center section_2 pos">
-			<!-- <image class="image"
-				src="https://ide.code.fun/api/image?token=67610a10797f850011f30392&name=49977e5fbfb65cc3b62ce79b9d6705a2.png" />
-			<text class="font text ml-4">搜索订单</text> -->
-			 <input style="width: 90%;" class="search-input" placeholder="请输入商品名称" v-model="searchKeyword" @input="handleSearch" />
-		</view>
-		<view class="flex-col section_44">
-			<view class="flex-row justify-between self-stretch groupp">
-				<view class="font_22" :class="{ active: orderStatus === '全部', selected: isSelected('全部') }"
-					@click="changeTab('全部')">
-					全部
-				</view>
-				<view class="font_22" :class="{ active: orderStatus === '待支付', selected: isSelected('待支付') }"
-					@click="changeTab('待支付')">
-					待支付
-				</view>
-				<view class="font_22" :class="{ active: orderStatus === '待发货', selected: isSelected('待发货') }"
-					@click="changeTab('待发货')">
-					待发货
-				</view>
-				<view class="font_22" :class="{ active: orderStatus === '已发货', selected: isSelected('已发货') }"
-					@click="changeTab('已发货')">
-					已发货
-				</view>
-				<view class="font_22" :class="{ active: orderStatus === '已退款', selected: isSelected('已退款') }"
-					@click="changeTab('已退款')">
-					售后/退款
-				</view>
-			</view>
-
-
-			<view class="flex-col pos_8">
-				<view class="flex-col section_4 list-item_1 mt-14" v-for="(order, index) in Status.displayedOrders"
-					:key="order.id" @click="goToText(index)">
-					<view class="flex-col">
-						<!-- <text class="self-end font_3 text_5">交易关闭</text> -->
-						<view class="flex-row items-center self-stretch mt-2">
-							<text class="font_4">订单编号：</text>
-							<text class="font_5 ml-5">{{order.orderNumber}}</text>
-						</view>
-					</view>
-					<view class="flex-col group">
-						<view class="flex-row justify-between list-item group_3" v-for="item in order.orderItemList"
-							:key="item.id">
-							<view class="flex-row">
-								<image class="image_2" :src="item.goodSnapshot.goodImg" />
-								<view class="flex-col self-start group_1 ml-18">
-									<view class="flex-row self-stretch">
-										<text class="font">{{ item.goodSnapshot.name }}</text>
-										<text class="font text_10">【{{ item.goodSnapshot.type }}】</text>
-									</view>
-									<text class="self-start font_7 text_12 mt-36">×1</text>
-								</view>
-							</view>
-							<view class="flex-row items-center self-start group_2">
-								{{ item.goodSnapshot.price }}
-							</view>
-						</view>
-					</view>
-					<view class="divider view_1"></view>
-					<view class="flex-row justify-end group_5">
-						<view v-if="order.orderStatus==='待支付'" class="font text_18">去支付</view>
-						<view v-if="order.orderStatus==='待发货'" class="font text_18">取消订单</view>
-						<view v-if="order.orderStatus==='已发货'" class="font text_18">确认收货</view>
-						<view v-if="order.orderStatus==='已退款'" class="font text_18">售后详情</view>
-					</view>
-					<view class="flex-row justify-end items-center view">
-						<text class="font_9 text_16">总 金额：</text>
-						<image class="image_4 image_5"
-							src="https://ide.code.fun/api/image?token=67610a10797f850011f30392&name=f10bd62afae3562e9d76103ff6fb0f84.png" />
-						<text class="font_8 text_17">{{order.totalAmount}}</text>
-					</view>
-					<view class="flex-row justify-end group_7">
-						<view class="flex-col justify-start items-center text-wrapper"><text
-								class="font text_18">删除记录</text></view>
-						<view class="flex-col justify-start items-center text-wrapper_2 ml-14">
-							<text class="font_3">联系客服</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-    import {
-        ref,
-        onMounted,
-        toRaw
-    } from 'vue';
-    import {
-        baseUrl,
-        testUrl,
-        suiUrl
-    } from '@/api/request';
-    import { onLoad } from "@dcloudio/uni-app";
-
-    const Status = ref({
-        orderStatus: '全部',
-        orders: [],
-        displayedOrders: [],
-    });
-    const orderStatus = '';
-    const currentColor = ref(0);
-    const isSelected = (tab) => Status.value.orderStatus === tab;
-    const searchKeyword = ref(''); // 新增，用于存储搜索关键词
-
-    onMounted(async () => {
-        await Getorder();
-        // 根据当前的tab值来设置displayedOrders
-        if (Status.value.orderStatus === '全部') {
-            Status.value.displayedOrders = Status.value.orders;
-        } else {
-            Status.value.displayedOrders = Status.value.orders.filter((order) => {
-                switch (Status.value.orderStatus) {
-                    case '待支付':
-                        return order.orderStatus === '待支付'
-                    case '待发货':
-                        return order.orderStatus === '待发货'
-                    case '已发货':
-                        return order.orderStatus === '已发货'
-                    case '已退款':
-                        return order.orderStatus === '已退款'
-                    default:
-                        return false;
-                }
-            });
-        }
-    });
-
-    const userInfo = wx.getStorageSync('userInfo');
-
-    const Getorder = async () => {
-        const res = await uni.request({
-            url: baseUrl + '/order/list',
-            method: 'POST',
-            header: {
-                cookie: wx.getStorageSync('cookie')
-            },
-            data: {
-                id: userInfo.id,
-            },
-        });
-        if (res.data.code === 1) {
-            Status.value.orders = res.data.data;
-        } else {
-            console.log('没拿到用户数据');
-        }
-    };
-
-    const zt = ref({
-        tab: ''
-    });
-
-    onLoad((options) => {
-        if (options.tab) {
-            zt.value.tab = JSON.parse(options.tab);
-            changeTab(zt.value.tab);
-        }
-    });
-
-    const changeTab = (tab) => {
-        if (tab === '全部') {
-            Status.value.displayedOrders = Status.value.orders;
-            Status.value.orderStatus = '全部';
-        } else {
-            Status.value.displayedOrders = Status.value.orders.filter((order) => {
-                switch (tab) {
-                    case '待支付':
-                        return order.orderStatus === '待支付';
-                    case '待发货':
-                        return order.orderStatus === '待发货';
-                    case '已发货':
-                        return order.orderStatus === '已发货';
-                    case '已退款':
-                        return order.orderStatus === '已退款';
-                    default:
-                        return false;
-                }
-            });
-            Status.value.orderStatus = tab;
-        }
-    };
-
-    // 新增，处理搜索逻辑的函数
-    const handleSearch = () => {
-        if (searchKeyword.value.trim() === '') {
-            // 如果关键词为空，恢复根据当前tab展示的数据（全部或筛选后的数据）
-            if (Status.value.orderStatus === '全部') {
-                Status.value.displayedOrders = Status.value.orders;
-            } else {
-                Status.value.displayedOrders = Status.value.orders.filter((order) => {
-                    switch (Status.value.orderStatus) {
-                        case '待支付':
-                            return order.orderStatus === '待支付'
-                        case '待发货':
-                            return order.orderStatus === '待发货'
-                        case '已发货':
-                            return order.orderStatus === '已发货'
-                        case '已退款':
-                            return order.orderStatus === '已退款'
-                        default:
-                            return false;
-                    }
-                });
-            }
-            return;
-        }
-        const keyword = searchKeyword.value.toLowerCase(); // 转换为小写，方便不区分大小写搜索
-        Status.value.displayedOrders = Status.value.orders.filter((order) => {
-            return order.orderItemList.some((item) => {
-                return item.goodSnapshot.name.toLowerCase().includes(keyword);
-            });
-        });
-    };
-
-    const goToText = (index) => {
-        uni.navigateTo({
-            url: '../../../pages/mine/OrderDetails/OrderDetails?info=' + JSON.stringify(Status.value
-              .displayedOrders[index]),
-        })
-    };
-</script>
-
-<style lang="scss" scoped>
-	.groupp {
-		padding: 22.5rpx 0 18.75rpx;
-	}
-
-	.section_44 {
-		padding-left: 33.75rpx;
-		padding-right: 30rpx;
-		width: 100%;
-		height: 120rpx;
-		margin-top: 80rpx;
-	}
-
-	.ml-5 {
-		margin-left: 9.38rpx;
-	}
-
-	.font_22.selected {
-		position: relative;
-	}
-
-	.font_22.selected::after {
-		content: '';
-		position: absolute;
-		bottom: -5px; // 调整线条距离底部的距离
-		left: 0;
-		right: 0;
-		height: 2px; // 调整线条的粗细
-		background-color: #f6aaa4; // 调整线条颜色
-		transition: all 0.3s ease; // 添加过渡效果
-	}
-
-	.page {
-		padding: 46.88rpx 22.5rpx 401.25rpx;
-		background-color: #ffffff;
-		background-image: url('https://ide.code.fun/api/image?token=67610a10797f850011f30392&name=4ba8389730acda4f67d46a7370efec60.png');
-		background-size: 100% 100%;
-		background-repeat: no-repeat;
-		height: 2073.75rpx;
-		width: 100%;
-		overflow-y: auto;
-		overflow-x: hidden;
-	}
-
-	.section_2 {
-		padding: 9.38rpx 0;
-		background-color: #ffffff;
-		border-radius: 75rpx;
-	}
-
-	.pos {
-		position: absolute;
-		left: 35.63rpx;
-		right: 35.63rpx;
-		top: 46.88rpx;
-	}
-
-	.image {
-		width: 37.5rpx;
-		height: 37.5rpx;
-	}
-
-	.font {
-		font-size: 26.25rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
-		line-height: 25.54rpx;
-		color: #323232;
-	}
-
-	.text {
-		color: #c0c0c0;
-		line-height: 25.84rpx;
-	}
-
-	.font_2 {
-		font-size: 30rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
-		line-height: 28.84rpx;
-		color: #323232;
-	}
-
-	.font_22 {
-		font-size: 30rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
-		line-height: 27.81rpx;
-		color: #323232;
-	}
-
-	.text_2 {
-		line-height: 28.48rpx;
-	}
-
-	.pos_2 {
-		position: absolute;
-		left: 33.99rpx;
-		top: 146.36rpx;
-	}
-
-	.text_3 {
-		line-height: 28.24rpx;
-	}
-
-	.pos_3 {
-		position: absolute;
-		left: 147.66rpx;
-		top: 146.14rpx;
-	}
-
-	.pos_4 {
-		position: absolute;
-		left: 295.78rpx;
-		top: 145.78rpx;
-	}
-
-	.pos_5 {
-		position: absolute;
-		right: 214.22rpx;
-		top: 145.78rpx;
-	}
-
-	.text_4 {
-		line-height: 29.53rpx;
-	}
-
-	.pos_6 {
-		position: absolute;
-		right: 34.22rpx;
-		top: 147.07rpx;
-	}
-
-	.section_3 {
-		background-color: #ffaaa5;
-		width: 73.13rpx;
-		height: 5.63rpx;
-	}
-
-	.pos_7 {
-		position: absolute;
-		left: 30rpx;
-		top: 182.81rpx;
-	}
-
-	.pos_8 {
-		position: absolute;
-		left: 22.5rpx;
-		right: 30rpx;
-		top: 217.5rpx;
-	}
-
-	.section_4 {
-		padding: 34.61rpx 15rpx 31.88rpx;
-		background-color: #ffffff;
-		border-radius: 31.88rpx;
-	}
-
-	.list-item_1:first-child {
-		margin-top: 0;
-	}
-
-	.font_3 {
-		font-size: 26.25rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
-		line-height: 25.54rpx;
-		color: #ffaaa5;
-	}
-
-	.text_5 {
-		margin-right: 8.08rpx;
-		line-height: 24.62rpx;
-	}
-
-	.font_4 {
-		font-size: 22.5rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
-		line-height: 22.14rpx;
-		color: #818181;
-	}
-
-	.font_5 {
-		font-size: 22.5rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
-		line-height: 15.04rpx;
-		color: #818181;
-	}
-
-	.group {
-		margin-top: 29.21rpx;
-	}
-
-	.list-item:first-child {
-		margin-top: 0;
-	}
-
-	.image_2 {
-		border-radius: 9.38rpx;
-		width: 146.25rpx;
-		height: 144.38rpx;
-	}
-
-	.group_1 {
-		margin-top: 2.33rpx;
-	}
-
-	.text_10 {
-		line-height: 25.01rpx;
-	}
-
-	.font_7 {
-		font-size: 26.25rpx;
-		font-family: Open Sans;
-		line-height: 19.29rpx;
-		color: #323232;
-	}
-
-	.text_12 {
-		margin-left: 5.34rpx;
-		line-height: 18.73rpx;
-	}
-
-	.group_2 {
-		margin-right: 8.23rpx;
-		margin-top: 89.19rpx;
-	}
-
-	.font_6 {
-		font-size: 33.75rpx;
-		font-family: Open Sans;
-		line-height: 25.54rpx;
-		font-weight: 600;
-		color: #323232;
-	}
-
-	.text_11 {
-		margin-left: 25.03rpx;
-		line-height: 24.88rpx;
-	}
-
-	.image_3 {
-		margin-left: -90.66rpx;
-		width: 30rpx;
-		height: 26.25rpx;
-	}
-
-	.font_8 {
-		font-size: 26.25rpx;
-		font-family: Open Sans;
-		line-height: 19.29rpx;
-		font-weight: 600;
-		color: #323232;
-	}
-
-	.text_13 {
-		margin-left: 61.14rpx;
-	}
-
-	.divider {
-		background-color: #dad2d2;
-		height: 0.81rpx;
-	}
-
-	.view_1 {
-		margin: 30.43rpx 28.13rpx 0 39.38rpx;
-	}
-
-	.group_5 {
-		margin-top: 49.41rpx;
-		padding: 0 21.21rpx;
-		color: #ffaaa5;
-	}
-
-	.font_9 {
-		font-size: 26.25rpx;
-		font-family: FZSongKeBenXiuKaiS-R-GB;
-		line-height: 25.54rpx;
-		color: #000000;
-	}
-
-	.text_14 {
-		line-height: 24.62rpx;
-	}
-
-	.text_15 {
-		margin-top: 2.17rpx;
-		line-height: 24rpx;
-	}
-
-	.view {
-		margin-top: 19.93rpx;
-		padding: 0 19.54rpx;
-	}
-
-	.text_16 {
-		margin-right: 6.99rpx;
-		line-height: 24.3rpx;
-	}
-
-	.image_4 {
-		width: 31.88rpx;
-		height: 30rpx;
-	}
-
-	.image_5 {
-		margin-right: -8.29rpx;
-	}
-
-	.text_17 {
-		color: #ffaaa5;
-		line-height: 19.39rpx;
-	}
-
-	.group_7 {
-		margin-top: 52.5rpx;
-		padding: 0 9.38rpx;
-	}
-
-	.text-wrapper {
-		padding: 13.86rpx 0 13.52rpx;
-		background-color: #fffef8;
-		border-radius: 75rpx;
-		width: 155.63rpx;
-		height: 56.25rpx;
-		border: solid 1.88rpx #cbcbcb;
-	}
-
-	.text_18 {
-		line-height: 25.13rpx;
-	}
-
-	.text-wrapper_2 {
-		padding: 13.46rpx 0 13.5rpx;
-		background-color: #fffef8;
-		border-radius: 75rpx;
-		width: 155.63rpx;
-		height: 56.25rpx;
-		border: solid 1.88rpx #ffaaa5;
-	}
-
-	.group_3 {
-		margin-top: 15rpx;
-	}
-
-	@import url("../common/css/global.css");
-</style>
\ No newline at end of file
diff --git a/pages/workshop/component/timeSelect.vue b/pages/workshop/component/timeSelect.vue
index 28132da..0e08bc2 100644
--- a/pages/workshop/component/timeSelect.vue
+++ b/pages/workshop/component/timeSelect.vue
@@ -13,7 +13,7 @@
 	          src="./images/cha.png"
 	        />
 	        <view class="flex-col items-start self-stretch mt-58">
-	          <text class="text">￥99</text>
+	          <text class="text">￥{{ productObject.price }}</text>
 	          <text class="font text_2 mt-14">请选择</text>
 	        </view>
 	      </view>
@@ -66,7 +66,7 @@
 	      </view>
 	    </view>
 	  </view>
-	  <view class="flex-col justify-start items-center text-wrapper_3"><text class="font text_8">下一步</text></view>
+	  <view class="flex-col justify-start items-center text-wrapper_3" @click="addCart"><text class="font text_8">加入购物车</text></view>
 	</view>
 	
 	<uni-popup ref="tip" :animation="false" @maskClick="maskClosehandler">
@@ -92,7 +92,7 @@
 	const cookie = wx.getStorageSync("cookie")  //请求头
 	const appIdx = ref(0)
 	const cnt = ref(1)
-	const productObject = ref({})
+	const productObject = ref()
 	const appointmentDateVOList = ref([])
 	
 	let appointmentDate = ''
@@ -107,6 +107,7 @@
 		closeyyxzTip()
 		emitter.on('getGoodData', (val) => {
 			productObject.value = val
+			// console.log('');
 			appointmentDateVOList.value = val.appointmentDateVOList 
 			selectObj.value = new Array(appointmentDateVOList.value.length).fill(null).map(() => ({
 				backgroundColor: '#fff',
@@ -130,9 +131,9 @@
 			}
 		})
 		
-		emitter.on('getBookingNumberMap', (val:any) => {
+		emitter.on('getBookingNumberMap', (val:any) => {  //将map集合传过来
 			countMap = val
-			console.log("==============>", val)
+			console.log("val==============>", val)
 			appointmentDate = appointmentDateVOList.value[appIdx.value].specificDate;
 		})
 	})
@@ -141,7 +142,43 @@
 	const maskClosehandler = () => {
 		
 	}
-
+	
+	const addCart = async () =>{  //加入购物车方法
+		console.log('日期--->',appointmentDate,'时间段--->',timeSlot,'数量--->',cnt.value,'商品id---->',productObject.value.id);
+		if(appointmentDate === '' || timeSlot === '' ) {
+			await uni.showToast({
+				icon: 'error',
+				title: "字段不能为空"
+			})
+			return;
+		}
+		const res = await uni.request({
+			url: baseUrl + '/cartExperience/add',
+			method: 'POST',
+			header: {
+				'cookie': wx.getStorageSync('cookie')
+			},
+			data: { 
+				goodId : productObject.value.id,
+				quantity : cnt.value,
+				reservationDate : appointmentDate,
+				timeSlot : timeSlot
+			}
+		})
+		console.log('加入购物车结果',res);
+		if(res.data.code === 1) {
+			uni.showToast({
+				icon: 'success',
+				title: "加入购物车成功"
+			})
+			close() //关闭弹窗
+		} else {
+			uni.showToast({
+				icon: 'error',
+				title: "服务错误"
+			})
+		}
+	}
 	
  
 	
@@ -157,7 +194,7 @@
 		tip.value.open()
 	}
 	
-	const add = () => {
+	const add = () => {  //添加商品方法
 		if (restNumber.value === '请选择时间段') {
 			uni.showToast({
 				title: '请选择时间段',
@@ -170,21 +207,22 @@
 		}
 	}
 	
-	const sub = () => {
+	const sub = () => {   //减少商品方法
 		if (cnt.value > 1) {
 			cnt.value --
 		}
 	}
 	
-	const close = () => {
+	const close = () => {   //关闭弹窗
 		emitter.emit('closeTimeDialog')
 	}
 	
 	
-	const isSelected = (index:any) => {
+	const isSelected = (index:any) => {   //选择预约日期方法
 		appIdx.value = index
 		restNumber.value = '请选择时间段'
 		appointmentDate = appointmentDateVOList.value[appIdx.value].specificDate;
+		timeSlot = ''
 		console.log('appointmentDate===================================>', appointmentDate)
 		for (var i = 0; i < appointmentDateVOList.value.length; i ++ ) {
 			if (i == index) {
@@ -205,7 +243,7 @@
 	}
 	
 	
-	const itemIsSelected = (index:any) => {
+	const itemIsSelected = (index:any) => {  //选择时间段方法
 		timeSlot = appointmentDateVOList.value[appIdx.value].timePeriodVOList[index].timeSlot
 		restNumber.value = countMap[appointmentDate + '&' + timeSlot]
 		console.log('timeSlot====================================>', timeSlot)
diff --git a/pages/workshop/productmain/productmain.vue b/pages/workshop/productmain/productmain.vue
index 3e29fae..804ec38 100644
--- a/pages/workshop/productmain/productmain.vue
+++ b/pages/workshop/productmain/productmain.vue
@@ -72,7 +72,7 @@
 </template>
 
 <script setup>
-import { ref,onMounted } from 'vue'
+import { ref,onMounted, nextTick } from 'vue'
 import { onLoad } from "@dcloudio/uni-app";
 import { baseUrl } from '../../../api/request';
 import timeSelectVue from '../component/timeSelect.vue';
@@ -132,7 +132,9 @@ const getBookingNumberMap = async () => {
 }
 
 const close =()=> {  //关闭弹窗
-	popup.value.close()
+	nextTick(()=>{
+		popup.value.close()
+	})
 }
 const loadPop =()=> {
 	emitter.emit('getGoodData', productObject.value)