diff --git a/pages/index/details.vue b/pages/index/details.vue index 95361f9..5a0ef9b 100644 --- a/pages/index/details.vue +++ b/pages/index/details.vue @@ -75,6 +75,10 @@ 快递 骑手 + + {{cur == 0 ? '快递单号':'骑手信息'}} + {{ cur == 0 ? pushid ? companyidA.express_name + ": " + pushid : '' : selctcar ? selctcar.label : '' }} + 确认 @@ -147,7 +151,7 @@ export default { data() { return { status: 1, // 订单状态 - cur: Number, + cur: 2, showDelivery: false, // 填写骑手信息 showExpress: false, // 填写快递单号 showRefunds: false, // 平台退货处理 @@ -337,7 +341,7 @@ export default { // 选择快递公司 getselectcompany(e) { let obj = this.companylist[e[0]]; - this.companyidA = obj.express_id; + this.companyidA = obj; this.showExpress = true; }, // 绑定配送方式 @@ -362,7 +366,7 @@ export default { this.$u.api.bindpushid({ order_id: this.orderid, shipping_code: this.pushid, - shipping_express_id: this.companyidA + shipping_express_id: this.companyidA.express_id }).then(res => { if (res.errCode != 0) { this.$refs.uToast.show({ diff --git a/pages/index/index.vue b/pages/index/index.vue index 454d64b..11b974c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -153,7 +153,7 @@ export default { }, onShow() { this.publishstate = false; - this.getallorder(1); + this.tabsChange(this.current); }, onReachBottom() { this.num++; diff --git a/pages/release/zhibo.nvue b/pages/release/zhibo.nvue index 3fd7424..52c0660 100644 --- a/pages/release/zhibo.nvue +++ b/pages/release/zhibo.nvue @@ -41,7 +41,7 @@
{{info.member_nickname}} - {{time}} | {{room.onlineUsers.users.length}} + {{time}} | {{room.onlineUsers.users.length - 1 < 0 ? 0 : room.onlineUsers.users.length - 1}}