Merge remote-tracking branch 'origin/mrr_sj_develop_丁杰_20260413_pricer'
This commit is contained in:
cjl520cy
commit
e89470df68
|
|
@ -1,115 +1,112 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="success-page">
|
<view class="success-page">
|
||||||
<!-- 自定义导航栏 -->
|
<!-- 自定义导航栏 -->
|
||||||
<custom-navbar
|
<custom-navbar title="支付成功" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
|
||||||
title="支付成功"
|
|
||||||
:showBack="true"
|
<!-- 成功提示 -->
|
||||||
backgroundColor="#FFFFFF"
|
<view class="success-content">
|
||||||
></custom-navbar>
|
<image src="/static/images/success_icon.png" mode="aspectFit" class="success-icon"></image>
|
||||||
|
<text class="success-text">支付成功</text>
|
||||||
<!-- 成功提示 -->
|
</view>
|
||||||
<view class="success-content">
|
|
||||||
<image src="/static/images/success_icon.png"
|
<!-- 查看订单按钮 -->
|
||||||
mode="aspectFit"
|
<view class="btn-box" @click="goToOrder">
|
||||||
class="success-icon"></image>
|
<text class="btn-text">查看订单</text>
|
||||||
<text class="success-text">支付成功</text>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</template>
|
||||||
<!-- 查看订单按钮 -->
|
|
||||||
<view class="btn-box" @click="goToOrder">
|
<script>
|
||||||
<text class="btn-text">查看订单</text>
|
import customNavbar from '@/components/custom-navbar/custom-navbar.vue'
|
||||||
</view>
|
|
||||||
</view>
|
export default {
|
||||||
</template>
|
components: {
|
||||||
|
customNavbar
|
||||||
<script>
|
},
|
||||||
import customNavbar from '@/components/custom-navbar/custom-navbar.vue'
|
data() {
|
||||||
|
return {
|
||||||
export default {
|
orderId: '',
|
||||||
components: {
|
serviceType: 1, //订单类型，1普通，2自营
|
||||||
customNavbar
|
}
|
||||||
},
|
},
|
||||||
data() {
|
onLoad(options) {
|
||||||
return {
|
console.log(options, '查看订单options');
|
||||||
orderId: '',
|
if (options.orderId) {
|
||||||
serviceType:1,//订单类型，1普通，2自营
|
this.orderId = options.orderId
|
||||||
}
|
}
|
||||||
},
|
if (options.serviceType) {
|
||||||
onLoad(options) {
|
this.serviceType = options.serviceType
|
||||||
if (options.orderId) {
|
}
|
||||||
this.orderId = options.orderId
|
},
|
||||||
}
|
methods: {
|
||||||
if(options.serviceType){
|
goToOrder() {
|
||||||
this.serviceType = options.serviceType
|
if (this.serviceType == 1) {
|
||||||
}
|
uni.redirectTo({
|
||||||
},
|
url: `/pages/order/userorder-detail?id=${this.orderId}`
|
||||||
methods: {
|
})
|
||||||
goToOrder() {
|
} else {
|
||||||
if(this.serviceType==1){
|
uni.redirectTo({
|
||||||
uni.redirectTo({
|
url: `/pages/order/userorder-detail?id=${this.orderId}&serviceType=2`
|
||||||
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;
|
||||||
</script>
|
background-color: #FFFFFF;
|
||||||
|
padding-bottom: env(safe-area-inset-bottom);
|
||||||
<style>
|
}
|
||||||
.success-page {
|
|
||||||
min-height: 100vh;
|
.success-content {
|
||||||
background-color: #FFFFFF;
|
display: flex;
|
||||||
padding-bottom: env(safe-area-inset-bottom);
|
flex-direction: column;
|
||||||
}
|
align-items: center;
|
||||||
|
padding-top: 120rpx;
|
||||||
.success-content {
|
}
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
.success-icon {
|
||||||
align-items: center;
|
width: 250rpx;
|
||||||
padding-top: 120rpx;
|
height: 184rpx;
|
||||||
}
|
margin-bottom: 40rpx;
|
||||||
|
}
|
||||||
.success-icon {
|
|
||||||
width: 250rpx;
|
.success-text {
|
||||||
height: 184rpx;
|
font-size: 40rpx;
|
||||||
margin-bottom: 40rpx;
|
color: #333333;
|
||||||
}
|
font-weight: 500;
|
||||||
|
}
|
||||||
.success-text {
|
|
||||||
font-size: 40rpx;
|
.action-button {
|
||||||
color: #333333;
|
width: 686rpx;
|
||||||
font-weight: 500;
|
height: 88rpx;
|
||||||
}
|
background: #FF4B4B;
|
||||||
|
border-radius: 44rpx;
|
||||||
.action-button {
|
color: #FFFFFF;
|
||||||
width: 686rpx;
|
font-size: 32rpx;
|
||||||
height: 88rpx;
|
display: flex;
|
||||||
background: #FF4B4B;
|
align-items: center;
|
||||||
border-radius: 44rpx;
|
justify-content: center;
|
||||||
color: #FFFFFF;
|
margin: 80rpx auto 0;
|
||||||
font-size: 32rpx;
|
}
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
/* 多端适配 */
|
||||||
justify-content: center;
|
/* #ifdef H5 */
|
||||||
margin: 80rpx auto 0;
|
.success-page {
|
||||||
}
|
padding-bottom: 0;
|
||||||
|
}
|
||||||
/* 多端适配 */
|
|
||||||
/* #ifdef H5 */
|
/* #endif */
|
||||||
.success-page {
|
|
||||||
padding-bottom: 0;
|
/* #ifdef APP-PLUS || MP */
|
||||||
}
|
.success-page {
|
||||||
/* #endif */
|
padding-bottom: constant(safe-area-inset-bottom);
|
||||||
|
padding-bottom: env(safe-area-inset-bottom);
|
||||||
/* #ifdef APP-PLUS || MP */
|
}
|
||||||
.success-page {
|
|
||||||
padding-bottom: constant(safe-area-inset-bottom);
|
/* #endif */
|
||||||
padding-bottom: env(safe-area-inset-bottom);
|
</style>
|
||||||
}
|
|
||||||
/* #endif */
|
|
||||||
</style>
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -88,11 +88,11 @@
|
||||||
<text class="label">下单时间</text>
|
<text class="label">下单时间</text>
|
||||||
<text class="value">{{orderInfo.add_time}}</text>
|
<text class="value">{{orderInfo.add_time}}</text>
|
||||||
</view>
|
</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="label">开始服务时间</text>
|
||||||
<text class="value">{{orderInfo.server_start_time}}</text>
|
<text class="value">{{orderInfo.server_start_time}}</text>
|
||||||
</view>
|
</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="label">服务完成时间</text>
|
||||||
<text class="value">{{orderInfo.server_end_time}}</text>
|
<text class="value">{{orderInfo.server_end_time}}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
|
|
@ -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 == 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> -->
|
<!-- <view class="btn accept-btn" v-if="dataItem.state == 7" @click.stop="emitReOrder">重新预订</view> -->
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,121 +1,115 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="success-page">
|
<view class="success-page">
|
||||||
<!-- 自定义导航栏 -->
|
<!-- 自定义导航栏 -->
|
||||||
<custom-navbar
|
<custom-navbar title="支付成功" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
|
||||||
title="支付成功"
|
|
||||||
:showBack="true"
|
<!-- 成功提示 -->
|
||||||
backgroundColor="#FFFFFF"
|
<view class="success-content">
|
||||||
></custom-navbar>
|
<image src="/static/images/success_icon.png" mode="aspectFit" class="success-icon"></image>
|
||||||
|
<text class="success-text">支付成功</text>
|
||||||
<!-- 成功提示 -->
|
</view>
|
||||||
<view class="success-content">
|
|
||||||
<image
|
<!-- 查看订单按钮 -->
|
||||||
src="/static/images/success_icon.png"
|
<view class="btn-box" @click="goToOrder">
|
||||||
mode="aspectFit"
|
<text class="btn-text">查看订单</text>
|
||||||
class="success-icon"
|
</view>
|
||||||
></image>
|
</view>
|
||||||
<text class="success-text">支付成功</text>
|
</template>
|
||||||
</view>
|
|
||||||
|
<script>
|
||||||
<!-- 查看订单按钮 -->
|
import customNavbar from "@/components/custom-navbar/custom-navbar.vue";
|
||||||
<view class="btn-box" @click="goToOrder">
|
|
||||||
<text class="btn-text">查看订单</text>
|
export default {
|
||||||
</view>
|
components: {
|
||||||
</view>
|
customNavbar,
|
||||||
</template>
|
},
|
||||||
|
data() {
|
||||||
<script>
|
return {
|
||||||
import customNavbar from "@/components/custom-navbar/custom-navbar.vue";
|
orderId: "",
|
||||||
|
path: "",
|
||||||
export default {
|
identity: "",
|
||||||
components: {
|
};
|
||||||
customNavbar,
|
},
|
||||||
},
|
onLoad(options) {
|
||||||
data() {
|
console.log(options, 'options查看订单');
|
||||||
return {
|
if (options.orderId) {
|
||||||
orderId: "",
|
this.orderId = options.orderId;
|
||||||
path: "",
|
}
|
||||||
identity:"",
|
if (options.path) {
|
||||||
};
|
this.path = options.path;
|
||||||
},
|
}
|
||||||
onLoad(options) {
|
if (options.identity) {
|
||||||
if (options.orderId) {
|
this.identity = options.identity;
|
||||||
this.orderId = options.orderId;
|
}
|
||||||
}
|
},
|
||||||
if (options.path) {
|
methods: {
|
||||||
this.path = options.path;
|
goToOrder() {
|
||||||
}
|
if (this.path) {
|
||||||
if(options.identity)
|
uni.redirectTo({
|
||||||
{
|
url: `${this.path}?order_id=${this.orderId}&identity=${this.identity}`,
|
||||||
this.identity = options.identity;
|
});
|
||||||
}
|
} else {
|
||||||
},
|
uni.redirectTo({
|
||||||
methods: {
|
url: "/pages/shop/buyorder-detail?id=" + this.orderId,
|
||||||
goToOrder() {
|
});
|
||||||
if (this.path) {
|
}
|
||||||
uni.redirectTo({
|
},
|
||||||
url: `${this.path}?id=${this.orderId}&identity=${this.identity}`,
|
},
|
||||||
});
|
};
|
||||||
} else {
|
</script>
|
||||||
uni.redirectTo({
|
|
||||||
url: "/pages/shop/buyorder-detail?id=" + this.orderId,
|
<style>
|
||||||
});
|
.success-page {
|
||||||
}
|
min-height: 100vh;
|
||||||
},
|
background-color: #ffffff;
|
||||||
},
|
padding-bottom: env(safe-area-inset-bottom);
|
||||||
};
|
}
|
||||||
</script>
|
|
||||||
|
.success-content {
|
||||||
<style>
|
display: flex;
|
||||||
.success-page {
|
flex-direction: column;
|
||||||
min-height: 100vh;
|
align-items: center;
|
||||||
background-color: #ffffff;
|
padding-top: 120rpx;
|
||||||
padding-bottom: env(safe-area-inset-bottom);
|
}
|
||||||
}
|
|
||||||
|
.success-icon {
|
||||||
.success-content {
|
width: 250rpx;
|
||||||
display: flex;
|
height: 184rpx;
|
||||||
flex-direction: column;
|
margin-bottom: 40rpx;
|
||||||
align-items: center;
|
}
|
||||||
padding-top: 120rpx;
|
|
||||||
}
|
.success-text {
|
||||||
|
font-size: 40rpx;
|
||||||
.success-icon {
|
color: #333333;
|
||||||
width: 250rpx;
|
font-weight: 500;
|
||||||
height: 184rpx;
|
}
|
||||||
margin-bottom: 40rpx;
|
|
||||||
}
|
.action-button {
|
||||||
|
width: 686rpx;
|
||||||
.success-text {
|
height: 88rpx;
|
||||||
font-size: 40rpx;
|
background: #ff4b4b;
|
||||||
color: #333333;
|
border-radius: 44rpx;
|
||||||
font-weight: 500;
|
color: #ffffff;
|
||||||
}
|
font-size: 32rpx;
|
||||||
|
display: flex;
|
||||||
.action-button {
|
align-items: center;
|
||||||
width: 686rpx;
|
justify-content: center;
|
||||||
height: 88rpx;
|
margin: 80rpx auto 0;
|
||||||
background: #ff4b4b;
|
}
|
||||||
border-radius: 44rpx;
|
|
||||||
color: #ffffff;
|
/* 多端适配 */
|
||||||
font-size: 32rpx;
|
/* #ifdef H5 */
|
||||||
display: flex;
|
.success-page {
|
||||||
align-items: center;
|
padding-bottom: 0;
|
||||||
justify-content: center;
|
}
|
||||||
margin: 80rpx auto 0;
|
|
||||||
}
|
/* #endif */
|
||||||
|
|
||||||
/* 多端适配 */
|
/* #ifdef APP-PLUS || MP */
|
||||||
/* #ifdef H5 */
|
.success-page {
|
||||||
.success-page {
|
padding-bottom: constant(safe-area-inset-bottom);
|
||||||
padding-bottom: 0;
|
padding-bottom: env(safe-area-inset-bottom);
|
||||||
}
|
}
|
||||||
/* #endif */
|
|
||||||
|
/* #endif */
|
||||||
/* #ifdef APP-PLUS || MP */
|
</style>
|
||||||
.success-page {
|
|
||||||
padding-bottom: constant(safe-area-inset-bottom);
|
|
||||||
padding-bottom: env(safe-area-inset-bottom);
|
|
||||||
}
|
|
||||||
/* #endif */
|
|
||||||
</style>
|
|
||||||
|
|
@ -285,7 +285,7 @@
|
||||||
<view class="handel-button btn-bg" v-if="orderInfo.state == 3" @click.stop="startOrder($event, orderInfo)">
|
<view class="handel-button btn-bg" v-if="orderInfo.state == 3" @click.stop="startOrder($event, orderInfo)">
|
||||||
<text class="button-text">开始服务</text>
|
<text class="button-text">开始服务</text>
|
||||||
</view>
|
</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>
|
<text class="button-text">服务完成</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue