admin1/jiangchengfeiyi-xiaochengxu
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this is lastest update

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-23 20:53:32 +08:00
parent acfa62be5a
commit 316e4848ff
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/request.ts
View File

@ -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 myIp = 'http://8.130.119.119:9092/api'
export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api' export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api'
export const suiUrl = '' export const suiUrl = ''
export const baseUrl = domain export const baseUrl = Url

28
pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
View File

@ -91,16 +91,20 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 遮罩层 -->
<view v-if="isShow" class="overlay"></view>
</template> </template>
<script setup> <script setup>
import {ref,onMounted} from 'vue' import {ref,onMounted, onUnmounted, onBeforeUnmount} from 'vue'
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import { clothesRentUrl } from '../../../common/globalImagesUrl'; import { clothesRentUrl } from '../../../common/globalImagesUrl';
import { clothesRentOrderMap } from '../../../common/global'; import { clothesRentOrderMap } from '../../../common/global';
import { baseUrl } from '../../../api/request'; import { baseUrl } from '../../../api/request';
import { publicPath } from '../../../common/globalImagesUrl'; import { publicPath } from '../../../common/globalImagesUrl';
import emitter from '../../../utils/emitter';
const cookie = wx.getStorageSync('cookie') const cookie = wx.getStorageSync('cookie')
const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderDetail/bkg.png') const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderDetail/bkg.png')
const rentOrderDetail = ref({}) //租赁订单详情 const rentOrderDetail = ref({}) //租赁订单详情
@ -159,8 +163,8 @@
success: async (res) => { success: async (res) => {
if (res.confirm) { if (res.confirm) {
await deleteOrder(val) await deleteOrder(val)
// await emitter.emit('flushAdvanceOrderList') await emitter.emit('flushClothesOrderList')
// routerJump('pages/clothesRent/clothRentOrderList/clothRentOrderList') routerJump('pages/clothesRent/clotherRentOrderList/clotherRentOrderList')
} }
} }
}) })
@ -216,6 +220,8 @@
const wxPay = async( oid )=> { //传入订单id const wxPay = async( oid )=> { //传入订单id
showLoading()
isShow.value = true //打开遮罩
try { try {
const res = await uni.request({ const res = await uni.request({
url: baseUrl + '/wechat/payment/clothesRent/create', url: baseUrl + '/wechat/payment/clothesRent/create',
@ -300,9 +306,23 @@
} }
onBeforeUnmount(() => {
routerJump('pages/clothesRent/clotherRentOrderList/clotherRentOrderList')
})
</script> </script>
<style scoped lang="scss"> <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 { .button-pos {
position: absolute; position: absolute;
left: 0; left: 0;