feat: 添加视频播放器组件并更新相关依赖
refactor: 统一将"无货"改为"无库存"、"收货"改为"收件"等文案 fix: 更新edu-core依赖版本至v1.0.8 chore: 更新manifest版本号至1.0.55并移除GET_ACCOUNTS权限 style: 调整mine页面样式布局 docs: 更新页面标题和地址相关文案
This commit is contained in:
@@ -71,12 +71,12 @@
|
||||
<text
|
||||
class="orderState orderState1"
|
||||
v-if="orderContet.orderStatus == 1"
|
||||
>待发货</text
|
||||
>待发出</text
|
||||
>
|
||||
<text
|
||||
class="orderState orderState2"
|
||||
v-if="orderContet.orderStatus == 2"
|
||||
>待收货</text
|
||||
>待收到</text
|
||||
>
|
||||
<text
|
||||
class="orderState orderState3"
|
||||
@@ -432,7 +432,7 @@
|
||||
</view>
|
||||
|
||||
<!-- <view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5">
|
||||
<span style="color: #666;margin-right: 10rpx;float: left;">发货时间 : </span>
|
||||
<span style="color: #666;margin-right: 10rpx;float: left;">发出时间 : </span>
|
||||
<text style="font-size: 24rpx;color: #666;">{{orderContet.shippingTime}}</text>
|
||||
</view> -->
|
||||
<view class=""></view>
|
||||
@@ -586,7 +586,7 @@
|
||||
plain
|
||||
type="success"
|
||||
/></view>
|
||||
<view class="">发货时间:{{ item.createTime }}</view>
|
||||
<view class="">发出时间:{{ item.createTime }}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -691,7 +691,7 @@ export default {
|
||||
this.goPay(this.orderContet);
|
||||
} else if (data.text == "取消订单") {
|
||||
this.canceOrder();
|
||||
} else if (data.text == "确认收货") {
|
||||
} else if (data.text == "确认收到") {
|
||||
this.OverOrder();
|
||||
} else if (data.text == "查看物流") {
|
||||
this.seeExpressDetail(this.orderContet);
|
||||
@@ -988,10 +988,10 @@ export default {
|
||||
});
|
||||
},
|
||||
OverOrder() {
|
||||
// 确认收货
|
||||
// 确认收到
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
content: "确认收货?",
|
||||
content: "确认收到?",
|
||||
success: (res) => {
|
||||
let data = {
|
||||
orderId: this.orderID,
|
||||
@@ -1013,7 +1013,7 @@ export default {
|
||||
if (res.code == 0) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: "收货成功",
|
||||
title: "确认收到成功",
|
||||
icon: "success",
|
||||
duration: 1000,
|
||||
});
|
||||
@@ -1067,7 +1067,7 @@ export default {
|
||||
if (this.orderContet.orderStatus == 2) {
|
||||
this.customButton.push({
|
||||
width: "160rpx",
|
||||
text: "确认收货",
|
||||
text: "确认收到",
|
||||
|
||||
color: "#fff",
|
||||
});
|
||||
@@ -1099,9 +1099,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 = "已完成";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user