From 316e4848ffbcb8bf1c96c043daad8f5e1d24f5b3 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Sun, 23 Mar 2025 20:53:32 +0800
Subject: [PATCH] this is lastest update

---
 api/request.ts                                |  2 +-
 .../clothesRentOrderDetail.vue                | 28 ++++++++++++++++---
 2 files changed, 25 insertions(+), 5 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/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
index 605ef4a..527bc94 100644
--- a/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
+++ b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
@@ -91,16 +91,20 @@
 			</view>
 	  </view>
 	</view>
+	
+	<!-- 遮罩层 -->
+	    <view v-if="isShow" class="overlay"></view>
+	
 </template>
 
 <script setup>
-	import {ref,onMounted} from 'vue'
+	import {ref,onMounted, onUnmounted, onBeforeUnmount} from 'vue'
 	import { onLoad } from "@dcloudio/uni-app";
 	import { clothesRentUrl } from '../../../common/globalImagesUrl';
 	import { clothesRentOrderMap } from '../../../common/global';
 	import { baseUrl } from '../../../api/request';
 	import { publicPath } from '../../../common/globalImagesUrl';
-	
+	import emitter from '../../../utils/emitter';
 	const cookie = wx.getStorageSync('cookie')
 	const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderDetail/bkg.png')
 	const rentOrderDetail = ref({})    //租赁订单详情
@@ -159,8 +163,8 @@
 			success: async (res) => {
 				if (res.confirm) {
 					await deleteOrder(val)
-					// await emitter.emit('flushAdvanceOrderList')
-					// routerJump('pages/clothesRent/clothRentOrderList/clothRentOrderList')
+					await emitter.emit('flushClothesOrderList')
+					routerJump('pages/clothesRent/clotherRentOrderList/clotherRentOrderList')
 				}
 			}
 		})
@@ -216,6 +220,8 @@
 	
 	
 	const wxPay = async( oid )=> {  //传入订单id
+		showLoading()
+		isShow.value = true  //打开遮罩
 		try {
 			const res = await uni.request({
 				url: baseUrl + '/wechat/payment/clothesRent/create',
@@ -300,9 +306,23 @@
 	}
 	
 	
+	onBeforeUnmount(() => {
+		routerJump('pages/clothesRent/clotherRentOrderList/clotherRentOrderList')
+	})
+	
 </script>
 
 <style scoped lang="scss">
+.overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.4);  /* 半透明黑色背景 */
+  z-index: 999;
+}
+	
 .button-pos {
 	position: absolute;
 	left: 0;