From 09f52581dee5373d84972b831bcb2ffad203c74e Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 27 Jul 2021 16:33:34 +0800
Subject: [PATCH] no message
---
pages/process/agent-list/index.js | 2 --
pages/process/order-check/index.js | 17 ++++++++++++++++-
pages/process/order-check/index.wxml | 2 +-
pages/process/order-price/index.js | 28 ++++++++++++++--------------
pages/process/order-price/index.wxml | 4 ++--
pages/setting/vehicle-list/index.js | 14 +++++++-------
6 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/pages/process/agent-list/index.js b/pages/process/agent-list/index.js
index 4151cd9..daee81d 100644
--- a/pages/process/agent-list/index.js
+++ b/pages/process/agent-list/index.js
@@ -96,7 +96,5 @@ Scene({
} else {
wx.navigateTo({ url: `/pages/process/outside-info/index?agent=1&id=${item.orderId}&status=${item.status}` })
}
-
}
-
})
\ No newline at end of file
diff --git a/pages/process/order-check/index.js b/pages/process/order-check/index.js
index 514c544..e83d549 100644
--- a/pages/process/order-check/index.js
+++ b/pages/process/order-check/index.js
@@ -45,6 +45,20 @@ Scene({
})
}
},
+ selectCustomer: function(){
+ var that = this
+ wx.navigateTo({
+ url: `/pages/home/customer-list/index?type=1`,
+ events: {
+ onCallback: (data) => {
+ if (data.what == 130) {
+ that.data.form.factoryCustomerId = data.detail.id
+ that.setData({ ['form.factoryCustomerName']: data.detail.name })
+ }
+ }
+ }
+ })
+ },
showPlate: function (e) {
this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard')
this.keyboard.show(this.data.form.plateNumber, 0)
@@ -142,7 +156,8 @@ Scene({
data.productId = this.data.form.productId
data.deductType = this.data.form.deductType
data.unitPrice = Number(this.data.form.unitPrice)
- checkingOrder({ id: this.data.form.id, editOrderPriceDto: data }).then(result => {
+ var factoryCustomerId = this.data.form.factoryCustomerId
+ checkingOrder({ id: this.data.form.id, factoryCustomerId, editOrderPriceDto: data }).then(result => {
wx.hideLoading()
event.emit('OrderMessage', { what: 12, desc: 'checkingOrder' })
util.showBackToast('订单审核已通过')
diff --git a/pages/process/order-check/index.wxml b/pages/process/order-check/index.wxml
index ee11f71..2b7dfa0 100644
--- a/pages/process/order-check/index.wxml
+++ b/pages/process/order-check/index.wxml
@@ -8,7 +8,7 @@
订单信息
-
+
客户姓名
{{form.factoryCustomerName}}
diff --git a/pages/process/order-price/index.js b/pages/process/order-price/index.js
index fee5eb2..bd7992a 100644
--- a/pages/process/order-price/index.js
+++ b/pages/process/order-price/index.js
@@ -62,20 +62,20 @@ Scene({
nextStep: function (e) {
this.setData({ step: 2 })
},
- selectCustomer: function(){
- var that = this
- wx.navigateTo({
- url: `/pages/home/customer-list/index?type=1`,
- events: {
- onCallback: (data) => {
- if (data.what == 130) {
- that.data.form.factoryCustomerId = data.detail.id
- that.setData({ ['form.factoryCustomerName']: data.detail.name })
- }
- }
- }
- })
- },
+ // selectCustomer: function(){
+ // var that = this
+ // wx.navigateTo({
+ // url: `/pages/home/customer-list/index?type=1`,
+ // events: {
+ // onCallback: (data) => {
+ // if (data.what == 130) {
+ // that.data.form.factoryCustomerId = data.detail.id
+ // that.setData({ ['form.factoryCustomerName']: data.detail.name })
+ // }
+ // }
+ // }
+ // })
+ // },
showPlate: function (e) {
this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard')
this.keyboard.show(this.data.form.plateNumber, 0)
diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml
index 06f657c..d64c8e5 100644
--- a/pages/process/order-price/index.wxml
+++ b/pages/process/order-price/index.wxml
@@ -4,7 +4,7 @@
-
+
客户姓名
{{form.factoryCustomerName}}
@@ -35,7 +35,7 @@
订单信息
-
+
客户姓名
{{form.factoryCustomerName}}
diff --git a/pages/setting/vehicle-list/index.js b/pages/setting/vehicle-list/index.js
index d4824bc..bea81e0 100644
--- a/pages/setting/vehicle-list/index.js
+++ b/pages/setting/vehicle-list/index.js
@@ -52,12 +52,13 @@ Scene({
this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false })
this.fetchOrderList()
},
- fetchOrderList: function () {
+ fetchOrderList: async function () {
if (this.data.requesting || this.data.finished) {
return
}
this.data.requesting = true
- getCarList(this.data.form).then(result => {
+ try {
+ var result = await getCarList(this.data.form)
if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
let nowList = `orderList[${this.data.orderList.length}]`
@@ -67,13 +68,12 @@ Scene({
} else {
this.setData({ finished: true, requesting: false, loading: false })
}
- }).catch(err => {
+ } catch (err) {
this.setData({ requesting: false, loading: false })
util.showToast(err)
- }).then(() => {
- this.refresh = this.refresh || this.selectComponent('#refresh')
- this.refresh.setRefresh(false)
- })
+ }
+ this.refresh = this.refresh || this.selectComponent('#refresh')
+ this.refresh.setRefresh(false)
},
lookItem: function (e) {
if(e.currentTarget.dataset.page >= 0){