diff --git a/common/global.js b/common/global.js
index fa2ff05..c3f706a 100644
--- a/common/global.js
+++ b/common/global.js
@@ -1,28 +1,30 @@
+import { clothesRentUrl , bookUrl , workshopUrl , myOrderUrl} from "./globalImagesUrl"
+
 //实体类订单状态数组
 export const stateList = [   
 	{
 		state: '待支付',
 		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFybMDtHR-dengdaifukuan.png',
 		msg: '等待买家付款',
-		tips: '请于15分钟内付款，超时订单将自动关闭'
+		tips: '超时订单将自动关闭'
 	},
 	{
 		state: '待发货',
 		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png',
 		msg: '等待卖家发货',
-		tips: '耐心等待工艺品发货~'
+		tips: '耐心等待'
 	},
 	{
 		state: '已退款',
 		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
 		msg: '订单已退款',
-		tips: '希望下次能让君满意'
+		tips: '钱款已退还'
 	},
 	{
 		state: '待收货',
 		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png',
 		msg: '商品已发货，注意查收',
-		tips: '非遗工艺品马上到手啦，耐心点'
+		tips: '工艺品即将送达，敬请耐心等候。'
 	},
 	{
 		state: '交易成功',
@@ -34,7 +36,7 @@ export const stateList = [
 		state: '交易关闭',
 		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
 		msg: '您的订单已关闭',
-		tips: '下次看好了之后再买哦'
+		tips: '请您在下次购买前仔细确认'
 	}
 ]
 export const stateMap = new Map()
@@ -46,33 +48,33 @@ stateList.forEach((item)=>{
 export const serviceStateList = [   
 	{
 		state: '待支付',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFybMDtHR-dengdaifukuan.png',
+		img: myOrderUrl + '/myServiceOrderDetail/dzf.png',
 		msg: '等待买家付款',
-		tips: '请于15分钟内付款，超时订单将自动关闭'
+		tips: '超时订单将自动关闭'
 	},
 	{
 		state: '待发货',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png',
+		img: myOrderUrl + '/myServiceOrderDetail/dfh.png',
 		msg: '待到店体验',
-		tips: '等待您的光临体验~'
+		tips: '期待您的莅临体验'
 	},
 	{
 		state: '已退款',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
+		img: myOrderUrl + '/myServiceOrderDetail/ytk.png',
 		msg: '订单已退款',
-		tips: '希望下次能让君满意'
+		tips: '钱款已退还'
 	},
 	{
 		state: '交易成功',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png',
+		img: myOrderUrl + '/myServiceOrderDetail/jywc.png',
 		msg: '订单完成，感谢您的支持',
 		tips: '感谢您的支持'
 	},
 	{
 		state: '交易关闭',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
+		img: myOrderUrl + '/myServiceOrderDetail/jygb.png',
 		msg: '您的订单已关闭',
-		tips: '下次看好了之后再买哦'
+		tips: '请您在下次购买前仔细确认'
 	}
 ]
 
@@ -80,49 +82,96 @@ export const serviceStateMap = new Map()
 serviceStateList.forEach((item)=>{
 	serviceStateMap.set(item.state,item)
 })
+
 //获取选中日期是星期几方法
 export const weekDay = function(time)  {
   let datelist = ['周日','周一','周二','周三','周四','周五','周六',]
   return datelist[new Date(time).getDay()];
 }
 
+//写真服务订单
+export const photoServiceOrder = [   
+	{
+		state: '待支付',
+		img: bookUrl + '/myPhotoProductsOrderDetail/dzf.png',
+		msg: '等待买家付款',
+		tips: '超时订单将自动关闭'
+	},
+	{
+		state: '待发货',
+		img: bookUrl + '/myPhotoProductsOrderDetail/dps.png',
+		msg: '等待拍摄',
+		tips: '敬请耐心等候'
+	},
+	{
+		state: '已退款',
+		img: bookUrl + '/myPhotoProductsOrderDetail/ytk.png',
+		msg: '订单已退款',
+		tips: '钱款已退还'
+	},
+	{
+		state: '交易成功',
+		img: bookUrl + '/myPhotoProductsOrderDetail/jywc.png',
+		msg: '租赁完成',
+		tips: '感谢您的支持'
+	},
+	{
+		state: '交易关闭',
+		img: bookUrl + '/myPhotoProductsOrderDetail/jygb.png',
+		msg: '您的订单已关闭',
+		tips: '请您在下次购买前仔细确认'
+	},
+	{
+		state: '待收货',
+		img: bookUrl + '/myPhotoProductsOrderDetail/yps.png',
+		msg: '服装已被您取走',
+		tips: '请爱护服装'
+	}
+]
+
+export const photoOrderMap = new Map()
+photoServiceOrder.forEach((item)=>{
+	photoOrderMap.set(item.state,item)
+})
+
+
 //服装租赁订单
 export const clothesRentOrder = [   
 	{
 		state: '待支付',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFybMDtHR-dengdaifukuan.png',
+		img: clothesRentUrl + '/clothesRentOrderDetail/dzf.png',
 		msg: '等待买家付款',
 		tips: '请于15分钟内付款，超时订单将自动关闭'
 	},
 	{
 		state: '待发货',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png',
+		img: clothesRentUrl + '/clothesRentOrderDetail/dqh.png',
 		msg: '等待您来取货',
-		tips: '等待您的光临体验~'
+		tips: '敬请耐心等候'
 	},
 	{
 		state: '已退款',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
+		img: clothesRentUrl + '/clothesRentOrderDetail/ytk.png',
 		msg: '订单已退款',
-		tips: '希望下次能让君满意'
+		tips: '钱款已退还'
 	},
 	{
-		state: '交易完成',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png',
-		msg: '租赁完成，感谢您的支持',
+		state: '交易成功',
+		img: clothesRentUrl + '/clothesRentOrderDetail/jywc.png',
+		msg: '租赁完成',
 		tips: '感谢您的支持'
 	},
 	{
 		state: '交易关闭',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
+		img: clothesRentUrl + '/clothesRentOrderDetail/jygb.png',
 		msg: '您的订单已关闭',
-		tips: '下次看好了之后再买哦'
+		tips: '请您在下次购买前仔细确认'
 	},
 	{
 		state: '待收货',
-		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
+		img: clothesRentUrl + '/clothesRentOrderDetail/yqh.png',
 		msg: '服装已被您取走',
-		tips: '请好好爱护服装'
+		tips: '请务必妥善保管并爱护所提供的服装'
 	}
 ]
 
diff --git a/pages.json b/pages.json
index 65f7b8d..a8253f4 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,11 @@
 {
 	"pages": [
+		{
+			"path": "pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/clothesRent/clotherRentOrderList/clotherRentOrderList",
 			"style": {
@@ -258,12 +264,6 @@
 				"navigationBarTitleText": ""
 			}
 		},
-		{
-			"path": "pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		}
 	],
 	"plugins": {
 		"logisticsPlugin": {
diff --git a/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue b/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue
index 871fbac..22b561a 100644
--- a/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue
+++ b/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue
@@ -3,11 +3,11 @@
 	  <view class="flex-row items-center section_2 pos">
 	    <image
 	      class="image"
-	      :src="bookUrl + '/myPhotoProductsOrderDetail/dzf.png'"
+	      :src="orderStatusObj.img"
 	    />
 	    <view class="flex-col items-start flex-1 ml-6">
-	      <text class="font text">等待买家付款</text>
-	      <text class="text_2 mt-3">请于13分51秒内付款，超时订单将自动关闭</text>
+	      <text class="font text">{{ orderStatusObj.msg }}</text>
+	      <text class="text_2 mt-3">{{ orderStatusObj.tips }}</text>
 	    </view>
 	  </view>
 	  <view class="flex-row items-center section_3 pos_2">
@@ -103,11 +103,14 @@
 	import { publicPath } from '../../../common/globalImagesUrl';
 	import { getFonts } from '../../../common/globalFont';
 	import { onPullDownRefresh } from '@dcloudio/uni-app';
+	import { photoOrderMap } from '../../../common/global';
 	import emitter from '../../../utils/emitter';
+	
 	const bkgUrl = ref(bookUrl + '/myPhotoProductsOrderDetail/bkg.png')
 	const id = ref(0)
 	const cookie = wx.getStorageSync('cookie')
 	const order = ref({})
+	const orderStatusObj = ref({})   //根据全局变量获取状态、图片 --- photoOrderMap
 	
 	let wxPayTimer = null;
 	let loading = false;
@@ -148,21 +151,18 @@
 			}
 		})
 		order.value = res.data.data
+		orderStatusObj.value = photoOrderMap.get(res.data.data.orderStatus)
+		console.log('orderStatusObj--->',orderStatusObj.value);
 		if (order.value.orderStatus === '待支付') {
 			order.value.operationList = [true, false, false]
-			// orderStatusObj.value = stateList[0]
 		} else if (order.value.orderStatus === '待发货') {
 			order.value.operationList = [false, false, true]
-			// orderStatusObj.value = stateList[5]
 		} else if (order.value.orderStatus === '已退款') {
 			order.value.operationList = [false, false, true] 
-			// orderStatusObj.value = stateList[2]
 		} else if (order.value.orderStatus === '交易成功') {
 			order.value.operationList = [false, false, true] 
-			// orderStatusObj.value = stateList[4]
 		} else if (order.value.orderStatus === '交易关闭') {
 			order.value.operationList = [false, true, false]
-			// orderStatusObj.value = stateList[3]
 		}
 	}
 	
diff --git a/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
index bd33756..36f1930 100644
--- a/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
+++ b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
@@ -3,11 +3,11 @@
 	  <view class="flex-row items-center section_2 pos">
 	    <image
 	      class="image"
-	      :src="clothesRentUrl + '/clothesRentOrderDetail/dzf.png'"
+	      :src="orderStatusObj.img"
 	    />
 	    <view class="ml-6 flex-col items-start flex-1">
-	      <text class="font text">等待买家付款</text>
-	      <text class="text_2 mt-3">请于13分51秒内付款，超时订单将自动关闭</text>
+	      <text class="font text">{{ orderStatusObj.msg }}</text>
+	      <text class="text_2 mt-3">{{ orderStatusObj.tips }}</text>
 	    </view>
 	  </view>
 	  <view class="flex-row items-center section_3 pos_2">
@@ -15,7 +15,7 @@
 	      class="image_2"
 	      :src="clothesRentUrl + '/clothesRentOrderDetail/lxr.png'"
 	    />
-	    <text class="font text_3 ml-9">张三 15888610253</text>
+	    <text class="font text_3 ml-9">{{ contactsSnapshot.name }} {{ contactsSnapshot.phone }}</text>
 	  </view>
 	  <view class="flex-col section_4 pos_3">
 	    <view class="flex-row justify-between group">
@@ -25,11 +25,11 @@
 	          src="https://ide.code.fun/api/image?token=67dd8f7cdefdb1001119a623&name=0c34cbad13bda42b94fffa906d29960d.png"
 	        />
 	        <view class="ml-12 flex-col items-start group_2">
-	          <text class="font_2 text_4">汉服—曲裾系列</text>
-	          <text class="font_3 text_6 mt-59">￥138.00</text>
+	          <text class="font_2 text_4">{{ clothesSnapshot.name }}</text>
+	          <text class="font_3 text_6 mt-59">￥{{ clothesSnapshot.price }}</text>
 	        </view>
 	      </view>
-	      <view class="flex-col items-center self-start">
+	      <view class="flex-col items-center self-start" @click="nav">
 	        <image
 	          class="image_2"
 	          :src="clothesRentUrl + '/clothesRentOrderDetail/nav.png'"
@@ -41,58 +41,287 @@
 	      <view class="flex-col group_3">
 	        <view class="flex-row justify-between items-baseline">
 	          <text class="font text_7">租赁天数</text>
-	          <text class="font_3 text_8">X3</text>
+	          <text class="font_3 text_8">X{{ clothesSnapshot.period }}</text>
 	        </view>
 	        <view class="mt-14 flex-row justify-end items-baseline">
 	          <text class="font_2 text_9">实付款：</text>
-	          <text class="text_10">￥138.00</text>
+	          <text class="text_10">￥{{ rentOrderDetail.totalAmount.toFixed(2) }}</text>
 	        </view>
 	      </view>
 	      <view class="flex-col group_4">
 	        <view class="flex-col" style="position: relative;">
 	          <view class="flex-row justify-between items-baseline">
 	            <text class="font">创建时间：</text>
-	            <text class="font_4 text_11">2024-10-05 09:58:41</text>
+	            <text class="font_4 text_11">{{ rentOrderDetail.createTime }}</text>
 	          </view>
 	          <view class="flex-row mt-9">
 	            <text class="font text_12">订单编号：</text>
 	            <view class="flex-row items-center flex-1 group_5" style="position: absolute; right: 0;">
-	              <text class="font_4 text_13">E20241005095840091406189</text>
-	              <view class="ml-4 flex-col justify-start items-center shrink-0 text-wrapper">
+	              <text class="font_4 text_13">{{ rentOrderDetail.orderNumber }}</text>
+	              <view class="ml-4 flex-col justify-start items-center shrink-0 text-wrapper" @click="copy(rentOrderDetail.orderNumber)">
 	                <text class="text_14">复制</text>
 	              </view>
 	            </view>
 	          </view>
 	        </view>
-	        <view class="flex-row justify-center items-center mt-19">
-	          <image
-	            class="image_4"
-	            :src="clothesRentUrl + '/clothesRentOrderDetail/lxkf.png'"
-	          />
-	          <text class="font_2 text_15">在线客服</text>
-	        </view>
+					
+					<button  class="flex-row justify-center items-center mt-19" style="display: flex; align-items: center; justify-content: space-around; height: 60rpx; width: 175rpx;" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
+						<image
+						  class="image_4"
+						  :src="clothesRentUrl + '/clothesRentOrderDetail/lxkf.png'"
+						/>
+						<text class="font_2 text_15">在线客服</text>
+					</button>
 	      </view>
 	    </view>
 	  </view>
 	  <view class="flex-row justify-between items-center section_5 pos_4">
 	    <view class="flex-row items-baseline">
 	      <text class="font text_16">应付款：</text>
-	      <text class="text_17">￥138.00</text>
+	      <text class="text_17">￥{{ rentOrderDetail.totalAmount.toFixed(2) }}</text>
 	    </view>
-	    <view class="flex-col justify-start items-center text-wrapper_2"><text class="font text_18">去支付</text></view>
+	    <view class="flex-col justify-start items-center text-wrapper_2" v-if="rentOrderDetail.operationList[0]" @click="wxPayFd(rentOrderDetail)">
+				<text class="font text_18">去支付</text>
+			</view>
+			<view class="flex-col justify-start items-center text-wrapper_2" v-if="rentOrderDetail.operationList[1]" @click="gotoDeleteOrder(rentOrderDetail.id)">
+				<text class="font text_18">删除订单</text>
+			</view>
+			<view class="flex-col justify-start items-center text-wrapper_2" style="background-color: #fff;" v-if="rentOrderDetail.operationList[2]">
+				<text class="font text_18"></text>
+			</view>
 	  </view>
 	</view>
 </template>
 
 <script setup>
-	import {ref} from 'vue'
+	import {ref,onMounted} from 'vue'
+		import { onLoad } from "@dcloudio/uni-app";
 	import { clothesRentUrl } from '../../../common/globalImagesUrl';
+	import { clothesRentOrderMap } from '../../../common/global';
+	import { baseUrl } from '../../../api/request';
+	
+	
+	const cookie = wx.getStorageSync('cookie')
 	const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderDetail/bkg.png')
+	const rentOrderDetail = ref({})    //租赁订单详情
+	const contactsSnapshot = ref({})   //联系人快照
+	const clothesSnapshot = ref({})    //服装快照
+	const orderStatusObj = ref({})   //订单状态----对应全局变量clothesRentOrderMap
+	
+	
+		let wxPayTimer = null;
+		let loading = false;
+		let isLoading = ref(false)
+		let isShow = ref(false)
+	
+	onMounted( async ()=>{
+		getOrderDetail()
+	})
+	
+	// onLoad((options)=>{
+	// 	getOrderDetail(options.id)
+	// })
+	
+	const getOrderDetail = async (val) => {
+		const res = await uni.request({
+			url: baseUrl + '/clothesRent/get/id',
+			method: 'POST',
+			header: {
+				cookie
+			},
+			data: {
+				// id: val
+				id: 18
+			}
+		})
+		// console.log('订单详情--->',res.data.data);
+		console.log('订单状态---->',res.data.data.orderStatus);
+		rentOrderDetail.value = res.data.data
+		contactsSnapshot.value = res.data.data.contactsSnapshot
+		clothesSnapshot.value = res.data.data.clothesSnapshot
+		orderStatusObj.value = clothesRentOrderMap.get(res.data.data.orderStatus)
+		if (rentOrderDetail.value.orderStatus === '待支付') {
+			rentOrderDetail.value.operationList = [true, false, false]
+		} else if (rentOrderDetail.value.orderStatus === '待发货' || rentOrderDetail.value.orderStatus === '待收货') {
+			rentOrderDetail.value.operationList = [false, false, true]
+		} else if (rentOrderDetail.value.orderStatus === '已退款') {
+			rentOrderDetail.value.operationList = [false, false, true]
+		} else if (rentOrderDetail.value.orderStatus === '交易成功') {
+			rentOrderDetail.value.operationList = [false, false, true]
+		} else if (rentOrderDetail.value.orderStatus === '交易关闭') {
+			rentOrderDetail.value.operationList = [false, true, false]
+		}
+	}
+	
+	const gotoDeleteOrder = (val) => {   //删除订单跳转服装租赁订单列表
+		uni.showModal({
+			title: '提示',
+			content: '您确定要删除订单吗？',
+			success: async (res) => {
+				if (res.confirm) {
+					await deleteOrder(val)
+					// await emitter.emit('flushAdvanceOrderList')
+					// routerJump('pages/clothesRent/clothRentOrderList/clothRentOrderList')
+				}
+			}
+		})
+	}
+	
+	
+	
+	const deleteOrder = async (val) => {
+		const res = await uni.request({
+			url: baseUrl + '/clothesRent/delete',
+			method: 'POST',
+			header: {
+				cookie
+			},
+			data: {
+				id: val
+			}
+		})
+		// console.log(res.data.data)
+	}
+	
+	const wxPayFd = (order) => {  //微信支付按钮防抖
+		clearTimeout(wxPayTimer)
+		showLoading()  
+		isShow.value = true  //打开遮罩
+		wxPayTimer = setTimeout(async () => {
+			await wxPay(order.id)
+		}, 1000)
+		setTimeout(()=>{
+			hideLoading()
+			isShow.value = false  //关闭遮罩
+		},2000)
+	}
+	
+	function showLoading() {  //加载弹窗
+	  if (!loading) {
+	    wx.showLoading({
+	      title: '加载中...',
+	    });
+	    loading = true;
+		isLoading.value = true
+	  }
+	}
+	
+	function hideLoading() {  //关闭弹窗
+	  if (loading) {
+	    wx.hideLoading();
+	    loading = false;
+		isLoading.value = false
+	  }
+	}
+	
+	
+	
+	const wxPay = async( oid )=> {  //传入订单id
+		try {
+			const res = await uni.request({
+				url: baseUrl + '/wechat/payment/clothesRent/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
+					})
+					getOrderDetail(oid)
+					// console.log('支付成功res--->',res);
+				},
+				fail(e) {
+					
+				}
+			})
+		}catch(error) {
+			console.error('支付请求失败');
+			uni.showModal({
+				content: '支付请求失败,请重试。',
+				showCancel: false
+			})
+		}
+	}
+	
+	const copy = ( orderNumber ) => {   //复制到粘贴板
+		// console.log('订单编号为--->',orderNumber);
+		uni.setClipboardData({
+			data: orderNumber,
+			success: () => {
+				uni.showToast({
+					title: '成功复制到剪贴板'
+				})
+			}
+		})
+	}
+	
+	const nav = () => {  //导航
+		wx.openLocation({
+			latitude: 45.867741,
+			longitude: 126.560037,
+			name: '哈尔滨师范大学(松北校区)',
+			address: '黑龙江省哈尔滨市呼兰区利民经济开发区师大路1号',
+			success: (res) => {
+			console.log(res)
+			}
+		})
+	}
+	
+	const routerJump = (val) => {
+		let pages = getCurrentPages();
+		var num = pages.length
+		if (num == 1) return ;
+		console.log(pages)
+			//当前页面栈总数
+		var backnum = num 
+		for( var i = 0; i < num; i ++ ) {
+			//循环找到指定页面路由所在的页数
+			if(pages[i].route == val){
+			//'pages/mypage/mypage'替换成A页面的路由地址
+				backnum = num - i - 1
+				//计算返回的层数，总数-指定页面页数-1
+			}		
+		}
+		uni.navigateBack({
+			delta:backnum
+			//返回的页面数，如果 delta 大于现有页面数，则返回到首页。
+		})
+	}
 	
 	
 </script>
 
 <style scoped lang="scss">
+.button-pos {
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 20rpx;
+	margin: 0 auto;
+	
+}
+
+button {
+	padding: 0;
+	// margin: 0;
+	background-color: #fff;
+}
+button::after{
+	border: none; 
+}
+
 .mt-3 {
   margin-top: 5.63rpx;
 }
diff --git a/pages/mine/main/main.vue b/pages/mine/main/main.vue
index 86cfd2d..d3505ab 100644
--- a/pages/mine/main/main.vue
+++ b/pages/mine/main/main.vue
@@ -1,282 +1,301 @@
 <template>
 	<view class="flex-col page" :style="{ backgroundImage: 'url(' + bkgUrl + ')' }">
-		
+
 		<image class="imgPos_1" :src="mineUrl + '/main/mh.png'" />
 		<image class="imgPos_2" :src="mineUrl + '/main/hb.png'" />
-		
-		<view class="flex-col group"> 
+
+		<view class="flex-col group">
 			<view class="flex-row items-center group_2">
 				<button class="avatar_button" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
 					<image class="avatar_son" mode="aspectFill" :src="publicPath + myAvatar" />
 				</button>
 
-				
+
 				<view class="ml-20 flex-col items-start flex-1">
 					<!-- <text class="text">微信用户</text> -->
-					
-						<input class= "text" type="nickname" :value="nickName" placeholder="请输入昵称" name="nickname"  @blur="onUpdateNick" />
+
+					<input class="text" type="nickname" :value="nickName" placeholder="请输入昵称" name="nickname"
+						@blur="onUpdateNick" />
 					<text class="mt-18 font text_2">剩余积分：{{ myPoints }}</text>
 				</view>
 			</view>
 			<view class="flex-row equal-division">
 				<view class="flex-col items-center" @click="goto(0)">
-					<image class="shrink-0 image_2"
-						:src="mineUrl + '/main/all.png'" />
+					<image class="shrink-0 image_2" :src="mineUrl + '/main/all.png'" />
 					<text class="font text_3">全部</text>
 				</view>
-				<view class="flex-col items-center ml-1"  @click="goto(1)">
-					<image class="shrink-0 image_2"
-						:src="mineUrl + '/main/dzf.png'" />
+				<view class="flex-col items-center ml-1" @click="goto(1)">
+					<image class="shrink-0 image_2" :src="mineUrl + '/main/dzf.png'" />
 					<text class="font text_5">待支付</text>
 				</view>
-				<view class="flex-col items-center ml-1"  @click="goto(2)">
-					<image class="shrink-0 image_2"
-						:src="mineUrl + '/main/dfh.png'" />
+				<view class="flex-col items-center ml-1" @click="goto(2)">
+					<image class="shrink-0 image_2" :src="mineUrl + '/main/dfh.png'" />
 					<text class="font text_4">待发货</text>
 				</view>
-				<view class="flex-col items-center ml-1"  @click="goto(3)">
-					<image class="shrink-0 image_2"
-						:src="mineUrl + '/main/dsh.png'" />
+				<view class="flex-col items-center ml-1" @click="goto(3)">
+					<image class="shrink-0 image_2" :src="mineUrl + '/main/dsh.png'" />
 					<text class="font text_6">待收货</text>
 				</view>
-				<view class="flex-col items-center ml-1"  @click="goto(4)">
-					<image class="shrink-0 image_2"
-						:src="mineUrl + '/main/ytk.png'" />
+				<view class="flex-col items-center ml-1" @click="goto(4)">
+					<image class="shrink-0 image_2" :src="mineUrl + '/main/ytk.png'" />
 					<text class="font text_7">已退款</text>
 				</view>
 			</view>
 		</view>
 		<view class="flex-col mt-37">
 			<view class="flex-col group_3">
-				
 				<view class="flex-row justify-between relative" @click="jump_addressList">
-					<image class="image_3"
-						:src="mineUrl + '/main/address.png'" />
-					<image class="self-start image_4 image_5"
-						:src="mineUrl + '/main/yjt.png'" />
+					<image class="image_3" :src="mineUrl + '/main/address.png'" />
+					<image class="self-start image_4 image_5" :src="mineUrl + '/main/yjt.png'" />
 					<text class="font_2 text_8 pos">地 址 列 表</text>
 					<view class="divider pos_2"></view>
 				</view>
-				
+
 				<view class="flex-row justify-between relative" @click="goToText">
-					<image class="image_6"
-						:src="mineUrl + '/main/contact.png'" />
-					<image class="self-start image_4 image_7"
-						:src="mineUrl + '/main/yjt.png'" />
-					<text class="font_2 pos_3">联系人列表</text>       
+					<image class="image_6" :src="mineUrl + '/main/contact.png'" />
+					<image class="self-start image_4 image_7" :src="mineUrl + '/main/yjt.png'" />
+					<text class="font_2 pos_3">联系人列表</text>
 					<view class="divider pos_4"></view>
 				</view>
 			</view>
-			<view class="flex-row justify-between group_4" @click="jumpToBookingOrder">
+			<view class="flex-col group_3">
+				<view class="flex-row justify-between relative" @click="jumpToBookingOrder">
+					<image class="image_33" :src="mineUrl + '/main/wdyy.png'" />
+					<image class="self-start image_4 image_5" :src="mineUrl + '/main/yjt.png'" />
+					<text class="font_2 text_8 pos">我 的 预 约</text>
+					<view class="divider pos_2"></view>
+				</view>
+			
+				<view class="flex-row justify-between relative" @click="goToText">
+					<image class="image_6" :src="mineUrl + '/main/rent.png'" />
+					<image class="self-start image_4 image_7" :src="mineUrl + '/main/yjt.png'" />
+					<text class="font_2 pos_3">我 的 租 赁</text>
+					<view class="divider pos_4"></view>
+				</view>
+			</view>
+
+			<!-- <view class="flex-row justify-between group_4" @click="jumpToBookingOrder">
 				<view class="flex-row items-center">
-					<image class="shrink-0 image_8"
-						:src="mineUrl + '/main/wdyy.png'" />
+					<image class="shrink-0 image_8" :src="mineUrl + '/main/wdyy.png'" />
 					<text class="font_2 text_9">我 的 预 约</text>
 				</view>
-				<image class="self-start image_4 image_9"
-					:src="mineUrl + '/main/yjt.png'" />
+				<image class="self-start image_4 image_9" :src="mineUrl + '/main/yjt.png'" />
+				<view class="divider pos_99"></view>
 			</view>
+			
+			<view class="flex-row justify-between group_4" @click="jumpToBookingOrder">
+				<view class="flex-row items-center">
+					<image class="shrink-0 image_8" :src="mineUrl + '/main/rent.png'" />
+					<text class="font_2 text_9">我 的 租 赁</text>
+				</view>
+				<image class="self-start image_4 image_9" :src="mineUrl + '/main/yjt.png'" />
+			</view> -->
+
 			<view class="flex-col group_5">
-				<view class="divider view"></view>
-				
+				<!-- <view class="divider view"></view> -->
 				<view class="flex-row justify-between items-center group_6" @click="jumpToMyCoupon">
 					<view class="flex-row items-center">
-						<image class="shrink-0 image_10"
-							:src="mineUrl + '/main/coupon.png'" />
+						<image class="shrink-0 image_10" :src="mineUrl + '/main/coupon.png'" />
 						<text class="font_2">我的优惠券</text>
 					</view>
-					<image class="image_4 image_11"
-						:src="mineUrl + '/main/yjt.png'" />
+					<image class="image_4 image_11" :src="mineUrl + '/main/yjt.png'" />
 				</view>
-				
+
 				<view class="divider view_2"></view>
-				
+
 				<view class="flex-row justify-between group_7" @click="userLogout">
 					<view class="flex-row self-center">
 						<view class="flex-row shrink-0">
-							<image class="shrink-0 image_12"
-								:src="mineUrl + '/main/logout.png'" />
+							<image class="shrink-0 image_12" :src="mineUrl + '/main/logout.png'" />
 							<text class="ml-10 self-start font_3 text_10">退 出 登 录</text>
 						</view>
 					</view>
-					<image class="self-start image_4 image_13"
-						:src="mineUrl + '/main/yjt.png'" />
+					<image class="self-start image_4 image_13" :src="mineUrl + '/main/yjt.png'" />
 				</view>
-				
 			</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
-import {
-	onMounted,
-	ref
-} from 'vue';
-import {
-	onShow,
-	onLoad
-} from "@dcloudio/uni-app";
-import { baseUrl } from '../../../api/request';
-import { getFonts } from '../../../common/globalFont';
-import { mineUrl } from '../../../common/globalImagesUrl';
-import { publicPath } from '../../../common/globalImagesUrl';
-import { onPullDownRefresh } from '@dcloudio/uni-app';
+	import {
+		onMounted,
+		ref
+	} from 'vue';
+	import {
+		onShow,
+		onLoad
+	} from "@dcloudio/uni-app";
+	import { baseUrl } from '../../../api/request';
+	import { getFonts } from '../../../common/globalFont';
+	import { mineUrl } from '../../../common/globalImagesUrl';
+	import { publicPath } from '../../../common/globalImagesUrl';
+	import { onPullDownRefresh } from '@dcloudio/uni-app';
 
-const bkgUrl = ref(mineUrl + '/main/bkg.png')
+	const bkgUrl = ref(mineUrl + '/main/bkg.png')
 
-onPullDownRefresh( async ()=>{  //下拉刷新
-	await getMyUser()
-	setTimeout(()=>{
-		uni.stopPullDownRefresh()   //停止下拉刷新
-	},1000)
-}) 
-
-onLoad(() => {
-	getFonts() //启动使从服务器下载字体
-})
-
-onMounted(() => {
-	getMyUser()
-})
-
-const goToText = () => { //跳转到联系人信息
-	uni.navigateTo({
-		url: '/pages/mine/Contact/testContact'
+	onPullDownRefresh(async () => { //下拉刷新
+		await getMyUser()
+		setTimeout(() => {
+			uni.stopPullDownRefresh() //停止下拉刷新
+		}, 1000)
 	})
-}
-const goTo = ()=>{  //跳转到预约
-	uni.navigateTo({
-		url: '/pages/mine/bookings/booking'
+
+	onLoad(() => {
+		getFonts() //启动使从服务器下载字体
 	})
-}
-const goto = (tab) => {
-	uni.navigateTo({
-		url: '/pages/my-order/myOrderList/myOrderList?status=' + tab
+
+	onMounted(() => {
+		getMyUser()
 	})
-}
 
-const jumpToBookingOrder = () => {
-	uni.navigateTo({
-		url: '/pages/book/photoProductsOrderDetail/photoProductsOrderDetail'
-	})
-}
+	const goToText = () => { //跳转到联系人信息
+		uni.navigateTo({
+			url: '/pages/mine/Contact/testContact'
+		})
+	}
+	const goTo = () => { //跳转到预约
+		uni.navigateTo({
+			url: '/pages/mine/bookings/booking'
+		})
+	}
+	const goto = (tab) => {
+		uni.navigateTo({
+			url: '/pages/my-order/myOrderList/myOrderList?status=' + tab
+		})
+	}
 
-const jumpToMyCoupon = () => {
-	uni.navigateTo({
-		url: '/pages/coupon/MyCoupon/MyCoupon'
-	})
-}
+	const jumpToBookingOrder = () => {
+		uni.navigateTo({
+			url: '/pages/book/photoProductsOrderDetail/photoProductsOrderDetail'
+		})
+	}
 
-const jump_addressList = () => {
-	uni.navigateTo({
-		url: '/pages/mine/addressList/addressList'
-	})
-}
-const cookie = wx.getStorageSync('cookie')
+	const jumpToMyCoupon = () => {
+		uni.navigateTo({
+			url: '/pages/coupon/MyCoupon/MyCoupon'
+		})
+	}
+
+	const jump_addressList = () => {
+		uni.navigateTo({
+			url: '/pages/mine/addressList/addressList'
+		})
+	}
+	const cookie = wx.getStorageSync('cookie')
 
 
 
-const logout = async () => {
-	const res = await uni.request({
-		url: baseUrl + '/user/mini/logout',
-		method: 'POST',
-		header: {
-			cookie
-		}
-	})
-}
-
-
-const userLogout = () => {
-	uni.showModal({
-		title: '提示',
-		content: '您确定要退出登录吗？',
-		success: (res) => {
-			if (res.confirm) {
-				logout()
-				uni.showToast({
-					title: '退出成功'
-				})
-				uni.redirectTo({
-					url: '/pages/login/login'
-				})
+	const logout = async () => {
+		const res = await uni.request({
+			url: baseUrl + '/user/mini/logout',
+			method: 'POST',
+			header: {
+				cookie
 			}
-		}
-	})
-}
+		})
+	}
 
 
-let tempFile = ''
-const myAvatar = ref(mineUrl + '/main/avatar.png')
-const onChooseAvatar = (e) => {
-	tempFile = e.detail.avatarUrl
-	console.log(tempFile)
-	uni.uploadFile({
-		url: baseUrl + '/file/uploadFile',
-		filePath: tempFile,
-		name: 'file',
-		formData: {
-			biz: 'user_avatar'
-		},
-		header: { 
-			cookie
-		},
-		success: (res) => {
-			myAvatar.value = JSON.parse(res.data).data
-			updateMyUser()
-		},
-		fail: (e) => {
-			console.log(e)
-		}
-	})
-}
+	const userLogout = () => {
+		uni.showModal({
+			title: '提示',
+			content: '您确定要退出登录吗？',
+			success: (res) => {
+				if (res.confirm) {
+					logout()
+					uni.showToast({
+						title: '退出成功'
+					})
+					uni.redirectTo({
+						url: '/pages/login/login'
+					})
+				}
+			}
+		})
+	}
 
 
-const nickName = ref('非遗雅士')
-const onUpdateNick = (e) => {
-	nickName.value = e.detail.value
-	updateMyUser()
-}
+	let tempFile = ''
+	const myAvatar = ref(mineUrl + '/main/avatar.png')
+	const onChooseAvatar = (e) => {
+		tempFile = e.detail.avatarUrl
+		console.log(tempFile)
+		uni.uploadFile({
+			url: baseUrl + '/file/uploadFile',
+			filePath: tempFile,
+			name: 'file',
+			formData: {
+				biz: 'user_avatar'
+			},
+			header: {
+				cookie
+			},
+			success: (res) => {
+				myAvatar.value = JSON.parse(res.data).data
+				updateMyUser()
+			},
+			fail: (e) => {
+				console.log(e)
+			}
+		})
+	}
 
 
-const updateMyUser = async () => {
-	const res = await uni.request({
-		url: baseUrl + '/user/update/my',
-		method: 'POST',
-		header: {
-			cookie
-		},
-		data: {
-			userName: nickName.value,
-			userAvatar: myAvatar.value
-		}
-	})
-	console.log(res.data.data)
-}
-
-const myPoints = ref(0)
-const getMyUser = async () => {
-	const res = await uni.request({
-		url: baseUrl + '/user/get/login',
-		method: 'GET',
-		header: {
-			cookie
-		}
-	})
-	console.log(res.data.data)
-	nickName.value = res.data.data.userName
-	myAvatar.value = res.data.data.userAvatar
-	myPoints.value = res.data.data.points
-}
+	const nickName = ref('非遗雅士')
+	const onUpdateNick = (e) => {
+		nickName.value = e.detail.value
+		updateMyUser()
+	}
 
 
+	const updateMyUser = async () => {
+		const res = await uni.request({
+			url: baseUrl + '/user/update/my',
+			method: 'POST',
+			header: {
+				cookie
+			},
+			data: {
+				userName: nickName.value,
+				userAvatar: myAvatar.value
+			}
+		})
+		console.log(res.data.data)
+	}
 
+	const myPoints = ref(0)
+	const getMyUser = async () => {
+		const res = await uni.request({
+			url: baseUrl + '/user/get/login',
+			method: 'GET',
+			header: {
+				cookie
+			}
+		})
+		console.log(res.data.data)
+		nickName.value = res.data.data.userName
+		myAvatar.value = res.data.data.userAvatar
+		myPoints.value = res.data.data.points
+	}
 </script>
 
 <style lang="scss" scoped>
-	button{padding: 0;margin: 0;}
-	button::after{ border: none; }
+	.pos_99 {
+		position: absolute;
+		left: 3.75rpx;
+		right: 37.5rpx;
+		top: 124.69rpx;
+	}
+	
+	button {
+		padding: 0;
+		margin: 0;
+	}
+
+	button::after {
+		border: none;
+	}
 
 	.ml-1 {
 		margin-left: 1.88rpx;
@@ -296,14 +315,14 @@ const getMyUser = async () => {
 		height: 100vh;
 		position: relative;
 	}
-	
+
 	.imgPos_1 {
 		position: absolute;
 		top: -80rpx;
 		right: 0;
 		opacity: 0.3;
 	}
-	
+
 	.imgPos_2 {
 		position: absolute;
 		bottom: -160rpx;
@@ -326,6 +345,7 @@ const getMyUser = async () => {
 		width: 150rpx;
 		height: 150rpx;
 	}
+
 	.avatar_button {
 		padding: 0;
 		height: 150rpx;
@@ -333,12 +353,13 @@ const getMyUser = async () => {
 		border-radius: 50%;
 		background-color: #fff;
 	}
+
 	.avatar_son {
 		border-radius: 50%;
 		width: 150rpx;
 		height: 150rpx;
 	}
-	
+
 	.text {
 		color: #000000;
 		font-size: 40rpx;
@@ -391,12 +412,17 @@ const getMyUser = async () => {
 	.group_3 {
 		padding: 0 35.63rpx;
 	}
-
+	
+	.image_33 {
+		width: 120rpx;
+		height: 123.75rpx;
+	}
+	
 	.image_3 {
 		width: 120rpx;
 		height: 123.75rpx;
 	}
-
+		
 	.image_4 {
 		width: 39.38rpx;
 		height: 41.25rpx;
diff --git a/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue b/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue
index 5956547..ca1b278 100644
--- a/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue
+++ b/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue
@@ -119,7 +119,7 @@
 	import { myOrderUrl } from '../../../common/globalImagesUrl';
 	import { publicPath } from '../../../common/globalImagesUrl';
 	import { onPullDownRefresh } from '@dcloudio/uni-app';
-	const bkgUrl = ref(myOrderUrl + '/photoProductDetail/bkg.png')
+	const bkgUrl = ref(myOrderUrl + '/myOrderList/bkg.png')
 	const cookie = wx.getStorageSync('cookie')
 	let orderId = ''
 	const order = ref({})
diff --git a/pages/workshop/productmain/productmain.vue b/pages/workshop/productmain/productmain.vue
index 132a80a..cce4832 100644
--- a/pages/workshop/productmain/productmain.vue
+++ b/pages/workshop/productmain/productmain.vue
@@ -14,15 +14,15 @@
 	        <view class="flex-col self-stretch mt-15">
 	          <text class="font text_4">{{ productObject.name }}</text>
 	          <text class="font_2 text_5 mt-11">
-	            {{ productObject.introDetail }}
+	            {{ productObject.intro }}
 	          </text>
 	        </view>
-	     <!--   <view class="flex-row items-baseline self-stretch group_2 mt-15">
+	       <!-- <view class="flex-row items-baseline self-stretch group_2 mt-15">
 	          <text class="font_3" style="margin-left: 0;">最近可预约时间：{{ specificDate }}</text>
 	          <text class="font_3 ml-1" style="margin-left: 20rpx;">{{ specificTime }}</text>
 	        </view> -->
 	      </view>
-	   <!--   <view class="flex-col section_4 mt-6">
+	     <view class="flex-col section_4 mt-6">
 	        <text class="self-start font text_6">用户须知</text>
 	        <text class="self-start font_2 text_7 text_1 mt-16">
 	          1.请根据预约时间，提前10-15分钟到达活动地点，以便顺利参与体验。
@@ -37,7 +37,7 @@
 	        <text class="self-stretch font_2 text_10 mt-16">
 	          5.如遇特殊情况，如突发疾病或其他不可抗力因素，请及时与客服沟通，我们将根据实际情况处理退款事宜。
 	        </text>
-	      </view> -->
+	      </view>
 	    </view>
 	    <view class="flex-row section_5">
 	      <view class="flex-col items-center shrink-0 self-start">