diff --git a/common/http.api.js b/common/http.api.js index 07fc4a2..79a9ca2 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -113,16 +113,16 @@ const install = (Vue, vm) => { return vm.$u.post("/order/goodsTryOrderInfo",{goods_try_id}) }, // 绑定物流订单 - bindpushid({order_id,shipping_code,shipping_express_id}){ - return vm.$u.post("/order/send",{order_id,shipping_code,shipping_express_id}) + bindpushid({store_deliver_type,order_id,shipping_code,shipping_express_id}){ + return vm.$u.post("/order/send",{store_deliver_type,order_id,shipping_code,shipping_express_id}) }, // 绑定骑手 - bindcarer({order_id,takeawayer_id}){ - return vm.$u.post("/order/orderRider",{order_id,takeawayer_id}) + bindcarer({store_deliver_type,order_id,takeawayer_id}){ + return vm.$u.post("/order/send",{store_deliver_type,order_id,takeawayer_id}) }, // 自提 - bindmention({shipping_express_id,deliver_explain,order_id,sendimg}) { - return vm.$u.post("/order/send",{shipping_express_id,deliver_explain,order_id,sendimg}) + bindmention({store_deliver_type,shipping_express_id,deliver_explain,order_id,sendimg}) { + return vm.$u.post("/order/send",{store_deliver_type,shipping_express_id,deliver_explain,order_id,sendimg}) }, // 发货物流公司 pushcompany(){ diff --git a/pages/index/details.vue b/pages/index/details.vue index a0162bd..0286710 100644 --- a/pages/index/details.vue +++ b/pages/index/details.vue @@ -95,12 +95,42 @@ - 物流信息 - 订单单号:   {{ info.order_sn }} - - {{list.content}} - {{list.kd_time}} - + + 物流信息 + 订单单号:   {{ info.order_sn }} + + {{list.content}} + {{list.kd_time}} + + + + 骑手信息 + + + + {{ takeawayer_info.takeawayer_name }} + + + + {{ takeawayer_info.takeawayer_mobile }} + + + + {{ takeawayer_info.company_name }} + + + + + 自提信息 + + 凭证图片 + + + + 备注: + {{ mineBy_text }} + + @@ -200,7 +230,7 @@ export default { return { status: 1, // 订单状态 cur: null, - show_invoice: false, // 发票 + show_invoice: false, // 发票 showDelivery: false, // 填写骑手信息 showExpress: false, // 填写快递单号 showRefunds: false, // 平台退货处理 @@ -231,10 +261,14 @@ export default { companyidB: null, //骑手派送公司id value:"", refundid:null, - is_invoice: 0, // 判断发票 - invoice_type: null, - invoiceList: {}, // 发票数据 - users_type: "", // 用户选择发货type + is_invoice: 0, // 判断发票 + invoice_type: null, + invoiceList: {}, // 发票数据 + users_type: "", // 用户选择发货type + ordered_type: 0, // 发货方式的状态 + takeawayer_info: {}, // 骑手信息 + mineBy_img: "", // 自提图片 + mineBy_text: "", // 自提备注 }; }, onLoad(option) { @@ -248,7 +282,7 @@ export default { } if (this.type == 2) { // 获取物流信息 - this.getcarinfo(); + // this.getcarinfo(); } // 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货 }, @@ -370,10 +404,10 @@ export default { title: res.message, type: 'success' }); - let pages = getCurrentPages(); - let prePage = pages[pages.length - 2]; - console.log(prePage.$vm); - prePage.$vm.del_id = this.orderid; + let pages = getCurrentPages(); + let prePage = pages[pages.length - 2]; + console.log(prePage.$vm); + prePage.$vm.del_id = this.orderid; uni.navigateBack({ delta: 1 }); @@ -422,24 +456,25 @@ export default { }, // 绑定配送方式 confirmpushstyle() { - // console.log(this.cur); - if (this.cur < 0) { - this.$refs.uToast.show({ - title: '请选择派送方式！', - type: 'warning ', - }) - return; - } + // console.log(this.cur); + if (this.cur < 0) { + this.$refs.uToast.show({ + title: '请选择派送方式！', + type: 'warning ', + }) + return; + } if (this.cur == 0) { - if (!this.companyidA) { - this.$refs.uToast.show({ - title: '请选择派送方式！', - type: 'warning ', - }) - return; - } + if (!this.companyidA) { + this.$refs.uToast.show({ + title: '请选择派送方式！', + type: 'warning ', + }) + return; + } // console.log(this.pushid); this.$u.api.bindpushid({ + store_deliver_type: 1, order_id: this.orderid, shipping_code: this.pushid, shipping_express_id: this.companyidA.express_id @@ -460,14 +495,15 @@ export default { } }); } else if (this.cur == 1) { - if (!this.selctcar) { - this.$refs.uToast.show({ - title: '请选择派送方式！', - type: 'warning ', - }) - return; - } + if (!this.selctcar) { + this.$refs.uToast.show({ + title: '请选择派送方式！', + type: 'warning ', + }) + return; + } this.$u.api.bindcarer({ + store_deliver_type: 2, order_id: this.orderid, takeawayer_id: this.selctcar.takeawayer_id }).then(res => { @@ -488,17 +524,17 @@ export default { } }); } else { - uni.navigateTo({ - url: "mention?id=" + this.orderid - }) - } + uni.navigateTo({ + url: "mention?id=" + this.orderid + }) + } + }, + // 显示发票 + showInvoice() { + if (this.is_invoice) { + this.show_invoice = true; + } }, - // 显示发票 - showInvoice() { - if (this.is_invoice) { - this.show_invoice = true; - } - }, // 选择骑手 getselect(e) { this.selctcar = this.list[e[0].value]; @@ -516,13 +552,18 @@ export default { }); } else { this.info = res.data; - this.cur = res.data.member_deliver_type; - // console.log(res.data.member_deliver_type); - this.users_type = res.data.member_deliver_type; - this.invoiceList = res.data.extend_order_common.invoice_info; - this.is_invoice = this.invoiceList.invoice_id || false; - this.invoice_type = this.invoiceList.invoice_type; - // console.log(this.invoiceList,this.is_invoice,this.invoice_type); + this.cur = res.data.member_deliver_type - 1; + this.users_type = res.data.member_deliver_type; // 用户选择发货方式 + this.invoiceList = res.data.extend_order_common.invoice_info; + this.is_invoice = this.invoiceList.invoice_id || false; + this.invoice_type = this.invoiceList.invoice_type; + this.ordered_type = res.data.store_deliver_type; // 发货方式 + // 骑手 + this.takeawayer_info = res.data.takeawayer || {}; // 骑手信息 + // 自提 + this.mineBy_img = res.data.extend_order_common.sendimg; // 自提图片 + this.mineBy_text = res.data.extend_order_common.deliver_explain; // 自提备注 + // console.log(this.invoiceList,this.is_invoice,this.invoice_type); } }); this.$u.api.takeawayerlist({}).then(res => { @@ -541,7 +582,15 @@ export default { this.list = arr; } }); - } + }, + // 预览图片 + viewImage() { + console.log(this.mineBy_img); + uni.previewImage({ + urls: this.mineBy_img, + current: 1 + }) + } } }; @@ -628,6 +677,51 @@ export default { } } } + .refunds-user-two { + padding: 25rpx 0; + background-color: #ffffff; + margin-bottom: 20rpx; + > view { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 30rpx; + @mixin image-class($width, $right) { + > image { + flex-shrink: 0; + width: $width; + height: 40rpx; + margin-right: $right; + } + } + &:first-child { + @include image-class($width: 40rpx, $right: 20rpx); + } + &:nth-child(2) { + margin-left: 4rpx; + @include image-class($width: 32rpx, $right: 24rpx); + } + &:last-child { + margin-left: 2rpx; + @include image-class($width: 36rpx, $right: 22rpx); + } + > view { + flex: 1; + font-size: 26rpx; + color: rgba(51, 51, 51, 1); + } + } + } + .ziti-title { + margin: 20rpx 0 10rpx; + font-size: 28rpx; + color: #333; + } + .certificate-img { + width: 320rpx; + height: 240rpx; + border-radius: 4rpx; + } .user-info { .info-title { font-size: 30rpx; diff --git a/pages/index/mention.vue b/pages/index/mention.vue index ae05e8f..d74b97a 100644 --- a/pages/index/mention.vue +++ b/pages/index/mention.vue @@ -69,6 +69,7 @@ } // 提交 this.$u.api.bindmention({ + store_deliver_type: 3, shipping_express_id: "e1000", deliver_explain: this.textareaVal, order_id: this.order_id, diff --git a/pages/release/zhibo.nvue b/pages/release/zhibo.nvue index d52148f..638cb6d 100644 --- a/pages/release/zhibo.nvue +++ b/pages/release/zhibo.nvue @@ -73,10 +73,10 @@
-
+
徳铭阳光在线 - + {{info.member_nickname}}
@@ -138,6 +138,7 @@ .jieshutitle{ font-size: 30rpx; color:#fff; + width: 350rpx; position: fixed; top: 70rpx; left: 31rpx; @@ -146,13 +147,14 @@ .jieshuback{ background-color: #000; opacity: 0.8; - position: absolute; + position: fixed; left: 0; top: 0; width: 750rpx; - + z-index: 901; } .jieshu{ + z-index: 9999; position: fixed; top: 0; left: 0; @@ -175,7 +177,7 @@ bottom: 24rpx; } .closeimg{ - position: fixed; + position: absolute; top: 70rpx; right: 31rpx; width: 51rpx; @@ -623,7 +625,11 @@ duration: 2000 }); }, + closes1() { + console.log(111); + }, closes(){ + console.log(this.zhibo) if(!this.zhibo){ uni.navigateBack({ delta:1