diff --git a/components/refresh-view/index.js b/components/refresh-view/index.js
index fdbc2de..e591a29 100644
--- a/components/refresh-view/index.js
+++ b/components/refresh-view/index.js
@@ -10,7 +10,7 @@ Component({
},
threshold: { // 下拉刷新阈值，下拉距离超过该值触发刷新
type: Number,
- value: 40
+ value: 32
},
color: { // 下拉刷新进度条颜色
type: String,
@@ -28,7 +28,6 @@ Component({
type: Boolean,
value: false,
observer(value) {
- console.log('refreshing>>>')
this.setRefresh(false)
}
}
diff --git a/pages/agent/index/index.js b/pages/agent/index/index.js
index 8acd882..858d875 100644
--- a/pages/agent/index/index.js
+++ b/pages/agent/index/index.js
@@ -13,7 +13,7 @@ Component({
/** 页面的初始数据 */
data: {
userInfo: app.userInfo,
- height: app.globalData.safeFragmentHeight,
+ height: app.globalData.safeFragmentHeight - 100,
tabList: [
{ status: 50, badge: '', name: '待预约', icon: '/assets/agent/icon-dyy.png' },
{ status: 51, badge: '', name: '待送货', icon: '/assets/agent/icon-dsh.png' },
@@ -23,8 +23,7 @@ Component({
},
lifetimes: {
attached: function () {
- var height = app.globalData.safeFragmentHeight - 100
- this.setData({userInfo: app.userInfo, height })
+ this.setData({userInfo: app.userInfo, height: app.globalData.safeFragmentHeight - 100 })
event.on('EventMessage', this, this.onEvent)
},
detached: function () {
diff --git a/pages/agent/index/index.json b/pages/agent/index/index.json
index eb60529..b869717 100644
--- a/pages/agent/index/index.json
+++ b/pages/agent/index/index.json
@@ -6,7 +6,6 @@
"van-cell": "/components/cell/index",
"van-cell-group": "/components/cell-group/index",
"van-info": "/components/info/index",
- "van-icon": "/components/icon/index",
- "van-calendar": "/components/calendar/index"
+ "van-icon": "/components/icon/index"
}
}
\ No newline at end of file
diff --git a/pages/agent/index/index.wxml b/pages/agent/index/index.wxml
index 7d3e54e..fd37b3a 100644
--- a/pages/agent/index/index.wxml
+++ b/pages/agent/index/index.wxml
@@ -65,7 +65,4 @@
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/agent/select-list/index.js b/pages/agent/select-list/index.js
index 5c13dd2..0efa46b 100644
--- a/pages/agent/select-list/index.js
+++ b/pages/agent/select-list/index.js
@@ -16,11 +16,15 @@ Scene({
pageNum: 1,
pageSize: 10
},
- lastTime: null
+ itemId: null
},
// * 生命周期函数--监听页面加载
onLoad: function (options) {
- this.setData({ height: app.globalData.fragmentHeight })
+ if(options.itemId){
+ this.setData({ height: app.globalData.fragmentHeight, itemId: options.itemId })
+ } else {
+ this.setData({ height: app.globalData.fragmentHeight })
+ }
this.fetchOrderList()
},
onRefreshList: function (isame) {
@@ -30,14 +34,13 @@ Scene({
this.setData({ orderList: [], ['form.pageNum']: 1, ['form.isSameCustomer']: isame == 1 ? 1 : 0, loading: true, finished: false })
this.fetchOrderList()
},
- //1：待定价，2：待过皮重，3：待过磅审核，4：待付款，5：已完成
fetchOrderList: function () {
if (this.data.requesting || this.data.finished) {
return
}
this.data.requesting = true
getPeymentList(this.data.form).then(result => {
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
let nowList = `orderList[${this.data.orderList.length}]`
var num = this.data.form.pageNum
@@ -57,9 +60,11 @@ Scene({
lookItem: function (e) {
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
const channel = this.getOpenerEventChannel()
+ if(!channel){
+ return
+ }
channel.emit('onCallback', { what: 62, detail: item })
wx.navigateBack()
-
}
})
\ No newline at end of file
diff --git a/pages/agent/select-list/index.wxml b/pages/agent/select-list/index.wxml
index 92bd043..a28371e 100644
--- a/pages/agent/select-list/index.wxml
+++ b/pages/agent/select-list/index.wxml
@@ -13,12 +13,16 @@
{{loading? '正在加载' : '暂无数据'}}
-
+
-
+
- {{item.name || ''}}
- {{item.mobile || ('卡号：' + item.cardNo)}}
+
+ 广州九尾造纸厂
+ 粤KUU283
+ 「黄纸边」
+
+ 下单时间：2021年4月28日 17:23:48
diff --git a/pages/client/factory-list/index.js b/pages/client/factory-list/index.js
index 67ad0c3..1b42967 100644
--- a/pages/client/factory-list/index.js
+++ b/pages/client/factory-list/index.js
@@ -40,7 +40,7 @@ Page({
}
this.data.requesting = true
getFactoryOrderList(this.data.form).then(result => {
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
// 对返回的消息列表进行处理，将同一天的消息显示在一起
let nowList = `orderList[${this.data.orderList.length}]`
diff --git a/pages/client/order-list/index.js b/pages/client/order-list/index.js
index c04afe2..8155635 100644
--- a/pages/client/order-list/index.js
+++ b/pages/client/order-list/index.js
@@ -67,7 +67,7 @@ Page({
this.setData({ requesting: true })
}
getCustomerOrderList(this.data.form).then(result => {
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
// 对返回的消息列表进行处理，将同一天的消息显示在一起
for (let i = 0; i < respList.length; i++) {
diff --git a/pages/home/customer-list/index.js b/pages/home/customer-list/index.js
index 542bb58..602b0e3 100644
--- a/pages/home/customer-list/index.js
+++ b/pages/home/customer-list/index.js
@@ -57,7 +57,7 @@ Scene({
this.setData({ requesting: true })
}
getCustomerList(this.data.form).then(result => {
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
let nowList = `orderList[${this.data.orderList.length}]`
var num = this.data.form.pageNum
diff --git a/pages/home/factory-list/index.js b/pages/home/factory-list/index.js
index 4552083..0d938ad 100644
--- a/pages/home/factory-list/index.js
+++ b/pages/home/factory-list/index.js
@@ -75,7 +75,7 @@ Scene({
}
this.data.requesting = true
getChanelList(this.data.form).then(result => {
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
let nowList = `orderList[${this.data.orderList.length}]`
var num = this.data.form.pageNum
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index c3d905f..4af8338 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -55,9 +55,9 @@
-
+
diff --git a/pages/login/index.js b/pages/login/index.js
index 27e6c38..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/agent/result/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/process/agent-list/index.js b/pages/process/agent-list/index.js
index 18e50e1..46a5234 100644
--- a/pages/process/agent-list/index.js
+++ b/pages/process/agent-list/index.js
@@ -53,7 +53,7 @@ Scene({
}
this.data.requesting = true
getAgentOrderList(this.data.form).then(result => {
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
// 对返回的消息列表进行处理，将同一天的消息显示在一起
for (let i = 0; i < respList.length; i++) {
diff --git a/pages/process/check-list/index.js b/pages/process/check-list/index.js
index b84dc81..f99562a 100644
--- a/pages/process/check-list/index.js
+++ b/pages/process/check-list/index.js
@@ -75,7 +75,7 @@ Scene({
})
},
handResult: function(result){
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
// 对返回的消息列表进行处理，将同一天的消息显示在一起
for (let i = 0; i < respList.length; i++) {
diff --git a/pages/process/order-list/index.js b/pages/process/order-list/index.js
index f81cdb5..f3871be 100644
--- a/pages/process/order-list/index.js
+++ b/pages/process/order-list/index.js
@@ -101,7 +101,7 @@ Scene({
})
},
handResult: function(result){
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
// 对返回的消息列表进行处理，将同一天的消息显示在一起
for (let i = 0; i < respList.length; i++) {
diff --git a/pages/process/payment-list/index.js b/pages/process/payment-list/index.js
index 07621dd..eb5bb36 100644
--- a/pages/process/payment-list/index.js
+++ b/pages/process/payment-list/index.js
@@ -45,7 +45,7 @@ Scene({
}
this.data.requesting = true
getPeymentList(this.data.form).then(result => {
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
// 对返回的消息列表进行处理，将同一天的消息显示在一起
for (let i = 0; i < respList.length; i++) {
diff --git a/pages/setting/paper-list/index.js b/pages/setting/paper-list/index.js
index 5975cf2..a061247 100644
--- a/pages/setting/paper-list/index.js
+++ b/pages/setting/paper-list/index.js
@@ -47,7 +47,7 @@ Scene({
}
this.data.requesting = true
getPaperPrice(this.data.form).then(result => {
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
let nowList = `orderList[${this.data.orderList.length}]`
var num = this.data.form.pageNum
diff --git a/pages/storage/order-list/index.js b/pages/storage/order-list/index.js
index 8db33be..a6f133f 100644
--- a/pages/storage/order-list/index.js
+++ b/pages/storage/order-list/index.js
@@ -90,7 +90,7 @@ Scene({
})
},
handResult: function(result){
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
var respList = result.data.records
// 对返回的消息列表进行处理，将同一天的消息显示在一起
diff --git a/pages/storage/pound-list/index.js b/pages/storage/pound-list/index.js
index 8b167e5..c63e485 100644
--- a/pages/storage/pound-list/index.js
+++ b/pages/storage/pound-list/index.js
@@ -49,7 +49,7 @@ Scene({
}
this.data.requesting = true
getPoundList(this.data.form).then(result => {
- if (result.data && result.data.records.length) {
+ if (result.data && result.data.records && result.data.records.length) {
var respList = result.data.records
// 对返回的消息列表进行处理，将同一天的消息显示在一起
for (let i = 0; i < respList.length; i++) {
@@ -82,6 +82,7 @@ Scene({
this.setData({ finished: true, requesting: false, loading: false })
}
}).catch(err => {
+ console.log(err)
this.setData({ requesting: false, loading: false })
util.showToast(err)
}).finally(() => {