From 391fda5abc765586a65683a10fbc889f23cf0c87 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 11 Sep 2020 19:46:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=80=89?=
=?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/details.vue | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/pages/index/details.vue b/pages/index/details.vue
index 0286710..8680b07 100644
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -87,7 +87,7 @@
骑手
自提
-
+
{{cur == 0 ? '快递单号':'骑手信息'}}
{{ cur == 0 ? pushid ? companyidA.express_name + ": " + pushid : '' : selctcar ? selctcar.label : '' }}
@@ -269,6 +269,7 @@ export default {
takeawayer_info: {}, // 骑手信息
mineBy_img: "", // 自提图片
mineBy_text: "", // 自提备注
+ pushstyleBshow: false
};
},
onLoad(option) {
@@ -331,17 +332,25 @@ export default {
},
// 人工配送
pushstyleA() {
- this.cur = 0;
+
+ if(this.cur != 0){
+ return ;
+ }
this.showcompany = true;
},
// 选择骑手
pushstyleB() {
- this.cur = 1;
+ if(this.cur != 1){
+ return ;
+ }
this.show = true;
},
// 选择骑手
pushstyleC() {
- this.cur = 2;
+ if(this.cur != 2){
+ return ;
+ }
+ this.pushstyleBshow = true
},
// 获取物流公司列表
getcompanyinfo() {
@@ -782,7 +791,7 @@ export default {
justify-content: space-around;
> view {
font-size: 30rpx;
- color: rgba(0, 0, 51, 1);
+ color: #999;
width: 30%;
height: 80rpx;
border: 1rpx solid rgba(236, 236, 236, 1);
From 1f6d2b4ab37bf4bea0f101cbba7fb69cdea3d860 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 11 Sep 2020 20:03:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E6=B4=BE?=
=?UTF-8?q?=E9=80=81=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/details.vue | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/pages/index/details.vue b/pages/index/details.vue
index 4a0bfad..2ef919d 100644
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -84,12 +84,12 @@
-
+
派送方式
- 快递
- 骑手
- 自提
+ 快递
+ 骑手
+ 自提
{{cur == 0 ? '快递单号':'骑手信息'}}
@@ -347,24 +347,27 @@ export default {
},
// 人工配送
pushstyleA() {
-
- if(this.cur != 0){
+ console.log(this.cur)
+ if(this.cur != 0 && this.cur != -1){
return ;
}
+ this.cur = 0;
this.showcompany = true;
},
// 选择骑手
pushstyleB() {
- if(this.cur != 1){
+ if(this.cur != 1 && this.cur != -1){
return ;
}
+ this.cur = 1;
this.show = true;
},
// 自提
pushstyleC() {
- if(this.cur != 2){
+ if(this.cur != 2 && this.cur != -1){
return ;
}
+ this.cur = 2;
this.pushstyleBshow = true
},
// 获取物流公司列表
@@ -394,7 +397,8 @@ export default {
})
return
}
- this.showExpress = false;
+ this.showExpress = false;
+ this.pushstyleBshow = true
},
// 取消退款
cancel() {
@@ -562,13 +566,14 @@ export default {
// 选择骑手
getselect(e) {
this.selctcar = this.list[e[0].value];
+ this.pushstyleBshow = true
},
// 获取订单信息
resetinfo() {
this.$u.api.orderdetail({
order_id: this.orderid
}).then(res => {
- // console.log(res);
+ console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
From fb81800253c411c21a00aea7f32bdfb8753703f2 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 11 Sep 2020 20:23:34 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B6=89=E9=BB=84=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 | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/pages/release/tosign.vue b/pages/release/tosign.vue
index 1a79527..4ac1a72 100644
--- a/pages/release/tosign.vue
+++ b/pages/release/tosign.vue
@@ -28,7 +28,7 @@
直播封面图
-
+
{{relerest}}
@@ -112,9 +112,18 @@
tupian(a){
// console.log(JSON.parse(a.data));
let info = JSON.parse(a.data);
- console.log(info.data);
+ console.log(info);
// console.log(JSON.stringify(a.data))
+ if(info.errCode == 1){
+ this.$refs.uToast.show({
+ title: info.message,
+ type: 'error'
+ });
+ }
+ this.$refs.upload.clear()
+ return ;
this.image = info.data.file_name;
+
},
navto(url){
this.$u.route({