diff --git a/api/user.js b/api/user.js index 8e6cf97..ca8f222 100644 --- a/api/user.js +++ b/api/user.js @@ -188,10 +188,10 @@ function initToken(token){ } function headerFactoryId(factoryId){ - sconfig.header.X_FactoryId = factoryId - pconfig.header.X_FactoryId = factoryId - zconfig.header.X_FactoryId = factoryId - mconfig.header.X_FactoryId = factoryId + sconfig.header.XFactoryId = factoryId + pconfig.header.XFactoryId = factoryId + zconfig.header.XFactoryId = factoryId + mconfig.header.XFactoryId = factoryId } function finalizeToken(){ diff --git a/components/step/index.wxss b/components/step/index.wxss index aa7919e..850c848 100644 --- a/components/step/index.wxss +++ b/components/step/index.wxss @@ -1 +1 @@ -.step{display:flex;position:relative}.step-custom{z-index:2}.step-row{flex-direction:column;align-items:center}.step-column{flex-direction:row;padding-left:30rpx;box-sizing:border-box}.step-container{display:flex;justify-content:center;z-index:2;align-items:center;background-color:#fff}.step-container-row{width:70rpx;height:40rpx}.step-container-column{height:60rpx;width:40rpx}.step-icon{width:40rpx;height:40rpx;display:flex;align-items:center;justify-content:center;font-size:22rpx;transition:.5s;box-sizing:border-box}.step-process{color:#fff;background-color:#008AFF;border-radius:50%}.step-error{background-color:#fff;border:1px solid #f4516c;color:#f4516c;border-radius:50%}.step-finish{background-color:#fff;color:#008AFF;border:1px solid #008AFF;border-radius:50%}.step-wait{background-color:#fff;color:#c4c9d2;border:1px solid #c4c9d2;border-radius:50%}.step-dot{width:24rpx;height:24rpx;border-radius:50%;transition:.5s}.step-dot-process{background-color:#008AFF}.step-dot-wait{background-color:#c4c9d2}.step-dot-error{background-color:#f4516c}.step-dot-finish{background-color:#008AFF}.step-line{background:#c4c9d2;transition:.5s;position:absolute;z-index:0}.step-line-row{height:2rpx;width:100%;left:50%;top:18rpx}.step-line-column{width:2rpx;height:100%;top:20rpx;left:48rpx}.step-line-wait{background-color:#e8e8e8}.step-line-finish{background-color:#008AFF}.step-content{display:flex;flex-direction:column}.step-content-row{align-items:center;width:100%}.step-content-column{margin-left:15rpx}.step-title{color:#595959;font-size:26rpx;line-height:40rpx;margin:10rpx 0}.step-title-process{color:#333;font-size:28rpx;line-height:40rpx;margin:10rpx 0}.step-describe{color:#8c98ae;font-size:22rpx}@font-face{font-family:iconfont;src:url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAK8AAsAAAAABpQAAAJvAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDBgp8gQsBNgIkAwwLCAAEIAWEbQc2G9EFyK4wbuGJaCgrSmkBCSe/ZeUtviBzEXztx/bd3f+oNEiuzaerJhKN6WQSJFqlZELxTOZqTS9l0hsflgVC/bD3z/dzv8lMXAksyeryeByfVkhgV93EvwdIwC+b/hetH5jPyAA+z+X0JtCBXONbltMcw496AcYBBbYnRoEEXEQBcAqyOwK15PsEmg2KiewMTy6yCoWzLBD3lqGwilJKUaRqo1C37C3iRaUxPaUnPMffj18LUUFSZc7a3bshnfV++DD/2GVISBPo4QoZU5hCXLeWThULiSvWbCrpb64VIS2VhYlVpqU+6B8vETWnsxWM0XLiI19G8OGABDKoy5VBzDRje98gRHertt+2fLx2cdC6ZJwcnK226Ifh0uzy4vzK8sLSytxprqHAHexGbz8/6za6C3ePjwW29viP3ailnm7Zz+SntAd5IV0IBHuvvy3Xd/41thTw/osdBRahcefh4Gepwb5iah13LrrKV9mRrBsIJKhCjvrnxLq9Trf0wb2ERn0TIg0GcmSNhsjCTqHSYgm1RutoNmnkcIseUrEoTZiwRRA63SBp94as0zNZ2BdU+v2h1hnFaHYczWe2GAmrakCiQqiDmgdLEz73vFSVdM+jkXUVWdTG/DLK0MpCOpGqVkfQR7nEhjBnZIg4cCk8GCaPoesKCKSwUaOESRS0J5O87UUJTXisyjYJKQjSAVUesGgEHw+Hk6ra5+chQ5ZLIXsEDfllSApZ44O0hBRAjph8SPAoz4RyDBmEcICTBA8YJrOQyyWAoH2WDWlIgjmhEGiXdAdx1JTY3uL93xFo5kzMkSJHUT+g+5BNxVpWMAYAAA==') format('woff2')}.iconfont{font-family:iconfont!important;font-size:24rpx;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-finish:before{content:"\e600"}.icon-error:before{content:"\e6cf"} \ No newline at end of file +.step{display:flex;position:relative}.step-custom{z-index:2}.step-row{flex-direction:column;align-items:center}.step-column{flex-direction:row;padding-left:30rpx;box-sizing:border-box}.step-container{display:flex;justify-content:center;z-index:2;align-items:center}.step-container-row{width:70rpx;height:40rpx}.step-container-column{height:60rpx;width:40rpx}.step-icon{width:40rpx;height:40rpx;display:flex;align-items:center;justify-content:center;font-size:22rpx;transition:.5s;box-sizing:border-box}.step-process{color:#fff;background-color:#008AFF;border-radius:50%}.step-error{background-color:#fff;border:1px solid #f4516c;color:#f4516c;border-radius:50%}.step-finish{background-color:#fff;color:#008AFF;border:1px solid #008AFF;border-radius:50%}.step-wait{background-color:#fff;color:#c4c9d2;border:1px solid #c4c9d2;border-radius:50%}.step-dot{width:24rpx;height:24rpx;border-radius:50%;transition:.5s}.step-dot-process{background-color:#008AFF}.step-dot-wait{background-color:#c4c9d2}.step-dot-error{background-color:#f4516c}.step-dot-finish{background-color:#008AFF}.step-line{background:#c4c9d2;background: linear-gradient(to bottom, #c4c9d2, #c4c9d2 7.5px, transparent 7.5px, transparent);transition:.5s;position:absolute;z-index:0}.step-line-row{height:2rpx;width:100%;left:50%;top:18rpx}.step-line-column{width:2rpx;height:100%;top:20rpx;left:48rpx}.step-line-wait{background-color:#e8e8e8}.step-line-finish{background-color:#008AFF}.step-content{display:flex;flex-direction:column}.step-content-row{align-items:center;width:100%}.step-content-column{margin-left:15rpx}.step-title{color:#595959;font-size:26rpx;line-height:40rpx;margin:10rpx 0}.step-title-process{color:#333;font-size:28rpx;line-height:40rpx;margin:10rpx 0}.step-describe{color:#8c98ae;font-size:22rpx}@font-face{font-family:iconfont;src:url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAK8AAsAAAAABpQAAAJvAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDBgp8gQsBNgIkAwwLCAAEIAWEbQc2G9EFyK4wbuGJaCgrSmkBCSe/ZeUtviBzEXztx/bd3f+oNEiuzaerJhKN6WQSJFqlZELxTOZqTS9l0hsflgVC/bD3z/dzv8lMXAksyeryeByfVkhgV93EvwdIwC+b/hetH5jPyAA+z+X0JtCBXONbltMcw496AcYBBbYnRoEEXEQBcAqyOwK15PsEmg2KiewMTy6yCoWzLBD3lqGwilJKUaRqo1C37C3iRaUxPaUnPMffj18LUUFSZc7a3bshnfV++DD/2GVISBPo4QoZU5hCXLeWThULiSvWbCrpb64VIS2VhYlVpqU+6B8vETWnsxWM0XLiI19G8OGABDKoy5VBzDRje98gRHertt+2fLx2cdC6ZJwcnK226Ifh0uzy4vzK8sLSytxprqHAHexGbz8/6za6C3ePjwW29viP3ailnm7Zz+SntAd5IV0IBHuvvy3Xd/41thTw/osdBRahcefh4Gepwb5iah13LrrKV9mRrBsIJKhCjvrnxLq9Trf0wb2ERn0TIg0GcmSNhsjCTqHSYgm1RutoNmnkcIseUrEoTZiwRRA63SBp94as0zNZ2BdU+v2h1hnFaHYczWe2GAmrakCiQqiDmgdLEz73vFSVdM+jkXUVWdTG/DLK0MpCOpGqVkfQR7nEhjBnZIg4cCk8GCaPoesKCKSwUaOESRS0J5O87UUJTXisyjYJKQjSAVUesGgEHw+Hk6ra5+chQ5ZLIXsEDfllSApZ44O0hBRAjph8SPAoz4RyDBmEcICTBA8YJrOQyyWAoH2WDWlIgjmhEGiXdAdx1JTY3uL93xFo5kzMkSJHUT+g+5BNxVpWMAYAAA==') format('woff2')}.iconfont{font-family:iconfont!important;font-size:24rpx;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-finish:before{content:"\e600"}.icon-error:before{content:"\e6cf"} \ No newline at end of file diff --git a/pages/agent/index.wxs b/pages/agent/index.wxs new file mode 100644 index 0000000..5c8e395 --- /dev/null +++ b/pages/agent/index.wxs @@ -0,0 +1,69 @@ +//订单状态 50待预约,51待送货,52结算中,53已完成,54已关闭 +function orderStatus(status) { + if (status == 50) { + return '待预约' + } else if (status == 51) { + return '待送货' + } else if (status == 52) { + return '收货待审核' + } else if (status == 53) { + return '结算中' + } else if (status == 54) { + return '已完成' + } else if (status == 55) { + return '已关闭' + } + return '' +} + +function iconStatus(status) { + if (status == 50) { + return 'time' + } else if (status == 51) { + return 'time' + } else if (status == 52) { + return 'time' + } else if (status == 53) { + return 'time' + } else if (status == 54) { + return 'roundcheck' + } else if (status == 55) { + return 'roundclose' + } + return '' +} + +function backStatus(status) { + if (status == 50) { + return 'blue' + } else if (status == 51) { + return 'blue' + } else if (status == 52) { + return 'blue' + } else if (status == 53) { + return 'blue' + } else if (status == 54) { + return 'yellow' + } else if (status == 55) { + return 'gray' + } + return '' +} + +function getActivitySettleType(type) { + if (type == 0) { + return '70%' + } else if (type == 1) { + return '85%' + } else if (type == 2) { + return '100%' + } + return '' +} + +module.exports = { + orderStatus: orderStatus, + iconStatus: iconStatus, + backStatus: backStatus, + getActivitySettleType: getActivitySettleType +} \ No newline at end of file diff --git a/pages/agent/order-detail/delivery-info/index.js b/pages/agent/order-detail/delivery-info/index.js new file mode 100644 index 0000000..e93d253 --- /dev/null +++ b/pages/agent/order-detail/delivery-info/index.js @@ -0,0 +1,26 @@ +// pages/agent/detail/delivery-info/delivery-info.js +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, + /** + * 组件的属性列表 + */ + properties: { + orderInfo: { type: Object, value: null } + }, + /** + * 组件的方法列表 + */ + methods: { + clipboard: function () { + wx.setClipboardData({ + data: this.data.orderInfo.millDeliveryOrderId, + success: function (res) { + util.showToast('复制成功') + } + }) + } + } +}) diff --git a/pages/agent/order-detail/delivery-info/index.json b/pages/agent/order-detail/delivery-info/index.json new file mode 100644 index 0000000..a14199f --- /dev/null +++ b/pages/agent/order-detail/delivery-info/index.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "wux-button": "/components/button/index" + } +} \ 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 new file mode 100644 index 0000000..1a03280 --- /dev/null +++ b/pages/agent/order-detail/delivery-info/index.wxml @@ -0,0 +1,28 @@ + + + + + + + 送货信息 + + 纸厂开户账号 + + {{orderInfo.millSupplierId || ''}} + 复制 + + + + + 纸厂订单号 + {{orderInfo.millDeliveryOrderId || ''}} + + + 货到时间 + {{orderInfo.paperMillDeliveryTime || ''}} + + + 注意事项 + {{orderInfo.attenssion || ''}} + + \ No newline at end of file diff --git a/pages/agent/order-detail/delivery-info/index.wxss b/pages/agent/order-detail/delivery-info/index.wxss new file mode 100644 index 0000000..ac0a139 --- /dev/null +++ b/pages/agent/order-detail/delivery-info/index.wxss @@ -0,0 +1,16 @@ +/* pages/agent/detail/delivery-info/delivery-info.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/header-info/index.js b/pages/agent/order-detail/header-info/index.js new file mode 100644 index 0000000..f890c6d --- /dev/null +++ b/pages/agent/order-detail/header-info/index.js @@ -0,0 +1,26 @@ +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, + /** + * 组件的属性列表 + */ + properties: { + orderInfo: { type: Object, value: null } + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/pages/agent/order-detail/header-info/index.json b/pages/agent/order-detail/header-info/index.json new file mode 100644 index 0000000..78013bd --- /dev/null +++ b/pages/agent/order-detail/header-info/index.json @@ -0,0 +1,5 @@ +{ + "component": true, + "usingComponents": { + } +} \ No newline at end of file diff --git a/pages/agent/order-detail/header-info/index.wxml b/pages/agent/order-detail/header-info/index.wxml new file mode 100644 index 0000000..1d53e86 --- /dev/null +++ b/pages/agent/order-detail/header-info/index.wxml @@ -0,0 +1,7 @@ + + + + + + {{agent.orderStatus(orderInfo.status)}} + \ No newline at end of file diff --git a/pages/agent/order-detail/header-info/index.wxss b/pages/agent/order-detail/header-info/index.wxss new file mode 100644 index 0000000..00093ad --- /dev/null +++ b/pages/agent/order-detail/header-info/index.wxss @@ -0,0 +1,16 @@ +/* pages/agent/detail/header-info/header-info.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/index.js b/pages/agent/order-detail/index.js index 0881cea..e17ee8c 100644 --- a/pages/agent/order-detail/index.js +++ b/pages/agent/order-detail/index.js @@ -1,17 +1,86 @@ // pages/message/detail/index.js import Scene from '../../index/scene' +import Dialog from '../../../components/dialog/dialog' +import { getProxyOrderInfo, cancelProxyOrder, cancelReservation, cancelProxyOrderItem } from "../../../api/ztb" +const util = require('../../../utils/util') +const math = require('../../../utils/math') +const event = require('../../../utils/event') +const app = getApp() Scene({ /** * 页面的初始数据 */ data: { - + id: null, + cancel: true, + orderInfo: null, + orderInfoStepLs:null }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { + if (options.id) { + this.data.id = options.id + this.fetchOrderInfo() + } + }, + fetchOrderInfo: function () { + wx.showLoading({ title: '加载中', mask: true }) + getProxyOrderInfo(this.data.id).then(result => { + this.data.cancel = true + for (let index = 0; index < result.data.orderItems.length; index++) { + const element = result.data.orderItems[index] + if (element.weightnoteInfo && element.weightnoteInfo.id) { + // 全额 + if (util.isEmpty(element.activityOrderAuditPassNum)) { + element.sumAmount = math.times(element.weightnoteInfo.settleUtiPrice, element.weightnoteInfo.settleWeight) + if (element.unitSurcharge!=null&element.surcharge !=null&&element.surcharge == math.times(element.weightnoteInfo.netWeight, element.unitSurcharge)) { + //按照净重,计算代卖费 + element.orderType = 0 + } else { + //按照结算重量计算代卖费 + element.orderType = 1 + } + } else { + if (element.weightnoteInfo.netWeight) { + element.proxyAmount = math.times(element.weightnoteInfo.netWeight, element.unitSurcharge) + } + } + this.data.cancel = false + } + if (element.activityOrderAuditPassNum == 2) { + element.finalSettlePrice = math.plus(element.finalPayMoney, element.preSettleMoney) + } + } + this.setData({ orderInfo: result.data, cancel: this.data.cancel }) + var orderInfoStepLs = result.data.orderItems + result.data.orderItems.forEach((element1, index1) => { + for (let i = 0; i { + wx.hideLoading() + util.showToast(err) + }) + }, + getStr: function (index) { + switch (index) { + case 0: + return "订单已提交,待预约"; + case 1: + return "预约成功,待送货"; + case 2: + return "已收货,待审核"; + case 3: + return "已审核,结算中"; + case 4: + return "已结算,订单完成"; + } + }, - } }) \ No newline at end of file diff --git a/pages/agent/order-detail/index.json b/pages/agent/order-detail/index.json index 19bbcd2..78c1145 100644 --- a/pages/agent/order-detail/index.json +++ b/pages/agent/order-detail/index.json @@ -1,5 +1,15 @@ { "usingComponents": { + "van-button": "/components/button/index", + "van-dialog": "/components/dialog/index", + "submit-layout": "/components/submit-layout/index", + "delivery-info": "/pages/agent/order-detail/delivery-info/index", + "item-money-info": "/pages/agent/order-detail/item-money-info/index", + "item-car-info": "/pages/agent/order-detail/item-car-info/index", + "order-info": "/pages/agent/order-detail/order-info/index", + "pound-info": "/pages/agent/order-detail/pound-info/index", + "reserve-info": "/pages/agent/order-detail/reserve-info/index", + "header-info": "/pages/agent/order-detail/header-info/index", "notification": "/pages/message/notification/index" } } \ No newline at end of file diff --git a/pages/agent/order-detail/index.wxml b/pages/agent/order-detail/index.wxml index 79f99dd..d67eadc 100644 --- a/pages/agent/order-detail/index.wxml +++ b/pages/agent/order-detail/index.wxml @@ -1,6 +1,52 @@ - 消息情况 + 订单详情 + + + + + + + + 货物即将发往{{orderInfo.paperMillName}} + {{orderInfo.paperMillAddress}} + + + + + + + + + + + + + + + + 车辆信息{{index+1}} + + + + + + + + + + + + + + + + + + 取消订单 + + diff --git a/pages/agent/order-detail/item-car-info/index.js b/pages/agent/order-detail/item-car-info/index.js new file mode 100644 index 0000000..ee9cb0f --- /dev/null +++ b/pages/agent/order-detail/item-car-info/index.js @@ -0,0 +1,28 @@ +// pages/agent/detail/item-history-part/item-history-info.js +Component({ + + options: { + addGlobalClass: true, + multipleSlots: true + }, + /** + * 组件的属性列表 + */ + properties: { + orderInfo: { type: Object, value: null }, + item: { type: Object, value: null } + }, + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/pages/agent/order-detail/item-car-info/index.json b/pages/agent/order-detail/item-car-info/index.json new file mode 100644 index 0000000..88730b3 --- /dev/null +++ b/pages/agent/order-detail/item-car-info/index.json @@ -0,0 +1,9 @@ +{ + "component": true, + "usingComponents": { + "wux-button": "/components/button/index", + "van-collapse": "/components/collapse/index", + "van-collapse-item": "/components/collapse-item/index", + "wux-steps": "/components/steps/index", + "wux-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 new file mode 100644 index 0000000..4e54522 --- /dev/null +++ b/pages/agent/order-detail/item-car-info/index.wxml @@ -0,0 +1,25 @@ + + + + + + + + {{item.logisticcsInfo.plateNumber}} + 「{{item.paperCategoryName || orderInfo.paperCategoryName}}」 + + 进度详情 + + + + + + + + function statusStep(status) { + return status == 1 ? "process" : "wait"; + } + module.exports = statusStep + \ No newline at end of file diff --git a/pages/agent/order-detail/item-car-info/index.wxss b/pages/agent/order-detail/item-car-info/index.wxss new file mode 100644 index 0000000..00093ad --- /dev/null +++ b/pages/agent/order-detail/item-car-info/index.wxss @@ -0,0 +1,16 @@ +/* pages/agent/detail/header-info/header-info.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-money-info/index.js b/pages/agent/order-detail/item-money-info/index.js new file mode 100644 index 0000000..1def1a4 --- /dev/null +++ b/pages/agent/order-detail/item-money-info/index.js @@ -0,0 +1,28 @@ +// pages/agent/detail/money-info/money-info.js +Component({ + + options: { + addGlobalClass: true, + multipleSlots: true + }, + /** + * 组件的属性列表 + */ + properties: { + orderInfo: { type: Object, value: null }, + item: { type: Object, value: null } + }, + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/pages/agent/order-detail/item-money-info/index.json b/pages/agent/order-detail/item-money-info/index.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/pages/agent/order-detail/item-money-info/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/agent/order-detail/item-money-info/index.wxml b/pages/agent/order-detail/item-money-info/index.wxml new file mode 100644 index 0000000..deb6bf1 --- /dev/null +++ b/pages/agent/order-detail/item-money-info/index.wxml @@ -0,0 +1,112 @@ + + + + + + + + 首款信息 + + 预计总金额 + {{formate.formateAmount(item.preTotalMoney)}}元 + + + 结算单价 x 净重 + {{formate.formatePrice2(item.unitPrice)}} x + {{formate.formateWeight3(item.weightnoteInfo.netWeight)}} + + + 首笔应收金额 + {{formate.formateAmount(item.prepayMoney)}}元 + + + 预估总金额 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}} + {{formate.formateAmount(item.preTotalMoney)}}元 x + {{agent.getActivitySettleType(orderInfo.activitySettleType)}} + + + 代卖费 + {{formate.formateAmount(item.proxyAmount) || 0}}元 + + + 代卖费单价 x 净重 + {{formate.formatePrice2(item.unitSurcharge)}} x + {{formate.formateWeight3(item.weightnoteInfo.netWeight)}} + + + 首笔实收金额： + {{formate.formateAmount(item.preSettleMoney)}}元 + + + + + + 尾款信息 + + 未结算金额 + {{formate.formateAmount(item.unSettleMoney)}}元 + + + 单价 x 结算重量 - 首笔应收金额 + {{formate.formatePrice2(item.unitPrice)}} x + {{formate.formateWeight3(item.weightnoteInfo.settleWeight)}} - + {{formate.formateAmount(item.prepayMoney)}}元 + + + 单价 x 净重 - 首笔应收金额 + {{formate.formatePrice2(item.unitPrice)}} x + {{formate.formateWeight3(item.weightnoteInfo.netWeight)}} - + {{formate.formateAmount(item.prepayMoney)}}元 + + + 调节费 + -{{formate.formateAmount(item.adjustMoney)}}元 + + + 尾款实收金额： + {{formate.formateAmount(item.finalPayMoney)}}元 + + + 总收款金额： + {{formate.formateAmount(item.finalSettlePrice)}}元 + + + + + + + 总金额 + {{formate.formateAmount(item.sumAmount)}}元 + + + 结算单价 x 结算重量 + {{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}} x + {{formate.formateWeight(item.weightnoteInfo.settleWeight)}} + + + 代卖费 + {{formate.formateAmount(item.surcharge) || 0}}元 + + + 代卖费单价 x 结算重量 + {{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}} x + {{formate.formateWeight(item.weightnoteInfo.settleWeight)}} + + + 代卖费单价 x 净重 + {{formate.formatePrice2(item.unitSurcharge)}} x + {{formate.formateWeight(item.weightnoteInfo.netWeight)}} + + + 调节费 + {{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元 + + + 总收款金额： + {{formate.formateAmount(item.weightnoteInfo.settlePrice)}}元 + + \ No newline at end of file diff --git a/pages/agent/order-detail/item-money-info/index.wxss b/pages/agent/order-detail/item-money-info/index.wxss new file mode 100644 index 0000000..00093ad --- /dev/null +++ b/pages/agent/order-detail/item-money-info/index.wxss @@ -0,0 +1,16 @@ +/* pages/agent/detail/header-info/header-info.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/order-info/index.js b/pages/agent/order-detail/order-info/index.js new file mode 100644 index 0000000..669a0c8 --- /dev/null +++ b/pages/agent/order-detail/order-info/index.js @@ -0,0 +1,27 @@ +// pages/agent/detail/order-info/order-info.js +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, + /** + * 组件的属性列表 + */ + properties: { + orderInfo: { type: Object, value: null } + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/pages/agent/order-detail/order-info/index.json b/pages/agent/order-detail/order-info/index.json new file mode 100644 index 0000000..0b36c4a --- /dev/null +++ b/pages/agent/order-detail/order-info/index.json @@ -0,0 +1,9 @@ +{ + "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" + } +} \ No newline at end of file diff --git a/pages/agent/order-detail/order-info/index.wxml b/pages/agent/order-detail/order-info/index.wxml new file mode 100644 index 0000000..ff2d51c --- /dev/null +++ b/pages/agent/order-detail/order-info/index.wxml @@ -0,0 +1,24 @@ + + + + + + + + + 订单信息 + + 订单编号 + {{orderInfo.orderId}} + + + 创建时间 + {{orderInfo.createTime}} + + + 订单备注 + {{orderInfo.remark || ''}} + + + + diff --git a/pages/agent/order-detail/order-info/index.wxss b/pages/agent/order-detail/order-info/index.wxss new file mode 100644 index 0000000..00093ad --- /dev/null +++ b/pages/agent/order-detail/order-info/index.wxss @@ -0,0 +1,16 @@ +/* pages/agent/detail/header-info/header-info.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/pound-info/index.js b/pages/agent/order-detail/pound-info/index.js new file mode 100644 index 0000000..9653dc5 --- /dev/null +++ b/pages/agent/order-detail/pound-info/index.js @@ -0,0 +1,28 @@ +// pages/agent/detail/pound-info/pound-info.js +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, + /** + * 组件的属性列表 + */ + properties: { + orderInfo: { type: Object, value: null }, + item: { type: Object, value: null } + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/pages/agent/order-detail/pound-info/index.json b/pages/agent/order-detail/pound-info/index.json new file mode 100644 index 0000000..50aea4d --- /dev/null +++ b/pages/agent/order-detail/pound-info/index.json @@ -0,0 +1,7 @@ +{ + "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 new file mode 100644 index 0000000..9e30d67 --- /dev/null +++ b/pages/agent/order-detail/pound-info/index.wxml @@ -0,0 +1,38 @@ + + + + + + 结算单价 + {{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}} + + + 净重 + {{formate.formateWeight(item.weightnoteInfo.netWeight)}} + + + 结算重量 + {{formate.formateWeight(item.weightnoteInfo.settleWeight)}} + + + 扣点 + {{item.weightnoteInfo.deductedPoint}}% + + + 代卖费 + {{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}} + + + 调节费 + {{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元 + + + 磅单图片 + + + + + + \ No newline at end of file diff --git a/pages/agent/order-detail/pound-info/index.wxss b/pages/agent/order-detail/pound-info/index.wxss new file mode 100644 index 0000000..00093ad --- /dev/null +++ b/pages/agent/order-detail/pound-info/index.wxss @@ -0,0 +1,16 @@ +/* pages/agent/detail/header-info/header-info.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/reserve-info/index.js b/pages/agent/order-detail/reserve-info/index.js new file mode 100644 index 0000000..9d11775 --- /dev/null +++ b/pages/agent/order-detail/reserve-info/index.js @@ -0,0 +1,26 @@ +// pages/agent/detail/reserve-info/reserve-info.js +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, + /** + * 组件的属性列表 + */ + properties: { + orderInfo: { type: Object, value: null } + }, + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/pages/agent/order-detail/reserve-info/index.json b/pages/agent/order-detail/reserve-info/index.json new file mode 100644 index 0000000..02ef175 --- /dev/null +++ b/pages/agent/order-detail/reserve-info/index.json @@ -0,0 +1,13 @@ +{ + "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"} +} \ 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 new file mode 100644 index 0000000..37bbdb2 --- /dev/null +++ b/pages/agent/order-detail/reserve-info/index.wxml @@ -0,0 +1,30 @@ + + + + + + + 预约信息 + + 纸品品类 + {{orderInfo.paperCategoryName}} + + + 预估单价 + {{formate.formatePrice2(orderInfo.paperCategoryPrice)}} + + + 预计重量 + {{formate.formateWeight(orderInfo.totalEstimatedWeight)}} + + + + 货到时间 + {{orderInfo.deliveryTime}} + + + + \ 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 new file mode 100644 index 0000000..00093ad --- /dev/null +++ b/pages/agent/order-detail/reserve-info/index.wxss @@ -0,0 +1,16 @@ +/* pages/agent/detail/header-info/header-info.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-item/index.js b/pages/agent/order-item/index.js index b54a3f7..f9695bd 100644 --- a/pages/agent/order-item/index.js +++ b/pages/agent/order-item/index.js @@ -9,7 +9,7 @@ Component({ }, methods: { lookItem: function (e) { - wx.navigateTo({url: `/pages/agent/detail/index?id=${this.data.item.orderId}`}) + wx.navigateTo({url: `/pages/agent/order-detail/index?id=${this.data.item.orderId}`}) } } }) \ No newline at end of file diff --git a/pages/agent/order-item/index.json b/pages/agent/order-item/index.json index bcb5e61..bae998e 100644 --- a/pages/agent/order-item/index.json +++ b/pages/agent/order-item/index.json @@ -1,8 +1,6 @@ { "component": true, "usingComponents": { - "van-image": "/components/image/index", - "van-steps": "/components/steps/index", - "van-step": "/components/step/index" + "van-image": "/components/image/index" } } \ No newline at end of file diff --git a/pages/agent/order-item/index.wxml b/pages/agent/order-item/index.wxml index 19c8090..1ab89dc 100644 --- a/pages/agent/order-item/index.wxml +++ b/pages/agent/order-item/index.wxml @@ -25,10 +25,18 @@ {{orderStatus(orderItem.status)}} - - - - + + + + + + + + {{orderStatus(orderItem.displayStatus)}} + + {{orderNextStatus(orderItem.displayStatus,orderItem.activityOrderAuditPassnum)}} + + 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 {