Browse Source

finally的问题,修改为then

feature/v1.5
xpz2018 4 years ago
parent
commit
e3b064ac7d
20 changed files with 21 additions and 23 deletions
  1. 2
      pages/agent/ability-list/index.js
  2. 2
      pages/agent/factory-fragment/index.js
  3. 2
      pages/agent/focus-fragment/index.js
  4. 2
      pages/agent/order-list/index.js
  5. 2
      pages/agent/select-list/index.js
  6. 2
      pages/client/factory-list/index.js
  7. 3
      pages/client/order-list/index.js
  8. 2
      pages/home/customer-list/index.js
  9. 2
      pages/home/factory-list/index.js
  10. 2
      pages/message/card-list/index.js
  11. 2
      pages/message/index/index.js
  12. 2
      pages/process/agent-list/index.js
  13. 2
      pages/process/check-list/index.js
  14. 2
      pages/process/order-list/index.js
  15. 4
      pages/process/outside-list/index.js
  16. 2
      pages/process/payment-list/index.js
  17. 2
      pages/setting/paper-list/index.js
  18. 2
      pages/settlement/bill-list/index.js
  19. 2
      pages/storage/order-list/index.js
  20. 3
      pages/storage/pound-list/index.js

2
pages/agent/ability-list/index.js

@ -50,7 +50,7 @@ Scene({
} }
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, finished: true, loading: false }) this.setData({ requesting: false, finished: true, loading: false })
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/agent/factory-fragment/index.js

@ -97,7 +97,7 @@ Component({
} }
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, finished: true, loading: false, }) this.setData({ requesting: false, finished: true, loading: false, })
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/agent/focus-fragment/index.js

@ -74,7 +74,7 @@ Component({
} }
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, finished: true, loading: false, }) this.setData({ requesting: false, finished: true, loading: false, })
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/agent/order-list/index.js

@ -88,7 +88,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/agent/select-list/index.js

@ -52,7 +52,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/client/factory-list/index.js

@ -53,7 +53,7 @@ Page({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

3
pages/client/order-list/index.js

@ -97,8 +97,7 @@ Page({
} }
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
console.log(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/home/customer-list/index.js

@ -73,7 +73,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/home/factory-list/index.js

@ -91,7 +91,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/message/card-list/index.js

@ -62,7 +62,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/message/index/index.js

@ -70,7 +70,7 @@ Component({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/process/agent-list/index.js

@ -84,7 +84,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/process/check-list/index.js

@ -69,7 +69,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/process/order-list/index.js

@ -95,7 +95,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

4
pages/process/outside-list/index.js

@ -95,7 +95,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })
@ -155,7 +155,7 @@ Scene({
wx.navigateTo({ url: '/pages/process/order-price/index?id=' + e.currentTarget.dataset.id }) wx.navigateTo({ url: '/pages/process/order-price/index?id=' + e.currentTarget.dataset.id })
}, },
addOutside: function(e){ addOutside: function(e){
wx.navigateTo({ url: '/pages/process/outside-check/index' })
wx.navigateTo({ url: '/pages/process/outside-add/index' })
}, },
onUnload: function(){ onUnload: function(){
event.remove('OrderMessage', this) event.remove('OrderMessage', this)

2
pages/process/payment-list/index.js

@ -79,7 +79,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/setting/paper-list/index.js

@ -63,7 +63,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/settlement/bill-list/index.js

@ -52,7 +52,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

2
pages/storage/order-list/index.js

@ -84,7 +84,7 @@ Scene({
}).catch(err => { }).catch(err => {
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

3
pages/storage/pound-list/index.js

@ -82,10 +82,9 @@ Scene({
this.setData({ finished: true, requesting: false, loading: false }) this.setData({ finished: true, requesting: false, loading: false })
} }
}).catch(err => { }).catch(err => {
console.log(err)
this.setData({ requesting: false, loading: false }) this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}).finally(() => {
}).then(() => {
this.refresh = this.refresh || this.selectComponent('#refresh') this.refresh = this.refresh || this.selectComponent('#refresh')
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })

Loading…
Cancel
Save