From 0a236745176d64ea6f32b769f783747ff722bd64 Mon Sep 17 00:00:00 2001 From: jinna Date: Fri, 25 Aug 2023 17:37:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=B5=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/pages_zhentou/form/form.vue | 3 +- pages/pages_zhentou/order/express.vue | 254 ++++++++++++-------------- 2 files changed, 117 insertions(+), 140 deletions(-) diff --git a/pages/pages_zhentou/form/form.vue b/pages/pages_zhentou/form/form.vue index 3a7f563..b1f7393 100644 --- a/pages/pages_zhentou/form/form.vue +++ b/pages/pages_zhentou/form/form.vue @@ -815,7 +815,8 @@ cervicalVertebra: this.valiFormData.cervicalVertebra, otherNeed: this.valiFormData.otherNeed, orderNo: this.orderNo, - id: this.valiFormData.id ? this.valiFormData.id : '' + id: this.valiFormData.id ? this.valiFormData.id : '', + purchaseChannel:4 } // console.log(getApp().globalData.baseUrl) diff --git a/pages/pages_zhentou/order/express.vue b/pages/pages_zhentou/order/express.vue index d379da5..8c899cd 100644 --- a/pages/pages_zhentou/order/express.vue +++ b/pages/pages_zhentou/order/express.vue @@ -11,16 +11,46 @@ - - - - - - - {{item.status}} - {{item.context}} - - {{item.time}} + + + + + + + + + + + + + + + 已揽收 + + + 已下单 + + + 待揽收 + + + 运输中 + + + 派件中 + + + 已投递菜鸟驿站/快递柜 + + + 已签收 + + + {{item.context}} + + + {{item.time}} + @@ -130,7 +160,7 @@ .process_more { height: 100%; overflow-y: hidden; - + .com_box { width: 690rpx; height: 90rpx; @@ -140,21 +170,21 @@ border-radius: 30rpx 30rpx 30rpx 30rpx; display: flex; align-items: center; - + .com_txt { margin-left: 38rpx; margin-right: 20rpx; font-size: 26rpx; color: #333; } - + .com_num { font-size: 26rpx; color: #333; } } - - .pro_box { + + .pro_box{ width: 690rpx; height: 75%; overflow-y: auto; @@ -164,139 +194,85 @@ margin: 0 auto; margin-top: 30rpx; padding: 30rpx 0; - - .process_text { - position: relative; - - .process_left { - position: absolute; - top: 200rpx; - left: 40rpx; - - image { - width: 44rpx; - height: 44rpx; + + .set-2{ + width: 100%; + + &:last-child{ + .wuliu_box{ + .right_box{ + border-left: none; + } } } - } - - .set-2:last-child::after { - display: none; - } - - .set-2 { - border-radius: 10rpx; - width: 600rpx; - margin-left: 100rpx; - margin-top: 60rpx; - position: relative; - - .set-view { - width: 493rpx; - - .set-view-test { - margin: 0 auto; - // padding-top: 20rpx; - padding-bottom: 20rpx; - - .set-view-test2 { - width: 100%; - height: 26rpx; - font-family: Gibson; - font-size: 20rpx; - color: #999; + + .wuliu_box{ + width: 100%; + // position: relative; + // height: 200rpx; + // background: red; + margin: 0 auto; + display: flex; + // border-left: 2rpx solid #E8E8E8; + + .left_box{ + width: 60rpx; + height: 100%; + display: flex; + flex-direction: column; + padding-left: 20rpx; + justify-content: center; + align-items: center; + + .line_box{ + width: 2rpx; + height: 100%; + background: #E8E8E8; + // position: relative; } - } - - .set-view-test3 { - margin: 0 auto; - font-size: 26rpx; - color: #666; - - &.active { - color: #333; + + image{ + width: 56rpx; + height: 56rpx; + margin-left: 40rpx; + position: relative; + z-index: 100; + // position: absolute; + // left: 20rpx; } } - - .set-view-test4 { - margin: 20rpx auto; - font-size: 22rpx; - color: #999; - - &.active { - color: #333; + .right_box{ + width: 100%; + padding-left: 60rpx; + padding-bottom: 60rpx; + padding-right: 80rpx; + margin-left: -10rpx; + border-left: 2rpx solid #E8E8E8; + + .top_title{ + font-size: 26rpx; + color: #666; + + &.active_top{ + color: #333; + } + } + .cen_title{ + font-size: 22rpx; + color: #999; + margin: 20rpx 0; + + &.active_cen{ + color: #333; + } + } + .bot_title{ + font-size: 20rpx; + color: #999; } } } } - - /* 普通 */ - .set-2 .img-border { - width: 18rpx; - height: 17rpx; - background: gray; - border-radius: 50%; - position: absolute; - top: 6%; - margin-top: -1rpx; - left: -58rpx; - z-index: 100; - } - - /* 特殊 */ - .set-2:nth-of-type(1)>.img-border { - width: 38rpx; - height: 38rpx; - background: transparent; - border-radius: 50%; - position: absolute; - top: 0%; - margin-top: -3rpx; - left: -11%; - z-index: 100; - } - - .set-2:nth-of-type(1) .left_img { - border-radius: 50%; - width: 16rpx; - height: 16rpx; - background: #FE3666; - top: 50%; - margin-top: 13rpx; - margin-left: 10rpx; - } - - .left_line_up { - position: absolute; - top: 0; - left: -52upx; - height: 80%; - margin-top: -22rpx; - border-style: solid; - border-left: 1rpx; - border-color: #ccc; - } - - .left_line_down { - position: absolute; - top: 50%; - left: -52upx; - height: 70%; - margin-top: 22rpx; - border-style: solid; - border-left: 1rpx; - border-color: #ccc; - - } - - .set-2:nth-of-type(1) .left_line_down { - top: 0; - height: 120%; - } - - .set-2:last-of-type .left_line_up { - height: 20%; - } } } \ No newline at end of file