From b2d7ae4ec5fcc348eb662bdada6b09c603b77c03 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Thu, 10 Sep 2020 09:27:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/release/zhibo.nvue | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/release/zhibo.nvue b/pages/release/zhibo.nvue index d52148f..9c8a3c5 100644 --- a/pages/release/zhibo.nvue +++ b/pages/release/zhibo.nvue @@ -157,6 +157,7 @@ top: 0; left: 0; width: 750rpx; + z-index: 900; align-items: center; justify-content: center; } From d0107c5729080c7901373e84e00bf6fbfb203cd6 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Thu, 10 Sep 2020 10:05:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http.api.js | 12 +- pages/index/details.vue | 243 +++++++++++++++++++++++++++------------ pages/index/mention.vue | 1 + pages/release/index.vue | 19 ++- pages/release/zhibo.nvue | 17 ++- pages/user/info.vue | 10 +- 6 files changed, 213 insertions(+), 89 deletions(-) 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 9f1dc4a..0286710 100644 --- a/pages/index/details.vue +++ b/pages/index/details.vue @@ -51,7 +51,7 @@ 派送方式 - {{ cur == 0 ? "快递" : cur == 1 ? "骑手" : "自提" }} + {{ users_type == 0 ? "-" : users_type == 1 ? "快递" : users_type == 2 ? "骑手" : "自提" }} 开具发票 @@ -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 }} + + @@ -163,31 +193,31 @@ 发票抬头： - {{ invoiceList.invoice_title }} + {{ invoiceList.invoice_title }} - + 税号： {{ invoiceList.invoice_code }} - + 单位地址： - {{ invoiceList.invoice_goto_addr }} + {{ invoiceList.invoice_goto_addr }} 电话号码： - {{ invoiceList.invoice_reg_mobphone }} + {{ invoiceList.invoice_rec_mobphone }} - + 开户银行： - {{ invoiceList.invoice_reg_bname }} + {{ invoiceList.invoice_reg_bname }} - + 银行账户： {{ invoiceList.invoice_reg_baccount }} - - 省份证号： - 111 + + 身份证号： + {{ invoiceList.invoice_code }} @@ -200,7 +230,7 @@ export default { return { status: 1, // 订单状态 cur: null, - show_invoice: false, // 发票 + show_invoice: false, // 发票 showDelivery: false, // 填写骑手信息 showExpress: false, // 填写快递单号 showRefunds: false, // 平台退货处理 @@ -231,14 +261,19 @@ export default { companyidB: null, //骑手派送公司id value:"", refundid:null, - is_invoice: 0, // 判断发票 - invoice_type: null, - invoiceList: {}, // 发票数据 + is_invoice: 0, // 判断发票 + invoice_type: null, + invoiceList: {}, // 发票数据 + users_type: "", // 用户选择发货type + ordered_type: 0, // 发货方式的状态 + takeawayer_info: {}, // 骑手信息 + mineBy_img: "", // 自提图片 + mineBy_text: "", // 自提备注 }; }, onLoad(option) { this.type = option.type; - console.log(this.type) + // console.log(this.type) this.orderid = option.id; this.resetinfo(); if (this.type == 1) { @@ -247,7 +282,7 @@ export default { } if (this.type == 2) { // 获取物流信息 - this.getcarinfo(); + // this.getcarinfo(); } // 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货 }, @@ -319,13 +354,13 @@ export default { }); }, // 查询物流 - getcarinfo() { - this.$u.api.getcarinfo({ - order_id: this.orderid - }).then(res => { - console.log(res); - }) - }, + // getcarinfo() { + // this.$u.api.getcarinfo({ + // order_id: this.orderid + // }).then(res => { + // console.log(res); + // }) + // }, // 保存订单号 saveDelivery() { if (!this.pushid) { @@ -369,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 }); @@ -421,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 @@ -459,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 => { @@ -487,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]; @@ -515,11 +552,18 @@ export default { }); } else { this.info = res.data; - this.cur = res.data.is_selfraising; - 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 => { @@ -538,7 +582,15 @@ export default { this.list = arr; } }); - } + }, + // 预览图片 + viewImage() { + console.log(this.mineBy_img); + uni.previewImage({ + urls: this.mineBy_img, + current: 1 + }) + } } }; @@ -625,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/index.vue b/pages/release/index.vue index aed2123..12906de 100644 --- a/pages/release/index.vue +++ b/pages/release/index.vue @@ -137,7 +137,8 @@ export default { selectarr: [], //选中标签 tagcontent: '', is_edit: false, // 编辑 - userinfo:{} + userinfo:{}, + device: null, // 手机信息 }; }, onLoad() { @@ -146,6 +147,9 @@ export default { this.tosign(); this.getLiveSpec(); + + this.device = uni.getSystemInfoSync(); // 获取信息 + console.log(this.device); }, methods: { publish() { @@ -277,7 +281,18 @@ export default { }, // 上传封面 uploadcover(data) { - console.log(data); + // console.log(data.data); + // #ifdef APP-PLUS + plus.io.getImageInfo({ + src: data.data.file_path, + success: (res) => { + console.log(res); + }, + fail: (err) => { + console.log(err); + } + }) + // #endif if (data.errCode != 0) { this.$refs.uToast.show({ title: '上传失败', diff --git a/pages/release/zhibo.nvue b/pages/release/zhibo.nvue index d52148f..0bde1ec 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,17 +147,19 @@ .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; width: 750rpx; + z-index: 900; align-items: center; justify-content: center; } @@ -175,7 +178,7 @@ bottom: 24rpx; } .closeimg{ - position: fixed; + position: absolute; top: 70rpx; right: 31rpx; width: 51rpx; @@ -623,7 +626,11 @@ duration: 2000 }); }, + closes1() { + console.log(111); + }, closes(){ + console.log(this.zhibo) if(!this.zhibo){ uni.navigateBack({ delta:1 diff --git a/pages/user/info.vue b/pages/user/info.vue index 6657421..731624e 100644 --- a/pages/user/info.vue +++ b/pages/user/info.vue @@ -12,7 +12,7 @@ 个性签名 - + 修改密码 @@ -27,11 +27,15 @@ export default { fileurl: "", filename:"", info:{}, - num:0 + num:0, + role: 0, }; }, onLoad() { - this.getmyinfo() + this.getmyinfo(); + let userinfo = uni.getStorageSync("userinfo"); + this.role = userinfo.role; + // console.log(this.role); }, onNavigationBarButtonTap() { let that = this; From d86dc49da2d98dc7a8bfa614dc12ef25cdcd34e2 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Thu, 10 Sep 2020 11:37:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/release/tosign.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/release/tosign.vue b/pages/release/tosign.vue index 88ab8e9..1a79527 100644 --- a/pages/release/tosign.vue +++ b/pages/release/tosign.vue @@ -13,7 +13,7 @@ - + {{this.titleMaxLength - this.max.length}}/20 From c236af59869bc3d2418d79e737d593cb1bd78da8 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Thu, 10 Sep 2020 11:38:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/release/zhibo.nvue | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/release/zhibo.nvue b/pages/release/zhibo.nvue index 0bde1ec..638cb6d 100644 --- a/pages/release/zhibo.nvue +++ b/pages/release/zhibo.nvue @@ -159,7 +159,6 @@ top: 0; left: 0; width: 750rpx; - z-index: 900; align-items: center; justify-content: center; }