wk450097098
/
mrr.sj.front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改001bug若干

This commit is contained in:
丁杰 2026-04-16 18:10:00 +08:00
parent 9ecaf1a1de
commit 566b6f8929
7 changed files with 1962 additions and 1959 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
pages/order/pay-success.vue
View File

@ -1,115 +1,112 @@
<template>
<view class="success-page">
<!-- 自定义导航栏 -->
<custom-navbar
title="支付成功"
:showBack="true"
backgroundColor="#FFFFFF"
></custom-navbar>
<!-- 成功提示 -->
<view class="success-content">
<image src="/static/images/success_icon.png"
mode="aspectFit"
class="success-icon"></image>
<text class="success-text">支付成功</text>
</view>
<!-- 查看订单按钮 -->
<view class="btn-box" @click="goToOrder">
<text class="btn-text">查看订单</text>
</view>
</view>
</template>
<script>
import customNavbar from '@/components/custom-navbar/custom-navbar.vue'
export default {
components: {
customNavbar
},
data() {
return {
orderId: '',
serviceType:1,//订单类型，1普通，2自营
}
},
onLoad(options) {
if (options.orderId) {
this.orderId = options.orderId
}
if(options.serviceType){
this.serviceType = options.serviceType
}
},
methods: {
goToOrder() {
if(this.serviceType==1){
uni.redirectTo({
url:`/pages/order/userorder-detail?id=${this.orderId}`
})
}else{
uni.redirectTo({
url: `/pages/order/userorder-detail?id=${this.orderId}&serviceType=2`
})
}
}
}
}
</script>
<style>
.success-page {
min-height: 100vh;
background-color: #FFFFFF;
padding-bottom: env(safe-area-inset-bottom);
}
.success-content {
display: flex;
flex-direction: column;
align-items: center;
padding-top: 120rpx;
}
.success-icon {
width: 250rpx;
height: 184rpx;
margin-bottom: 40rpx;
}
.success-text {
font-size: 40rpx;
color: #333333;
font-weight: 500;
}
.action-button {
width: 686rpx;
height: 88rpx;
background: #FF4B4B;
border-radius: 44rpx;
color: #FFFFFF;
font-size: 32rpx;
display: flex;
align-items: center;
justify-content: center;
margin: 80rpx auto 0;
}
/* 多端适配 */
/* #ifdef H5 */
.success-page {
padding-bottom: 0;
}
/* #endif */
/* #ifdef APP-PLUS || MP */
.success-page {
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
}
/* #endif */
</style>
<template>
<view class="success-page">
<!-- 自定义导航栏 -->
<custom-navbar title="支付成功" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
<!-- 成功提示 -->
<view class="success-content">
<image src="/static/images/success_icon.png" mode="aspectFit" class="success-icon"></image>
<text class="success-text">支付成功</text>
</view>
<!-- 查看订单按钮 -->
<view class="btn-box" @click="goToOrder">
<text class="btn-text">查看订单</text>
</view>
</view>
</template>
<script>
import customNavbar from '@/components/custom-navbar/custom-navbar.vue'
export default {
components: {
customNavbar
},
data() {
return {
orderId: '',
serviceType: 1, //订单类型，1普通，2自营
}
},
onLoad(options) {
console.log(options, '查看订单options');
if (options.orderId) {
this.orderId = options.orderId
}
if (options.serviceType) {
this.serviceType = options.serviceType
}
},
methods: {
goToOrder() {
if (this.serviceType == 1) {
uni.redirectTo({
url: `/pages/order/userorder-detail?id=${this.orderId}`
})
} else {
uni.redirectTo({
url: `/pages/order/userorder-detail?id=${this.orderId}&serviceType=2`
})
}
}
}
}
</script>
<style>
.success-page {
min-height: 100vh;
background-color: #FFFFFF;
padding-bottom: env(safe-area-inset-bottom);
}
.success-content {
display: flex;
flex-direction: column;
align-items: center;
padding-top: 120rpx;
}
.success-icon {
width: 250rpx;
height: 184rpx;
margin-bottom: 40rpx;
}
.success-text {
font-size: 40rpx;
color: #333333;
font-weight: 500;
}
.action-button {
width: 686rpx;
height: 88rpx;
background: #FF4B4B;
border-radius: 44rpx;
color: #FFFFFF;
font-size: 32rpx;
display: flex;
align-items: center;
justify-content: center;
margin: 80rpx auto 0;
}
/* 多端适配 */
/* #ifdef H5 */
.success-page {
padding-bottom: 0;
}
/* #endif */
/* #ifdef APP-PLUS || MP */
.success-page {
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
}
/* #endif */
</style>

1385
pages/shop/buy-order.vue
View File

File diff suppressed because it is too large Load Diff

4
pages/shop/buyorder-detail.vue
View File

@ -88,11 +88,11 @@
<text class="label">下单时间</text>
<text class="value">{{orderInfo.add_time}}</text>
</view>
<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3">
<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 7">
<text class="label">开始服务时间</text>
<text class="value">{{orderInfo.server_start_time}}</text>
</view>
<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 4">
<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 4 && orderInfo.state != 7">
<text class="label">服务完成时间</text>
<text class="value">{{orderInfo.server_end_time}}</text>
</view>

2
pages/shop/manHour/components/orderCard.vue
View File

@ -51,7 +51,7 @@
<view class="btn accept-btn" v-if="dataItem.state == 2 || dataItem.state == 3" @click.stop="emitRefund">申请退款</view>
<!-- 已完成状态：再来一单 -->
<view class="btn accept-btn" v-if="dataItem.state == 5 || dataItem.state == 7" @click.stop="emitReOrder">再来一单</view>
<view class="btn accept-btn" v-if="dataItem.state == 5 || dataItem.state == 7" @click.stop="emitReOrder">再次购买</view>
<!-- 已取消状态：重新预订 -->
<!-- <view class="btn accept-btn" v-if="dataItem.state == 7" @click.stop="emitReOrder">重新预订</view> -->

2065
pages/shop/manHourDetail.vue
View File

File diff suppressed because it is too large Load Diff

236
pages/shop/pay-success.vue
View File

@ -1,121 +1,115 @@
<template>
<view class="success-page">
<!-- 自定义导航栏 -->
<custom-navbar
title="支付成功"
:showBack="true"
backgroundColor="#FFFFFF"
></custom-navbar>
<!-- 成功提示 -->
<view class="success-content">
<image
src="/static/images/success_icon.png"
mode="aspectFit"
class="success-icon"
></image>
<text class="success-text">支付成功</text>
</view>
<!-- 查看订单按钮 -->
<view class="btn-box" @click="goToOrder">
<text class="btn-text">查看订单</text>
</view>
</view>
</template>
<script>
import customNavbar from "@/components/custom-navbar/custom-navbar.vue";
export default {
components: {
customNavbar,
},
data() {
return {
orderId: "",
path: "",
identity:"",
};
},
onLoad(options) {
if (options.orderId) {
this.orderId = options.orderId;
}
if (options.path) {
this.path = options.path;
}
if(options.identity)
{
this.identity = options.identity;
}
},
methods: {
goToOrder() {
if (this.path) {
uni.redirectTo({
url: `${this.path}?id=${this.orderId}&identity=${this.identity}`,
});
} else {
uni.redirectTo({
url: "/pages/shop/buyorder-detail?id=" + this.orderId,
});
}
},
},
};
</script>
<style>
.success-page {
min-height: 100vh;
background-color: #ffffff;
padding-bottom: env(safe-area-inset-bottom);
}
.success-content {
display: flex;
flex-direction: column;
align-items: center;
padding-top: 120rpx;
}
.success-icon {
width: 250rpx;
height: 184rpx;
margin-bottom: 40rpx;
}
.success-text {
font-size: 40rpx;
color: #333333;
font-weight: 500;
}
.action-button {
width: 686rpx;
height: 88rpx;
background: #ff4b4b;
border-radius: 44rpx;
color: #ffffff;
font-size: 32rpx;
display: flex;
align-items: center;
justify-content: center;
margin: 80rpx auto 0;
}
/* 多端适配 */
/* #ifdef H5 */
.success-page {
padding-bottom: 0;
}
/* #endif */
/* #ifdef APP-PLUS || MP */
.success-page {
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
}
/* #endif */
</style>
<template>
<view class="success-page">
<!-- 自定义导航栏 -->
<custom-navbar title="支付成功" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
<!-- 成功提示 -->
<view class="success-content">
<image src="/static/images/success_icon.png" mode="aspectFit" class="success-icon"></image>
<text class="success-text">支付成功</text>
</view>
<!-- 查看订单按钮 -->
<view class="btn-box" @click="goToOrder">
<text class="btn-text">查看订单</text>
</view>
</view>
</template>
<script>
import customNavbar from "@/components/custom-navbar/custom-navbar.vue";
export default {
components: {
customNavbar,
},
data() {
return {
orderId: "",
path: "",
identity: "",
};
},
onLoad(options) {
console.log(options, 'options查看订单');
if (options.orderId) {
this.orderId = options.orderId;
}
if (options.path) {
this.path = options.path;
}
if (options.identity) {
this.identity = options.identity;
}
},
methods: {
goToOrder() {
if (this.path) {
uni.redirectTo({
url: `${this.path}?order_id=${this.orderId}&identity=${this.identity}`,
});
} else {
uni.redirectTo({
url: "/pages/shop/buyorder-detail?id=" + this.orderId,
});
}
},
},
};
</script>
<style>
.success-page {
min-height: 100vh;
background-color: #ffffff;
padding-bottom: env(safe-area-inset-bottom);
}
.success-content {
display: flex;
flex-direction: column;
align-items: center;
padding-top: 120rpx;
}
.success-icon {
width: 250rpx;
height: 184rpx;
margin-bottom: 40rpx;
}
.success-text {
font-size: 40rpx;
color: #333333;
font-weight: 500;
}
.action-button {
width: 686rpx;
height: 88rpx;
background: #ff4b4b;
border-radius: 44rpx;
color: #ffffff;
font-size: 32rpx;
display: flex;
align-items: center;
justify-content: center;
margin: 80rpx auto 0;
}
/* 多端适配 */
/* #ifdef H5 */
.success-page {
padding-bottom: 0;
}
/* #endif */
/* #ifdef APP-PLUS || MP */
.success-page {
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
}
/* #endif */
</style>

2
pages/shop/userorder-detail.vue
View File

@ -285,7 +285,7 @@
<view class="handel-button btn-bg" v-if="orderInfo.state == 3" @click.stop="startOrder($event, orderInfo)">
<text class="button-text">开始服务</text>
</view>
<view class="handel-button btn-bg" v-if="orderInfo.state == 4" @click.stop="endOrder($event, orderInfo)">
<view class="handel-button btn-bg" v-if="orderInfo.state != 4" @click.stop="endOrder($event, orderInfo)">
<text class="button-text">服务完成</text>
</view>
</view>