@@ -46,6 +46,9 @@ Page({ | |||||
let that = this; | let that = this; | ||||
that.getBussiness(); | that.getBussiness(); | ||||
that.getList(1, 0); | that.getList(1, 0); | ||||
wx.showLoading({ | |||||
title: '加载中...', | |||||
}) | |||||
}, | }, | ||||
onShow(){ | onShow(){ | ||||
let that = this; | let that = this; | ||||
@@ -98,6 +101,7 @@ Page({ | |||||
url: config.api.merchantList, | url: config.api.merchantList, | ||||
data: data | data: data | ||||
}).then(res => { | }).then(res => { | ||||
wx.hideLoading(); | |||||
if (page == 1) { | if (page == 1) { | ||||
that.setData({ | that.setData({ | ||||
merchantVoList: [], | merchantVoList: [], | ||||
@@ -114,6 +118,7 @@ Page({ | |||||
console.log(that.data.merchantVoList) | console.log(that.data.merchantVoList) | ||||
}) | }) | ||||
.catch(err => { | .catch(err => { | ||||
wx.hideLoading(); | |||||
wx.showToast({ | wx.showToast({ | ||||
title: err.errMsg, | title: err.errMsg, | ||||
icon: 'none', | icon: 'none', | ||||
@@ -68,6 +68,9 @@ Page({ | |||||
}, | }, | ||||
//跳转到报名详情页 | //跳转到报名详情页 | ||||
goSignUp(e) { | goSignUp(e) { | ||||
wx.showLoading({ | |||||
title: '报名中...', | |||||
}) | |||||
let activityId = e.currentTarget.dataset.activityid; | let activityId = e.currentTarget.dataset.activityid; | ||||
this.checkUserStatus(activityId); | this.checkUserStatus(activityId); | ||||
}, | }, | ||||
@@ -77,10 +80,12 @@ Page({ | |||||
url: config.api.checkPhoneStatus, | url: config.api.checkPhoneStatus, | ||||
data: {} | data: {} | ||||
}).then(res=>{ | }).then(res=>{ | ||||
wx.hideLoading() | |||||
wx.navigateTo({ | wx.navigateTo({ | ||||
url: `/pages/radetail/joinActivity/edit?activityId=${activityId}`, | url: `/pages/radetail/joinActivity/edit?activityId=${activityId}`, | ||||
}) | }) | ||||
}).catch(err=>{ | }).catch(err=>{ | ||||
wx.hideLoading() | |||||
wx.navigateTo({ | wx.navigateTo({ | ||||
url: `/pages/getphoneInfo/index?signActivity=${activityId}`, | url: `/pages/getphoneInfo/index?signActivity=${activityId}`, | ||||
}) | }) | ||||