This commit is contained in:
2025-04-18 16:32:32 +08:00
parent 09c087508f
commit 8e44473164
74 changed files with 24833 additions and 10335 deletions

View File

@@ -1,9 +1,5 @@
<template>
<view
class="container commonPageBox commonDetailPage"
style=""
>
<view class="container commonPageBox commonDetailPage" style="">
<!-- 公共组件-每个页面必须引入 -->
<public-module></public-module>
<z-nav-bar
@@ -39,11 +35,7 @@
<!-- 站位 -->
<!-- <view v-if="ordersListTab == 1"> -->
<view
class="order_box"
:style="`height: auto;margin-top: 40px; `"
style=""
>
<view class="order_box" :style="`height: auto;margin-top: 40px; `" style="margin-bottom: 40px;">
<common-list
imgUrl="url"
indexKey="orderSn"
@@ -130,7 +122,41 @@
>
</view>
</view>
<view
v-if="slotProps.row.orderType == 'relearn'"
class="bookinfolist"
>
<image
class="feng fengPoint"
src="/static/icon/fugou.png"
mode="aspectFill"
>
</image>
<!-- <view class="description" >课程复读订单
</view> -->
<view class="btns flexbox">
<view class="booknameleft">
{{ slotProps.row.remark }}
</view>
<view
style="
line-height: 58rpx;
color: #333;
font-size: 26rpx;
font-weight: 700;
"
>
<text style="font-size: 20rpx"></text>
</view>
</view>
<!-- <view
class="btns flexbox"
style="color: #9f9f9f; margin-top: 10rpx; font-size: 24rpx"
>
下单时间{{ slotProps.row.createTime }}
</view> -->
</view>
<view
v-if="slotProps.row.orderType == 'vip'"
class="bookinfolist"
@@ -322,64 +348,32 @@
font-weight: 700;
"
>
<text style="font-size: 20rpx"></text>
{{
slotProps.row.realMoney ||
slotProps.row.realMoney == 0
? slotProps.row.realMoney
: ""
}}
<!-- <text style="font-size: 20rpx"></text> -->
<text v-if="slotProps.row.orderType == 'point'">
{{ slotProps.row.bookBuyConfigEntity.realMoney }}
</text>
<template v-if="slotProps.row.realMoney > 0&&slotProps.row.orderType != 'point'">
{{ slotProps.row.realMoney }}
</template>
<text
style="margin: 0 4rpx"
v-if="
slotProps.row.realMoney > 0 &&
slotProps.row.jfDeduction > 0&&slotProps.row.orderType != 'point'
"
>
+
</text>
<text v-if="slotProps.row.jfDeduction > 0&&slotProps.row.orderType != 'point'"
>{{ slotProps.row.jfDeduction }} 积分</text
>
</view>
</view>
</view>
<view
class="btns flexbox"
style="
margin-top: 0rpx;
float: right;
width: auto;
margin-left: 20rpx;
"
v-if="
(slotProps.row.addressId == 0 ||
slotProps.row.addressId == null) &&
slotProps.row.orderType == 'order' &&
slotProps.row.jfDeduction > 0
"
>
<view
class="right flexbox opbtns"
style="
line-height: 44rpx;
letter-spacing: 1rpx;
display: flex;
align-items: center;
"
><text style="color: #9b9b9b"> </text>
<view
style="
line-height: 46rpx;
color: #9b9b9b;
font-size: 24rpx;
font-weight: 500;
margin-right: 10rpx;
"
>积分抵扣</view
>
<view
style="
/* margin-top: 8rpx; */
line-height: 46rpx;
color: #9b9b9b;
font-size: 26rpx;
font-weight: 700;
"
>
<text style="font-size: 20rpx">¥</text>
{{ slotProps.row.jfDeduction }}
</view> </view
><text style="color: #9b9b9b"></text>
</view>
</view>
<view
@@ -982,7 +976,7 @@ export default {
});
}
this.getOrderList();
},
}
);
} else if (payItem.paymentMethod == 1) {
console.log("微信支付");
@@ -1282,7 +1276,7 @@ export default {
//匹配最后一个表情符号并删除11。
this.Pform.comment = this.Pform.comment.replace(
/(\[[^\]]+\]|[\s\S])$/,
"",
""
);
if (this.emoji.length > 0) {
this.emoji = this.emoji.slice(0, -1);
@@ -1642,7 +1636,7 @@ export default {
.cateList {
width: 100%;
position: fixed !important;
z-index: 970;
z-index: 970;
}
/deep/.u-tabs__wrapper__nav__item {