From 0e0c52bdd851a4f1402859357a9c0089f2e6790d Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Tue, 27 Apr 2021 21:51:12 +0800 Subject: [PATCH] no message --- components/collapse-item/index.wxml | 2 +- components/collapse-item/index.wxss | 2 +- .../order-detail/delivery-info/index.wxml | 42 +++++++++---------- pages/agent/order-detail/header-info/index.js | 14 ------- .../agent/order-detail/header-info/index.wxss | 19 ++++----- pages/agent/order-detail/index.js | 8 +++- pages/agent/order-detail/index.wxml | 15 ++++--- pages/agent/order-detail/index.wxss | 17 +++++++- .../agent/order-detail/item-car-info/index.js | 7 ++-- .../order-detail/item-car-info/index.json | 4 +- .../order-detail/item-car-info/index.wxml | 27 ++++++------ .../order-detail/item-money-info/index.js | 14 ------- .../order-detail/item-money-info/index.wxml | 2 - pages/agent/order-detail/order-info/index.js | 8 ++-- .../agent/order-detail/order-info/index.json | 2 - .../agent/order-detail/order-info/index.wxml | 17 ++++---- .../agent/order-detail/order-info/index.wxss | 8 ---- .../agent/order-detail/pound-info/index.json | 1 - .../agent/order-detail/pound-info/index.wxml | 3 +- .../agent/order-detail/reserve-info/index.js | 7 ++-- .../order-detail/reserve-info/index.json | 10 +---- .../order-detail/reserve-info/index.wxml | 16 +++---- .../order-detail/reserve-info/index.wxss | 8 ---- pages/login/index.js | 2 +- 24 files changed, 113 insertions(+), 142 deletions(-) diff --git a/components/collapse-item/index.wxml b/components/collapse-item/index.wxml index ae4cc83..3a09394 100644 --- a/components/collapse-item/index.wxml +++ b/components/collapse-item/index.wxml @@ -12,7 +12,7 @@ border="{{ border && expanded }}" class="{{ utils.bem('collapse-item__title', { disabled, expanded }) }}" right-icon-class="van-cell__right-icon" - custom-class="van-cell" + custom-class="van-cell collapse" hover-class="van-cell--hover" bind:click="onClick" > diff --git a/components/collapse-item/index.wxss b/components/collapse-item/index.wxss index 0e075bd..bd8e5b0 100644 --- a/components/collapse-item/index.wxss +++ b/components/collapse-item/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-collapse-item__title .van-cell__right-icon{-webkit-transform:rotate(90deg);transform:rotate(90deg);transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;transition:-webkit-transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s),-webkit-transform var(--collapse-item-transition-duration,.3s)}.van-collapse-item__title--expanded .van-cell__right-icon{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.van-collapse-item__title--disabled .van-cell,.van-collapse-item__title--disabled .van-cell__right-icon{color:#c8c9cc!important;color:var(--collapse-item-title-disabled-color,#c8c9cc)!important}.van-collapse-item__title--disabled .van-cell--hover{background-color:#fff!important;background-color:var(--white,#fff)!important}.van-collapse-item__wrapper{overflow:hidden}.van-collapse-item__content{color:#969799;color:var(--collapse-item-content-text-color,#969799);font-size:13px;font-size:var(--collapse-item-content-font-size,13px);line-height:1.5;line-height:var(--collapse-item-content-line-height,1.5);background-color:#fff;background-color:var(--collapse-item-content-background-color,#fff)} \ No newline at end of file +@import '../common/index.wxss';.van-collapse-item__title .van-cell__right-icon{-webkit-transform:rotate(90deg);transform:rotate(90deg);transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;transition:-webkit-transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s),-webkit-transform var(--collapse-item-transition-duration,.3s)}.van-collapse-item__title--expanded .van-cell__right-icon{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.van-collapse-item__title--disabled .van-cell,.van-collapse-item__title--disabled .van-cell__right-icon{color:#c8c9cc!important;color:var(--collapse-item-title-disabled-color,#c8c9cc)!important}.van-collapse-item__title--disabled .van-cell--hover{background-color:#fff!important;background-color:var(--white,#fff)!important}.van-collapse-item__wrapper{overflow:hidden}.van-collapse-item__content{color:#969799;color:var(--collapse-item-content-text-color,#969799);font-size:13px;font-size:var(--collapse-item-content-font-size,13px);line-height:1.5;line-height:var(--collapse-item-content-line-height,1.5);background-color:#fff;background-color:var(--collapse-item-content-background-color,#fff)}.collapse{min-height: auto;} \ No newline at end of file diff --git a/pages/agent/order-detail/delivery-info/index.wxml b/pages/agent/order-detail/delivery-info/index.wxml index 6cbcb2e..82e08bb 100644 --- a/pages/agent/order-detail/delivery-info/index.wxml +++ b/pages/agent/order-detail/delivery-info/index.wxml @@ -1,26 +1,26 @@ - + - 送货信息 - - 纸厂开户账号 - - {{orderInfo.millSupplierId || ''}} - 复制 - + 送货信息 + + 纸厂开户账号 + + {{orderInfo.millSupplierId || ''}} + 复制 - - 纸厂订单号 - {{orderInfo.millDeliveryOrderId || ''}} - - - 货到时间 - {{orderInfo.paperMillDeliveryTime || ''}} - - - 注意事项 - {{orderInfo.attenssion || ''}} - - \ No newline at end of file + + + 纸厂订单号 + {{orderInfo.millDeliveryOrderId || ''}} + + + 货到时间 + {{orderInfo.paperMillDeliveryTime || ''}} + + + 注意事项 + {{orderInfo.attenssion || ''}} + + \ No newline at end of file diff --git a/pages/agent/order-detail/header-info/index.js b/pages/agent/order-detail/header-info/index.js index f890c6d..b7ff566 100644 --- a/pages/agent/order-detail/header-info/index.js +++ b/pages/agent/order-detail/header-info/index.js @@ -8,19 +8,5 @@ Component({ */ properties: { orderInfo: { type: Object, value: null } - }, - - /** - * 组件的初始数据 - */ - data: { - - }, - - /** - * 组件的方法列表 - */ - methods: { - } }) diff --git a/pages/agent/order-detail/header-info/index.wxss b/pages/agent/order-detail/header-info/index.wxss index 00093ad..7e9b348 100644 --- a/pages/agent/order-detail/header-info/index.wxss +++ b/pages/agent/order-detail/header-info/index.wxss @@ -1,16 +1,15 @@ /* pages/agent/detail/header-info/header-info.wxss */ -.margin-top{ - margin-top: 16rpx; +.bg-blue{ + color: #FFFFFF; + background-color: #008AFF; } -.margin-right{ - margin-right: 24rpx; +.bg-yellow{ + background-color: var(--yellow); + color: white; } -.image-load { - width: 50px; - height: 50px; - display: flex; - align-items: center; - justify-content: center; +.bg-gray{ + background-color: var(--gray); + color: white; } \ No newline at end of file diff --git a/pages/agent/order-detail/index.js b/pages/agent/order-detail/index.js index 9a5c4ec..94bb9d0 100644 --- a/pages/agent/order-detail/index.js +++ b/pages/agent/order-detail/index.js @@ -52,7 +52,13 @@ Scene({ element.finalSettlePrice = math.plus(element.finalPayMoney, element.preSettleMoney) } } - this.setData({ orderInfo: result.data, cancel: this.data.cancel }) + var orderInfoStep = result.data.orderItems + result.data.orderItems.forEach((element1, index1) => { + for (let i = 0; i { wx.hideLoading() diff --git a/pages/agent/order-detail/index.wxml b/pages/agent/order-detail/index.wxml index d67eadc..f27e2dc 100644 --- a/pages/agent/order-detail/index.wxml +++ b/pages/agent/order-detail/index.wxml @@ -1,6 +1,6 @@ - 订单详情 + 订单详情 @@ -15,19 +15,18 @@ - + - + - 车辆信息{{index+1}} - + 车辆信息{{index+1}} @@ -45,8 +44,8 @@ - 取消订单 + 取消订单 - + \ No newline at end of file diff --git a/pages/agent/order-detail/index.wxss b/pages/agent/order-detail/index.wxss index f42776e..eace3b8 100644 --- a/pages/agent/order-detail/index.wxss +++ b/pages/agent/order-detail/index.wxss @@ -1 +1,16 @@ -/* pages/message/detail/index.wxss */ \ No newline at end of file +/* pages/message/detail/index.wxss */ +.margin-top{ + margin-top: 16rpx; +} + +.margin-right{ + margin-right: 24rpx; +} + +.image-load { + width: 50px; + height: 50px; + display: flex; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/pages/agent/order-detail/item-car-info/index.js b/pages/agent/order-detail/item-car-info/index.js index ee9cb0f..fedbf42 100644 --- a/pages/agent/order-detail/item-car-info/index.js +++ b/pages/agent/order-detail/item-car-info/index.js @@ -16,13 +16,14 @@ Component({ * 组件的初始数据 */ data: { - + activeNames: [] }, - /** * 组件的方法列表 */ methods: { - + onChange: function({detail}) { + this.setData({ activeNames: detail }) + } } }) diff --git a/pages/agent/order-detail/item-car-info/index.json b/pages/agent/order-detail/item-car-info/index.json index 0015676..1bb80c1 100644 --- a/pages/agent/order-detail/item-car-info/index.json +++ b/pages/agent/order-detail/item-car-info/index.json @@ -3,6 +3,6 @@ "usingComponents": { "van-collapse": "/components/collapse/index", "van-collapse-item": "/components/collapse-item/index", - "wux-steps": "/components/steps/index", - "wux-step": "/components/step/index"} + "van-steps": "/components/steps/index", + "van-step": "/components/step/index"} } \ No newline at end of file diff --git a/pages/agent/order-detail/item-car-info/index.wxml b/pages/agent/order-detail/item-car-info/index.wxml index 295fa90..ab92665 100644 --- a/pages/agent/order-detail/item-car-info/index.wxml +++ b/pages/agent/order-detail/item-car-info/index.wxml @@ -1,21 +1,24 @@ - + - - - + + + {{item.logisticcsInfo.plateNumber}} - 「{{item.paperCategoryName || orderInfo.paperCategoryName}}」 + 「{{item.paperCategoryName || orderInfo.paperCategoryName}}」 进度详情 - - - - - + + + + + + + + + function statusStep(status) { return status == 1 ? "process" : "wait"; diff --git a/pages/agent/order-detail/item-money-info/index.js b/pages/agent/order-detail/item-money-info/index.js index 1def1a4..08fc25f 100644 --- a/pages/agent/order-detail/item-money-info/index.js +++ b/pages/agent/order-detail/item-money-info/index.js @@ -1,6 +1,5 @@ // pages/agent/detail/money-info/money-info.js Component({ - options: { addGlobalClass: true, multipleSlots: true @@ -11,18 +10,5 @@ Component({ properties: { orderInfo: { type: Object, value: null }, item: { type: Object, value: null } - }, - /** - * 组件的初始数据 - */ - data: { - - }, - - /** - * 组件的方法列表 - */ - methods: { - } }) diff --git a/pages/agent/order-detail/item-money-info/index.wxml b/pages/agent/order-detail/item-money-info/index.wxml index deb6bf1..0cabb34 100644 --- a/pages/agent/order-detail/item-money-info/index.wxml +++ b/pages/agent/order-detail/item-money-info/index.wxml @@ -1,8 +1,6 @@ - - 首款信息 diff --git a/pages/agent/order-detail/order-info/index.js b/pages/agent/order-detail/order-info/index.js index 669a0c8..cfcedf5 100644 --- a/pages/agent/order-detail/order-info/index.js +++ b/pages/agent/order-detail/order-info/index.js @@ -10,18 +10,18 @@ Component({ properties: { orderInfo: { type: Object, value: null } }, - /** * 组件的初始数据 */ data: { - + activeNames: ['1'] }, - /** * 组件的方法列表 */ methods: { - + onChange: function({detail}) { + this.setData({ activeNames: detail }) + } } }) diff --git a/pages/agent/order-detail/order-info/index.json b/pages/agent/order-detail/order-info/index.json index 0b36c4a..8545148 100644 --- a/pages/agent/order-detail/order-info/index.json +++ b/pages/agent/order-detail/order-info/index.json @@ -1,8 +1,6 @@ { "component": true, "usingComponents": { - "wux-dialog": "/components/dialog/index", - "wux-image": "/components/image/index", "van-collapse": "/components/collapse/index", "van-collapse-item": "/components/collapse-item/index" } diff --git a/pages/agent/order-detail/order-info/index.wxml b/pages/agent/order-detail/order-info/index.wxml index ff2d51c..e1d6a9f 100644 --- a/pages/agent/order-detail/order-info/index.wxml +++ b/pages/agent/order-detail/order-info/index.wxml @@ -3,11 +3,12 @@ - - - - 订单信息 - + + + + 订单信息 + + 订单编号 {{orderInfo.orderId}} @@ -19,6 +20,6 @@ 订单备注 {{orderInfo.remark || ''}} - - - + + + \ No newline at end of file diff --git a/pages/agent/order-detail/order-info/index.wxss b/pages/agent/order-detail/order-info/index.wxss index 00093ad..1e2187f 100644 --- a/pages/agent/order-detail/order-info/index.wxss +++ b/pages/agent/order-detail/order-info/index.wxss @@ -5,12 +5,4 @@ .margin-right{ margin-right: 24rpx; -} - -.image-load { - width: 50px; - height: 50px; - display: flex; - align-items: center; - justify-content: center; } \ No newline at end of file diff --git a/pages/agent/order-detail/pound-info/index.json b/pages/agent/order-detail/pound-info/index.json index 50aea4d..4bdaa9d 100644 --- a/pages/agent/order-detail/pound-info/index.json +++ b/pages/agent/order-detail/pound-info/index.json @@ -1,7 +1,6 @@ { "component": true, "usingComponents": { - "wux-image": "/components/image/index", "sudoku-image": "/components/sudoku-image/index" } } \ No newline at end of file diff --git a/pages/agent/order-detail/pound-info/index.wxml b/pages/agent/order-detail/pound-info/index.wxml index 9e30d67..d575761 100644 --- a/pages/agent/order-detail/pound-info/index.wxml +++ b/pages/agent/order-detail/pound-info/index.wxml @@ -32,7 +32,6 @@ 磅单图片 - - + \ No newline at end of file diff --git a/pages/agent/order-detail/reserve-info/index.js b/pages/agent/order-detail/reserve-info/index.js index 9d11775..7fcc979 100644 --- a/pages/agent/order-detail/reserve-info/index.js +++ b/pages/agent/order-detail/reserve-info/index.js @@ -14,13 +14,14 @@ Component({ * 组件的初始数据 */ data: { - + activeNames: ['1'] }, - /** * 组件的方法列表 */ methods: { - + onChange: function({detail}) { + this.setData({ activeNames: detail }) + } } }) diff --git a/pages/agent/order-detail/reserve-info/index.json b/pages/agent/order-detail/reserve-info/index.json index 02ef175..802c847 100644 --- a/pages/agent/order-detail/reserve-info/index.json +++ b/pages/agent/order-detail/reserve-info/index.json @@ -1,13 +1,7 @@ { "component": true, "usingComponents": { - "wux-dialog": "/components/dialog/index", - "wux-image": "/components/image/index", - "sudoku-image": "/components/sudoku-image/index", - "wux-button": "/components/button/index", - "wux-divider": "/components/divider/index", "van-collapse": "/components/collapse/index", - "van-collapse-item": "/components/collapse-item/index", - "wux-steps": "/components/steps/index", - "wux-step": "/components/step/index"} + "van-collapse-item": "/components/collapse-item/index" + } } \ No newline at end of file diff --git a/pages/agent/order-detail/reserve-info/index.wxml b/pages/agent/order-detail/reserve-info/index.wxml index 37bbdb2..b2fed53 100644 --- a/pages/agent/order-detail/reserve-info/index.wxml +++ b/pages/agent/order-detail/reserve-info/index.wxml @@ -1,10 +1,12 @@ - - - - 预约信息 + + + + + 预约信息 + 纸品品类 {{orderInfo.paperCategoryName}} @@ -25,6 +27,6 @@ 货到时间 {{orderInfo.deliveryTime}} - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/pages/agent/order-detail/reserve-info/index.wxss b/pages/agent/order-detail/reserve-info/index.wxss index 00093ad..5842437 100644 --- a/pages/agent/order-detail/reserve-info/index.wxss +++ b/pages/agent/order-detail/reserve-info/index.wxss @@ -6,11 +6,3 @@ .margin-right{ margin-right: 24rpx; } - -.image-load { - width: 50px; - height: 50px; - display: flex; - align-items: center; - justify-content: center; -} \ No newline at end of file diff --git a/pages/login/index.js b/pages/login/index.js index 27e6c38..5e46729 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -128,7 +128,7 @@ Page({ }) return } - headerFactoryId(app.userInfo.factoryId) + // headerFactoryId(app.userInfo.factoryId) // wx.redirectTo({ url: '/pages/agent/result/index' }) wx.redirectTo({ url: '/pages/index/index' }) } else {