feat: 添加视频播放器组件并更新相关依赖

refactor: 统一将"无货"改为"无库存"、"收货"改为"收件"等文案

fix: 更新edu-core依赖版本至v1.0.8

chore: 更新manifest版本号至1.0.55并移除GET_ACCOUNTS权限

style: 调整mine页面样式布局

docs: 更新页面标题和地址相关文案
This commit is contained in:
2026-03-03 15:57:18 +08:00
parent 91decda774
commit 7317550374
42 changed files with 11626 additions and 77 deletions

View File

@@ -98,12 +98,12 @@
<text
class="orderstatus"
v-show="slotProps.row.orderStatus == 1"
>待发</text
>待发</text
>
<text
class="orderstatus"
v-show="slotProps.row.orderStatus == 2"
>已发货</text
>待收到</text
>
<text
class="orderstatus"
@@ -405,7 +405,7 @@
<view
class="orderstatusbtn"
v-if="slotProps.row.orderStatus == 1"
>催发</view
>催发</view
>
<view
class="orderstatusbtn"
@@ -417,7 +417,7 @@
class="orderstatusbtn"
v-if="slotProps.row.orderStatus == 2"
@click.native.stop="OverOrder(slotProps.row)"
>确认收</view
>确认收</view
>
<view
class="orderstatusbtn"
@@ -657,12 +657,12 @@ export default {
badge: {},
},
{
name: "待发",
name: "待发",
value: 1,
badge: {},
},
{
name: "待收",
name: "待收",
value: 2,
badge: {},
},
@@ -877,8 +877,8 @@ export default {
.then((res) => {
// 订单状态
// * 0: 待付款
// * 1: 待发
// * 2: 已发货
// * 1: 待发
// * 2: 待收到
// * 3已完成
// * 4: 交易失败
// * 5: 已过期
@@ -909,7 +909,7 @@ export default {
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,
// limit: 10,
// page: this.newestpage,
@@ -1021,16 +1021,6 @@ export default {
} else if (payItem.paymentMethod == 3) {
// 苹果充值
console.log("苹果二次支付");
if (this.isAndorid) {
uni.showModal({
title: "提示",
showCancel: false,
content:
"很抱歉,当前订单属于苹果系统内购订单,安卓系统无法完成支付操作,您可切换到苹果系统进行支付,也可以取消该订单,并重新下单",
});
} else {
this.iphonepay(payItem);
}
}
},
// 取消订单
@@ -1115,11 +1105,11 @@ export default {
});
// }
},
// 确认收
// 确认收
OverOrder(item) {
uni.showModal({
title: "提示",
content: "确认收",
content: "确认收到吗",
success: (res) => {
let data = {
orderId: item.orderId,
@@ -1141,7 +1131,7 @@ export default {
if (res.code == 0) {
uni.hideLoading();
uni.showToast({
title: "收货成功",
title: "确认收到成功",
icon: "success",
duration: 1000,
});