From 91b12e6b3942fb498f45a5cf0c63c2615ea815fb Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Thu, 29 Apr 2021 19:14:52 +0800 Subject: [PATCH] no message --- api/ztb.js | 2 +- app.json | 1 - pages/agent/item-info/index.js | 83 --------------------------- pages/agent/item-info/index.json | 15 ----- pages/agent/item-info/index.wxml | 53 ----------------- pages/agent/item-info/index.wxss | 16 ------ pages/agent/order-detail/index.js | 89 +++++++++++++++++------------ pages/storage/order-info/index.wxml | 2 +- 8 files changed, 55 insertions(+), 206 deletions(-) delete mode 100644 pages/agent/item-info/index.js delete mode 100644 pages/agent/item-info/index.json delete mode 100644 pages/agent/item-info/index.wxml delete mode 100644 pages/agent/item-info/index.wxss diff --git a/api/ztb.js b/api/ztb.js index 42a3dcd..ea0f36b 100644 --- a/api/ztb.js +++ b/api/ztb.js @@ -35,7 +35,7 @@ const getRelation = () => mGet(`/recycle-service/proxy-sell/get/relation`, null, const postRelation = (code) => mPost(`/recycle-service/proxy-sell/bind/relation?code=${code}`, null, zconfig) // /proxy-sell/get/proxy-order/{orderId}客户查看订单详情 const getProxyOrderInfo = (id) => mGet(`/recycle-service/proxy-sell/get/proxy-order/${id}`, null, zconfig) -const getProxyOrderItemInfo = (params) => mGet(`/proxy-sell/get/agency-sell-order-info/by-id`, params, zconfig) +const getProxyOrderItemInfo = (params) => mGet(`/recycle-service/proxy-sell/get/agency-sell-order-info/by-id`, params, zconfig) // recycle-service/proxy-sell/get/proxy-order-list const getProxyOrderList = (params) => mGet(`/recycle-service/proxy-sell/get/proxy-order-list`, params, zconfig) // recycle-service/proxy-sell/create/order diff --git a/app.json b/app.json index b379806..5a7b087 100644 --- a/app.json +++ b/app.json @@ -34,7 +34,6 @@ "pages/agent/order-list/index", "pages/agent/focus-list/index", "pages/agent/order-detail/index", - "pages/agent/item-info/index", "pages/agent/appointment/index", "pages/agent/select-list/index", "pages/agent/result/index", diff --git a/pages/agent/item-info/index.js b/pages/agent/item-info/index.js deleted file mode 100644 index e8ac625..0000000 --- a/pages/agent/item-info/index.js +++ /dev/null @@ -1,83 +0,0 @@ -// pages/message/detail/index.js -import Scene from '../../index/scene' -import Dialog from '../../../components/dialog/dialog' -import { getProxyOrderItemInfo, cancelProxyOrderItem } from "../../../api/ztb" -const util = require('../../../utils/util') -const math = require('../../../utils/math') -const event = require('../../../utils/event') - -Scene({ - /** - * 页面的初始数据 - */ - data: { - id: null, - cancel: true, - orderInfo: null - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - if (options.id) { - this.data.id = options.id - this.fetchOrderInfo() - } - }, - fetchOrderInfo: function () { - wx.showLoading({ title: '加载中', mask: true }) - getProxyOrderItemInfo({orderItemId: 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) - } - } - var orderInfoStep = result.data.orderItems - result.data.orderItems.forEach((element1, index1) => { - for (let i = 0; i { - wx.hideLoading() - util.showToast(err) - }) - }, - cancelOrder: function () { - Dialog.confirm({ title: '温馨提示', message: '确定预约的日期无法送货，需要销售重新到纸厂进程预约？' }).then(() => { - wx.showLoading({ title: '处理中', mask: true }) - cancelProxyOrderItem(that.data.orderInfo.orderId).then(result => { - wx.hideLoading() - that.setData({ ['orderInfo.status']: 55 }) - event.emit('ProxyMessage', { what: 400, desc: 'ProxyChange' }) - util.showToast('订单已经取消') - }).catch(err => { - wx.hideLoading() - util.showToast(err) - }) - }) - } - -}) \ No newline at end of file diff --git a/pages/agent/item-info/index.json b/pages/agent/item-info/index.json deleted file mode 100644 index 78c1145..0000000 --- a/pages/agent/item-info/index.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "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/item-info/index.wxml b/pages/agent/item-info/index.wxml deleted file mode 100644 index 741e037..0000000 --- a/pages/agent/item-info/index.wxml +++ /dev/null @@ -1,53 +0,0 @@ - - - 代卖订单详情 - - - - - - - - - 货物即将发往{{orderInfo.paperMillName}} - {{orderInfo.paperMillAddress}} - - - - - - - - - - - - - - - - 车辆信息{{index+1}} - - - - - - - - - - - - - - - - - - - 取消订单 - - - \ No newline at end of file diff --git a/pages/agent/item-info/index.wxss b/pages/agent/item-info/index.wxss deleted file mode 100644 index eace3b8..0000000 --- a/pages/agent/item-info/index.wxss +++ /dev/null @@ -1,16 +0,0 @@ -/* 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/index.js b/pages/agent/order-detail/index.js index 94bb9d0..2b3351e 100644 --- a/pages/agent/order-detail/index.js +++ b/pages/agent/order-detail/index.js @@ -1,7 +1,7 @@ // pages/message/detail/index.js import Scene from '../../index/scene' import Dialog from '../../../components/dialog/dialog' -import { getProxyOrderInfo, cancelProxyOrder, cancelReservation, cancelProxyOrderItem } from "../../../api/ztb" +import { getProxyOrderInfo, cancelProxyOrder, getProxyOrderItemInfo, cancelReservation, cancelProxyOrderItem } from "../../../api/ztb" const util = require('../../../utils/util') const math = require('../../../utils/math') const event = require('../../../utils/event') @@ -12,6 +12,7 @@ Scene({ */ data: { id: null, + itemId: null, cancel: true, orderInfo: null }, @@ -21,49 +22,65 @@ Scene({ onLoad: function (options) { if (options.id) { this.data.id = options.id - this.fetchOrderInfo() } + if (options.itemId) { + this.data.itemId = options.itemId + } + 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 - } + if(this.data.id){ + wx.showLoading({ title: '加载中', mask: true }) + getProxyOrderInfo(this.data.id).then(result => { + this.setResult(result) + wx.hideLoading() + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + } else if(this.data.itemId){ + getProxyOrderItemInfo({orderItemId: this.data.id}).then(result => { + this.setResult(result) + wx.hideLoading() + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + } + }, + setResult: function(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 && element.surcharge && element.surcharge == math.times(element.weightnoteInfo.netWeight, element.unitSurcharge)) { + //按照净重,计算代卖费 + element.orderType = 0 } else { - if (element.weightnoteInfo.netWeight) { - element.proxyAmount = math.times(element.weightnoteInfo.netWeight, element.unitSurcharge) - } + //按照结算重量计算代卖费 + 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.data.cancel = false + } + if (element.activityOrderAuditPassNum == 2) { + element.finalSettlePrice = math.plus(element.finalPayMoney, element.preSettleMoney) + } + } + var orderInfoStep = result.data.orderItems + result.data.orderItems.forEach((element1, index1) => { + for (let i = 0; i { - for (let i = 0; i { - wx.hideLoading() - util.showToast(err) }) + this.setData({ orderInfo: result.data, cancel: this.data.cancel, orderInfoStep }) }, cancelOrder: function () { Dialog.confirm({ title: '温馨提示', message: '确定预约的日期无法送货，需要销售重新到纸厂进程预约？' }).then(() => { diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml index dabcfd6..ae1dba3 100644 --- a/pages/storage/order-info/index.wxml +++ b/pages/storage/order-info/index.wxml @@ -37,7 +37,7 @@ 司机姓名 - + 代卖订单详情