|
@@ -19,16 +19,13 @@ Page({
|
|
|
*/
|
|
|
onLoad: function ( opt) {
|
|
|
let TabCur = app.globalData.taskTab||0;
|
|
|
- console.log( "TabCur", TabCur)
|
|
|
this.setData( {TabCur} )
|
|
|
- app.checkLogin( ()=>{
|
|
|
- this.getuserInfo( this.loadData)
|
|
|
- } )
|
|
|
+ app.checkLogin( )
|
|
|
},
|
|
|
- getuserInfo( cb ){
|
|
|
+ onShow( ){
|
|
|
app.getMakerInfo( (userInfo)=>{
|
|
|
this.setData({userInfo})
|
|
|
- cb&&cb()
|
|
|
+ this.doOnShow()
|
|
|
} )
|
|
|
},
|
|
|
tabSelect(e){
|
|
@@ -56,7 +53,7 @@ Page({
|
|
|
wx.stopPullDownRefresh();
|
|
|
})
|
|
|
},
|
|
|
- onShow(){
|
|
|
+ doOnShow(){
|
|
|
let action = app.getAction()
|
|
|
if( action && action.action=="addDeliverImg"){
|
|
|
let list = this.data.list;
|
|
@@ -67,6 +64,7 @@ Page({
|
|
|
})
|
|
|
this.setData({list});
|
|
|
}
|
|
|
+ this.loadData()
|
|
|
},
|
|
|
onReachBottom: function () {
|
|
|
var that = this
|