zm/sociology_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tijiao

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/bookShop/deliverDetail.vue
View File

@@ -17,7 +17,7 @@
/></view>
</view>
<view v-if="deliverDetails.length > 0">
<!-- <u-tabs active-color="#2979ff" inactive-color="#606266" bar-height="6" bar-width="40"
<!-- <u-tabs active-color="#117e4c" inactive-color="#606266" bar-height="6" bar-width="40"
name="name" :list="deliverList" :is-scroll="false" :current="current" @change="tabchange"></u-tabs> -->
<view class="deliverCntent">
<view class="">

113
pages/bookShop/orderLCont.vue
View File

@@ -174,6 +174,23 @@
<br clear="both" />
</view>
<view class="orderContent" v-if="orderContet.orderType == 'relearn'">
<image
src="/static/icon/fugou.png"
mode="aspectFill"
style="width: 100rpx; height: 100rpx"
></image>
<view class="itemJian">
<view class="orderTitle" style="line-height: 60rpx">
<text>{{ orderContet.remark }}</text>
</view>
<view class="orderPrice">
<text style="font-weight: bold">&nbsp;</text>
</view>
<br clear="both" />
</view>
<br clear="both" />
</view>
<view class="orderContent" v-if="orderContet.orderType == 'vip'">
<image
src="/static/icon/vip.png"
@@ -213,6 +230,7 @@
</view>
<view class="order_item" style="">
<view class="orderallpri">
<span style="color: #666; margin-right: 10rpx; float: left"
>商品总价 :
@@ -259,12 +277,88 @@
>- ￥{{ orderContet.vipDiscountAmount }}</span
>
</view>
<view class="orderReal" v-if="orderContet.orderType == 'order'">
<view
class="orderReal"
v-if="orderContet.couponId && orderContet.couponId != null"
>
<span style="color: #666; margin-right: 10rpx; float: left"
>优惠券 :
</span>
<span>- ￥</span>{{ orderContet.couponAmount }}
</view>
<view class="orderReal" v-if="orderContet.jfDeduction > 0">
<span style="color: #666; margin-right: 10rpx; float: left"
>积分 :
</span>
<span v-if="orderContet.jfDeduction > 0">-</span> <span>￥</span
>{{ orderContet.jfDeduction }}
<span style="color: #fa2d12" v-if="orderContet.jfDeduction > 0"
>-</span
>
<span style="color: #fa2d12"
>￥ {{ orderContet.jfDeduction }}</span
>
</view>
<view
class="orderReal"
v-if="orderContet.paymentMethod == 4 && orderContet.realMoney > 0"
>
<span style="color: #666; margin-right: 10rpx; float: left"
>天医币抵扣:
</span>
<span style="color: #fa2d12">-&nbsp;&nbsp;</span>
<span style="color: #fa2d12">￥{{ orderContet.realMoney }}</span>
</view>
<view
class="orderReal"
v-if="orderContet.orderStatus != 0"
style="margin-bottom: 20rpx"
>
<span style="color: #666; margin-right: 10rpx; float: left"
>实付款 :
</span>
<b v-if="orderContet.orderType == 'point'" style="color: #dd3c0c"
>￥ {{ orderContet.bookBuyConfigEntity.realMoney }}</b
>
<b style="color: #dd3c0c" v-else>
<template v-if="orderContet.realMoney > 0">
￥{{ orderContet.realMoney }}
<text style="font-size: 28rpx;margin-left: 10rpx;">
<span
style=""
v-if="orderContet.paymentMethod == 1"
>微信支付</span
>
<span
style=""
v-if="orderContet.paymentMethod == 2"
>支付宝支付</span
>
<span
style=""
v-if="orderContet.paymentMethod == 3"
>苹果支付</span
>
<span
style=""
v-if="orderContet.paymentMethod == 4"
>
天医币支付
</span></text
>
</template>
<text
style="margin: 0 4rpx"
v-if="
orderContet.realMoney > 0 && orderContet.jfDeduction > 0
"
>
+
</text>
<text v-if="orderContet.jfDeduction > 0"
>{{ orderContet.jfDeduction }} 积分</text
></b
>
</view>
<!-- <view class="orderReal">
<span style="color: #666; margin-right: 10rpx; float: left"
@@ -275,14 +369,7 @@
>
<b v-else style="color: #dd3c0c"><span>-￥</span>0</b>
</view> -->
<view class="orderReal" v-if="orderContet.orderStatus != 0">
<span style="color: #666; margin-right: 10rpx; float: left"
>实付款 :
</span>
<b style="color: #dd3c0c"
><span>￥</span>{{ orderContet.realMoney }}</b
>
</view>
</view>
<view class="order_item">
<view class="orderYunf">
@@ -327,9 +414,11 @@
>付款时间 :
</span>
<text style="font-size: 24rpx; color: #666">{{
orderContet.paymentDate
orderContet.paymentDate? orderContet.paymentDate:''
}}</text>
</view>
<br/>
</view>
<!-- <view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5">

130
pages/bookShop/orderList.vue
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 {