no message

5 years ago · e183c09aaa
38 changed files with 835 additions and 17 deletions
--- 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(){
--- 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"}
+.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"}
--- a/pages/agent/index.wxs
+++ 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
+}
--- a/pages/agent/order-detail/delivery-info/index.js
+++ 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('复制成功')
+        }
+      })
+    }
+  }
+})
--- a/pages/agent/order-detail/delivery-info/index.json
+++ b/pages/agent/order-detail/delivery-info/index.json
@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "wux-button": "/components/button/index"
+  }
+}
--- a/pages/agent/order-detail/delivery-info/index.wxml
+++ b/pages/agent/order-detail/delivery-info/index.wxml
@ -0,0 +1,28 @@
+<!--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"/>
+<view class="bg-white" style="padding:24rpx 30rpx" wx:if="{{orderInfo.millSupplierId}}">
+		<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">
+				<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>
+			</view>
+		</view>
+		<view class="flex flex-justify text-sg" style="margin-top:20rpx">
+			<text class="text-black">纸厂订单号</text>
+			<text class="text-gray">{{orderInfo.millDeliveryOrderId || ''}}</text>
+		</view>
+		<view class="flex flex-justify text-sg" style="margin-top:20rpx">
+			<text class="text-black">货到时间</text>
+			<text class="text-gray">{{orderInfo.paperMillDeliveryTime || ''}}</text>
+		</view>
+		<view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
+			<text class="text-black" style="min-width:180rpx">注意事项</text>
+			<text class="text-gray">{{orderInfo.attenssion || ''}}</text>
+		</view>
+	</view>
--- a/pages/agent/order-detail/delivery-info/index.wxss
+++ 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;
+}
--- a/pages/agent/order-detail/header-info/index.js
+++ 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: {
+
+  }
+})
--- a/pages/agent/order-detail/header-info/index.json
+++ b/pages/agent/order-detail/header-info/index.json
@ -0,0 +1,5 @@
+{
+  "component": true,
+  "usingComponents": {
+  }
+}
--- a/pages/agent/order-detail/header-info/index.wxml
+++ b/pages/agent/order-detail/header-info/index.wxml
@ -0,0 +1,7 @@
+<!--pages/agent/detail/header-info/header-info.wxml-->
+<!-- 顶部的header -->
+<wxs module="agent" src="../../../agent/index.wxs"></wxs>
+<view class="bg-{{agent.backStatus(orderInfo.status)}} flex" style="padding:30rpx" wx:if="{{orderInfo}}">
+	<text class="cuIcon-{{agent.iconStatus(orderInfo.status)}} text-white" style="font-size:30px"></text>
+	<text class="text-xxl text-white" style="margin-left:16rpx">{{agent.orderStatus(orderInfo.status)}}</text>
+</view>
--- a/pages/agent/order-detail/header-info/index.wxss
+++ 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;
+}
--- 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 <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 "已结算,订单完成";
+    }
+  },

-  }
 })
--- 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"
  }
 }
--- a/pages/agent/order-detail/index.wxml
+++ b/pages/agent/order-detail/index.wxml
@ -1,6 +1,52 @@
 <!--pages/message/detail/index.wxml-->
 <cu-custom bgColor="bg-white" isBack="{{true}}">
-  <view slot="content">消息情况</view>
+  <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="border-bottom:2rpx solid #f3f3f3;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}}" />

+<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"/>
--- a/pages/agent/order-detail/item-car-info/index.js
+++ 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: {
+
+  }
+})
--- a/pages/agent/order-detail/item-car-info/index.json
+++ 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"}
+}
--- a/pages/agent/order-detail/item-car-info/index.wxml
+++ b/pages/agent/order-detail/item-car-info/index.wxml
@ -0,0 +1,25 @@
+<!--pages/agent/detail/item-history-part/item-history-info.wxml-->
+<!-- 车辆信息 -->
+<wxs module="agent" src="../../../agent/index.wxs"></wxs>
+<wux-accordion-group>
+	<wux-accordion>
+		<view slot="header" class="flex flex-justify" style="width: 100%">
+			<view class="flex">
+				<text class="text-sg text-black text-bold">{{item.logisticcsInfo.plateNumber}}</text>
+				<text class="text-sg text-black text-bold"
+					style="margin-left:8rpx">「{{item.paperCategoryName || orderInfo.paperCategoryName}}」</text>
+			</view>
+			<view class="text-df text-gray" style="padding-right:16rpx;">进度详情</view>
+		</view>
+		<wux-steps direction="vertical">
+			<wux-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex"
+				title="{{timeItem.description}}" status="{{statusStep(timeItem.status)}}" content="{{timeItem.time}}" />
+		</wux-steps>
+	</wux-accordion>
+</wux-accordion-group>
+<wxs module="statusStep">
+	function statusStep(status) {
+		return status == 1 ? "process" : "wait";
+	}
+	module.exports = statusStep
+</wxs>
--- a/pages/agent/order-detail/item-car-info/index.wxss
+++ 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;
+}
--- a/pages/agent/order-detail/item-money-info/index.js
+++ 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: {
+
+  }
+})
--- a/pages/agent/order-detail/item-money-info/index.json
+++ b/pages/agent/order-detail/item-money-info/index.json
@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
--- a/pages/agent/order-detail/item-money-info/index.wxml
+++ b/pages/agent/order-detail/item-money-info/index.wxml
@ -0,0 +1,112 @@
+<!--pages/agent/detail/money-info/money-info.wxml-->
+
+<wxs module="agent" src="../../../agent/index.wxs"></wxs>
+<wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
+
+<!-- 预付款 -->
+<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx" wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 1}}">
+	<view class="text-df text-gray" style="solid #f3f3f3;padding-bottom:24rpx">首款信息</view>
+	<view class="flex flex-justify text-sg">
+		<text class="text-black">预计总金额</text>
+		<text style="color:#F5222D">{{formate.formateAmount(item.preTotalMoney)}}元</text>
+	</view>
+	<view class="flex flex-justify text-sm" style="margin-top:2rpx">
+		<text class="text-gray">结算单价 x 净重</text>
+		<view class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x
+			{{formate.formateWeight3(item.weightnoteInfo.netWeight)}}</view>
+	</view>
+	<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
+		<text class="text-black">首笔应收金额</text>
+		<text style="color:#F5222D">{{formate.formateAmount(item.prepayMoney)}}元</text>
+	</view>
+	<view class="flex flex-justify text-sm" style="margin-top:2rpx">
+		<text class="text-gray">预估总金额 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}</text>
+		<view class="text-gray">{{formate.formateAmount(item.preTotalMoney)}}元 x
+			{{agent.getActivitySettleType(orderInfo.activitySettleType)}}</view>
+	</view>
+	<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
+		<text class="text-black">代卖费</text>
+		<text style="color:#F5222D">{{formate.formateAmount(item.proxyAmount) || 0}}元</text>
+	</view>
+	<view class="flex flex-justify text-sm" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==0}}" >
+		<text class="text-gray">代卖费单价 x 净重</text>
+		<view class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x
+			{{formate.formateWeight3(item.weightnoteInfo.netWeight)}}</view>
+	</view>
+	<view class="flex text-sg"
+		style="justify-content: flex-end;margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
+		<text class="text-black text-bold">首笔实收金额：</text>
+		<text class="text-gray" style="color:#F5222D">{{formate.formateAmount(item.preSettleMoney)}}元</text>
+	</view>
+</view>
+<!-- 尾款 只有活动订单才会有这个字段,并且这个字段=2表示第二次审核了 -->
+<view wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 2}}">
+	<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx">
+	<view class="text-df text-gray" style="solid #f3f3f3;padding-bottom:24rpx">尾款信息</view>
+		<view class="flex flex-justify text-sg">
+			<text class="text-black">未结算金额</text>
+			<text style="color:#F5222D">{{formate.formateAmount(item.unSettleMoney)}}元</text>
+		</view>
+		<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==1}}">
+			<text class="text-gray">单价 x 结算重量 - 首笔应收金额</text>
+			<view class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x
+				{{formate.formateWeight3(item.weightnoteInfo.settleWeight)}} -
+				{{formate.formateAmount(item.prepayMoney)}}元</view>
+		</view>
+		<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==0}}">
+			<text class="text-gray">单价 x 净重 - 首笔应收金额</text>
+			<view class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x
+				{{formate.formateWeight3(item.weightnoteInfo.netWeight)}} -
+				{{formate.formateAmount(item.prepayMoney)}}元</view>
+		</view>
+		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx"
+			wx:if="{{item.adjustMoney && item.adjustMoney != 0}}">
+			<text class="text-black">调节费</text>
+			<text style="color:#F5222D">-{{formate.formateAmount(item.adjustMoney)}}元</text>
+		</view>
+		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
+			<text class="text-black text-bold">尾款实收金额：</text>
+			<text style="color:#F5222D">{{formate.formateAmount(item.finalPayMoney)}}元</text>
+		</view>
+		<view class="flex flex-justify text-sg" style=";margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
+			<text class="text-black text-bold">总收款金额：</text>
+			<text style="color:#F5222D">{{formate.formateAmount(item.finalSettlePrice)}}元</text>
+		</view>
+	</view>
+</view>
+<!-- 全款 非活动订单,或者一次性付款的活动订单 , 在待审核和待结算,已完成下 , 显示全款信息, -->
+<view wx:if="{{(item.paymentType == 3||orderInfo.activityId==null)&&(item.status>52&&item.status!=55)}}" class="bg-white"
+	style="padding: 24rpx 30rpx;margin-top:16rpx">
+	<view class="flex flex-justify text-sg">
+		<text class="text-black">总金额</text>
+		<text style="color:#F5222D">{{formate.formateAmount(item.sumAmount)}}元</text>
+	</view>
+	<view class="flex flex-justify text-xs" style="margin-top:2rpx">
+		<text class="text-gray">结算单价 x 结算重量</text>
+		<view class="text-gray">{{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}} x
+			{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}</view>
+	</view>
+	<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
+		<text class="text-black">代卖费</text>
+		<text style="color:#F5222D">{{formate.formateAmount(item.surcharge) || 0}}元</text>
+	</view>
+	<view class="flex flex-justify text-xs" style="margin-top:2rpx"  wx:if="{{item.proxySellerSettleType==1}}">
+		<text class="text-gray">代卖费单价 x 结算重量</text>
+		<view class="text-gray">{{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}} x
+			{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}</view>
+	</view>
+	<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:elif="{{item.proxySellerSettleType==0}}">
+		<text class="text-gray">代卖费单价 x 净重</text>
+		<view class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x
+			{{formate.formateWeight(item.weightnoteInfo.netWeight)}}</view>
+	</view>
+	<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx"
+		wx:if="{{item.adjustMoney && item.adjustMoney}}">
+		<text class="text-black">调节费</text>
+		<text style="color:#F5222D">{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元</text>
+	</view>
+	<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
+		<text class="text-black text-bold">总收款金额：</text>
+		<text style="color:#F5222D">{{formate.formateAmount(item.weightnoteInfo.settlePrice)}}元</text>
+	</view>
+</view>
--- a/pages/agent/order-detail/item-money-info/index.wxss
+++ 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;
+}
--- a/pages/agent/order-detail/order-info/index.js
+++ 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: {
+
+  }
+})
--- a/pages/agent/order-detail/order-info/index.json
+++ 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"
+  }
+}
--- a/pages/agent/order-detail/order-info/index.wxml
+++ b/pages/agent/order-detail/order-info/index.wxml
@ -0,0 +1,24 @@
+<!--pages/agent/detail/order-info/order-info.wxml-->
+
+<wxs module="agent" src="../../../agent/index.wxs"></wxs>
+<wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
+
+<view class="bg-white margin-top" >
+<wux-accordion-group wx:if="{{orderInfo}}">
+	<wux-accordion>
+		<view slot="header" class="text-gray">订单信息</view>
+		<view class="flex flex-justify text-sg">
+			<text class="text-black">订单编号</text>
+			<text class="text-gray">{{orderInfo.orderId}}</text>
+		</view>
+		<view class="flex flex-justify text-sg" style="margin-top:20rpx">
+			<text class="text-black">创建时间</text>
+			<text class="text-gray">{{orderInfo.createTime}}</text>
+		</view>
+		<view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
+			<text class="text-black" style="min-width:200rpx">订单备注</text>
+			<text class="text-gray">{{orderInfo.remark || ''}}</text>
+		</view>
+	</wux-accordion>
+</wux-accordion-group>
+</view>
--- a/pages/agent/order-detail/order-info/index.wxss
+++ 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;
+}
--- a/pages/agent/order-detail/pound-info/index.js
+++ 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: {
+
+  }
+})
--- a/pages/agent/order-detail/pound-info/index.json
+++ 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"
+  }
+}
--- a/pages/agent/order-detail/pound-info/index.wxml
+++ b/pages/agent/order-detail/pound-info/index.wxml
@ -0,0 +1,38 @@
+<!--pages/agent/detail/pound-info/pound-info.wxml-->
+<wxs module="agent" src="../../../agent/index.wxs"></wxs>
+<wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
+<view class="bg-white"
+  wx:if="{{item.weightnoteInfo && item.weightnoteInfo.id&&(orderInfo.activityId!=null||item.status>=53)}}"
+  style="padding: 24rpx 30rpx">
+  <view class="flex flex-justify text-sg">
+    <text class="text-black">结算单价</text>
+    <text class="text-gray">{{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}}</text>
+  </view>
+  <view class="flex flex-justify text-sg" style="margin-top:20rpx">
+    <text class="text-black">净重</text>
+    <text class="text-gray">{{formate.formateWeight(item.weightnoteInfo.netWeight)}}</text>
+  </view>
+  <view class="flex flex-justify text-sg" style="margin-top:20rpx" wx:if="{{item.weightnoteInfo.settleWeight}}">
+    <text class="text-black">结算重量</text>
+    <text class="text-gray">{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}</text>
+  </view>
+  <view class="flex flex-justify text-sg" style="margin-top:20rpx" wx:if="{{item.weightnoteInfo.deductedPoint}}">
+    <text class="text-black">扣点</text>
+    <text class="text-gray">{{item.weightnoteInfo.deductedPoint}}%</text>
+  </view>
+  <view class="flex flex-justify text-sg" style="margin-top:20rpx">
+    <text class="text-black">代卖费</text>
+    <text class="text-gray">{{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}}</text>
+  </view>
+  <view class="flex flex-justify text-sg" style="margin-top:20rpx">
+    <text class="text-black">调节费</text>
+    <text class="text-gray">{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元</text>
+  </view>
+  <view class="flex flex-justify text-sg" style="margin-top:20rpx">
+    <text class="text-black">磅单图片</text>
+  </view>
+  <view style="margin-top:20rpx">
+    <sudoku-image image-list="{{item.weightnoteInfo.imageUrls}}" square="{{true}}" clickable="{{true}}">
+    </sudoku-image>
+  </view>
+</view>
--- a/pages/agent/order-detail/pound-info/index.wxss
+++ 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;
+}
--- a/pages/agent/order-detail/reserve-info/index.js
+++ 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: {
+
+  }
+})
--- a/pages/agent/order-detail/reserve-info/index.json
+++ 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"}
+}
--- a/pages/agent/order-detail/reserve-info/index.wxml
+++ b/pages/agent/order-detail/reserve-info/index.wxml
@ -0,0 +1,30 @@
+<!--pages/agent/detail/reserve-info/reserve-info.wxml-->
+<wxs module="agent" src="../../../agent/index.wxs"></wxs>
+<wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
+<view class="bg-white margin-top">
+<wux-accordion-group  default-current="{{['0']}}">
+		<wux-accordion>
+			<view slot="header" class="text-gray ">预约信息</view>
+			<view class="flex flex-justify text-sg">
+				<text class="text-black">纸品品类</text>
+				<text class="text-gray">{{orderInfo.paperCategoryName}}</text>
+			</view>
+			<view class="flex flex-justify text-sg" style="margin-top:20rpx">
+				<text class="text-black">预估单价</text>
+				<text class="text-gray">{{formate.formatePrice2(orderInfo.paperCategoryPrice)}}</text>
+			</view>
+			<view class="flex flex-justify text-sg" style="margin-top:20rpx">
+				<text class="text-black">预计重量</text>
+				<text class="text-gray">{{formate.formateWeight(orderInfo.totalEstimatedWeight)}}</text>
+			</view>
+			<!-- <view class="flex flex-justify text-sg" style="margin-top:20rpx">
+				<text class="text-black">货车数量</text>
+				<text class="text-gray">{{orderInfo.orderItems.length}}辆</text>
+			</view> -->
+			<view class="flex flex-justify text-sg" style="margin-top:20rpx">
+				<text class="text-black">货到时间</text>
+				<text class="text-gray">{{orderInfo.deliveryTime}}</text>
+			</view>
+		</wux-accordion>
+	</wux-accordion-group>
+</view>
--- a/pages/agent/order-detail/reserve-info/index.wxss
+++ 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;
+}
--- 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}`})
    }
  }
 })
--- 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"
  }
 }
--- a/pages/agent/order-item/index.wxml
+++ b/pages/agent/order-item/index.wxml
@ -25,10 +25,18 @@
 					<text class="cuIcon-title" style="font-size: 16px;color:#E7643B"></text>
 					<view style="margin-top:-4rpx;color:#E7643B">{{orderStatus(orderItem.status)}}</view>
 				</view>
-				<van-steps dot direction="column" wx:key="index" wx:else>
-					<van-step title="已出餐"></van-step>
-					<van-step title="已出餐"></van-step>
-        </van-steps>
+				<view class="flex" wx:else>
+					<view class="flex flex-center flex-column">
+						<text slot="dot" class="cuIcon-title" style="font-size: 16px;color:#E7643B"></text>
+						<text style="height:24rpx;width:2rpx;border-left:4rpx dashed #ccc;border-left-style: dotted;"></text>
+						<text slot="dot" class="cuIcon-title" style="font-size: 16px;color:#999999"></text>
+					</view>
+					<view class="flex flex-center flex-column">
+						<view style="margin-top:-6rpx;color:#E7643B;width:90rpx">{{orderStatus(orderItem.displayStatus)}}</view>
+						<text style="height:24rpx;width:2rpx;"></text>
+						<view class="text-sm text-gray" style="text-align: right;width:76rpx">{{orderNextStatus(orderItem.displayStatus,orderItem.activityOrderAuditPassnum)}}</view>
+					</view>
+				</view>
 			</view>
 		</view>
 	</view>
--- 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 {