From 4628d14aab3c31a36c00ee0501f557b650a7dc7a Mon Sep 17 00:00:00 2001
From: yuanteng0011 <1876787513@qq.com>
Date: Sun, 23 Mar 2025 12:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request.ts                                |   2 +-
 common/global.js                              |  54 +-
 pages.json                                    | 501 ++++++------
 .../clotherRentOrderList.vue                  | 721 ++++++++++--------
 .../clothesRentOrderDetail.vue                |   2 +
 pages/login/login.vue                         |   2 +-
 pages/workshop/index/index.vue                |  46 +-
 7 files changed, 713 insertions(+), 615 deletions(-)

diff --git a/api/request.ts b/api/request.ts
index e4616ea..07f68f1 100644
--- a/api/request.ts
+++ b/api/request.ts
@@ -6,4 +6,4 @@ export const domain = 'https://www.carboner.cn:8888/api'
 export const myIp = 'http://8.130.119.119:9092/api'
 export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api'
 export const suiUrl = ''
-export const baseUrl = domain
+export const baseUrl = Url
diff --git a/common/global.js b/common/global.js
index 9939914..fa2ff05 100644
--- a/common/global.js
+++ b/common/global.js
@@ -1,4 +1,4 @@
-//订单状态数组
+//实体类订单状态数组
 export const stateList = [   
 	{
 		state: '待支付',
@@ -15,7 +15,7 @@ export const stateList = [
 	{
 		state: '已退款',
 		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
-		msg: '订单已经退款',
+		msg: '订单已退款',
 		tips: '希望下次能让君满意'
 	},
 	{
@@ -41,6 +41,8 @@ export const stateMap = new Map()
 stateList.forEach((item)=>{
 	stateMap.set(item.state,item)
 })
+
+//服务类订单状态
 export const serviceStateList = [   
 	{
 		state: '待支付',
@@ -57,7 +59,7 @@ export const serviceStateList = [
 	{
 		state: '已退款',
 		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
-		msg: '订单已经退款',
+		msg: '订单已退款',
 		tips: '希望下次能让君满意'
 	},
 	{
@@ -73,6 +75,7 @@ export const serviceStateList = [
 		tips: '下次看好了之后再买哦'
 	}
 ]
+
 export const serviceStateMap = new Map()
 serviceStateList.forEach((item)=>{
 	serviceStateMap.set(item.state,item)
@@ -82,3 +85,48 @@ export const weekDay = function(time)  {
   let datelist = ['周日','周一','周二','周三','周四','周五','周六',]
   return datelist[new Date(time).getDay()];
 }
+
+//服装租赁订单
+export const clothesRentOrder = [   
+	{
+		state: '待支付',
+		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFybMDtHR-dengdaifukuan.png',
+		msg: '等待买家付款',
+		tips: '请于15分钟内付款，超时订单将自动关闭'
+	},
+	{
+		state: '待发货',
+		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png',
+		msg: '等待您来取货',
+		tips: '等待您的光临体验~'
+	},
+	{
+		state: '已退款',
+		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
+		msg: '订单已退款',
+		tips: '希望下次能让君满意'
+	},
+	{
+		state: '交易完成',
+		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png',
+		msg: '租赁完成，感谢您的支持',
+		tips: '感谢您的支持'
+	},
+	{
+		state: '交易关闭',
+		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
+		msg: '您的订单已关闭',
+		tips: '下次看好了之后再买哦'
+	},
+	{
+		state: '待收货',
+		img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
+		msg: '服装已被您取走',
+		tips: '请好好爱护服装'
+	}
+]
+
+export const clothesRentOrderMap = new Map()
+clothesRentOrder.forEach((item)=>{
+	clothesRentOrderMap.set(item.state,item)
+})
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 3355ed9..65f7b8d 100644
--- a/pages.json
+++ b/pages.json
@@ -1,314 +1,272 @@
 {
 	"pages": [
-	{
-		"path" : "pages/home/home",
-		"style" : 
 		{
-			"navigationBarTitleText" : "首页",
-			// "enablePullDownRefresh":true,   //开启下拉刷新
-			"navigationBarBackgroundColor": "#ede8e7"
-		}
-	},
-	{
-		"path" : "pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail",
-		"style" : 
+			"path": "pages/clothesRent/clotherRentOrderList/clotherRentOrderList",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : "",
-			"enablePullDownRefresh":true   //开启下拉刷新
-		}
-	}, 
-	{
-		"path" : "pages/my-order/myServiceOrderDetail/myServiceOrderDetail",
-		"style" : 
+			"path": "pages/home/home",
+			"style": {
+				"navigationBarTitleText": "首页",
+				// "enablePullDownRefresh":true,   //开启下拉刷新
+				"navigationBarBackgroundColor": "#ede8e7"
+			}
+		},
 		{
-			"navigationBarTitleText" : "",
-			"enablePullDownRefresh":true   //开启下拉刷新
-		}
-	},
-	{
-		"path" : "pages/my-order/myOrderList/myOrderList",
-		"style" : 
+			"path": "pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true //开启下拉刷新
+			}
+		},
 		{
-			"navigationBarTitleText" : "",
-			"enablePullDownRefresh":true   //开启下拉刷新
-		}
-	},
-	{
-		"path" : "pages/my-order/researchOrder/researchOrder",
-		"style" : 
+			"path": "pages/my-order/myServiceOrderDetail/myServiceOrderDetail",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true //开启下拉刷新
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/workshop/searchResult/searchResult",
-		"style" : 
+			"path": "pages/my-order/myOrderList/myOrderList",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true //开启下拉刷新
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-		
-	{
-		"path" : "pages/workshop/searchGood/searchGood",
-		"style" : 
+			"path": "pages/my-order/researchOrder/researchOrder",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/book/photoProductsOrderDetail/photoProductsOrderDetail",
-		"style" : 
+			"path": "pages/workshop/searchResult/searchResult",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/book/photoProductsOrder/photoProductsOrder",
-		"style" : 
+			"path": "pages/workshop/searchGood/searchGood",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/book/photoProductDetail/photoProductDetail",
-		"style" : 
+			"path": "pages/book/photoProductsOrderDetail/photoProductsOrderDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/book/photoProducts/photoProducts",
-		"style" : 
+			"path": "pages/book/photoProductsOrder/photoProductsOrder",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/order/component/contactsComponent",
-		"style" : 
+			"path": "pages/book/photoProductDetail/photoProductDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/coupon/CouponMall/CouponMall",
-		"style" : 
+			"path": "pages/book/photoProducts/photoProducts",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/testPage/testPage",
-		"style" : 
+			"path": "pages/order/component/contactsComponent",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/test/test",
-		"style" : 
+			"path": "pages/coupon/CouponMall/CouponMall",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	
-	{
-		"path" : "pages/mine/main/main",
-		"style" : 
+			"path": "pages/testPage/testPage",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : "",
-			"enablePullDownRefresh":true   //开启下拉刷新
-		}
-	},
-	{
-		"path" : "pages/store-home/ProductDetails/ProductDetails",
-		"style" : 
+			"path": "pages/test/test",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+
 		{
-			"navigationBarTitleText" : "泠珑水月阁工作室"
-		}
-	},
-	{
-		"path" : "pages/Shopping-cart/newaddress_Info/newaddress_Info",
-		"style" : 
+			"path": "pages/mine/main/main",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true //开启下拉刷新
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/order/product-waitpay/product-waitpay",
-		"style" : 
+			"path": "pages/store-home/ProductDetails/ProductDetails",
+			"style": {
+				"navigationBarTitleText": "泠珑水月阁工作室"
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/login/login",
-		"style" : 
+			"path": "pages/Shopping-cart/newaddress_Info/newaddress_Info",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/Shopping-cart/component/addProduct",
-		"style" :
+			"path": "pages/order/product-waitpay/product-waitpay",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/workshop/index/index",
-		"style" : 
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : "",
-			"enablePullDownRefresh":true   //开启下拉刷新
-		}
-	},
-	{
-		"path" : "pages/workshop/productmain/productmain",
-		"style" : 
+			"path": "pages/Shopping-cart/component/addProduct",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/store-home/main/testMain",
-		"style" :
+			"path": "pages/workshop/index/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true //开启下拉刷新
+			}
+		},
 		{
-			"navigationBarTitleText" : "",
-			"enablePullDownRefresh":true   //开启下拉刷新
-		}
-	},
-	{
-		"path" : "pages/order/singleGoodOrder/singleGoodOrder",
-		"style" : 
+			"path": "pages/workshop/productmain/productmain",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/Shopping-cart/productmain/testproductmain",
-		"style" : 
+			"path": "pages/store-home/main/testMain",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true //开启下拉刷新
+			}
+		},
 		{
-			"navigationBarTitleText" : "",
-			"enablePullDownRefresh":true   //开启下拉刷新
-		}
-	},
-	{
-		"path" : "pages/mine/addressList/addressList",
-		"style" : 
+			"path": "pages/order/singleGoodOrder/singleGoodOrder",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/coupon/CouponTips/CouponTips",
-		"style" : 
+			"path": "pages/Shopping-cart/productmain/testproductmain",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true //开启下拉刷新
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/coupon/MyCoupon/MyCoupon",
-		"style" : 
+			"path": "pages/mine/addressList/addressList",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/order/serviceWaitPay/serviceWaitPay",
-		"style" : 
+			"path": "pages/coupon/CouponTips/CouponTips",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/mine/Contact/testContact",
-		"style" : 
+			"path": "pages/coupon/MyCoupon/MyCoupon",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/mine/component/contactPop",
-		"style" : 
+			"path": "pages/order/serviceWaitPay/serviceWaitPay",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/coupon/OverDueCoupon/OverDueCoupon",
-		"style" : 
+			"path": "pages/mine/Contact/testContact",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/order/singleServiceWait/singleServiceWait",
-		"style" : 
+			"path": "pages/mine/component/contactPop",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/activity/activityHome/activityHome",
-		"style" : 
+			"path": "pages/coupon/OverDueCoupon/OverDueCoupon",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/activity/activityMain/activityMain",
-		"style" : 
+			"path": "pages/order/singleServiceWait/singleServiceWait",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/clothesRent/clotherRentOrderList/clotherRentOrderList",
-		"style" : 
+			"path": "pages/activity/activityHome/activityHome",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder",
-		"style" : 
+			"path": "pages/activity/activityMain/activityMain",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail",
-		"style" : 
+			"path": "pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : "",
-			"enablePullDownRefresh":true   //开启下拉刷新
-		}
-	},
-	{
-		"path" : "pages/book/myPhotoProductDetail/myPhotoProductDetail",
-		"style" : 
+			"path": "pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true //开启下拉刷新
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/book/myPhotoProducts/myPhotoProducts",
-		"style" : 
+			"path": "pages/book/myPhotoProductDetail/myPhotoProductDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
-		}
-	},
-	{
-		"path" : "pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail",
-		"style" : 
+			"path": "pages/book/myPhotoProducts/myPhotoProducts",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
+			"path": "pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
 		}
-	}
 	],
-	"plugins" : {
-		"logisticsPlugin" : {
+	"plugins": {
+		"logisticsPlugin": {
 			"version": "2.3.0",
 			"provider": "wx9ad912bf20548d92"
 		}
@@ -328,27 +286,26 @@
 	},
 	"tabBar": {
 		"backgroundColor": "#FFFFFF",
-		"list": [
-			{
+		"list": [{
 				"pagePath": "pages/home/home",
 				"iconPath": "./static/home.png",
-				"text":"首页"
+				"text": "首页"
 			},
 			{
 				"pagePath": "pages/store-home/main/testMain",
 				"iconPath": "./static/store.png",
-				"text":"商城"
+				"text": "商城"
 			},
 			{
 				"pagePath": "pages/Shopping-cart/productmain/testproductmain",
 				"iconPath": "./static/shopcar.png",
-				"text":"购物车"
+				"text": "购物车"
 			},
 			{
 				"pagePath": "pages/mine/main/main",
 				"iconPath": "./static/mine.png",
-				"text":"我的"
+				"text": "我的"
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue b/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue
index 33ac745..0d11008 100644
--- a/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue
+++ b/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue
@@ -1,105 +1,123 @@
 <template>
 	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
-	  <view class="flex-row justify-between section_2 pos">
-		  
-		<view @click="isSelectedState(0)">
-		   <text class="font" :style="{ color: color[0] }">&ensp;全部&ensp;</text>
-		   <view class="flex-col justify-start items-center" v-if="isShowUnderLine[0]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
-		</view>
-		
-		<view @click="isSelectedState(1)">
-	      <text class="font" :style="{ color: color[1] }">待支付</text>
-		  <view class="flex-col justify-start items-center" v-if="isShowUnderLine[1]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
-		</view>
-		
-		<view @click="isSelectedState(2)">
-	      <text class="font" :style="{ color: color[2] }">待提货</text>
-		  <view class="flex-col justify-start items-center" v-if="isShowUnderLine[2]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+		<view class="flex-row justify-between section_2 pos">
+
+			<view @click="isSelectedState(0)">
+				<text class="font" :style="{ color: color[0] }">&ensp;全部&ensp;</text>
+				<view class="flex-col justify-start items-center" v-if="isShowUnderLine[0]"
+					style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+			</view>
+
+			<view @click="isSelectedState(1)">
+				<text class="font" :style="{ color: color[1] }">待支付</text>
+				<view class="flex-col justify-start items-center" v-if="isShowUnderLine[1]"
+					style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+			</view>
+
+			<view @click="isSelectedState(2)">
+				<text class="font" :style="{ color: color[2] }">待提货</text>
+				<view class="flex-col justify-start items-center" v-if="isShowUnderLine[2]"
+					style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+			</view>
+
+			<view @click="isSelectedState(3)">
+				<text class="font" :style="{ color: color[3] }">租赁中</text>
+				<view class="flex-col justify-start items-center" v-if="isShowUnderLine[3]"
+					style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+			</view>
+
+			<view @click="isSelectedState(4)">
+				<text class="font" :style="{ color: color[4] }">已完成</text>
+				<view class="flex-col justify-start items-center" v-if="isShowUnderLine[4]"
+					style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+			</view>
+
 		</view>
 
-		<view @click="isSelectedState(3)">
-			<text class="font" :style="{ color: color[3] }">租赁中</text>
-			<view class="flex-col justify-start items-center" v-if="isShowUnderLine[3]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+
+		<view class="flex-col pos_2">
+			<view class="flex-col list-item mt-15" v-for="(item, index) in items" :key="index">
+				<view class="flex-row justify-between group">
+					<text class="font_3">泠珑水月阁</text>
+					<view class="flex-row items-center">
+						<text class="font_4 text_2">00:45</text>
+						<text class="ml-4 font_5 text_3">等待买家付款</text>
+					</view>
+				</view>
+				<view class="flex-row items-center group view">
+					<text class="font_6">订单编号：</text>
+					<text class="font_7 text_4">E20241005095840091406189</text>
+				</view>
+				<view class="divider"></view>
+				<view class="flex-row justify-between items-end group_2">
+					<view class="flex-row">
+						<image class="image"
+							src="https://ide.code.fun/api/image?token=67dd57af4ae84d00122a84d1&name=4e1283e4d0bf9a8e9fe23602be4fa0f7.png" />
+						<view class="flex-col items-start group_3 ml-13">
+							<text class="font_8">汉服—曲裾系列</text>
+							<text class="font_10 text_6 mt-59">￥138.00</text>
+						</view>
+					</view>
+					<view class="flex-col items-center group_4">
+						<image class="image_2" :src="clothesRentUrl + '/clothesRentOrderList/bkg.png'" />
+						<text class="font_9 text_5 mt-11">提货地址</text>
+					</view>
+				</view>
+				<view class="flex-row justify-between items-baseline group view_2">
+					<text class="font_6 text_7">租赁天数</text>
+					<text class="font_11 text_8">X3</text>
+				</view>
+				<view class="flex-row justify-end items-baseline group_5">
+					<text class="font_9 text_9">实付款：</text>
+					<text class="font_12">￥138.00</text>
+				</view>
+				<view class="flex-row justify-center group_6">
+					<view class="flex-col justify-start items-center text-wrapper">
+						<text class="font_13 text_10">联系客服</text>
+					</view>
+					<view class="ml-10 flex-col justify-start items-center text-wrapper">
+						<text class="font_13">取消订单</text>
+					</view>
+					<view class="ml-10 flex-col justify-start items-center text-wrapper_2">
+						<text class="font_14 text_11">去付款</text>
+					</view>
+				</view>
+			</view>
 		</view>
-		
-		<view @click="isSelectedState(4)">
-			<text class="font" :style="{ color: color[4] }">已完成</text>
-			<view class="flex-col justify-start items-center" v-if="isShowUnderLine[4]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
-		</view>
-		
-	  </view>
-	  
-	  
-	  <view class="flex-col pos_2">
-	    <view class="flex-col list-item mt-15" v-for="(item, index) in items" :key="index">
-	      <view class="flex-row justify-between group">
-	        <text class="font_3">泠珑水月阁</text>
-	        <view class="flex-row items-center">
-	          <text class="font_4 text_2">00:45</text>
-	          <text class="ml-4 font_5 text_3">等待买家付款</text>
-	        </view>
-	      </view>
-	      <view class="flex-row items-center group view">
-	        <text class="font_6">订单编号：</text>
-	        <text class="font_7 text_4">E20241005095840091406189</text>
-	      </view>
-	      <view class="divider"></view>
-	      <view class="flex-row justify-between items-end group_2">
-	        <view class="flex-row">
-	          <image
-	            class="image"
-	            src="https://ide.code.fun/api/image?token=67dd57af4ae84d00122a84d1&name=4e1283e4d0bf9a8e9fe23602be4fa0f7.png"
-	          />
-	          <view class="flex-col items-start group_3 ml-13">
-	            <text class="font_8">汉服—曲裾系列</text>
-	            <text class="font_10 text_6 mt-59">￥138.00</text>
-	          </view>
-	        </view>
-	        <view class="flex-col items-center group_4">
-	          <image
-	            class="image_2"
-				:src="clothesRentUrl + '/clothesRentOrderList/bkg.png'"
-	          />
-	          <text class="font_9 text_5 mt-11">提货地址</text>
-	        </view>
-	      </view>
-	      <view class="flex-row justify-between items-baseline group view_2">
-	        <text class="font_6 text_7">租赁天数</text>
-	        <text class="font_11 text_8">X3</text>
-	      </view>
-	      <view class="flex-row justify-end items-baseline group_5">
-	        <text class="font_9 text_9">实付款：</text>
-	        <text class="font_12">￥138.00</text>
-	      </view>
-	      <view class="flex-row justify-center group_6">
-	        <view class="flex-col justify-start items-center text-wrapper">
-	          <text class="font_13 text_10">联系客服</text>
-	        </view>
-	        <view class="ml-10 flex-col justify-start items-center text-wrapper">
-	          <text class="font_13">取消订单</text>
-	        </view>
-	        <view class="ml-10 flex-col justify-start items-center text-wrapper_2">
-	          <text class="font_14 text_11">去付款</text>
-	        </view>
-	      </view>
-	    </view>
-	  </view>
 	</view>
 </template>
 
 <script setup>
-	import {ref} from 'vue'
+	import { onMounted, ref } from 'vue'
 	import { clothesRentUrl } from '../../../common/globalImagesUrl';
+	import { baseUrl } from '../../../api/request';
 	const items = ref([null, null, null, null])
 	const isShowUnderLine = ref([true, false, false, false, false])
 	const color = ref(new Array(5).fill('#323232'))
 	const point = ref(0)
+	const cookie = wx.getStorageSync("cookie") //请求头
 	const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderList/bkg.png')
-	
+
+	onMounted(() => {
+		getRentOrderList()
+	})
+
+	const getRentOrderList = async () => {
+		const res = await uni.request({
+			url: baseUrl + '/clothesRent/list/my',
+			method: 'POST',
+			header: {
+				'cookie': cookie
+			}
+		})
+		console.log('订单列表--->', res.data);
+	}
+
 	const isSelectedState = async (val) => {
-		if (point.value === val) return 
+		console.log('val--->',val);
+		if (point.value === val) return
 		point.value = val
-		for (var i = 0; i < 5; i ++ ) {
+		for (var i = 0; i < 5; i++) {
 			if (i === val) {
 				isShowUnderLine.value[i] = true
 				color.value[i] = '#e79ea1'
@@ -108,247 +126,308 @@
 				color.value[i] = '#323232'
 			}
 		}
+		// if()
 		// await getMyOrder()
 		// if (point.value !== 0) {
 		// 	orderList.value = orderList.value.filter(item => item.orderStatus === orderStatusList[point.value])
 		// } 
 	}
-	
+
+
+	const nav = () => { //导航
+		wx.openLocation({
+			latitude: 45.867741,
+			longitude: 126.560037,
+			name: '哈尔滨师范大学(松北校区)',
+			address: '黑龙江省哈尔滨市呼兰区利民经济开发区师大路1号',
+			success: (res) => {
+				console.log(res)
+			}
+		})
+	}
 </script>
 
 <style scoped lang="scss">
-.mt-15 {
-  margin-top: 28.13rpx;
-}
-.ml-13 {
-  margin-left: 24.38rpx;
-}
-.mt-59 {
-  margin-top: 110.63rpx;
-}
-.mt-11 {
-  margin-top: 20.63rpx;
-}
-.page {
-  background-color: #ffffff;
-  overflow: hidden;
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  width: 100%;
-  overflow-y: auto; 
-  overflow-x: hidden;
-  height: 100vh;
-}
-.section_2 {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 20rpx 41.25rpx 0;
-  background-color: #ebe7e4;
-}
-.pos {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 9;
-}
-.font {
-  font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 28.24rpx;
-  color: #323232;
-}
-.font_2 {
-  font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 28.84rpx;
-  color: #323232;
-}
-.text {
-  line-height: 27.43rpx;
-}
-.pos_2 {
-  position: absolute;
-  left: 22.5rpx;
-  right: 24.38rpx;
-  top: 108.75rpx;
-  padding-bottom: 40rpx;
-}
-.list-item {
-  padding: 18.75rpx 15rpx 0;
-  background-color: #ffffff;
-  border-radius: 18.75rpx;
-}
-.list-item:first-child {
-  margin-top: 0;
-}
-.group {
-  padding: 0 11.25rpx;
-}
-.font_3 {
-  font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 28.01rpx;
-  color: #323232;
-}
-.font_4 {
-  font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 18.79rpx;
-  color: #ffaaa5;
-}
-.text_2 {
-  font-size: 28.13rpx;
-}
-.font_5 {
-  font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 25.84rpx;
-  color: #ffaaa5;
-}
-.text_3 {
-  line-height: 25.74rpx;
-}
-.view {
-  margin-top: 18.75rpx;
-}
-.font_6 {
-  font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 25.84rpx;
-  color: #818181;
-}
-.font_7 {
-  font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 18.79rpx;
-  color: #818181;
-}
-.text_4 {
-  line-height: 17.53rpx;
-}
-.divider {
-  margin-top: 18.75rpx;
-  background-color: #dbdbdb;
-  height: 1.88rpx;
-}
-.group_2 {
-  margin-top: 26.25rpx;
-  padding: 0 9.38rpx;
-  position: relative;
-}
-.image {
-  border-radius: 9.38rpx;
-  width: 148.13rpx;
-  height: 165rpx;
-}
-.group_3 {
-  margin-bottom: 3.75rpx;
-}
-.font_8 {
-  font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 29.18rpx;
-  color: #323232;
-}
-.font_10 {
-  font-size: 30rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 18.79rpx;
-  color: #323232;
-}
-.text_6 {
-  margin-left: 7.5rpx;
-  line-height: 20.04rpx;
-}
-.group_4 {
-  position: absolute;
-  top: 0;
-  right: 0rpx;
-}
-.image_2 {
-  width: 46.88rpx;
-  height: 46.88rpx;
-}
-.font_9 {
-  font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 25.84rpx;
-  color: #323232;
-}
-.text_5 {
-  line-height: 25.22rpx;
-}
-.view_2 {
-  margin-top: 22.5rpx;
-}
-.text_7 {
-  font-size: 28.13rpx;
-  line-height: 27.02rpx;
-}
-.font_11 {
-  font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 18.79rpx;
-  color: #323232;
-}
-.text_8 {
-  font-size: 28.13rpx;
-}
-.group_5 {
-  margin-top: 30rpx;
-}
-.text_9 {
-  font-size: 28.13rpx;
-  line-height: 26.7rpx;
-}
-.font_12 {
-  font-size: 33.75rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 22.54rpx;
-  color: #c35c5d;
-}
-.group_6 {
-  margin-top: 30rpx;
-  padding: 26.25rpx 0rpx 26.25rpx 180rpx;
-  border-top: solid 1.88rpx #dbdbdb;
-}
-.font_13 {
-  font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 25.84rpx;
-  color: #e79ea1;
-}
-.text_10 {
-  line-height: 25.54rpx;
-}
-.text-wrapper {
-  padding: 15rpx 0;
-  background-color: #ffffff;
-  border-radius: 75rpx;
-  width: 153.75rpx;
-  height: 56.25rpx;
-  border-left: solid 1.88rpx #e79ea1;
-  border-right: solid 1.88rpx #e79ea1;
-  border-top: solid 1.88rpx #e79ea1;
-  border-bottom: solid 1.88rpx #e79ea1;
-}
-.text-wrapper_2 {
-  padding: 15rpx 0;
-  background-color: #e79ea1;
-  border-radius: 75rpx;
-  width: 153.75rpx;
-  height: 56.25rpx;
-}
-.font_14 {
-  font-size: 26.25rpx;
-  font-family: FZSongKeBenXiuKaiS-R-GB;
-  line-height: 25.84rpx;
-  color: #ffffff;
-}
-.text_11 {
-  line-height: 24rpx;
-}
-@import url(../../../common/css/global.css);
-</style>
+	.mt-15 {
+		margin-top: 28.13rpx;
+	}
+
+	.ml-13 {
+		margin-left: 24.38rpx;
+	}
+
+	.mt-59 {
+		margin-top: 110.63rpx;
+	}
+
+	.mt-11 {
+		margin-top: 20.63rpx;
+	}
+
+	.page {
+		background-color: #ffffff;
+		overflow: hidden;
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		width: 100%;
+		overflow-y: auto;
+		overflow-x: hidden;
+		height: 100vh;
+	}
+
+	.section_2 {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 20rpx 41.25rpx 0;
+		background-color: #ebe7e4;
+	}
+
+	.pos {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 9;
+	}
+
+	.font {
+		font-size: 30rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 28.24rpx;
+		color: #323232;
+	}
+
+	.font_2 {
+		font-size: 30rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 28.84rpx;
+		color: #323232;
+	}
+
+	.text {
+		line-height: 27.43rpx;
+	}
+
+	.pos_2 {
+		position: absolute;
+		left: 22.5rpx;
+		right: 24.38rpx;
+		top: 108.75rpx;
+		padding-bottom: 40rpx;
+	}
+
+	.list-item {
+		padding: 18.75rpx 15rpx 0;
+		background-color: #ffffff;
+		border-radius: 18.75rpx;
+	}
+
+	.list-item:first-child {
+		margin-top: 0;
+	}
+
+	.group {
+		padding: 0 11.25rpx;
+	}
+
+	.font_3 {
+		font-size: 30rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 28.01rpx;
+		color: #323232;
+	}
+
+	.font_4 {
+		font-size: 26.25rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 18.79rpx;
+		color: #ffaaa5;
+	}
+
+	.text_2 {
+		font-size: 28.13rpx;
+	}
+
+	.font_5 {
+		font-size: 26.25rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 25.84rpx;
+		color: #ffaaa5;
+	}
+
+	.text_3 {
+		line-height: 25.74rpx;
+	}
+
+	.view {
+		margin-top: 18.75rpx;
+	}
+
+	.font_6 {
+		font-size: 26.25rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 25.84rpx;
+		color: #818181;
+	}
+
+	.font_7 {
+		font-size: 26.25rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 18.79rpx;
+		color: #818181;
+	}
+
+	.text_4 {
+		line-height: 17.53rpx;
+	}
+
+	.divider {
+		margin-top: 18.75rpx;
+		background-color: #dbdbdb;
+		height: 1.88rpx;
+	}
+
+	.group_2 {
+		margin-top: 26.25rpx;
+		padding: 0 9.38rpx;
+		position: relative;
+	}
+
+	.image {
+		border-radius: 9.38rpx;
+		width: 148.13rpx;
+		height: 165rpx;
+	}
+
+	.group_3 {
+		margin-bottom: 3.75rpx;
+	}
+
+	.font_8 {
+		font-size: 30rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 29.18rpx;
+		color: #323232;
+	}
+
+	.font_10 {
+		font-size: 30rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 18.79rpx;
+		color: #323232;
+	}
+
+	.text_6 {
+		margin-left: 7.5rpx;
+		line-height: 20.04rpx;
+	}
+
+	.group_4 {
+		position: absolute;
+		top: 0;
+		right: 0rpx;
+	}
+
+	.image_2 {
+		width: 46.88rpx;
+		height: 46.88rpx;
+	}
+
+	.font_9 {
+		font-size: 26.25rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 25.84rpx;
+		color: #323232;
+	}
+
+	.text_5 {
+		line-height: 25.22rpx;
+	}
+
+	.view_2 {
+		margin-top: 22.5rpx;
+	}
+
+	.text_7 {
+		font-size: 28.13rpx;
+		line-height: 27.02rpx;
+	}
+
+	.font_11 {
+		font-size: 26.25rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 18.79rpx;
+		color: #323232;
+	}
+
+	.text_8 {
+		font-size: 28.13rpx;
+	}
+
+	.group_5 {
+		margin-top: 30rpx;
+	}
+
+	.text_9 {
+		font-size: 28.13rpx;
+		line-height: 26.7rpx;
+	}
+
+	.font_12 {
+		font-size: 33.75rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 22.54rpx;
+		color: #c35c5d;
+	}
+
+	.group_6 {
+		margin-top: 30rpx;
+		padding: 26.25rpx 0rpx 26.25rpx 180rpx;
+		border-top: solid 1.88rpx #dbdbdb;
+	}
+
+	.font_13 {
+		font-size: 26.25rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 25.84rpx;
+		color: #e79ea1;
+	}
+
+	.text_10 {
+		line-height: 25.54rpx;
+	}
+
+	.text-wrapper {
+		padding: 15rpx 0;
+		background-color: #ffffff;
+		border-radius: 75rpx;
+		width: 153.75rpx;
+		height: 56.25rpx;
+		border-left: solid 1.88rpx #e79ea1;
+		border-right: solid 1.88rpx #e79ea1;
+		border-top: solid 1.88rpx #e79ea1;
+		border-bottom: solid 1.88rpx #e79ea1;
+	}
+
+	.text-wrapper_2 {
+		padding: 15rpx 0;
+		background-color: #e79ea1;
+		border-radius: 75rpx;
+		width: 153.75rpx;
+		height: 56.25rpx;
+	}
+
+	.font_14 {
+		font-size: 26.25rpx;
+		font-family: FZSongKeBenXiuKaiS-R-GB;
+		line-height: 25.84rpx;
+		color: #ffffff;
+	}
+
+	.text_11 {
+		line-height: 24rpx;
+	}
+
+	@import url(../../../common/css/global.css);
+</style>
\ No newline at end of file
diff --git a/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
index d5f2992..bd33756 100644
--- a/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
+++ b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
@@ -88,6 +88,8 @@
 	import {ref} from 'vue'
 	import { clothesRentUrl } from '../../../common/globalImagesUrl';
 	const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderDetail/bkg.png')
+	
+	
 </script>
 
 <style scoped lang="scss">
diff --git a/pages/login/login.vue b/pages/login/login.vue
index dfade0f..d53dd84 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -11,7 +11,7 @@
 
 		  <view class="section_3 pos_5"></view>
 		  <view class="flex-col justify-start items-center text-wrapper pos_6" @click="login">
-				<text class="text">微信登陆</text>
+				<text class="text">微信登录</text>
 			</view>
 		</view>
 	<!-- </view> -->
diff --git a/pages/workshop/index/index.vue b/pages/workshop/index/index.vue
index b63aed1..06edd30 100644
--- a/pages/workshop/index/index.vue
+++ b/pages/workshop/index/index.vue
@@ -54,21 +54,50 @@ import carousel from '@/components/vear-carousel/vear-carousel'
 const products = ref()
 const cookie = wx.getStorageSync("cookie")
 const bkgUrl = ref(workshopUrl + '/index/bkg.png')
+const carouseList = ref([])  //轮播图
+const imgList = ref([])  //轮播图展示图
+
+
 
  onLoad(() => {
 	 getFonts()
  })
 onMounted(()=>{
 	getProducts()
+	getCarouseList()
 })
 
 onPullDownRefresh( async ()=>{  //下拉刷新
 	await getProducts()
+	await getCarouseList()
 	setTimeout(()=>{
 		uni.stopPullDownRefresh()   //停止下拉刷新
 	}, 1000)
 }) 
 
+const getCarouseList = async () => {
+	const res = await uni.request({
+		url: baseUrl + '/banner/query',
+		method: 'POST',
+		header: {
+			cookie
+		},
+		data: {
+			type: '服务类'
+		}
+	})
+	console.log('轮播图---->',res.data);
+	if(res.data.code === 1) {
+		carouseList.value = res.data.data
+		carouseList.value.forEach((item)=>{
+			imgList.value.push({
+				url: publicPath + item.url
+			})
+		})
+	}
+}
+
+
 const getProducts = async ()=> {
 	const res = await uni.request({
 		url: baseUrl + '/goods/service/list/card',
@@ -86,23 +115,6 @@ const jump_detail =(item,index)=>{
 	})
 }
 
-
-const imgList = ref([{
-			url: workshopUrl + '/index/banner1.png',
-			id: 1
-		},{
-			url: workshopUrl + '/index/banner2.png',
-			id: 2
-		},{
-			url: workshopUrl + '/index/banner3.png',
-			id: 3
-		},{
-			url: workshopUrl + '/index/banner4.png',
-			id: 4
-		},])
-
-	
-	
 	
 	const goToSearch = () => {
 		uni.navigateTo({