diff --git a/api/system/user.js b/api/system/user.js
index c094c85..b8040ac 100644
--- a/api/system/user.js
+++ b/api/system/user.js
@@ -3,152 +3,154 @@ import request from '@/utils/request'
 
 // 用户密码重置
 export function updateUserPwd(oldPassword, newPassword) {
-  const data = {
-    oldPassword,
-    newPassword
-  }
-  return request({
-    url: '/system/user/profile/updatePwd',
-    method: 'put',
-    params: data
-  })
+	const data = {
+		oldPassword,
+		newPassword
+	}
+	return request({
+		url: '/system/user/profile/updatePwd',
+		method: 'put',
+		params: data
+	})
 }
 
 // 查询用户个人信息
 export function getUserProfile() {
-  return request({
-    url: '/system/user/profile',
-    method: 'get'
-  })
+	return request({
+		url: '/system/user/profile',
+		method: 'get'
+	})
 }
 
 // 修改用户个人信息
 export function updateUserProfile(data) {
-  return request({
-    url: '/system/user/profile',
-    method: 'put',
-    data: data
-  })
+	return request({
+		url: '/system/user/profile',
+		method: 'put',
+		data: data
+	})
 }
 
 // 用户头像上传
 export function uploadAvatar(data) {
-  return upload({
-    url: '/system/user/profile/avatar',
-    name: data.name,
-    filePath: data.filePath
-  })
+	return upload({
+		url: '/system/user/profile/avatar',
+		name: data.name,
+		filePath: data.filePath
+	})
 }
 // 人员列表
-export function getStaffList(){
+export function getStaffList() {
 	return request({
-	  url: '/h5/staff/list',
-	  method: 'get'
+		url: '/h5/staff/list',
+		method: 'get'
 	})
 }
 // 产品列表
-export function getProductList(data){
+export function getProductList(data) {
 	return request({
-	  url: '/no-auth/product/list',
-	  method: 'post',
-	  data:data
+		url: '/no-auth/product/list',
+		method: 'post',
+		data: data
 	})
 }
 
 // 产品详情
-export function getProductDetails(data){
+export function getProductDetails(data) {
 	return request({
-	  url: `/no-auth/product/detail/${data}`,
-	  method: 'get',
+		url: `/no-auth/product/detail/${data}`,
+		method: 'get',
 	})
 }
 
 // 字典
-export function getDictList(type){
+export function getDictList(type) {
 	return request({
-	  url: `/h5/system/dict/data/type/${type}`,
-	  method: 'get'
+		url: `/h5/system/dict/data/type/${type}`,
+		method: 'get'
 	})
 }
 //获取openId
-export function getOpenId(code){
+export function getOpenId(code) {
 	return request({
-	  url: `/no-auth/wechat/getOpenId?code=${code}`,
-	  method: 'get'
+		url: `/no-auth/wechat/getOpenId?code=${code}`,
+		method: 'get'
 	})
 }
 // 创建订单
-export function createOrder(data){
+export function createOrder(data) {
 	return request({
-	  url: `/no-auth/appointment/add`,
-	  method: 'post',
-	  data:data
+		url: `/no-auth/appointment/add`,
+		method: 'post',
+		data: data
 	})
 }
 
 // 创建订单新
-export function createOrderNew(data){
+export function createOrderNew(data) {
 	return request({
-	  url: `/h5/appointment/add`,
-	  method: 'post',
-		headers:{ "isToken":true},
-	  data:data
+		url: `/h5/appointment/add`,
+		method: 'post',
+		headers: {
+			"isToken": true
+		},
+		data: data
 	})
 }
 
-export function getOrderList(data){
+export function getOrderList(params) {
 	return request({
-	  url: `/h5/order/listByOpenid?status=${data.status}&openid=${data.openId}&page=${data.page}&size=${data.size}`,
-	  method: 'get'
+		url: `/h5/order/listByOpenid`,
+		method: 'get',
+		params,
 	})
 }
-export function getBannerList(){
+export function getBannerList() {
 	return request({
-	  url: `/h5/system/dict/data/type/sys_banner`,
-	  method: 'get'
+		url: `/h5/system/dict/data/type/sys_banner`,
+		method: 'get'
 	})
 }
 
-export function getCity(){
+export function getCity() {
 	return request({
-	  url: `/h5/system/config/order.city.list`,
-	  method: 'get'
+		url: `/h5/system/config/order.city.list`,
+		method: 'get'
 	})
 }
-export function getCouponList(){
+export function getCouponList() {
 	return request({
-	  url: `/h5/coupon/list`,
-	  headers:{ "isToken":true},
-	  method: 'get'
+		url: `/h5/coupon/list`,
+		headers: {
+			"isToken": true
+		},
+		method: 'get'
 	})
 }
 
-export function receiveCoupon(data){
+export function receiveCoupon(data) {
 	return request({
-	  url: `/h5/coupon/get`,
-	  headers:{ "isToken":true},
-	  method: 'post',
-	  data
+		url: `/h5/coupon/get`,
+		headers: {
+			"isToken": true
+		},
+		method: 'post',
+		data
 	})
 }
 
-export function getCouponListNoAuth(){
+export function getCouponListNoAuth() {
 	return request({
-	  url: `/no-auth/h5/coupon/list`,
-	  method: 'get'
+		url: `/no-auth/h5/coupon/list`,
+		method: 'get'
 	})
 }
 
 //获取手机号
-export function getPhoneNumber(data){
+export function getPhoneNumber(data) {
 	return request({
-	  url: `/no-auth/wechat/getPhoneNumber`,
-	  method: 'post',
-	  data
+		url: `/no-auth/wechat/getPhoneNumber`,
+		method: 'post',
+		data
 	})
-}
-
-
-
-
-
+}
\ No newline at end of file
diff --git a/pages/details/feed.vue b/pages/details/feed.vue
index 59c4a45..e859d39 100644
--- a/pages/details/feed.vue
+++ b/pages/details/feed.vue
@@ -123,6 +123,8 @@
 						"skuId": this.skus[0].id,
 						"quantity": 1
 					}
+                    this.$store.commit('setPosition', {})
+                    this.buyInfo.teacher = null
 					this.$globalData.newOrderData={
 						currentAddress:{},
 						currentPets:[],
diff --git a/pages/details/walk.vue b/pages/details/walk.vue
index 13f4f71..2879429 100644
--- a/pages/details/walk.vue
+++ b/pages/details/walk.vue
@@ -122,6 +122,8 @@
 						"skuId": this.skus[0].id,
 						"quantity": 1
 					}
+                    this.$store.commit('setPosition', {})
+                    this.buyInfo.teacher = null
 					this.$globalData.newOrderData={
 						currentAddress:{},
 						currentPets:[],
diff --git a/pages/newOrder/confirmOrder.vue b/pages/newOrder/confirmOrder.vue
index 076a970..5aca76c 100644
--- a/pages/newOrder/confirmOrder.vue
+++ b/pages/newOrder/confirmOrder.vue
@@ -1,16 +1,16 @@
 <template>
-  <view class="service-new container">
-    <view class="service-new-address">
+	<view class="service-new container">
+		<view class="service-new-address">
 			<uni-card padding=0 :is-shadow="false">
 				<view class="service-new-title" slot="title">
-					<view class="service-new-title-left">	
+					<view class="service-new-title-left">
 						<view class="service-new-flag"></view>
 						<view>服务地址</view>
 					</view>
 				</view>
 				<view class="split-line"></view>
 				<view class="service-new-address-content">
-					<view class="service-new-address-selected" >
+					<view class="service-new-address-selected">
 						<view class="personal-address-info">
 							<view class="personal-address-text">
 								{{currentAddress.province}} {{currentAddress.city}} {{currentAddress.detailAddress}}
@@ -19,7 +19,7 @@
 								<view>
 									{{currentAddress.name}}
 								</view>
-								<view style="border: solid #7D8196 1px; margin: 0 10px; height: 12px;">	</view>
+								<view style="border: solid #7D8196 1px; margin: 0 10px; height: 12px;"> </view>
 								<view>
 									{{currentAddress.phone}}
 								</view>
@@ -42,32 +42,34 @@
 				</view>
 				<view class="split-line"></view>
 				<view class="service-new-pet-content">
-					<view class="personal-pet-list">			
+					<view class="personal-pet-list">
 						<view v-for="(item,index) in showPets" :key="index">
 							<view class="personal-pet-list-item">
 								<view class="personal-pet-info">
 									<!-- 左侧头像 -->
 									<view class="pet-avatar">
-										<u-avatar :src="item.photo?item.photo:defaultPhoto" size="60" shape="circle"></u-avatar>
+										<u-avatar :src="item.photo?item.photo:defaultPhoto" size="60"
+											shape="circle"></u-avatar>
 									</view>
-									
+
 									<!-- 中间内容 -->
 									<view class="pet-info" style="flex: 1; margin: 0 20rpx; max-width: 50%;">
 										<view class="pet-name-gender" style="display: flex; align-items: center;">
 											<view>{{item.name}}</view>
-											<view class="pet-gender" style="margin-left: 10rpx; display: flex;align-items: center;">
-												<img :src="item.gender=='男生'?'../../static/images/details/boy.svg':'../../static/images/details/girl.svg'" alt="sex" 		
-												style="width: 16px;height: 16px;"/>
+											<view class="pet-gender"
+												style="margin-left: 10rpx; display: flex;align-items: center;">
+												<img :src="item.gender=='男生'?'../../static/images/details/boy.svg':'../../static/images/details/girl.svg'"
+													alt="sex" style="width: 16px;height: 16px;" />
 											</view>
 										</view>
-										<view class="pet-dates ellipsis" >
+										<view class="pet-dates ellipsis">
 											{{ item.pets.map(e=>e.serviceDate).join(';') }}
 										</view>
 									</view>
-									
+
 									<!-- 右侧天数统计 -->
 									<view class="date-total" style="margin-left: auto;width: 140rpx;text-align: end;">
-										共 {{item.pets.length}} 天 
+										共 {{item.pets.length}} 天
 									</view>
 								</view>
 							</view>
@@ -89,51 +91,63 @@
 				</view>
 				<view class="split-line"></view>
 				<view class="service-new-pet-content">
-					<view class="personal-pet-list">			
-						
+					<view class="personal-pet-list">
+
 						<view v-for="item in dailyShowData" :key="item.date" class="service-new-address">
-							<view  class="service-summary">
+							<view class="service-summary">
 								<view style="display: flex; align-items: center;">
 									<view style="padding-right: 10rpx;color: #7D8196;">{{ item.date }}</view>
-									<view style="margin: 0 10rpx; width: 2px; height: 20rpx; background-color: #7D8196;"></view>
-									<view style="color: #333333; margin-left: 10rpx;">{{baseProduct}} 
-											{{item.customServicesTotalCnt? ' + 定制服务' + item.customServicesTotalCnt + '项' : '' }} </view>
+									<view
+										style="margin: 0 10rpx; width: 2px; height: 20rpx; background-color: #7D8196;">
+									</view>
+									<view style="color: #333333; margin-left: 10rpx;">{{baseProduct}}
+										{{item.customServicesTotalCnt? ' + 定制服务' + item.customServicesTotalCnt + '项' : '' }}
+									</view>
 								</view>
 								<view style="display: flex; align-items: center;">
 									<view style="color: #333333;margin-right: 10rpx;">¥{{ item.totalCost }}.00</view>
 									<view>
-										<u-icon @click="toggleExpand( item.date )" :name="expandedIndexs.includes( item.date ) ? 'arrow-up' : 'arrow-down'" color="#FFBF60" size="14"></u-icon>
+										<u-icon @click="toggleExpand( item.date )"
+											:name="expandedIndexs.includes( item.date ) ? 'arrow-up' : 'arrow-down'"
+											color="#FFBF60" size="14"></u-icon>
 									</view>
 								</view>
 							</view>
-							
+
 							<view v-if="!expandedIndexs.includes(item.date)" class="split-line"></view>
 							<view v-show="expandedIndexs.includes(item.date)" class="service-details">
 								<!-- 基础服务 上门次数 额外费用  -->
 								<view>基础服务</view>
-								<view v-for="(priceItem, priceIndex) in item.priceDetails" :key="priceIndex" class="price-details-item" >
+								<view v-for="(priceItem, priceIndex) in item.priceDetails" :key="priceIndex"
+									class="price-details-item">
 									<view style="display: flex;" v-for="(item2, index) in priceItem.item" :key="index">
 										<view v-if="item2.quantity" class="service-item">
-											<view v-if="item2.itemName != item.name" class="price-details-item-price-total-item">- {{ item2.itemName }}</view>
-											<view class="price-details-item-price-total-item">¥{{ item2.price }} × {{ item2.quantity }} {{ item2.unit }}</view>
+											<view v-if="item2.itemName != item.name"
+												class="price-details-item-price-total-item">- {{ item2.itemName }}
+											</view>
+											<view class="price-details-item-price-total-item">¥{{ item2.price }} ×
+												{{ item2.quantity }} {{ item2.unit }}</view>
 										</view>
 									</view>
 								</view>
 								<view v-if="item.customServicesTotalCnt>0" style="margin-top: 20rpx;">定制服务</view>
 								<view v-for="(pet, petIndex) in item.pets" :key="petIndex">
-									<view v-if="pet.customServices &&pet.customServices.filter(e=>e.quantity>0).length>0" style="display: flex; align-items: center; justify-content: flex-start; margin-top: 20rpx;">
+									<view
+										v-if="pet.customServices &&pet.customServices.filter(e=>e.quantity>0).length>0"
+										style="display: flex; align-items: center; justify-content: flex-start; margin-top: 20rpx;">
 										<view class="pet-avatar">
-											<u-avatar :src="pet.photo?pet.photo:defaultPhoto" size="34" shape="circle"></u-avatar>
+											<u-avatar :src="pet.photo?pet.photo:defaultPhoto" size="34"
+												shape="circle"></u-avatar>
 										</view>
 										<view style="margin-left: 20rpx;">{{ pet.name}}</view>
 									</view>
 									<!-- 定制服务 -->
 									<view v-for="(customItem, customIndex) in pet.customServices" :key="customIndex">
-										<view v-if="customItem.quantity"  class="service-item">
+										<view v-if="customItem.quantity" class="service-item">
 											<view>- {{ customItem.name }}</view>
 											<view>¥{{ customItem.price }} × {{ customItem.quantity }} 次</view>
 										</view>
-									</view>	
+									</view>
 								</view>
 							</view>
 						</view>
@@ -149,7 +163,7 @@
 							</view>
 							<view class="total-cost">
 								<view>平台优惠</view>
-								<view style="color: #FF530A;">-¥{{ discount }} 
+								<view style="color: #FF530A;">-¥{{ discount }}
 									<uni-icons type="right" size="28rpx" color="#AAA" @click="selectCoupon"></uni-icons>
 								</view>
 							</view>
@@ -157,7 +171,7 @@
 								<view>会员折扣</view>
 								<view style="display: flex; align-items: center;">
 									<view style="color: #999999;">{{ currentMember.itemType }}</view>
-									<view style="border: solid #7D8196 1px; margin: 0 10rpx; height: 12px;">	</view>
+									<view style="border: solid #7D8196 1px; margin: 0 10rpx; height: 12px;"> </view>
 									<view style="color: #FF530A;">-¥{{ memberDiscount }}</view>
 								</view>
 							</view>
@@ -166,13 +180,13 @@
 								<view style="font-weight: 500;font-size: 32rpx;">¥{{ finalPrice }}</view>
 							</view>
 						</view>
-						
+
 					</view>
 				</view>
 			</uni-card>
 		</view>
 
-    <view class="service-new-pet">
+		<view class="service-new-pet">
 			<uni-card padding=0 :is-shadow="false">
 				<view class="service-new-title" slot="title">
 					<view class="service-new-title-left">
@@ -186,11 +200,8 @@
 				<view class="split-line"></view>
 				<view class="service-new-details-content">
 					<view style="margin: 30rpx 0;">
-						<u-checkbox-group
-								@change="changePreFamiliarize"
-						    :value="needPreFamiliarize"
-						    iconPlacement="right" 
-								placement="column">
+						<u-checkbox-group @change="changePreFamiliarize" :value="needPreFamiliarize"
+							iconPlacement="right" placement="column">
 							<u-checkbox activeColor="#FFBF60" label="是否提前熟悉" name="是否提前熟悉" shape="circle"></u-checkbox>
 						</u-checkbox-group>
 					</view>
@@ -212,11 +223,12 @@
 				</view>
 			</uni-card>
 		</view>
-    <view class="details-subscribe">
+		<view class="details-subscribe">
 			<view class="details-radio" style="width: 100%;padding-bottom: 20rpx;">
 				<view>
 					<u-checkbox-group v-model="isAgree" size="16" labelSize="14" labelColor="#999999">
-						<u-checkbox activeColor="#FFBF60" label="我同意" name="我同意" labelSize="14" size="14" shape="circle"></u-checkbox>
+						<u-checkbox activeColor="#FFBF60" label="我同意" name="我同意" labelSize="14" size="14"
+							shape="circle"></u-checkbox>
 					</u-checkbox-group>
 				</view>
 				<text style="color: #FFBF60;font-size: 28rpx;" @click="checkAgreement">《猫妈狗爸用户服务协议和隐私协议》</text>
@@ -224,27 +236,33 @@
 			<view style="display: flex;justify-content: space-between; align-items: center;">
 				<view style="height: 80rpx; display: flex; align-items: center;">
 					<text style="color: #333333;">订单总价: </text>
-					<text style="color: #FF530A; font-size: 40rpx;">¥{{ finalPrice }} <text style="font-size: 32rpx;"></text></text>
+					<text style="color: #FF530A; font-size: 40rpx;">¥{{ finalPrice }} <text
+							style="font-size: 32rpx;"></text></text>
 				</view>
 				<view style="display: flex;">
-					<u-button color="#FFF4E4" customStyle="width: 200rpx; color: #FFAA48; margin-right: 20rpx;" text="上一步" @click="goBack"></u-button>
-					<u-button color="#FFBF60" customStyle="width: 200rpx; color: #FFF;" text="支付" @click="goNext"></u-button>
+					<u-button color="#FFF4E4" customStyle="width: 200rpx; color: #FFAA48; margin-right: 20rpx;"
+						text="上一步" @click="goBack"></u-button>
+					<u-button color="#FFBF60" customStyle="width: 200rpx; color: #FFF;" text="支付"
+						@click="goNext"></u-button>
 				</view>
 			</view>
-		</view> 
+		</view>
 		<view v-if="showCoupon" class="calendar-popup">
-      <view class="calendar-mask" ></view>
-      <view class="calendar-content">
-        <view class="price-details">
+			<view class="calendar-mask"></view>
+			<view class="calendar-content">
+				<view class="price-details">
 					<view class="price-details-header">
-						<text style="text-align: center; width: 100%; font-size: 32rpx; font-weight: 500; color: #333333;">优惠券</text>
+						<text
+							style="text-align: center; width: 100%; font-size: 32rpx; font-weight: 500; color: #333333;">优惠券</text>
 						<u-icon name="close" @click="togglePriceDetails"></u-icon>
 					</view>
-					<view class="split-line"></view> 
+					<view class="split-line"></view>
 					<scroll-view class="price-details-body" scroll-y v-if="showCouponList">
 						<view v-for="(item,index) in couponList" style="padding-bottom:14px;" :key="index">
 							<view class="coupon-card">
-								<view class="card-left"><text style="font-size: 40rpx; margin-left: 5rpx;">{{ getCouponAmountOrDiscount(item) }}</text></view>
+								<view class="card-left"><text
+										style="font-size: 40rpx; margin-left: 5rpx;">{{ getCouponAmountOrDiscount(item) }}</text>
+								</view>
 								<view class="card-right">
 									<view class="card-content">
 										<view class="card-info">{{item.stockName}}</view>
@@ -252,7 +270,8 @@
 									</view>
 									<view style="width: 20%;">
 										<u-checkbox-group :value="item.checked" @change="changeCoupon">
-											<u-checkbox :disabled="item.transactionMinimum > originalTotalPrice" shape="circle" :name="item.id" activeColor="#ffbf60"></u-checkbox>
+											<u-checkbox :disabled="item.transactionMinimum > originalTotalPrice"
+												shape="circle" :name="item.id" activeColor="#ffbf60"></u-checkbox>
 										</u-checkbox-group>
 									</view>
 								</view>
@@ -260,75 +279,83 @@
 						</view>
 					</scroll-view>
 				</view>
-        <u-button color="#FFBF60" type="primary" @click="confirmCoupon">确定</u-button>
-      </view>
-      
-    </view>
-  </view>
+				<u-button color="#FFBF60" type="primary" @click="confirmCoupon">确定</u-button>
+			</view>
+
+		</view>
+	</view>
 </template>
 <script>
-	import {getPersonalInfo,getCouponList,getCouponListForOrder} from "@/api/system/personal.js"
-	import {getToken,getOpenIdKey} from '@/utils/auth'
-	import { createOrderNew } from '@/api/system/user.js'
-  export default {
-    data() {
-      return {
-				isPaying:false,
-        currentAddress: {},
-        currentPetsByDay: [],
-        showPets: [],
-        expandedIndexs: [],
+	import {
+		getPersonalInfo,
+		getCouponList,
+		getCouponListForOrder
+	} from "@/api/system/personal.js"
+	import {
+		getToken,
+		getOpenIdKey
+	} from '@/utils/auth'
+	import {
+		createOrderNew
+	} from '@/api/system/user.js'
+	export default {
+		data() {
+			return {
+				isPaying: false,
+				currentAddress: {},
+				currentPetsByDay: [],
+				showPets: [],
+				expandedIndexs: [],
 				isAgree: false,
 				needPreFamiliarize: [],
 				dailyShowData: [],
-				originalTotalPrice:0,
-        totalPrice: 0, // 总费用
-        discount: 0, // 平台优惠
-				memberDiscount:0, // 会员折扣
-        finalPrice: 0, // 应付费用
-				defaultPhoto:'https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/personal/pet/catdog.png',
-				currentMember:{},
-				memberDiscountList:[
-					{
-						itemType:"新晋家长9.5折优惠",
-						discount:0.05
+				originalTotalPrice: 0,
+				totalPrice: 0, // 总费用
+				discount: 0, // 平台优惠
+				memberDiscount: 0, // 会员折扣
+				finalPrice: 0, // 应付费用
+				defaultPhoto: 'https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/personal/pet/catdog.png',
+				currentMember: {},
+				memberDiscountList: [{
+						itemType: "新晋家长9.5折优惠",
+						discount: 0.05
 					},
 					{
-						itemType:"普卡会员9折优惠",
-						discount:0.1
+						itemType: "普卡会员9折优惠",
+						discount: 0.1
 					},
 					{
-						itemType:"银卡会员8.8折优惠",
-						discount:0.12
+						itemType: "银卡会员8.8折优惠",
+						discount: 0.12
 					},
 					{
-						itemType:"金卡会员8.5折优惠",
-						discount:0.15
+						itemType: "金卡会员8.5折优惠",
+						discount: 0.15
 					}
 				],
-				couponList:[],
-				showCoupon:false ,
-				selectedCoupon:null,
-				showCouponList:true,
-				couponId:null,
-				basePrice:0,
-				baseProduct:'',
-				
-      }
-    },
-    onLoad() {
+				couponList: [],
+				showCoupon: false,
+				selectedCoupon: null,
+				showCouponList: true,
+				couponId: null,
+				basePrice: 0,
+				baseProduct: '',
+
+			}
+		},
+		onLoad() {
 			if (getToken() && getOpenIdKey()) {
 				this.getPersonalInfo()
 			}
-			
+
 			this.originalTotalPrice = this.$globalData.newOrderData.totalPrice
-			if(this.originalTotalPrice){
+			if (this.originalTotalPrice) {
 				this.basePrice = this.$globalData.mainSku[0].price
 				this.baseProduct = this.$globalData.mainSku[0].name
 				this.currentAddress = this.$globalData.newOrderData.currentAddress
 				this.currentPetsByDay = this.$globalData.newOrderData.currentPetsByDay
 				this.needPreFamiliarize = this.$globalData.newOrderData.needPreFamiliarize
-			}else{
+			} else {
 				// 返回首页
 				uni.reLaunch({
 					url: '/pages/index'
@@ -337,10 +364,10 @@
 			this.getCouponList()
 			this.getShowPets()
 			this.groupPetsByDate()
-      // this.totalPrice = this.$globalData.newOrderData.totalPrice
-			
-    },
-    methods: {
+			// this.totalPrice = this.$globalData.newOrderData.totalPrice
+
+		},
+		methods: {
 			// 将currentPets转换为showPets
 			getShowPets() {
 				const showPets = []
@@ -355,7 +382,7 @@
 				}, {});
 				console.log(groupedPets)
 				// 循环将pets转换为showPets
-				for(let petId in groupedPets) {
+				for (let petId in groupedPets) {
 					const showPet = {
 						petId: petId,
 						name: groupedPets[petId][0].name,
@@ -382,60 +409,80 @@
 					}
 					dailyPets[serviceDate].push(pet);
 				});
-				
+
 				// 计算每日费用
 				for (const date in dailyPets) {
 					const pets = dailyPets[date];
 					const priceDetails = []
 					// 基础服务
 					const baseServiceCost = this.basePrice
-					
+
 					const largeDogCount = pets.filter(pet => pet.petType === 'dog' && pet.bodyType.includes('大型')).length;
 					let mediumDogCount = pets.filter(pet => pet.petType === 'dog' && pet.bodyType.includes('中型')).length;
 					let smallDogCount = pets.filter(pet => pet.petType === 'dog' && pet.bodyType.includes('小型')).length;
 					let catCount = pets.filter(pet => pet.petType === 'cat').length;
 
-					
+
 					const additionalCostItem = []
 					let additionalCost = 0
 					// 单天总宠物费用
 					let totalPetCost = pets.reduce((acc, pet) => {
-							return acc + this.calculatePetCost(pet);
-						}, 0);
+						return acc + this.calculatePetCost(pet);
+					}, 0);
 					// 如果总宠物费用>30
-					if(totalPetCost>30){
+					if (totalPetCost > 30) {
 						// 如果猫数量>=3,则免3只猫	
 						if (catCount >= 3) {
 							additionalCost = totalPetCost - 30
-							catCount = catCount-3
-						}else if (smallDogCount >= 2) { // 如果小型犬数量>=2,则免2只小型犬
+							catCount = catCount - 3
+						} else if (smallDogCount >= 2) { // 如果小型犬数量>=2,则免2只小型犬
 							additionalCost = totalPetCost - 30
-							smallDogCount = smallDogCount-2
-						}else if(mediumDogCount >= 1) { // 如果中型犬数量>=1,则免1只中型犬
+							smallDogCount = smallDogCount - 2
+						} else if (mediumDogCount >= 1) { // 如果中型犬数量>=1,则免1只中型犬
 							additionalCost = totalPetCost - 30
-							mediumDogCount = mediumDogCount-1
-						}else{
+							mediumDogCount = mediumDogCount - 1
+						} else {
 							additionalCost = totalPetCost - 25
 							catCount = catCount - 1
 							smallDogCount = smallDogCount - 1
 						}
 
-						
-						if(mediumDogCount>0){
-							additionalCostItem.push({ itemName: '中型犬', price: 30, quantity: mediumDogCount, unit: '只'})
+
+						if (mediumDogCount > 0) {
+							additionalCostItem.push({
+								itemName: '中型犬',
+								price: 30,
+								quantity: mediumDogCount,
+								unit: '只'
+							})
 						}
-						if(smallDogCount>0){
-							additionalCostItem.push({ itemName: '小型犬', price: 15, quantity: smallDogCount, unit: '只'})
+						if (smallDogCount > 0) {
+							additionalCostItem.push({
+								itemName: '小型犬',
+								price: 15,
+								quantity: smallDogCount,
+								unit: '只'
+							})
 						}
-						if(catCount>0){
-							additionalCostItem.push({ itemName: '猫猫', price: 10, quantity: catCount, unit: '只'})
+						if (catCount > 0) {
+							additionalCostItem.push({
+								itemName: '猫猫',
+								price: 10,
+								quantity: catCount,
+								unit: '只'
+							})
 						}
 
 					}
 					// 如果有大型犬，额外费用为40元/只
 					if (largeDogCount > 0) {
-						additionalCost +=(40 * largeDogCount)
-						additionalCostItem.push({ itemName: '大型犬', price: 40, quantity: largeDogCount, unit: '只'})
+						additionalCost += (40 * largeDogCount)
+						additionalCostItem.push({
+							itemName: '大型犬',
+							price: 40,
+							quantity: largeDogCount,
+							unit: '只'
+						})
 					}
 					// 当日多次服务次数
 					let multServicesTotalCost = 0
@@ -445,16 +492,37 @@
 					} else if (maxFeedCount === 3) {
 						multServicesTotalCost += 130; // 1天3次
 					}
-					priceDetails.push({ name: '专业喂养', item: [
-						{ itemName: '专业喂养', price: baseServiceCost, quantity: 1, unit: '天' },
-					]})
-					priceDetails.push({ name: '上门次数', item: [
-						{ itemName: '1天2次', price: 45, quantity: maxFeedCount === 2 ? 1 : 0, unit: '天'},
-						{ itemName: '1天3次', price: 130, quantity: maxFeedCount === 3 ? 1 : 0, unit: '天'},
-					]})
-					
-					if(additionalCostItem.length>0){
-						priceDetails.push({ name: '额外宠物费用', item: additionalCostItem})
+					priceDetails.push({
+						name: '专业喂养',
+						item: [{
+							itemName: '专业喂养',
+							price: baseServiceCost,
+							quantity: 1,
+							unit: '天'
+						}, ]
+					})
+					priceDetails.push({
+						name: '上门次数',
+						item: [{
+								itemName: '1天2次',
+								price: 45,
+								quantity: maxFeedCount === 2 ? 1 : 0,
+								unit: '天'
+							},
+							{
+								itemName: '1天3次',
+								price: 130,
+								quantity: maxFeedCount === 3 ? 1 : 0,
+								unit: '天'
+							},
+						]
+					})
+
+					if (additionalCostItem.length > 0) {
+						priceDetails.push({
+							name: '额外宠物费用',
+							item: additionalCostItem
+						})
 					}
 
 					// 所有宠物定制服务费用
@@ -462,9 +530,9 @@
 					const totalCost = baseServiceCost + additionalCost + multServicesTotalCost + customServiceCost
 					// 所有宠物定制服务总项数，每个类型的服务只算一次
 					const acc = []
-					pets.map(pet=>{
-						pet.customServices.forEach(service=>{
-							if(!acc.includes(service.skuId) && service.quantity>0){
+					pets.map(pet => {
+						pet.customServices.forEach(service => {
+							if (!acc.includes(service.skuId) && service.quantity > 0) {
 								acc.push(service.skuId)
 							}
 						})
@@ -492,7 +560,7 @@
 					petCost += 15; // 小型犬额外费用
 				} else if (pet.petType === 'dog' && pet.bodyType.includes('中型')) {
 					petCost += 30; // 中型犬额外费用
-				} 
+				}
 				return petCost;
 			},
 			// 计算宠物定制服务费用
@@ -501,18 +569,21 @@
 				return customServiceCost
 			},
 			// 展开或收起服务详情
-      toggleExpand(index) {
+			toggleExpand(index) {
 				console.log(index)
-        this.expandedIndexs = this.expandedIndexs.includes(index) ? this.expandedIndexs.filter(i => i !== index) : [...this.expandedIndexs, index];
+				this.expandedIndexs = this.expandedIndexs.includes(index) ? this.expandedIndexs.filter(i => i !== index) :
+					[...this.expandedIndexs, index];
 				// this.expandedIndexs.push(index)
 				console.log(this.expandedIndexs)
-      },
-      goBack() {		
+			},
+			goBack() {
 				let len = getCurrentPages().length;
-				if(len >= 2) {  
-				    uni.navigateBack();  
-				}else {  
-				    uni.redirectTo({url:'/pages/newOrder/serviceNew2'});  
+				if (len >= 2) {
+					uni.navigateBack();
+				} else {
+					uni.redirectTo({
+						url: '/pages/newOrder/serviceNew2'
+					});
 				}
 			},
 			changeAgree() {
@@ -523,117 +594,124 @@
 					url: '/pages/details/agreement'
 				});
 			},
-				// 节流
+			// 节流
 			throttle(func, delay) {
-			  let lastCall = 0;
-			  return function(...args) {
-			    const now = new Date().getTime();
-			    if (now - lastCall < delay) {
-			      return;
-			    }
-			    lastCall = now;
-			    func(...args);
-			  }
+				let lastCall = 0;
+				return function(...args) {
+					const now = new Date().getTime();
+					if (now - lastCall < delay) {
+						return;
+					}
+					lastCall = now;
+					func(...args);
+				}
 			},
-			getPersonalInfo(){
-				getPersonalInfo().then(res=>{
-					if(res&&(res.id || res.id === 0)){
-						let userLevel=res.level
-						this.currentMember = this.memberDiscountList.find(item=>{
-							if(item.itemType.includes(userLevel)){
+			getPersonalInfo() {
+				getPersonalInfo().then(res => {
+					if (res && (res.id || res.id === 0)) {
+						let userLevel = res.level
+						this.currentMember = this.memberDiscountList.find(item => {
+							if (item.itemType.includes(userLevel)) {
 								return item
 							}
-						})					
+						})
 						this.getShowTotalPrice()
 					}
 				})
 			},
 			// 获取优惠券列表
 			getCouponList() {
-				getCouponListForOrder().then(res=>{
+				getCouponListForOrder().then(res => {
 					let rows = res.rows
 					console.log(rows)
-					this.couponList=rows.filter(item=>item.couponState=="SENDED")
-					this.couponList.forEach(item=>{
+					this.couponList = rows.filter(item => item.couponState == "SENDED")
+					this.couponList.forEach(item => {
 						item.checked = []
 						item.couponAmount = 20
 					})
-					
+
 				})
 			},
-			selectCoupon(){
+			selectCoupon() {
 				this.showCoupon = true
 			},
-			changeCoupon(item){
+			changeCoupon(item) {
 				this.showCouponList = false
-				this.couponList.forEach(coupon=>{
-					if(coupon.id!=item[0]){
-					coupon.checked = null
-				}else{
-					coupon.checked = item
+				this.couponList.forEach(coupon => {
+					if (coupon.id != item[0]) {
+						coupon.checked = null
+					} else {
+						coupon.checked = item
 					}
 				})
 				this.showCouponList = true
 			},
-			confirmCoupon(){
-				this.selectedCoupon = this.couponList.find(coupon=>coupon.checked && coupon.checked.length>0)
-				if(!this.selectedCoupon){
+			confirmCoupon() {
+				this.selectedCoupon = this.couponList.find(coupon => coupon.checked && coupon.checked.length > 0)
+				if (!this.selectedCoupon) {
 					this.couponId = null
 					this.discount = 0
-				}else{
+				} else {
 					this.couponId = this.selectedCoupon?.id
 					// 如果优惠券是折扣
-					if(this.selectedCoupon?.stockType=="PDISCOUNT" && this.selectedCoupon?.discountPercent>0){
-					//保留两位小数	
-						this.discount = (this.originalTotalPrice * (1-this.selectedCoupon.discountPercent/100)).toFixed(2)
-					}else{
+					if (this.selectedCoupon?.stockType == "PDISCOUNT" && this.selectedCoupon?.discountPercent > 0) {
+						//保留两位小数	
+						this.discount = (this.originalTotalPrice * (1 - this.selectedCoupon.discountPercent / 100))
+							.toFixed(2)
+					} else {
 						this.discount = this.selectedCoupon?.discountAmount
 					}
 				}
 				this.getShowTotalPrice()
 				this.showCoupon = false
-				
+
 			},
-			togglePriceDetails(){
+			togglePriceDetails() {
 				this.showCoupon = !this.showCoupon
 			},
 			// 构造订单
-			constructOrder(){
+			constructOrder() {
 				const order = {
-					openId:getOpenIdKey(),
-					addressId:this.currentAddress.id,
-					totalPrice:this.finalPrice,
-					needPreFamiliarize:this.needPreFamiliarize.length>0,
-					couponId:this.couponId,
-					petOrderServices:this.getPetOrderServices(this.currentPetsByDay),
-
+					openId: getOpenIdKey(),
+					addressId: this.currentAddress.id,
+					totalPrice: this.finalPrice,
+					needPreFamiliarize: this.needPreFamiliarize.length > 0,
+					couponId: this.couponId,
+					petOrderServices: this.getPetOrderServices(this.currentPetsByDay),
+				}
+				
+				if(this.buyInfo.teacher){
+					order.teacherId = this.buyInfo.teacher.userId
+				}else{
+					order.companionLevel = ['', 'junior', 'senior'].indexOf(this.$globalData.newOrderData.companionLevel)
 				}
+				
 				console.log(order)
 				return order
 			},
-			getSkuList(customServices,feedCount){
-				const skuList = customServices.filter(service=>service.quantity>0).map(service2=>{
+			getSkuList(customServices, feedCount) {
+				const skuList = customServices.filter(service => service.quantity > 0).map(service2 => {
 					return {
-						skuId:service2.skuId,
-						quantity:service2.quantity,
-						isMainProduct:service2.isMainProduct
+						skuId: service2.skuId,
+						quantity: service2.quantity,
+						isMainProduct: service2.isMainProduct
 					}
 				})
 				skuList.push({
-					skuId:this.$globalData.mainSku[0].skuId,
-					quantity:feedCount,
-					isMainProduct:true
+					skuId: this.$globalData.mainSku[0].skuId,
+					quantity: feedCount,
+					isMainProduct: true
 				})
 				return skuList
 			},
-			getPetOrderServices(currentPetsByDay){
-				const petOrderServices = currentPetsByDay.map(pet=>{
+			getPetOrderServices(currentPetsByDay) {
+				const petOrderServices = currentPetsByDay.map(pet => {
 					return {
-						petId:pet.petId,
-						serviceDate:pet.serviceDate,
-						feedCount:pet.feedCount,
-						selectedTimeSlots:pet.selectedTimeSlots.join(','),
-						skuList:this.getSkuList(pet.customServices,pet.feedCount)
+						petId: pet.petId,
+						serviceDate: pet.serviceDate,
+						feedCount: pet.feedCount,
+						selectedTimeSlots: pet.selectedTimeSlots.join(','),
+						skuList: this.getSkuList(pet.customServices, pet.feedCount)
 					}
 				})
 				return petOrderServices
@@ -652,59 +730,60 @@
 					paySign: params.paySign,
 					success: (res) => {
 						this.$modal.showToast('支付成功')
-						this.$globalData.newOrderData={
-							currentAddress:{},
-							currentPets:[],
-							totalPrice:0,
-							needPreFamiliarize:[]
+						this.$globalData.newOrderData = {
+							currentAddress: {},
+							currentPets: [],
+							totalPrice: 0,
+							needPreFamiliarize: []
 						}
 						uni.navigateTo({
-							url: '/pages/details/successful'
+							url: '/pages_order/order/payOrderSuccessful'
+							// url: '/pages/details/successful'
 						});
 					},
 					fail: (err) => {
-						this.loading=false
+						this.loading = false
 						console.log('支付失败', err)
 						this.$modal.showToast('支付失败')
 					},
 					complete: () => {
-						this.loading=false
+						this.loading = false
 						this.isPaying = false
 					}
 				})
 			},
-			changePreFamiliarize(name){
-				if(name&&name.length>0){
-					this.needPreFamiliarize=name
+			changePreFamiliarize(name) {
+				if (name && name.length > 0) {
+					this.needPreFamiliarize = name
 					this.originalTotalPrice = this.originalTotalPrice + 40
-				}else{
-					this.needPreFamiliarize=[]
+				} else {
+					this.needPreFamiliarize = []
 					this.originalTotalPrice = this.originalTotalPrice - 40
 				}
 				// 如果总价小于优惠券的最低消费，则不使用优惠券
-				if(this.selectedCoupon && this.originalTotalPrice<this.selectedCoupon.transactionMinimum){
+				if (this.selectedCoupon && this.originalTotalPrice < this.selectedCoupon.transactionMinimum) {
 					this.discount = 0
 					this.couponId = null
-					this.couponList.forEach(coupon=>{
+					this.couponList.forEach(coupon => {
 						coupon.checked = null
 					})
 				}
 				this.getShowTotalPrice()
 			},
-			getShowTotalPrice(){
+			getShowTotalPrice() {
 				//保留两位小数
 				this.memberDiscount = ((this.originalTotalPrice - this.discount) * this.currentMember.discount).toFixed(2)
 				this.finalPrice = (this.originalTotalPrice - this.memberDiscount - this.discount).toFixed(2)
 			},
-			getCouponAmountOrDiscount(item){
-				if(item.stockType=="PDISCOUNT"){
-					return item.discountPercent/10 + '折'
-				}else{
+			getCouponAmountOrDiscount(item) {
+				if (item.stockType == "PDISCOUNT") {
+					return item.discountPercent / 10 + '折'
+				} else {
 					return '¥' + item.discountAmount
 				}
 			},
-      goNext() {
-				if(!this.isAgree) {
+			goNext() {
+				if (!this.isAgree) {
 					uni.showToast({
 						title: '请先同意用户协议',
 						icon: 'none'
@@ -717,19 +796,20 @@
 						this.pay(res.data)
 					} else {
 						this.$modal.showToast('创建订单失败，请重试');
-						this.loading=false
+						this.loading = false
 					}
 				})
-        
-      }
-    }
-  }
+
+			}
+		}
+	}
 </script>
 <style scoped lang="scss">
-.container {
+	.container {
 		position: relative;
 		height: 100%;
 		padding-bottom: 200rpx;
+
 		.details-subscribe {
 			background-color: #FFFFFF;
 			padding: 10px;
@@ -738,7 +818,7 @@
 			position: fixed;
 			bottom: 0;
 			z-index: 100;
-		
+
 			.details-btn {
 				width: 100%;
 				border-radius: 6px;
@@ -746,227 +826,266 @@
 				font-size: 16px;
 				color: #FFFFFF;
 			}
-			.details-radio{
+
+			.details-radio {
 				display: flex;
 				align-items: center;
 				justify-content: center;
 			}
 		}
 	}
-.service-new{
-	.service-new-flag {
-		width: 8rpx;
-		height: 32rpx;
-		background: #FFBF60;
-		border-radius: 30rpx 30rpx 30rpx 30rpx;
-		margin-right: 10rpx;
-	}
-	.split-line{
-		width: 100%;
-		height: 1rpx;
-		background: #EFEFEF;
-	}
-	.service-new-title{
-		display: flex;
-		font-weight: 500;
-		font-size: 28rpx;
-		color: #333333;
-		line-height: 33rpx;
-		margin: 42rpx 0 30rpx;
-		justify-content: space-between;
-		.service-new-title-left{
-			display: flex;
-			align-items: center;
+
+	.service-new {
+		.service-new-flag {
+			width: 8rpx;
+			height: 32rpx;
+			background: #FFBF60;
+			border-radius: 30rpx 30rpx 30rpx 30rpx;
+			margin-right: 10rpx;
 		}
-	}
-	.service-new-details-desc{
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #A94F20;
-		line-height: 28rpx;
-		text-align: left;
-		padding: 26rpx 0;
-	}
-	.personal-address-info{
-		display: flex;
-		align-items: center;
-		justify-content: flex-start;
-		flex-wrap: wrap;
-		margin: 32rpx 0;
-		width: 80%;
-		.personal-address-text{
-			color: #333;
-			font-size: 28rpx;
-			font-weight: bold;
+
+		.split-line {
 			width: 100%;
+			height: 1rpx;
+			background: #EFEFEF;
 		}
-		.personal-address-people{
-			color: #7D8196;
+
+		.service-new-title {
+			display: flex;
+			font-weight: 500;
 			font-size: 28rpx;
+			color: #333333;
+			line-height: 33rpx;
+			margin: 42rpx 0 30rpx;
+			justify-content: space-between;
+
+			.service-new-title-left {
+				display: flex;
+				align-items: center;
+			}
+		}
+
+		.service-new-details-desc {
 			font-weight: 400;
+			font-size: 24rpx;
+			color: #A94F20;
+			line-height: 28rpx;
+			text-align: left;
+			padding: 26rpx 0;
+		}
+
+		.personal-address-info {
 			display: flex;
-			justify-content: flex-start;
 			align-items: center;
+			justify-content: flex-start;
+			flex-wrap: wrap;
+			margin: 32rpx 0;
+			width: 80%;
+
+			.personal-address-text {
+				color: #333;
+				font-size: 28rpx;
+				font-weight: bold;
+				width: 100%;
+			}
+
+			.personal-address-people {
+				color: #7D8196;
+				font-size: 28rpx;
+				font-weight: 400;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+			}
 		}
-	}
-	.service-new-address-selected{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-}
-.personal-pet-list {
-	margin-top: 20rpx;
-	
-	.personal-pet-list-item {
-		margin-bottom: 20rpx;
-		background-color: #F9F9F9;
-		height: 172rpx;
-		border-radius: 8rpx;
-		
-		.personal-pet-info {
-			height: 100%;
+
+		.service-new-address-selected {
 			display: flex;
+			justify-content: space-between;
 			align-items: center;
-			padding: 0 20rpx;
 		}
 	}
-}
-.service-new-address {
-	.service-summary {
-		height: 90rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 15rpx;
-		cursor: pointer;
-		transition: background-color 0.3s;
-	}
 
-	.service-details {
-		padding: 10rpx 15rpx;
-		background-color: #F9F9F9;
-		margin-bottom: 10rpx;
+	.personal-pet-list {
+		margin-top: 20rpx;
+
+		.personal-pet-list-item {
+			margin-bottom: 20rpx;
+			background-color: #F9F9F9;
+			height: 172rpx;
+			border-radius: 8rpx;
 
-		.pet-info {
+			.personal-pet-info {
+				height: 100%;
+				display: flex;
+				align-items: center;
+				padding: 0 20rpx;
+			}
+		}
+	}
+
+	.service-new-address {
+		.service-summary {
+			height: 90rpx;
 			display: flex;
 			justify-content: space-between;
-			margin: 5rpx 0;
-			font-size: 24rpx;
-			color: #333;
+			align-items: center;
+			padding: 15rpx;
+			cursor: pointer;
+			transition: background-color 0.3s;
 		}
-		.service-item {
+
+		.service-details {
+			padding: 10rpx 15rpx;
+			background-color: #F9F9F9;
+			margin-bottom: 10rpx;
+
+			.pet-info {
+				display: flex;
+				justify-content: space-between;
+				margin: 5rpx 0;
+				font-size: 24rpx;
+				color: #333;
+			}
+
+			.service-item {
+				display: flex;
+				justify-content: space-between;
+				width: 100%;
+				color: #999999;
+				font-size: 28rpx;
+			}
+		}
+
+		.total-cost {
+			padding: 10rpx 15rpx;
+			font-size: 28rpx;
+			color: #333;
 			display: flex;
 			justify-content: space-between;
-			width: 100%;
-			color: #999999;
-			font-size: 28rpx;
 		}
+
 	}
 
-	.total-cost {
-		padding: 10rpx 15rpx;
-		font-size: 28rpx;
-		color: #333;
-		display: flex;
-		justify-content: space-between;
+	.calendar-popup {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 999;
+
+		.calendar-content {
+			background: #F5F5F7;
+			border-radius: 16rpx 16rpx 0 0;
+			padding: 0 20rpx 40rpx;
+		}
 	}
-	
-}
-.calendar-popup{
-	position: fixed; 
-	bottom: 0; 
-	left: 0; 
-	right: 0; 
-	z-index: 999;
-	.calendar-content{
-		background: #F5F5F7;
-		border-radius: 16rpx 16rpx 0 0; 
-		padding: 0 20rpx 40rpx;
+
+	.calendar-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.5);
+		/* 半透明黑色 */
+		z-index: 998;
+		/* 确保在内容下方 */
+		pointer-events: none;
+		/* 使遮罩层不阻止点击事件 */
+	}
+
+	.calendar-content {
+		position: relative;
+		/* 确保内容在遮罩层之上 */
+		z-index: 999;
+		/* 确保内容在遮罩层之上 */
 	}
-}
-.calendar-mask {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background: rgba(0, 0, 0, 0.5); /* 半透明黑色 */
-	z-index: 998; /* 确保在内容下方 */
-	pointer-events: none; /* 使遮罩层不阻止点击事件 */
-}
-.calendar-content {
-	position: relative; /* 确保内容在遮罩层之上 */
-	z-index: 999; /* 确保内容在遮罩层之上 */
-}
-.price-details {
-	background: #F5F5F7; /* 背景颜色 */
-	padding: 10px 10px 0 10px; /* 内边距 */
-	z-index: 1000; /* 确保在其他元素之上 */
-	min-height: 600rpx; /* 固定高度 */
-	overflow: hidden; /* 隐藏超出部分 */
+
+	.price-details {
+		background: #F5F5F7;
+		/* 背景颜色 */
+		padding: 10px 10px 0 10px;
+		/* 内边距 */
+		z-index: 1000;
+		/* 确保在其他元素之上 */
+		min-height: 600rpx;
+		/* 固定高度 */
+		overflow: hidden;
+		/* 隐藏超出部分 */
 	}
+
 	.price-details-header {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		padding-bottom: 20rpx;
 	}
+
 	.price-details-body {
 		margin-top: 20rpx;
-		max-height: 450rpx; /* 留出头部空间 */
-		overflow-y: auto; /* 允许上下滚动 */
+		max-height: 450rpx;
+		/* 留出头部空间 */
+		overflow-y: auto;
+		/* 允许上下滚动 */
 	}
-	.coupon-card{
-		  display: flex;
-		  align-items: center;
-		  width: 100%;
-		  padding: 10px 0;
-		  background: #fff;
-		  border-radius: 8px;
-		  -webkit-mask-image: radial-gradient(circle at 88px 4px, transparent 4px, #d8d8d8 4.5px),radial-gradient(closest-side circle at 50%, #d8d8d8 99%, transparent 100%);
-		  -webkit-mask-size: 100%, 2px 4px;
-		  -webkit-mask-repeat: repeat, repeat-y;
-		  -webkit-mask-position: 0 -4px, 87px;
-		  -webkit-mask-composite: source-out;
-		  mask-composite: subtract;
-		  // background: linear-gradient(45deg, orange, red);
-		}
-		.card-left{
-		  width: 88px;
-		  text-align: center;
-		  font-size: 28rpx;
-		  color: #FF530A;
-		  
-		}
-		.card-right{
-		  padding: 0px 12px;
-		  display: flex;
-		  flex: 1;
-		  /* flex-direction: column; */
-		  justify-content: space-between;
-		  align-items: center;
-		  height: 60px;s
-		  .card-content {
-			  width: 80%;
-		  }
-		  .card-icon{
-		  			position: relative;
-		  			right: -10px;
-		  			top: -10px;
-		  }
-		}
-		.card-info{
-		  margin: 0;
-		  font-size: 14px;
-		  line-height: 20px;
-		  color:#333333;
+
+	.coupon-card {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		padding: 10px 0;
+		background: #fff;
+		border-radius: 8px;
+		-webkit-mask-image: radial-gradient(circle at 88px 4px, transparent 4px, #d8d8d8 4.5px), radial-gradient(closest-side circle at 50%, #d8d8d8 99%, transparent 100%);
+		-webkit-mask-size: 100%, 2px 4px;
+		-webkit-mask-repeat: repeat, repeat-y;
+		-webkit-mask-position: 0 -4px, 87px;
+		-webkit-mask-composite: source-out;
+		mask-composite: subtract;
+		// background: linear-gradient(45deg, orange, red);
+	}
+
+	.card-left {
+		width: 88px;
+		text-align: center;
+		font-size: 28rpx;
+		color: #FF530A;
+
+	}
+
+	.card-right {
+		padding: 0px 12px;
+		display: flex;
+		flex: 1;
+		/* flex-direction: column; */
+		justify-content: space-between;
+		align-items: center;
+		height: 60px;
+
+		s .card-content {
+			width: 80%;
 		}
-		.card-time{
-		  font-size: 12px; 
-		  line-height: 16px;
-		  font-weight: normal;
-		  color: #aaaaaa;
-		  margin-top: 4px;
+
+		.card-icon {
+			position: relative;
+			right: -10px;
+			top: -10px;
 		}
+	}
+
+	.card-info {
+		margin: 0;
+		font-size: 14px;
+		line-height: 20px;
+		color: #333333;
+	}
+
+	.card-time {
+		font-size: 12px;
+		line-height: 16px;
+		font-weight: normal;
+		color: #aaaaaa;
+		margin-top: 4px;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/newOrder/serviceNew.vue b/pages/newOrder/serviceNew.vue
index e1f647d..0c47ce8 100644
--- a/pages/newOrder/serviceNew.vue
+++ b/pages/newOrder/serviceNew.vue
@@ -217,6 +217,7 @@
 				needPreFamiliarize:[],
 				defaultPhoto:'https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/personal/pet/catdog.png',
 				companionLevel: 'junior', // 默认选择初级伴宠师
+				companionLevelList: ['', 'junior', 'senior'], // 默认选择初级伴宠师
 				popupTitle: '',
 				popupLevel: '',
 			}
diff --git a/pages_order/order/orderList.vue b/pages_order/order/orderList.vue
index 4d93073..94cbd38 100644
--- a/pages_order/order/orderList.vue
+++ b/pages_order/order/orderList.vue
@@ -2,43 +2,34 @@
 	<view class="order-list-page">
 		<!-- 顶部标签栏 -->
 		<view class="order-tabs">
-			<view 
-				v-for="(tab, index) in tabs" 
-				:key="index" 
-				class="tab-item" 
-				:class="{active: currentTab === tab.value}"
-				@click="switchTab(tab.value)"
-			>
+			<view v-for="(tab, index) in tabs" :key="index" class="tab-item" :class="{active: currentTab === tab.value}"
+				@click="switchTab(tab.value)">
 				<text>{{tab.name}}</text>
 			</view>
 		</view>
-		
+
 		<!-- 订单列表 -->
-		<scroll-view 
-			scroll-y 
-			class="order-list-scroll" 
-			@scrolltolower="loadMore" 
-			@refresherrefresh="refresh"
-			:refresher-enabled="true"
-			:refresher-triggered="refreshing"
-		>
+		<scroll-view scroll-y class="order-list-scroll" @scrolltolower="loadMore" @refresherrefresh="refresh"
+			:refresher-enabled="true" :refresher-triggered="refreshing">
 			<view class="order-list">
 				<!-- 订单卡片 -->
 				<view class="order-card" v-for="(order, index) in orderList" :key="index">
 					<view class="order-header">
+						<text>{{ tabs[order.status - 1].name }}</text>
 						<view class="order-status">
-							<text>{{order.statusText}}</text>
+							<text v-if="order.teacherId">指定伴宠师下单</text>
+							<text v-else>系统下单</text>
 						</view>
 						<view class="order-amount">
 							<text>金额：</text>
-							<text class="amount-value">¥{{order.amount}}</text>
+							<text class="amount-value">¥{{order.payAmount}}</text>
 						</view>
 					</view>
-					
+
 					<!-- 宠物信息 -->
-					<view class="pet-info" v-for="(pet, petIndex) in order.pets" :key="petIndex">
+					<view class="pet-info" v-for="(pet, petIndex) in order.petVOList" :key="petIndex">
 						<view class="pet-avatar">
-							<image :src="pet.avatar || '/static/images/personal/pet.png'" mode="aspectFill"></image>
+							<image :src="pet.photo || '/static/images/personal/pet.png'" mode="aspectFill"></image>
 							<view class="pet-tag" v-if="pet.tag">
 								<text>{{pet.tag}}</text>
 							</view>
@@ -46,27 +37,30 @@
 						<view class="pet-details">
 							<view class="pet-name-gender" style="display: flex; align-items: center;">
 								<text class="pet-name">{{pet.name}}</text>
-								<view class="pet-gender" style="margin-left: 10rpx; display: flex; align-items: center;">
-									<image :src="pet.gender=='男生'?'/static/images/details/boy.svg':'/static/images/details/girl.svg'" style="width: 24rpx; height: 24rpx;" alt="sex"></image>
+								<view class="pet-gender"
+									style="margin-left: 10rpx; display: flex; align-items: center;">
+									<image
+										:src="pet.gender=='男生'?'/static/images/details/boy.svg':'/static/images/details/girl.svg'"
+										style="width: 24rpx; height: 24rpx;" alt="sex"></image>
 								</view>
 							</view>
 							<text class="pet-service">{{pet.serviceTime}}</text>
 						</view>
 					</view>
-					
+
 					<!-- 订单信息 -->
 					<view class="order-info">
-						<text class="order-time">下单时间: {{order.orderTime}}</text>
+						<text class="order-time">下单时间: {{order.createTime}}</text>
 						<view class="companion-info">
 							<text>伴宠师: {{order.companionName}}</text>
 							<text v-if="order.companionNote">({{order.companionNote}})</text>
 						</view>
 					</view>
-					
+
 					<!-- 订单操作 -->
 					<view class="order-actions">
-						<view class="action-btn details-btn" v-if="order.status == 0" 
-						@click="$refs.cancelOrderPopup.open()">
+						<view class="action-btn details-btn" v-if="order.status == 0"
+							@click="$refs.cancelOrderPopup.open()">
 							<text>取消订单</text>
 						</view>
 						<view class="action-btn details-btn" @click="viewOrderDetails(order.id)">
@@ -80,17 +74,17 @@
 						</view>
 					</view>
 				</view>
-				
+
 				<!-- 加载更多 -->
 				<view class="loading-more" v-if="orderList.length > 0 && hasMore">
 					<text>加载中...</text>
 				</view>
-				
+
 				<!-- 无更多数据 -->
 				<view class="no-more" v-if="orderList.length > 0 && !hasMore">
 					<text>没有更多订单了</text>
 				</view>
-				
+
 				<!-- 无订单提示 -->
 				<view class="no-order" v-if="orderList.length === 0 && !loading">
 					<image src="/static/images/personal/no-data.png" mode="aspectFit" class="no-data-image"></image>
@@ -100,27 +94,27 @@
 		</scroll-view>
 
 		<!-- 取消订单弹窗 -->
-		<cancel-order-popup 
-		ref="cancelOrderPopup"
-		@cancel="handleCancelOrder"
-		></cancel-order-popup>
-		
+		<cancel-order-popup ref="cancelOrderPopup" @cancel="handleCancelOrder"></cancel-order-popup>
+
 		<!-- 客服组件 -->
 		<Kefu></Kefu>
 
 		<!-- 伴宠师选择弹窗 -->
-		<companion-select-popup 
-        ref="companionSelectPopup"/>
+		<companion-select-popup ref="companionSelectPopup" />
 	</view>
 </template>
 
 <script>
 	import Kefu from '@/pages/common/kefu.vue'
-	import { getOrderList } from "@/api/system/user.js"
-	import { getOpenIdKey } from '@/utils/auth'
+	import {
+		getOrderList
+	} from "@/api/system/user.js"
+	import {
+		getOpenIdKey
+	} from '@/utils/auth'
 	import CancelOrderPopup from '@/pages_order/components/order/CancelOrderPopup.vue'
 	import CompanionSelectPopup from '@/pages_order/components/order/CompanionSelectPopup.vue'
-	
+	// import { getOrderServiceText, getProductNameText } from '@/utils/serviceTime.js'
 	export default {
 		components: {
 			Kefu,
@@ -129,14 +123,28 @@
 		},
 		data() {
 			return {
-				tabs: [
-					{ name: '全部', value: '' },
-					{ name: '待付款', value: '0' },
-					{ name: '已接单', value: '1' },
-					{ name: '服务中', value: '2' },
-					{ name: '已完成', value: '3' }
+				tabs: [{
+						name: '全部',
+						value: -1
+					},
+					{
+						name: '待付款',
+						value: 0
+					},
+					{
+						name: '已接单',
+						value: 1
+					},
+					{
+						name: '服务中',
+						value: 2
+					},
+					{
+						name: '已完成',
+						value: 3
+					}
 				],
-				currentTab: '',
+				currentTab: -1,
 				orderList: [],
 				page: 1,
 				size: 10,
@@ -145,46 +153,43 @@
 				refreshing: false,
 				currentOrder: null,
 				// 示例数据，实际应从API获取
-				exampleData: [
-					{
-						id: '1',
-						status: '0',
-						statusText: '待付款',
-						amount: '264',
-						pets: [
-							{
-								name: '小咪',
-								avatar: '/static/images/personal/pet.png',
-								tag: '猫',
-								gender: '女生',
-								serviceTime: '专业喂养2天: 03-20,03-22'
-							},
-							{
-								name: '小汪',
-								avatar: '/static/images/personal/pet.png',
-								tag: '狗',
-								gender: '男生',
-								serviceTime: '专业喂养2天: 03-20,03-22'
-							}
-						],
-						orderTime: '2025-12-14 18:23:06',
-						companionName: '张三',
-						companionNote: '伴宠师名称暂不可见'
-					}
-				]
+				exampleData: [{
+					id: '1',
+					status: '0',
+					statusText: '待付款',
+					amount: '264',
+					pets: [{
+							name: '小咪',
+							avatar: '/static/images/personal/pet.png',
+							tag: '猫',
+							gender: '女生',
+							serviceTime: '专业喂养2天: 03-20,03-22'
+						},
+						{
+							name: '小汪',
+							avatar: '/static/images/personal/pet.png',
+							tag: '狗',
+							gender: '男生',
+							serviceTime: '专业喂养2天: 03-20,03-22'
+						}
+					],
+					orderTime: '2025-12-14 18:23:06',
+					companionName: '张三',
+					companionNote: '伴宠师名称暂不可见'
+				}]
 			};
 		},
 		methods: {
 			// 切换标签
 			switchTab(tabValue) {
-				if (this.currentTab === tabValue) return;
+				// if (this.currentTab === tabValue) return;
 				this.currentTab = tabValue;
 				this.orderList = [];
 				this.page = 1;
 				this.hasMore = true;
 				this.getOrderList();
 			},
-			
+
 			// 下拉刷新
 			refresh() {
 				this.refreshing = true;
@@ -197,37 +202,37 @@
 					this.refreshing = false;
 				});
 			},
-            
-            handleCancelOrder(){
 
-            },
-			
+			handleCancelOrder() {
+
+			},
+
 			// 加载更多
 			loadMore() {
 				if (this.loading || !this.hasMore) return;
 				this.page++;
 				this.getOrderList();
 			},
-			
+
 			// 查看订单详情
 			viewOrderDetails(orderId) {
 				uni.navigateTo({
 					url: `/pages_order/order/orderDetail?id=${orderId}`
 				});
 			},
-			
+
 			// 去付款
 			goToPay(orderId) {
 				uni.navigateTo({
 					url: `/pages/details/order?id=${orderId}`
 				});
 			},
-			
+
 			// 获取订单列表
 			getOrderList() {
 				if (this.loading) return Promise.reject();
 				this.loading = true;
-				
+
 				// 构建请求参数
 				const params = {
 					status: this.currentTab,
@@ -236,47 +241,46 @@
 					size: this.size
 				};
 				
+
 				// 实际API调用
-				return new Promise((resolve, reject) => {
-					// 模拟API调用，实际项目中应使用真实API
-					setTimeout(() => {
-						try {
-							// 模拟数据，实际应调用API
-							if (this.page === 1) {
-								this.orderList = [...this.exampleData];
-							} else if (this.page < 3) {
-								this.orderList = [...this.orderList, ...this.exampleData];
-							} else {
-								this.hasMore = false;
-							}
-							
-							// 实际API调用应该是这样：
-							// getOrderList(params).then(res => {
-							//   if (res && res.code === 200) {
-							//     const newList = res.data.records || [];
-							//     if (this.page === 1) {
-							//       this.orderList = newList;
-							//     } else {
-							//       this.orderList = [...this.orderList, ...newList];
-							//     }
-							//     this.hasMore = newList.length === this.size;
-							//   } else {
-							//     this.hasMore = false;
-							//   }
-							//   this.loading = false;
-							//   resolve();
-							// }).catch(err => {
-							//   this.loading = false;
-							//   reject(err);
-							// });
-							
-							this.loading = false;
-							resolve();
-						} catch (err) {
-							this.loading = false;
-							reject(err);
+				// return new Promise((resolve, reject) => {
+				// 	// 模拟API调用，实际项目中应使用真实API
+				// 	setTimeout(() => {
+				// 		try {
+				// 			// 模拟数据，实际应调用API
+				// 			if (this.page === 1) {
+				// 				this.orderList = [...this.exampleData];
+				// 			} else if (this.page < 3) {
+				// 				this.orderList = [...this.orderList, ...this.exampleData];
+				// 			} else {
+				// 				this.hasMore = false;
+				// 			}
+				// 			this.loading = false;
+				// 			resolve();
+				// 		} catch (err) {
+				// 			this.loading = false;
+				// 			reject(err);
+				// 		}
+				// 	}, 500);
+				// });
+				// 实际API调用应该是这样：
+				return getOrderList(params).then(res => {
+					if (res.content) {
+						const newList = res.content || [];
+						if (this.page === 1) {
+							this.orderList = newList;
+						} else {
+							this.orderList = [...this.orderList, ...newList];
 						}
-					}, 500);
+						this.hasMore = newList.length === this.size;
+					} else {
+						this.hasMore = false;
+					}
+					this.loading = false;
+					resolve();
+				}).catch(err => {
+					this.loading = false;
+					reject(err);
 				});
 			},
 
@@ -301,7 +305,7 @@
 		display: flex;
 		flex-direction: column;
 	}
-	
+
 	.order-tabs {
 		display: flex;
 		justify-content: space-around;
@@ -309,7 +313,7 @@
 		height: 88rpx;
 		background-color: #FFBF60;
 		color: #FFFFFF;
-		
+
 		.tab-item {
 			padding: 0 20rpx;
 			height: 100%;
@@ -318,10 +322,10 @@
 			justify-content: center;
 			font-size: 28rpx;
 			position: relative;
-			
+
 			&.active {
 				font-weight: bold;
-				
+
 				&::after {
 					content: '';
 					position: absolute;
@@ -336,67 +340,72 @@
 			}
 		}
 	}
-	
+
 	.order-list-scroll {
 		flex: 1;
 		width: 100%;
 	}
-	
+
 	.order-list {
 		padding: 20rpx;
 		padding-bottom: 40rpx;
 	}
-	
+
 	.order-card {
 		background-color: #FFFFFF;
 		border-radius: 20rpx;
-		padding: 30rpx;
 		margin-bottom: 20rpx;
 		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
 	}
-	
+
 	.order-header {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		margin-bottom: 20rpx;
-		
+		background-color: #FFF4E5;
+		padding: 30rpx;
+		padding-bottom: 20rpx;
+
 		.order-status {
-			background-color: #FFF5E6;
-			color: #FFAA48;
+			color: #A94F20;
 			padding: 6rpx 16rpx;
 			border-radius: 20rpx;
 			font-size: 24rpx;
+			background-color: #FFE0BF;
+			margin-right: auto;
+			margin-left: 20rpx;
 		}
-		
+
 		.order-amount {
 			font-size: 28rpx;
 			color: #333;
-			
+
 			.amount-value {
 				color: #FF5252;
 				font-weight: bold;
 			}
 		}
 	}
-	
+
 	.pet-info {
 		display: flex;
 		align-items: center;
-		margin-bottom: 20rpx;
-		
+		padding: 30rpx;
+		padding-bottom: 20rpx;
+		padding-top: 20rpx;
+
 		.pet-avatar {
 			position: relative;
 			width: 80rpx;
 			height: 80rpx;
 			margin-right: 20rpx;
-			
+
 			image {
 				width: 100%;
 				height: 100%;
 				border-radius: 50%;
 			}
-			
+
 			.pet-tag {
 				position: absolute;
 				right: -10rpx;
@@ -409,17 +418,17 @@
 				line-height: 1;
 			}
 		}
-		
+
 		.pet-details {
 			display: flex;
 			flex-direction: column;
-			
+
 			.pet-name {
 				font-size: 28rpx;
 				color: #333;
 				font-weight: bold;
 			}
-			
+
 			.pet-service {
 				font-size: 24rpx;
 				color: #666;
@@ -427,17 +436,19 @@
 			}
 		}
 	}
-	
+
 	.order-info {
-		margin-bottom: 30rpx;
-		
+		padding: 30rpx;
+		padding-bottom: 20rpx;
+		padding-top: 20rpx;
+
 		.order-time {
 			font-size: 24rpx;
 			color: #999;
 			display: block;
 			margin-bottom: 10rpx;
 		}
-		
+
 		.companion-info {
 			font-size: 24rpx;
 			color: #999;
@@ -446,38 +457,41 @@
 			border-radius: 10rpx;
 		}
 	}
-	
+
 	.order-actions {
+		padding: 30rpx;
+		padding-top: 20rpx;
 		display: flex;
 		justify-content: flex-end;
 		align-items: center;
-		
+
 		.action-btn {
 			padding: 16rpx 30rpx;
 			border-radius: 30rpx;
 			font-size: 26rpx;
 			margin-left: 20rpx;
 		}
-		
+
 		.details-btn {
 			background-color: #FFFFFF;
 			color: #666;
 			border: 1px solid #DDDDDD;
 		}
-		
+
 		.pay-btn {
 			background-color: #FFAA48;
 			color: #FFFFFF;
 		}
 	}
-	
-	.loading-more, .no-more {
+
+	.loading-more,
+	.no-more {
 		text-align: center;
 		padding: 20rpx 0;
 		color: #999;
 		font-size: 24rpx;
 	}
-	
+
 	.no-order {
 		text-align: center;
 		padding: 100rpx 0;
@@ -486,7 +500,7 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		
+
 		.no-data-image {
 			width: 200rpx;
 			height: 200rpx;
diff --git a/utils/serviceTime.js b/utils/serviceTime.js
new file mode 100644
index 0000000..80c24b3
--- /dev/null
+++ b/utils/serviceTime.js
@@ -0,0 +1,45 @@
+
+
+
+
+
+import dayjs from "dayjs";
+
+
+
+
+export function getOrderServiceText(petId, orderServiceList) {
+
+	let YYYY = undefined
+
+	return orderServiceList
+		.filter(service => service.petId == petId) //过滤
+		.map(service => dayjs(service.serviceDate)) //转成时间
+		.sort((a, b) => a.valueOf() - b.valueOf()) //排序
+		.map((service, i) => {
+			// if(YYYY && YYYY.format('YYYY-MM') == service.format('YYYY-MM')){
+			// 	return service.format('DD')
+			// }
+			// if(YYYY && YYYY.format('YYYY') == service.format('YYYY')){
+			// 	return service.format('MM-DD')
+			// }
+			// YYYY = service
+			return service.format('MM-DD')
+		})
+}
+
+export function getProductNameText(petId, productList, orderServiceList) {
+
+	let orderService = orderServiceList.filter(service => service.petId == petId)
+	
+	let list = (productList
+		.filter(product => orderService.filter(service => service.id == product.orderServiceId).length > 0)
+		.map(product => product.productName))
+
+	return [...new Set(list)]
+}
+
+export default {
+	getProductNameText,
+	getOrderServiceText,
+}
\ No newline at end of file