|
@@ -27,6 +27,7 @@ Page({
|
|
tmplIds: []
|
|
tmplIds: []
|
|
},
|
|
},
|
|
onLoad(options) {
|
|
onLoad(options) {
|
|
|
|
+ // if MP
|
|
this.getLocUserInfo()
|
|
this.getLocUserInfo()
|
|
if (Object.keys(this.data.userInfo).length > 0) {
|
|
if (Object.keys(this.data.userInfo).length > 0) {
|
|
this.requestAgain()
|
|
this.requestAgain()
|
|
@@ -50,6 +51,10 @@ Page({
|
|
})
|
|
})
|
|
}, 6000)
|
|
}, 6000)
|
|
}
|
|
}
|
|
|
|
+ // elif ANDROID
|
|
|
|
+ this.getLocUserInfo()
|
|
|
|
+ this.requestAgain()
|
|
|
|
+ // endif
|
|
},
|
|
},
|
|
onShow() {
|
|
onShow() {
|
|
if (typeof this.getTabBar === 'function') {
|
|
if (typeof this.getTabBar === 'function') {
|
|
@@ -72,6 +77,16 @@ Page({
|
|
},
|
|
},
|
|
})
|
|
})
|
|
this.storeBindings.updateStoreBindings()
|
|
this.storeBindings.updateStoreBindings()
|
|
|
|
+ // if ANDROID
|
|
|
|
+ console.log(this.data.userInfo.grade);
|
|
|
|
+ if(!this.data.userInfo.grade){
|
|
|
|
+ this.setData({
|
|
|
|
+ userInfo:{
|
|
|
|
+ grade:"PRIMARY_FIRST_GRADE"
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ // endif
|
|
},
|
|
},
|
|
async getCategoryList() {
|
|
async getCategoryList() {
|
|
let grade = this.data.userInfo.grade
|
|
let grade = this.data.userInfo.grade
|