diff --git a/common/http.api.js b/common/http.api.js index fab5570..c6963bd 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -121,6 +121,10 @@ const install = (Vue, vm) => { bindcarer({order_id,takeawayer_id}){ return vm.$u.post("/order/orderRider",{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}) + }, // 发货物流公司 pushcompany(){ return vm.$u.post("/order/getExpress") diff --git a/pages.json b/pages.json index 9986ce6..5aa458a 100644 --- a/pages.json +++ b/pages.json @@ -273,7 +273,13 @@ } } } - ], + ,{ + "path" : "pages/index/mention", + "style" : { + "navigationBarTitleText": "上传凭证" + } + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", diff --git a/pages/index/details.vue b/pages/index/details.vue index bc435fc..0cbde5e 100644 --- a/pages/index/details.vue +++ b/pages/index/details.vue @@ -49,6 +49,10 @@ 收货地址 {{ info.extend_order_common.reciver_info.address }} + + 派送方式 + {{ cur == 0 ? "快递" : cur == 1 ? "骑手" : "自提" }} + @@ -74,6 +78,7 @@ 快递 骑手 + 自提 {{cur == 0 ? '快递单号':'骑手信息'}} @@ -122,7 +127,7 @@ title="请选择公司" confirm-text="下一步" > - + 填写快递单号 确认 @@ -151,7 +156,7 @@ export default { data() { return { status: 1, // 订单状态 - cur: 2, + cur: null, showDelivery: false, // 填写骑手信息 showExpress: false, // 填写快递单号 showRefunds: false, // 平台退货处理 @@ -252,6 +257,10 @@ export default { this.cur = 1; this.show = true; }, + // 选择骑手 + pushstyleC() { + this.cur = 2; + }, // 获取物流公司列表 getcompanyinfo() { let that = this; @@ -357,8 +366,8 @@ export default { }, // 绑定配送方式 confirmpushstyle() { - console.log(this.cur); - if (this.cur != 0 && this.cur != 1) { + // console.log(this.cur); + if (this.cur < 0) { this.$refs.uToast.show({ title: '请选择派送方式!', type: 'warning ', @@ -373,7 +382,7 @@ export default { }) return; } - console.log(this.pushid); + // console.log(this.pushid); this.$u.api.bindpushid({ order_id: this.orderid, shipping_code: this.pushid, @@ -394,7 +403,7 @@ export default { }); } }); - } else { + } else if (this.cur == 1) { if (!this.selctcar) { this.$refs.uToast.show({ title: '请选择派送方式!', @@ -422,7 +431,11 @@ export default { }); } }); - } + } else { + uni.navigateTo({ + url: "mention?id=" + this.orderid + }) + } }, // 选择骑手 getselect(e) { @@ -598,10 +611,11 @@ export default { .methods { display: flex; flex-wrap: wrap; + justify-content: space-around; > view { font-size: 30rpx; color: rgba(0, 0, 51, 1); - width: 335rpx; + width: 30%; height: 80rpx; border: 1rpx solid rgba(236, 236, 236, 1); background: rgba(236, 236, 236, 1); @@ -609,9 +623,6 @@ export default { text-align: center; line-height: 80rpx; margin-bottom: 20rpx; - &:nth-child(2n-1) { - margin-right: 20rpx; - } } .active { border: 1rpx solid #ff780f; @@ -647,6 +658,7 @@ export default { color: rgba(51, 51, 51, 1); } .timelineid { + margin: 18rpx 0; min-height: 40rpx; font-size: 24rpx; font-weight: 400; diff --git a/pages/index/mention.vue b/pages/index/mention.vue new file mode 100644 index 0000000..1135909 --- /dev/null +++ b/pages/index/mention.vue @@ -0,0 +1,139 @@ +