no message

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

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",

pages/agent/item-info/index.js

@@ -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 <element1.orderItemTimeList.length; i++) {
-          orderInfoStep[index1].orderItemTimeList[i] = element1.orderItemTimeList[i]
-        }
-      })
-      this.setData({ orderInfo: result.data, cancel: this.data.cancel, orderInfoStep })
-      wx.hideLoading()
-    }).catch(err => {
-      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)
-      })
-    })
-  }
-
-})

pages/agent/item-info/index.json

@@ -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"
-  }
-}

pages/agent/item-info/index.wxml

@@ -1,53 +0,0 @@
-<!--pages/message/detail/index.wxml-->
-<cu-custom bgColor="bg-white" isBack="{{true}}">
-	<view slot="content">代卖订单详情</view>
-</cu-custom>
-<!-- ------顶部信息------ -->
-<header-info orderInfo="{{orderInfo}}" />
-<!-- ------特殊信息------ -->
-<view wx:if="{{orderInfo && (orderInfo.status == 50 || orderInfo.status == 51)}}">
-	<view class="flex flex-justify bg-white margin-top" style="padding:30rpx">
-		<image class="image-load" src="/assets/image/ico_address.png"></image>
-		<view style="margin-left:24rpx;flex:1">
-			<view class="text-sg">货物即将发往{{orderInfo.paperMillName}}</view>
-			<view class="text-sm text-gray" style="margin-top:8rpx">{{orderInfo.paperMillAddress}}</view>
-		</view>
-	</view>
-	<!-- 待预约状态下,预约信息放前面 -->
-	<view wx:if="{{orderInfo.status==50}}">
-		<reserve-info orderInfo="{{orderInfo}}" />
-		<view style="height:16rpx"> </view>
-	</view>
-	<!-- 待送货状态下送货信息放在前面 -->
-	<delivery-info orderInfo="{{orderInfo}}" wx:if="{{orderInfo.status==51}}" />
-</view>
-<!-- ------车辆信息------ -->
-<!-- 总共多少辆车，单独放在顶部 -->
-<view style="height:16rpx"> </view>
-<!-- 每一辆车，进度信息和结算信息 -->
-<view wx:for="{{orderInfoStep}}" wx:key="index" style="margin-top:{{index == 0 ? 0 : 16}}rpx">
-	<view class="bg-white text-df text-gray" style="padding:24rpx 30rpx">车辆信息{{index+1}}</view>
-	<!-- 进度 -->
-	<item-car-info orderInfo="{{orderInfo}}" item="{{item}}" />
-	<!-- 磅单 -->
-	<pound-info orderInfo="{{orderInfo}}" item="{{item}}" />
-	<!-- 金额 -->
-	<item-money-info orderInfo="{{orderInfo}}" item="{{item}}" />
-</view>
-<!-- ------送货信息------ -->
-<!-- 预约和送货状态下的送货信息已在前面展示过了,所以不需要展示 -->
-<delivery-info orderInfo="{{orderInfo}}" wx:if="{{orderInfo.status>51}}" />
-<!-- ------预约信息------ -->
-<!-- 预约和送货状态下的预约信息已在前面展示过了,所以不需要展示 -->
-<reserve-info orderInfo="{{orderInfo}}" wx:if="{{orderInfo.status>51}}" />
-<!-- ------订单信息------ -->
-<order-info orderInfo="{{orderInfo}}" />
-
-<view style="height:{{136}}rpx;"
-	wx:if="{{orderInfo && ((cancel && orderInfo.status == 51) || orderInfo.status == 50)}}"></view>
-<submit-layout wx:if="{{orderInfo && ((cancel && orderInfo.status == 51) || orderInfo.status == 50)}}">
-	<van-button type="default" custom-style="height:88rpx;width:240rpx" bind:click="cancelOrder"
-		wx:if="{{orderInfo.status == 50 || orderInfo.status == 51}}">取消订单</van-button>
-</submit-layout>
-<van-dialog id="van-dialog" />
-<notification id="qn-notification" />

pages/agent/item-info/index.wxss

@@ -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;
-}

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 <element1.orderItemTimeList.length; i++) {
+        orderInfoStep[index1].orderItemTimeList[i] = element1.orderItemTimeList[i]
       }
-      var orderInfoStep = result.data.orderItems
-      result.data.orderItems.forEach((element1, index1) => {
-        for (let i = 0; i <element1.orderItemTimeList.length; i++) {
-          orderInfoStep[index1].orderItemTimeList[i] = element1.orderItemTimeList[i]
-        }
-      })
-      this.setData({ orderInfo: result.data, cancel: this.data.cancel, orderInfoStep })
-      wx.hideLoading()
-    }).catch(err => {
-      wx.hideLoading()
-      util.showToast(err)
     })
+    this.setData({ orderInfo: result.data, cancel: this.data.cancel, orderInfoStep })
   },
   cancelOrder: function () {
     Dialog.confirm({ title: '温馨提示',  message: '确定预约的日期无法送货，需要销售重新到纸厂进程预约？' }).then(() => {

pages/storage/order-info/index.wxml

@@ -37,7 +37,7 @@
         <view class="text-black">司机姓名</view>
       </view>
     </van-cell>
-    <van-cell clickable is-link wx:if="{{orderInfo.agencySellOrderItemId}}" url="/pages/agent/item-info/index?id={{orderInfo.agencySellOrderItemId}}">
+    <van-cell clickable is-link wx:if="{{orderInfo.agencySellOrderItemId}}" url="/pages/agent/order-detail/index?itemId={{orderInfo.agencySellOrderItemId}}">
       <view slot="title" class="flex flex-justify">
         <view class="text-black">代卖订单详情</view>
       </view>