Browse Source

no message

feature/v1.4
xpz2018 5 years ago
parent
commit
63ca718978
19 changed files with 38 additions and 34 deletions
  1. 3
      components/refresh-view/index.js
  2. 5
      pages/agent/index/index.js
  3. 3
      pages/agent/index/index.json
  4. 5
      pages/agent/index/index.wxml
  5. 15
      pages/agent/select-list/index.js
  6. 12
      pages/agent/select-list/index.wxml
  7. 2
      pages/client/factory-list/index.js
  8. 2
      pages/client/order-list/index.js
  9. 2
      pages/home/customer-list/index.js
  10. 2
      pages/home/factory-list/index.js
  11. 4
      pages/home/index/index.wxml
  12. 2
      pages/login/index.js
  13. 2
      pages/process/agent-list/index.js
  14. 2
      pages/process/check-list/index.js
  15. 2
      pages/process/order-list/index.js
  16. 2
      pages/process/payment-list/index.js
  17. 2
      pages/setting/paper-list/index.js
  18. 2
      pages/storage/order-list/index.js
  19. 3
      pages/storage/pound-list/index.js

3
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)
}
}

5
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 () {

3
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"
}
}

5
pages/agent/index/index.wxml

@ -65,7 +65,4 @@
</view>
<view style="height:24rpx;"></view>
</scroll-view>
<!-- <van-action-sheet show="{{ show }}" actions="{{ actions }}" bind:close="onClose" bind:select="onSelect" z-index="22"/> -->
<van-calendar show="{{ show }}" type="range" row-height="50" color="#008AFF" z-index="22" min-date="{{ minDate }}" max-date="{{ maxDate }}" default-date="{{ vdate }}" top="{{ 1500 }}" show-subtitle="{{ false }}" show-confirm="{{ false }}" bind:close="onClose" bind:confirm="onSelect"/>
</scroll-view>

15
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()
}
})

12
pages/agent/select-list/index.wxml

@ -13,12 +13,16 @@
<view class="text-empty">{{loading? '正在加载' : '暂无数据'}}</view>
</view>
<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
<van-cell clickable is-link center wx:for="{{pageItem}}" wx:key="index">
<van-cell clickable center is-link center wx:for="{{pageItem}}" wx:key="index">
<view slot="title" class="flex flex-justify" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
<van-image round width="80rpx" height="80rpx" src="{{ item.avatarUrl || '/assets/image/ygImg.png' }}" />
<van-image round width="80rpx" height="80rpx" src="{{ item.logoImg || '/assets/image/icon_logo.png' }}" />
<view style="margin-left:18rpx;width:100%;flex:1">
<view class="text-sg text-bold">{{item.name || ''}}</view>
<view class="text-sm text-gray" style="line-height:32rpx">{{item.mobile || ('卡号:' + item.cardNo)}}</view>
<view class="flex flex-justify {{index != 0 || 'text-blue'}}">
<text class="text-sg text-bold text-cut" style="width:220rpx">广州九尾造纸厂</text>
<text class="text-sg text-bold">粤KUU283</text>
<text class="text-sg text-bold">「黄纸边」</text>
</view>
<view class="text-sm text-gray" style="line-height:32rpx">下单时间:2021年4月28日 17:23:48</view>
</view>
</view>
</van-cell>

2
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}]`

2
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++) {

2
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

2
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

4
pages/home/index/index.wxml

@ -55,9 +55,9 @@
<van-grid-item text="出货渠道" url="/pages/home/factory-list/index">
<van-icon slot="icon" name="newspaper-o" size="60rpx" />
</van-grid-item>
<van-grid-item text="二维码名片" url="/pages/home/qrcode/index">
<!-- <van-grid-item text="二维码名片" url="/pages/home/qrcode/index">
<van-icon slot="icon" name="qr" size="60rpx" />
</van-grid-item>
</van-grid-item> -->
</van-grid>
</view>

2
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' })

2
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++) {

2
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++) {

2
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++) {

2
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++) {

2
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

2
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
// 对返回的消息列表进行处理,将同一天的消息显示在一起

3
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(() => {

Loading…
Cancel
Save