no message

pages/agent/order-detail/delivery-info/index.json

@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "wux-button": "/components/button/index"
+    "van-button": "/components/button/index"
   }
 }

pages/agent/order-detail/delivery-info/index.wxml

@@ -1,5 +1,4 @@
 <!--pages/agent/detail/delivery-info/delivery-info.wxml-->
-
 <wxs module="agent" src="../../../agent/index.wxs"></wxs>
 <wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
 <view class=" margin-top"/>
@@ -7,10 +6,9 @@
 		<view class="text-df text-gray" style="border-bottom:2rpx solid #f3f3f3;padding-bottom:24rpx">送货信息</view>
 		<view class="flex flex-justify text-sg" style="margin-top:20rpx">
 			<text class="text-black">纸厂开户账号</text>
-			<view class="flex flex-center">
+			<view class="flex flex-center" wx:if="{{orderInfo.millSupplierId}}">
 				<text class="text-gray" style="margin-right:12rpx">{{orderInfo.millSupplierId  || ''}}</text>
-				<wux-button outline type="positive" size="copy" bind:click="clipboard" wx:if="{{orderInfo.millSupplierId}}">复制
-				</wux-button>
+				<van-button plain type="info" size="mini" bind:click="clipboard">复制</van-button>
 			</view>
 		</view>
 		<view class="flex flex-justify text-sg" style="margin-top:20rpx">

pages/agent/order-detail/index.js

@@ -5,7 +5,6 @@ import { getProxyOrderInfo, cancelProxyOrder, cancelReservation, cancelProxyOrde
 const util = require('../../../utils/util')
 const math = require('../../../utils/math')
 const event = require('../../../utils/event')
-const app = getApp()
 
 Scene({
   /**
@@ -14,8 +13,7 @@ Scene({
   data: {
     id: null,
     cancel: true,
-    orderInfo: null,
-    orderInfoStepLs:null
+    orderInfo: null
   },
   /**
    * 生命周期函数--监听页面加载
@@ -55,32 +53,25 @@ Scene({
         }
       }
       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 <element1.orderItemTimeList.length; i++) {
-          orderInfoStepLs[index1].orderItemTimeList[i] = element1.orderItemTimeList[i]
-        }
-      });
-      this.setData({ orderInfoStep: orderInfoStepLs })
       wx.hideLoading()
     }).catch(err => {
       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 "已结算,订单完成";
-    }
-  },
+  cancelOrder: function () {
+    Dialog.confirm({ title: '温馨提示',  message: '确定预约的日期无法送货，需要销售重新到纸厂进程预约？' }).then(() => {
+      wx.showLoading({ title: '处理中', mask: true })
+      cancelProxyOrder(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/order-detail/item-car-info/index.json

@@ -1,7 +1,6 @@
 {
   "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",

pages/agent/order-detail/item-car-info/index.wxml

@@ -1,5 +1,4 @@
 <!--pages/agent/detail/item-history-part/item-history-info.wxml-->
-<!-- 车辆信息 -->
 <wxs module="agent" src="../../../agent/index.wxs"></wxs>
 <wux-accordion-group>
 	<wux-accordion>

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 {