diff --git a/api/ztb.js b/api/ztb.js
index 62b9778..42a3dcd 100644
--- a/api/ztb.js
+++ b/api/ztb.js
@@ -35,6 +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)
// 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
@@ -78,6 +79,7 @@ export {
getRelation,
postRelation,
getProxyOrderInfo,
+ getProxyOrderItemInfo,
getProxyOrderList,
createProxyOrder,
cancelProxyOrder,
diff --git a/app.json b/app.json
index 5a7b087..b379806 100644
--- a/app.json
+++ b/app.json
@@ -34,6 +34,7 @@
"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/assets/image/icon_pdf.svg b/assets/image/icon_pdf.svg
deleted file mode 100644
index 4810b79..0000000
--- a/assets/image/icon_pdf.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/pages/agent/ability-item/index.js b/pages/agent/ability-item/index.js
index ae32396..41e5096 100644
--- a/pages/agent/ability-item/index.js
+++ b/pages/agent/ability-item/index.js
@@ -40,7 +40,7 @@ Component({
return
}
if(!this.data.item.isOperations){
- util.showToast('该纸厂已暂停接单，请联系相关负责人！')
+ util.showToast(this.data.item.manageNotifyMessage)
return
}
if(util.isEmpty(this.data.cateIndex)){
diff --git a/pages/agent/agent-item/index.js b/pages/agent/agent-item/index.js
index 7f02d37..f7be056 100644
--- a/pages/agent/agent-item/index.js
+++ b/pages/agent/agent-item/index.js
@@ -37,7 +37,7 @@ Component({
return
}
if(!this.data.item.isOperations){
- util.showToast('该纸厂已暂停接单，请联系相关负责人！')
+ util.showToast(this.data.item.manageNotifyMessage)
return
}
if(util.isEmpty(this.data.cateIndex)){
diff --git a/pages/agent/appointment/index.js b/pages/agent/appointment/index.js
index ec91657..1dd67e0 100644
--- a/pages/agent/appointment/index.js
+++ b/pages/agent/appointment/index.js
@@ -213,12 +213,12 @@ Scene({
this.setData({ vehicleList: this.data.vehicleList })
},
submitForm: function (e) {
- if(!app.userInfo.isAuth) {
- Dialog.alert({ title: '温馨提示', message: '您暂未实名认证，请实名认证后提交订单。' }).then(() => {
- wx.navigateTo({ url: '/pages/setting/authory/index' })
- })
- return
- }
+ // if(!app.userInfo.isAuth) {
+ // Dialog.alert({ title: '温馨提示', message: '您暂未实名认证，请实名认证后提交订单。' }).then(() => {
+ // wx.navigateTo({ url: '/pages/setting/authory/index' })
+ // })
+ // return
+ // }
if (util.isEmpty(this.data.form.totalEstimatedWeight)) {
util.showToast('请输入预估重量')
return
diff --git a/pages/agent/factory-detail/index.js b/pages/agent/factory-detail/index.js
index 6160346..c56d135 100644
--- a/pages/agent/factory-detail/index.js
+++ b/pages/agent/factory-detail/index.js
@@ -98,7 +98,7 @@ Scene({
return
}
if(!this.data.factoryDetail.isOperations){
- util.showToast('该纸厂已暂停接单，请联系相关负责人！')
+ util.showToast(this.data.factoryDetail.manageNotifyMessage)
return
}
var item = this.data.factoryDetail.paperCategoryList[this.data.cateIndex]
diff --git a/pages/agent/item-info/index.js b/pages/agent/item-info/index.js
new file mode 100644
index 0000000..e8ac625
--- /dev/null
+++ b/pages/agent/item-info/index.js
@@ -0,0 +1,83 @@
+// 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
new file mode 100644
index 0000000..78c1145
--- /dev/null
+++ b/pages/agent/item-info/index.json
@@ -0,0 +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/item-info/index.wxml b/pages/agent/item-info/index.wxml
new file mode 100644
index 0000000..741e037
--- /dev/null
+++ b/pages/agent/item-info/index.wxml
@@ -0,0 +1,53 @@
+
+
+ 代卖订单详情
+
+
+
+
+
+
+
+
+ 货物即将发往{{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
new file mode 100644
index 0000000..eace3b8
--- /dev/null
+++ b/pages/agent/item-info/index.wxss
@@ -0,0 +1,16 @@
+/* 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-list/index.wxml b/pages/agent/order-list/index.wxml
index 5c33dff..31455ce 100644
--- a/pages/agent/order-list/index.wxml
+++ b/pages/agent/order-list/index.wxml
@@ -17,10 +17,8 @@
-
-
-
-
+
+
diff --git a/pages/agent/select-item/index.js b/pages/agent/select-item/index.js
new file mode 100644
index 0000000..b0450a8
--- /dev/null
+++ b/pages/agent/select-item/index.js
@@ -0,0 +1,26 @@
+// pages/message/index.js
+Component({
+ options: {
+ addGlobalClass: true,
+ multipleSlots: true
+ },
+ properties: {
+ item: { type: Object, value: null },
+ itemId: { type: String, value: null }
+ },
+ methods: {
+ lookItem: function (e) {
+ var orderItem = this.data.item.orderItems[e.currentTarget.dataset.index]
+ var data = { millName: this.data.item.paperMillName, createTime: this.data.item.createTime }
+ data.categoryName = orderItem.paperCategoryName
+ data.plateNumber = orderItem.plateNumber
+ data.id = orderItem.id
+ const channel = this.getOpenerEventChannel()
+ if(!channel){
+ return
+ }
+ channel.emit('onCallback', { what: 62, detail: data })
+ wx.navigateBack()
+ }
+ }
+})
\ No newline at end of file
diff --git a/pages/agent/select-item/index.json b/pages/agent/select-item/index.json
new file mode 100644
index 0000000..f277ba9
--- /dev/null
+++ b/pages/agent/select-item/index.json
@@ -0,0 +1,7 @@
+{
+ "component": true,
+ "usingComponents": {
+ "van-cell": "/components/cell/index",
+ "van-image": "/components/image/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/agent/select-item/index.wxml b/pages/agent/select-item/index.wxml
new file mode 100644
index 0000000..e8d35f7
--- /dev/null
+++ b/pages/agent/select-item/index.wxml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+ {{item.paperMillName}}
+ 下单时间：{{item.createTime}}
+
+
+
+
+ 车牌号码：{{orderItem.plateNumber}}
+ 「{{orderItem.paperCategoryName}}」
+
+
\ No newline at end of file
diff --git a/pages/agent/select-item/index.wxss b/pages/agent/select-item/index.wxss
new file mode 100644
index 0000000..0f95c5a
--- /dev/null
+++ b/pages/agent/select-item/index.wxss
@@ -0,0 +1,12 @@
+/* pages/mall/shops/index.wxss */
+.item-content {
+ background-color: white;
+ padding: 24rpx 32rpx;
+}
+
+.item-order {
+ padding: 8rpx 30rpx;
+ border-radius: 10rpx;
+ border: 1rpx solid #f3f3f3;
+ background-color: #f3f3f3;
+}
diff --git a/pages/agent/select-list/index.js b/pages/agent/select-list/index.js
index 7b7909e..806b3be 100644
--- a/pages/agent/select-list/index.js
+++ b/pages/agent/select-list/index.js
@@ -41,14 +41,7 @@ Scene({
this.data.requesting = true
getAgencyOrderList(this.data.form).then(result => {
if (result.data && result.data.records && result.data.records.length) {
- var respList = []
- for (let index = 0; index < result.data.records.length; index++) {
- const element = result.data.records[index]
- for (let i = 0; i < element.orderItems.length; i++) {
- const item = element.orderItems[i]
- respList.push({id: item.id, millName: element.paperMillName, categoryName: item.paperCategoryName, plateNumber: item.plateNumber, createTime: element.createTime, logoImg: element.logoImg })
- }
- }
+ var respList = result.data.records
let nowList = `orderList[${this.data.orderList.length}]`
var num = this.data.form.pageNum
var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total
diff --git a/pages/agent/select-list/index.json b/pages/agent/select-list/index.json
index a120622..bc56053 100644
--- a/pages/agent/select-list/index.json
+++ b/pages/agent/select-list/index.json
@@ -1,7 +1,7 @@
{
"usingComponents": {
"refresh-view": "/components/refresh-view/index",
- "van-cell": "/components/cell/index",
+ "select-item": "/pages/agent/select-item/index",
"van-image": "/components/image/index",
"van-divider": "/components/divider/index",
"van-loading": "/components/loading/index",
diff --git a/pages/agent/select-list/index.wxml b/pages/agent/select-list/index.wxml
index 637c684..c2109d2 100644
--- a/pages/agent/select-list/index.wxml
+++ b/pages/agent/select-list/index.wxml
@@ -1,5 +1,4 @@
-
选择代卖单
@@ -13,19 +12,10 @@
{{loading? '正在加载' : '暂无数据'}}
-
-
-
-
-
-
- {{item.plateNumber}}
- 「{{item.categoryName}}」
-
- 下单纸厂：{{item.millName || ''}}
-
-
-
+
+
+
+
diff --git a/pages/login/index.js b/pages/login/index.js
index 42b40cc..2c99018 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -129,7 +129,7 @@ Page({
return
}
headerFactoryId(app.userInfo.factoryId)
- // wx.redirectTo({ url: '/pages/setting/authory/index' })
+ // wx.redirectTo({ url: '/pages/agent/select-list/index' })
wx.redirectTo({ url: '/pages/index/index' })
} else {
wx.redirectTo({ url: '/pages/client/index/index' })
diff --git a/pages/moment/new-list/index.js b/pages/moment/new-list/index.js
index 5f7eb53..c380cd4 100644
--- a/pages/moment/new-list/index.js
+++ b/pages/moment/new-list/index.js
@@ -39,7 +39,7 @@ Scene({
return
}
if(!e.currentTarget.dataset.operations){
- util.showToast('该纸厂已暂停接单，请联系相关负责人！')
+ util.showToast(e.currentTarget.dataset.msg)
return
}
wx.navigateTo({url: `/pages/agent/appointment/index?id=${e.currentTarget.dataset.fcid}&categoryId=${e.currentTarget.dataset.paperid}`})
diff --git a/pages/moment/new-list/index.wxml b/pages/moment/new-list/index.wxml
index d46d725..51dc873 100644
--- a/pages/moment/new-list/index.wxml
+++ b/pages/moment/new-list/index.wxml
@@ -79,7 +79,7 @@
class="text-df {{cell.curDeductionPoint>0?'text-red':(cell.curDeductionPoint<0?'text-green':'text-black')}}"
style="flex:1;text-align: center">{{cell.curDeductionPoint|| 0}}
+ data-fcId="{{item.paperMillId}}" data-paperId="{{cell.categoryId}}" data-operations="{{item.isOperations}}" data-msg="{{item.manageNotifyMessage}}" catchtap="toPage">
代卖
diff --git a/pages/setting/authory/index.wxml b/pages/setting/authory/index.wxml
index 35c9cc0..27540d8 100644
--- a/pages/setting/authory/index.wxml
+++ b/pages/setting/authory/index.wxml
@@ -5,7 +5,7 @@
-
+ *
请拍摄/上传本人身份证（头像面）
@@ -24,7 +24,7 @@
-
+ *
请拍摄/上传本人身份证（国徽面）
@@ -49,20 +49,20 @@
*
姓名：
-
+
*
身份证号码：
-
+
- 手动输入
-
+
提交
diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml
index fd24d51..dabcfd6 100644
--- a/pages/storage/order-info/index.wxml
+++ b/pages/storage/order-info/index.wxml
@@ -32,13 +32,16 @@
{{orderInfo.plateNumber || ''}}
-
+
司机姓名
- {{ orderInfo.driverName || ''}}
-
+
+
+ 代卖订单详情
+
+