wangxiaowei/xiuhuwangqiu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善功能

Browse Source
This commit is contained in:
wangxiaowei
2025-12-11 01:50:58 +08:00
parent 6cba10eb94
commit d77dbb20f3
7 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
App.vue
View File

@ -261,4 +261,7 @@ export default {
@import './common/myIcon.css';
/*每个页面公共css */
@import './common/style.scss';
.one-line-ellipsis {white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
.two-line-ellipsis {display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;overflow: hidden;text-overflow: ellipsis;}
</style>

7
bundle/recharge/recharge.vue
View File

@ -154,13 +154,6 @@
title: '支付失败',
icon: 'none'
});
setTimeout(() => {
uni.redirectTo({
url: '/bundle/recharge/card'
});
}, 500);
},
});
} else {

5
bundle/reserve/confirm.vue
View File

@ -730,11 +730,6 @@
}
},
// 选择会员卡
selectCard() {
this.balance = 200; // 模拟选择会员卡后的余额
},
// 确认选择
confirmCard() {
if (this.userBalance['balance' + this.currentType] <= 0) {

2
bundle/reserve/details.vue
View File

@ -105,7 +105,7 @@
<image style="width: 36rpx;height: 36rpx;margin-top: 4rpx;" src="@/static/icon/location2.png"
mode=""></image>
<view class="">
<view class="address-time">{{ venue.address }}</view>
<view class="address-time one-line-ellipsis" style="width:400rpx;"> {{ venue.address }}</view>
<!-- <view class="address-time">距您{{ venue.distance }}km</view> -->
</view>
</view>

4
pages/order/cashier.vue
View File

@ -21,14 +21,14 @@
<view class="icon-box d-c-c"><span class="icon iconfont icon-xuanze"></span></view>
</view>
</view>
<view v-if="hasBanlance && balance > 0" class="item">
<!-- <view v-if="hasBanlance && balance > 0" class="item">
<view class="d-s-c">
<view class="icon-box d-c-c mr10"><span class="icon iconfont icon-yue"></span></view>
<text class="key">余额抵扣：(剩余：{{balance}})</text>
</view>
<switch :color="getThemeColor()" style="transform:scale(0.7);margin-right: -20rpx;"
:checked="balanceType" @change="switch2Change" />
</view>
</view> -->
</view>
<view class="bottom-btn" @click="submit">
<button type="default">立即支付</button>

7
pages/order/cg-my-order.vue
View File

@ -48,9 +48,10 @@
<view class="state cg-state">
<text class="red" v-if="item.order_status == 0">待付款</text>
<text style="color: #365A9A;" v-if="item.order_status == 1">已预约</text>
<text style="color: #606266;" v-if="item.order_status == 2">已完成</text>
<text style="color: #C9C9C9;" v-if="item.order_status == 3">订单取消</text>
<text style="color: #606266;" v-if="item.order_status == 4">退款成功</text>
<text style="color: #606266;" v-if="item.order_status == 2">进行中</text>
<text style="color: #C9C9C9;" v-if="item.order_status == 3">已完成</text>
<text style="color: #C9C9C9;" v-if="item.order_status == 4">订单取消</text>
<text style="color: #606266;" v-if="item.order_status == 5">退款成功</text>
</view>
</view>
<!--一个商品显示-->

57
pages/order/cg-order-detail.vue
View File

@ -36,17 +36,22 @@
<view class="status-text" style="width: 100%;" v-if="detail.order_status == 2">
感谢预定场馆，期待下次再见！
</view>
<!-- 进行中 -->
<view class="status-text" style="width: 100%;" v-if="detail.order_status == 3">
您的订单正在进行中！
</view>
<!-- 订单取消 -->
<view class="status-text" style="width: 100%;" v-if="detail.order_status == 3">
<view class="status-text" style="width: 100%;" v-if="detail.order_status == 4">
您的订单已取消。期待下次有机会再为您服务！
</view>
<!-- 退款 -->
<view class="status-text" style="width: 100%;" v-if="detail.order_status == 4">
<view class="status-text" style="width: 100%;" v-if="detail.order_status == 5">
<view class="d-c-c" style="margin-bottom: 18rpx;" @tap="billPopup = true">
<view class="refund-txt">实际退款￥175.00</view>
<image style="width: 48rpx;height: 48rpx;margin-left: 6rpx;margin-top: 10rpx;" src="@/static/icon/right.png" mode=""></image>
<view class="refund-txt">实际退款￥{{ detail.order_amount }}</view>
<!-- <image style="width: 48rpx;height: 48rpx;margin-left: 6rpx;margin-top: 10rpx;" src="@/static/icon/right.png" mode=""></image> -->
</view>
<view class="">您的订单已取消。期待下次有机会再为您服务！</view>
</view>
@ -123,7 +128,7 @@
<image style="width: 48rpx;height: 48rpx;" src="@/static/icon/right.png" mode=""></image>
</view>
<view class="cg-store-jl">距您{{ venue.distance }}km</view>
<!-- <view class="cg-store-jl">距您{{ venue.distance }}km</view> -->
<view class="d-f a-i-c cg-address-block">
<view class="">
@ -157,7 +162,8 @@
<view class="cg-order-info d-b-c mt14" v-if="detail.pay_way > 0">
<view class="">交易方式：</view>
<view class="">
<text>{{ detail.pay_way == 1 ? '余额支付' : '微信支付' }}</text>
<text v-if="detail.pay_way == 1">余额支付-{{ cardType(detail.pay_way) }}</text>
<text v-if="detail.pay_way == 2">微信支付</text>
</view>
</view>
@ -200,7 +206,7 @@
</templte>
<!-- 订单取消、退款成功 -->
<templte class="ww100" v-if="detail.order_status == 3 || detail.order_status == 4">
<templte class="ww100" v-if="detail.order_status == 4 || detail.order_status == 5">
<view class="ww100 again-btn" @click="againReserve">再次预定</view>
</templte>
</view>
@ -401,13 +407,15 @@
function(res) {
self.cancelOrderPopup = false;
uni.hideLoading();
uni.showToast({
title: '操作成功',
duration: 2000,
icon: 'success'
});
self.getData();
self.loadding = false;
uni.hideLoading();
}
);
},
@ -431,13 +439,15 @@
function(res) {
self.cancelReservePopup = false;
uni.hideLoading();
uni.showToast({
title: '操作成功',
duration: 2000,
icon: 'success'
});
self.getData();
if(res.code) {
uni.hideLoading();
uni.showToast({
title: res.msg,
duration: 2000,
icon: 'success'
});
self.getData();
}
}
);
},
@ -533,7 +543,22 @@
name: this.venue.name,
address: this.venue.address
});
}
},
// 会员卡类型
cardType(type) {
if (type == 1) {
return '白银会员卡'
} else if (type == 2) {
return '黄金会员卡'
} else if (type == 3) {
return '铂金会员卡'
} else if (type == 4) {
return '钻石会员卡'
} else if (type == 5) {
return '至尊会员卡'
}
},
}
};
</script>