feat: 新增心理论坛功能并优化订单相关文案;更新音视频播放组件版本;
- 新增心理论坛页面及文章详情页 - 更新订单状态文案:"待发货"改为"待发出","待收货"改为"待收到" - 统一修改"收货地址"相关文案为"收件地址" - 添加安卓应用包下载地址配置 - 更新依赖edu-core至v1.0.6版本 - 优化首页课程列表布局和样式 - 新增分享功能到我的页面
This commit is contained in:
@@ -77,9 +77,9 @@ export default {
|
||||
if (this.orderContet.orderStatus == 0) {
|
||||
this.titleStat = '待支付'
|
||||
} else if (this.orderContet.orderStatus == 1) {
|
||||
this.titleStat = '待发货'
|
||||
this.titleStat = '待发出'
|
||||
} else if (this.orderContet.orderStatus == 2) {
|
||||
this.titleStat = '待收货'
|
||||
this.titleStat = '待收到'
|
||||
} else if (this.orderContet.orderStatus == 3) {
|
||||
this.titleStat = '已完成'
|
||||
}
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
<view class="source_app"></view>
|
||||
<view style="text-align: left">
|
||||
<text class="orderstatus" v-show="slotProps.row.orderStatus == 0">未付款</text>
|
||||
<text class="orderstatus" v-show="slotProps.row.orderStatus == 1">待发货</text>
|
||||
<text class="orderstatus" v-show="slotProps.row.orderStatus == 2">已发货</text>
|
||||
<text class="orderstatus" v-show="slotProps.row.orderStatus == 1">待发出</text>
|
||||
<text class="orderstatus" v-show="slotProps.row.orderStatus == 2">已发出</text>
|
||||
<text class="orderstatus" v-show="slotProps.row.orderStatus == 3">交易成功</text>
|
||||
<text class="orderstatus" v-show="slotProps.row.orderStatus == 4">交易失败</text>
|
||||
<text class="orderstatus" v-show="slotProps.row.orderStatus == 5">已过期</text>
|
||||
@@ -259,11 +259,11 @@
|
||||
<view class="orderstatusbtn orderstatusbtn_success"
|
||||
v-if="slotProps.row.orderStatus == 0"
|
||||
@click.stop="goPay(slotProps.row)">继续付款</view>
|
||||
<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 1">催发货</view>
|
||||
<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 1">催发出</view>
|
||||
<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 2"
|
||||
@click.stop="seeExpressDetail(slotProps.row)">查看物流</view>
|
||||
<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 2"
|
||||
@click.stop="OverOrder(slotProps.row)">确认收货</view>
|
||||
@click.stop="OverOrder(slotProps.row)">确认收到</view>
|
||||
<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 3">申请售后</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -333,12 +333,12 @@
|
||||
badge: {},
|
||||
},
|
||||
{
|
||||
name: "待发货",
|
||||
name: "待发出",
|
||||
value: 1,
|
||||
badge: {},
|
||||
},
|
||||
{
|
||||
name: "待收货",
|
||||
name: "待收到",
|
||||
value: 2,
|
||||
badge: {},
|
||||
},
|
||||
@@ -456,8 +456,8 @@
|
||||
.then((res) => {
|
||||
//订单状态
|
||||
// * 0: 待付款
|
||||
// * 1: 待发货
|
||||
// * 2: 已发货
|
||||
// * 1: 待发出
|
||||
// * 2: 待收到
|
||||
// * 3:已完成
|
||||
// * 4: 交易失败
|
||||
// * 5: 已过期
|
||||
@@ -489,7 +489,7 @@
|
||||
var params = {
|
||||
userId: this.userInfo.id,
|
||||
come: this.come,
|
||||
orderStatus: flag == -1 ? "" : flag, //传null为全部,订单状态 0-未付款 1-待发货 2-已发货 3-交易成功 4-交易失败 5-过期
|
||||
orderStatus: flag == -1 ? "" : flag, //传null为全部,订单状态 0-未付款 1-待发出 2-待收到 3-交易成功 4-交易失败 5-过期
|
||||
...this.pagination
|
||||
}
|
||||
this.$http.request({
|
||||
@@ -635,11 +635,11 @@
|
||||
item.expressList[0].expressOrderSn,
|
||||
});
|
||||
},
|
||||
// 确认收货
|
||||
// 确认收到商品
|
||||
OverOrder(item) {
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
content: "确认收货?",
|
||||
content: "确认收到商品?",
|
||||
success: (res) => {
|
||||
let data = {
|
||||
orderId: item.orderId,
|
||||
@@ -659,7 +659,7 @@
|
||||
if (res.code == 0) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: "收货成功",
|
||||
title: "签收成功",
|
||||
icon: "success",
|
||||
duration: 1000,
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user