feat: 1.修改“货”字;2.优化视频播放;3.优化小班心得和思考题状态显示
更新多个文件中的"收货地址"相关文案为"收件地址",包括页面标题、按钮文字、状态提示等 更新隐私政策文件中"健康超市收货"为"健康超市收件" 更新订单状态相关文案:"待发货"改为"待发出","待收货"改为"待收到","确认收货"改为"确认收到" 更新商品库存状态提示:"无货"改为"无库存" 更新manifest.json版本号为2.0.42 更新edu-core依赖版本为v1.0.8 新增yingbing-video视频播放器组件
This commit is contained in:
@@ -89,12 +89,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"
|
||||
@@ -423,7 +423,7 @@
|
||||
<view
|
||||
class="orderstatusbtn"
|
||||
v-if="slotProps.row.orderStatus == 1"
|
||||
>催发货</view
|
||||
>催发出</view
|
||||
>
|
||||
<view
|
||||
class="orderstatusbtn"
|
||||
@@ -435,7 +435,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: {},
|
||||
},
|
||||
@@ -838,8 +838,8 @@ export default {
|
||||
.then((res) => {
|
||||
// 订单状态
|
||||
// * 0: 待付款
|
||||
// * 1: 待发货
|
||||
// * 2: 已发货
|
||||
// * 1: 待发出
|
||||
// * 2: 待收到
|
||||
// * 3:已完成
|
||||
// * 4: 交易失败
|
||||
// * 5: 已过期
|
||||
@@ -872,7 +872,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,
|
||||
@@ -1062,11 +1062,11 @@ export default {
|
||||
});
|
||||
// }
|
||||
},
|
||||
// 确认收货
|
||||
// 确认收到
|
||||
OverOrder(item) {
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
content: "确认收货?",
|
||||
content: "确认收到?",
|
||||
success: (res) => {
|
||||
let data = {
|
||||
orderId: item.orderId,
|
||||
@@ -1088,7 +1088,7 @@ export default {
|
||||
if (res.code == 0) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: "收货成功",
|
||||
title: "确认收到成功",
|
||||
icon: "success",
|
||||
duration: 1000,
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user